0.3.7.021

This commit is contained in:
vbawol 2016-01-12 20:53:57 -06:00
parent 08a1e85a67
commit 0b357e10c6
20 changed files with 175 additions and 66 deletions

View File

@ -2,6 +2,7 @@
[Added] Repack magazines feature. Simply select a magazine and press the "Repack" button.
[Added] 55 Gallon (210 liters) Fuel Barrel that can be used to refill/siphon vehicles. (Full - ItemBarrelF,Empty - ItemBarrelE).
[Added] Ability to siphon fuel from other fuel sources like gas stations and gas tanks.
[Added] Crafting Burlap from Hemp.
[ADDED-WIP] Pack/unpack empty backpacks into carryable magazine items.
[ADDED-WIP] Hotwire Kit (ItemHotwire).
[ADDED-WIP] Key Makers Kit (ItemKeyKit).
@ -15,6 +16,9 @@
[ADDED-WIP] Copper Bars (ItemCopperBar).
[ADDED-WIP] Tin Bars (ItemTinBar).
[ADDED-WIP] Plywood sheets in small and large stacks (ItemPlywood,ItemPlywoodPack).
[Changed] Drinking Alcohol increases the new "Alcohol" stat instead of directly effecting blood pressure.
[Changed] Crafting Hesco barrier now require 3x Burlap.
[Changed] Crafting wood and meta spike traps now require 2x Sticks.
[Changed] Change all publicVariableServer calls to use remoteExec calls for better performance.
[Fixed] Prevented death just after revive due still having high blood pressure.
[Fixed] Incorrectly being able to sell/buy items from a dead trader.
@ -29,5 +33,6 @@
[Changed] Driver or passengers of a driverless can now control vehicle locks. Also only the owner can control locks from outside of a occupied vehicle.
[Changed] Commented out Halloween masks from loot tables.
[Updated] New Battleye remoteExec.txt for added remoteExec calls.
[Fixed] Player positions in database now use Epoch precision position functions this fixes loading issues noticed in testing.
[Fixed] When killed instead of saving blank array delete (object,trader,vehicle) data from database.
[Info] Removed old .bikey and added new one for 0370.

View File

@ -51,7 +51,7 @@
7 ctrlSetEventHandler !"BIS_fnc_guiMessage_status" !"ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\""
7 addMPEventHandler
7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !"[\"FiredNear"\" !"[\"EpeContactStart"\" !"[\"GetOut"\" !"[\"local"\" !"[\"PostReset"\" !"[\"TaskSetAsCurrent"\" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];"
7 displayAddEventHandler !="_display displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !"[_display] call _fnc_animate;" !"tVersion select 4) == \"Development\") then" !"_display displayaddeventhandler\n[\n\"mousemoving\"," !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown;}];" !"_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'"
7 displayAddEventHandler !="(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !="_display displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !"[_display] call _fnc_animate;" !"tVersion select 4) == \"Development\") then" !"_display displayaddeventhandler\n[\n\"mousemoving\"," !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown;}];" !"_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'"
7 ctrlAddEventHandler !"rCfg >> \"refreshDelay\");" !" [\n\"draw\"," !" [\"buttonclick\"," !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];"
7 removeAllEventHandlers !="ctrlRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_unit removeAllEventHandlers \"Hit\";\n_unit removeAllEventHandlers \"FiredNear\";" !="_display46 displayRemoveAllEventHandlers 'KeyDown';"
7 removeAllMissionEventHandlers

View File

@ -61,8 +61,6 @@ _giveAttributes = {
_return = format["Immunity: %1%2 (%3/%4)<br />", _addPlus, _data, EPOCH_playerImmunity, 100];
};
case 6: {
// EPOCH_playerToxicity = ((EPOCH_playerToxicity + _data) min 100) max 0;
// new random tox
_randomData = round(random _data);
EPOCH_playerToxicity = ((EPOCH_playerToxicity + _randomData) min 100) max 0;
_return = format["Toxicity: %1%2 (%3/%4)<br />", _addPlus, _randomData, EPOCH_playerToxicity, 100];
@ -72,6 +70,7 @@ _giveAttributes = {
_return = format["Stamina: %1%2 (%3/%4)<br />", _addPlus, _data, EPOCH_playerStamina, EPOCH_playerStaminaMax];
};
case 8: {
// this is handled server side
//EPOCH_playerCrypto = ((EPOCH_playerCrypto + _data) min 25000) max 0;
//_return = format["Krypto: %1%2 (%3)<br />", _addPlus, _data, EPOCH_playerCrypto];
};
@ -79,6 +78,20 @@ _giveAttributes = {
EPOCH_playerBloodP = ((EPOCH_playerBloodP + _data) min 190) max 0;
_return = format["Blood Pressure: %1%2 (%3/%4)<br />", _addPlus, _data, EPOCH_playerBloodP, 100];
};
case 10: {
EPOCH_playerKarma = ((EPOCH_playerKarma + _data) min 50000) max -50000;
_return = format["Karma: %1%2 (%3/%4)<br />", _addPlus, _data, EPOCH_playerKarma, 50000];
};
case 11: {
EPOCH_playerAlcohol = ((EPOCH_playerAlcohol + _data) min 100) max 0;
_return = format["Alcohol: %1%2 (%3/%4)<br />", _addPlus, _data, EPOCH_playerAlcohol, 100];
};
case 12: {
EPOCH_playerRadiation = ((EPOCH_playerRadiation + _data) min 100) max 0;
_return = format["Radiation: %1%2 (%3/%4)<br />", _addPlus, _data, EPOCH_playerRadiation, 100];
};
};
};
_return

View File

@ -0,0 +1,9 @@
Epoch Mod for Arma 3
http://epochmod.com
by Epoch Mod Team
https://github.com/EpochModTeam/Epoch
The contents of this pbo are under the following license:
http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Keep this file and file headers with attribution intact for proper use.

View File

@ -31,7 +31,7 @@ class CfgMagazines
mass = 1;
interactAction = 2;
interactText = "DRINK";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,500,0,0,0,0,0,0,0};
};
class 1Rnd_Food: CA_Magazine
@ -44,7 +44,7 @@ class CfgMagazines
mass = 1;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,600,0,0,0,0,0,0,0,0};
};
@ -145,7 +145,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\soda_redbull.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_soda_rbull_CA.paa";
mass = 1;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,1000,0,0,0,0,100,0,0};
};
class ItemSodaOrangeSherbet : 1Rnd_Soda{
@ -154,7 +154,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\soda_sherbet.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\soda_orangesherbet_ca.paa";
mass = 1;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,800,0,0,0,0,75,0,0};
};
@ -164,7 +164,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\soda_purple.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\soda_purple_equip_ca.paa";
mass = 1;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 0, 800, 0, 0, 0, 0, 75, 0, 0 };
};
class ItemSodaMocha : 1Rnd_Soda{
@ -173,7 +173,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\soda_mocha.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\soda_mocha_equip_ca.paa";
mass = 1;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 0, 650, 0, 0, 0, 0, 150, 0, 0 };
};
class ItemSodaBurst : 1Rnd_Soda{
@ -182,7 +182,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\soda_burst.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\soda_burst_equip_ca.paa";
mass = 1;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 0, 800, 0, 0, 0, 0, 75, 0, 0 };
};
@ -194,7 +194,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\trout.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_rainbowtrout_CA.paa";
mass = 5;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 300, 0, 0, 0, 0, 5, 0, 0, 0 };
};
class ItemSeaBass : 1Rnd_Food{
@ -204,7 +204,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\seabass.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_seabass_CA.paa";
mass = 10;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 500, 0, 0, 0, 0, 10, 0, 0, 0 };
};
class ItemTuna : 1Rnd_Food{
@ -214,7 +214,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\tuna.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_tuna_CA.paa";
mass = 50;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 2500, 0, 0, 0, 0, 0, 0, 0, 0 };
};
class ItemTroutCooked : 1Rnd_Food{
@ -224,7 +224,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\trout_cooked.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_trout_cooked_CA.paa";
mass = 5;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 600, 0, 0, 0, 0, 0, 0, 0, 0 };
};
class ItemSeaBassCooked : 1Rnd_Food{
@ -234,7 +234,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\seabass_cooked.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_seabass_cooked_CA.paa";
mass = 10;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 1200, 0, 0, 0, 0, 0, 0, 0, 0 };
};
class ItemTunaCooked : 1Rnd_Food{
@ -244,7 +244,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\tuna_cooked.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_tuna_cooked_CA.paa";
mass = 50;
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 5000, 0, 0, 0, 0, 0, 0, 0, 0 };
};
@ -254,7 +254,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets_1\models\biomeat_can.p3d";
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_biomeat_CA.paa";
descriptionShort = "Bio Meat: A very good source of nutrition, and a very high chance of infection. Eat at own risk.";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,1000,0,0,0,0,7,0,0,0};
};
@ -264,7 +264,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets\models\meeps.p3d";
picture = "\x\addons\a3_epoch_assets\textures\candy\equip_meeps_ca.paa";
descriptionShort = "Pumpkin marshmallow candy";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,500,0,0,0,0,0,0,0,0};
};
class FoodSnooter : 1Rnd_Food{
@ -273,7 +273,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets\models\snooter.p3d";
picture = "\x\addons\a3_epoch_assets\textures\candy\equip_snooters_ca.paa";
descriptionShort = "Not hungry? grab a Snooters";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,500,0,0,0,0,0,50,0,0};
};
class FoodWalkNSons : 1Rnd_Soda{
@ -282,7 +282,7 @@ class CfgMagazines
model = "\x\addons\a3_epoch_assets\models\walkinson.p3d";
picture = "\x\addons\a3_epoch_assets\textures\candy\equip_walkinson_ca.paa";
descriptionShort = "Stuck walkin' grab a Walk N' Sons Soda";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,1200,0,0,0,0,150,0,0};
};
@ -493,7 +493,7 @@ class CfgMagazines
interactReturnOnUse = "ItemCoolerE";
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 5000, 0, 0, 0, 0, 0, 0, 0, 0 };
};
@ -811,7 +811,7 @@ class CfgMagazines
mass = 4;
interactAction = 9;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,0,100,0,0,0,0,0,0};
};
class EnergyPackLg : CA_Magazine
@ -828,7 +828,7 @@ class CfgMagazines
mass = 40;
interactAction = 9;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,0,1000,0,0,0,0,0,0};
};
@ -853,8 +853,8 @@ class CfgMagazines
mass = 1;
interactAction = 2;
interactText = "DRINK";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
interactAttributes[] = {0,0,800,0,0,0,-5,50,0,20};
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,800,0,0,0,-5,50,0,0,0,10,0};
};
class CircuitParts : CA_Magazine
@ -914,7 +914,7 @@ class CfgMagazines
mass = 1;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,0,0,0,0,20,0,0,0};
};
class SnakeCarcass_EPOCH : CA_Magazine
@ -928,7 +928,7 @@ class CfgMagazines
mass = 5;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 300, 0, 0, 0, 0, 10, 0, 0, 0 };
};
/*
@ -954,7 +954,7 @@ class CfgMagazines
mass = 5;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,1200,0,0,0,0,0,0,0,0};
};
class RabbitCarcass_EPOCH : CA_Magazine
@ -968,7 +968,7 @@ class CfgMagazines
mass = 5;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 300, 0, 0, 0, 0, 10, 0, 0, 0 };
};
class CookedRabbit_EPOCH : CA_Magazine
@ -982,7 +982,7 @@ class CfgMagazines
mass = 5;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,1200,0,0,0,0,0,0,0,0};
};
class ChickenCarcass_EPOCH : CA_Magazine
@ -996,7 +996,7 @@ class CfgMagazines
mass = 10;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 500, 0, 0, 0, 0, 25, 0, 0, 0 };
};
class CookedChicken_EPOCH : CA_Magazine
@ -1010,7 +1010,7 @@ class CfgMagazines
mass = 10;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,2000,0,0,0,0,0,0,0,0};
};
class GoatCarcass_EPOCH : CA_Magazine
@ -1024,7 +1024,7 @@ class CfgMagazines
mass = 20;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 500, 0, 0, 0, 0, 15, 0, 0, 0 };
};
class CookedGoat_EPOCH : CA_Magazine
@ -1038,7 +1038,7 @@ class CfgMagazines
mass = 20;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,3000,0,0,0,0,0,0,0,0};
};
class SheepCarcass_EPOCH : CA_Magazine
@ -1052,7 +1052,7 @@ class CfgMagazines
mass = 20;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 500, 0, 0, 0, 0, 15, 0, 0, 0 };
};
class CookedSheep_EPOCH : CA_Magazine
@ -1066,7 +1066,7 @@ class CfgMagazines
mass = 20;
interactAction = 1;
interactText = "EAT";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,3000,0,0,0,0,0,0,0,0};
};
@ -1438,7 +1438,7 @@ class CfgMagazines
mass = 1;
interactAction = 6;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 0, 0, 0, 0, 10, 0, -100, 0, -10 };
};
@ -1453,7 +1453,7 @@ class CfgMagazines
mass = 1;
interactAction = 6;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 0, 0, 0, 0, 0, -50, 0, 0, 0 };
};
@ -1468,7 +1468,7 @@ class CfgMagazines
mass = 1;
interactAction = 6;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = { 0, 500, 0, 0, 0, 0, 0, 50, 0, 0 };
};
@ -1483,7 +1483,7 @@ class CfgMagazines
mass = 1;
interactAction = 6;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {0,0,0,0,-25,0,0,0,0,0};
};
class HeatPack: CA_Magazine
@ -1497,7 +1497,7 @@ class CfgMagazines
mass = 1;
interactAction = 7;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {1,0,0,0,0,0,0,0,0,0};
};
class ColdPack : CA_Magazine
@ -1511,7 +1511,7 @@ class CfgMagazines
mass = 1;
interactAction = 8;
interactText = "USE";
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP
//Temp,Hunger,Thirst,Energy,Soiled,Immunity,Toxicity,Stamina,Crypto,BloodP,Karma,Alcohol,Radiation
interactAttributes[] = {-1,0,0,0,0,0,0,0,0,0};
};
};

View File

@ -228,7 +228,7 @@ class CfgCrafting
};
class ItemStick : Item
{
usedIn[] = { "WoodClub","MeleeMaul", "CrudeHatchet", "KitFirePlace" };
usedIn[] = { "WoodClub", "MeleeMaul", "CrudeHatchet", "KitFirePlace" , "KitSpikeTrap" , "KitMetalTrap" };
recipe[] = { { "WoodLog_EPOCH", 1 } };
previewPosition[] = {0.8,1,0.25};
previewScale = 0.4;
@ -236,7 +236,7 @@ class CfgCrafting
};
class ItemKiloHemp : Part
{
usedIn[] = { "ItemRope" };
usedIn[] = { "ItemRope", "ItemBurlap" };
previewPosition[] = {0.796267,1,0.322762};
previewScale = 0.9;
previewVector = 1.4;
@ -248,6 +248,13 @@ class CfgCrafting
previewPosition[] = {0.8,1,0.35};
previewScale = 4;
};
class ItemBurlap : Item
{
usedIn[] = { "KitHesco3" };
recipe[] = { { "ItemKiloHemp", 1 } };
previewPosition[] = {0.8,1,0.35};
previewScale = 4;
};
class MeleeMaul : Item
{
recipe[] = { { "ItemRock", 1 }, { "ItemStick", 2 }, { "ItemRope", 1 } };
@ -681,7 +688,7 @@ class CfgCrafting
class KitSpikeTrap : Kit
{
recipe[] = {{"PartPlankPack",4}};
recipe[] = {{"PartPlankPack",4},{"ItemStick",2}};
model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d";
nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
previewPosition[] = {0.797675,1,0.398882};
@ -690,7 +697,7 @@ class CfgCrafting
};
class KitMetalTrap : Kit
{
recipe[] = {{"PartPlankPack",4}, {"ItemScraps",2}};
recipe[] = {{"PartPlankPack",4}, {"ItemStick",2}, {"ItemScraps",2}};
model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d";
nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
previewPosition[] = {0.797675,1,0.398882};
@ -747,7 +754,7 @@ class CfgCrafting
};
class KitHesco3 : Kit
{
recipe[] = { { "MortarBucket", 2 }, { "ItemCorrugatedLg", 2 } };
recipe[] = { { "ItemBurlap", 3 }, { "MortarBucket", 2 }, { "ItemCorrugatedLg", 2 } };
nearby[] = { { "Workbench", "", "workbench", { 1, { "WorkBench_EPOCH" } }, 3, 1, 0, 1 } };
model = "\x\addons\a3_epoch_assets_3\CfgVehicles\Defense\hesco.p3d";
previewPosition[] = { 0.803749, 1, 0.448515 };

View File

@ -0,0 +1,9 @@
Epoch Mod for Arma 3
http://epochmod.com
by Epoch Mod Team
https://github.com/EpochModTeam/Epoch
The contents of this pbo are under the following license:
http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Keep this file and file headers with attribution intact for proper use.

View File

@ -0,0 +1,9 @@
Epoch Mod for Arma 3
http://epochmod.com
by Epoch Mod Team
https://github.com/EpochModTeam/Epoch
The contents of this pbo are under the following license:
http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Keep this file and file headers with attribution intact for proper use.

View File

@ -1,7 +1,7 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors:
Contributors: Skaronator
Description:
Load Buildings from Epoch Hive

View File

@ -1,14 +1,31 @@
/*
Building Maintain
by Aaron Clark - EpochMod.com
Author: Aaron Clark - EpochMod.com
This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
http://creativecommons.org/licenses/by-nc-nd/4.0/
Contributors: Skaronator
Improvements and or bugfixes and other contributions are welcome via the github:
Description:
Building Maintain
Licence:
Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_bases/EPOCH_server_maintBUILD.sqf
Example:
// Client RE
[_this, player, _maintainCount, Epoch_personalToken] remoteExec ["EPOCH_server_maintBUILD",2];
Parameter(s):
_this select 0: OBJECT - Jammer object
_this select 1: STRING - Player Object
_this select 2: STRING - Maintain count
_this select 3: STRING - Epoch Personal Token
Returns:
NOTHING
*/
private["_object", "_plyr", "_maintCount", "_plyrUID", "_counter", "_objSlot", "_objHiveKey", "_buildingJammerRange", "_current_crypto", "_cIndex", "_vars"];
private ["_object","_plyr","_maintCount","_plyrUID","_counter","_objSlot","_buildingJammerRange","_current_crypto","_cIndex","_vars","_storSlot","_playerCryptoLimit","_config"];
_object = _this select 0;
_plyr = _this select 1;

View File

@ -68,7 +68,7 @@ if (typename _this == "ARRAY") then {
_normalMagazines = [_serverSettingsConfig, "normalMagazines", []] call EPOCH_fnc_returnConfigEntry;
_weaponsAndItems = [_serverSettingsConfig, "weaponsAndItems", ["", []]] call EPOCH_fnc_returnConfigEntry;
diag_log format["DEBUG (Load Player) _linkedItems 1: %1", _linkedItems];
if (count _arr < 11) then { // invaild format attempt to override
_arr = [[0, [], _instanceID], [0, 0, 1, 0, []], [_goggles, _headgear, _vest, _backpack, _uniform, _class], [""], [] + EPOCH_defaultVars_SEPXVar, _weaponsAndItems, _linkedItems, _normalMagazines, _itemsInContainers, _weaponsInContainers, "", true];
@ -77,11 +77,19 @@ if (typename _this == "ARRAY") then {
_worldspace = _arr select 0;
_dir = _worldspace select 0;
_location = _worldspace select 1;
if (count _location == 2) then{
_location = (_location select 0) vectorAdd (_location select 1);
};
_prevInstance = _worldspace select 2;
_medical = _arr select 1;
_server_vars = _arr select 3;
_vars = _arr select 4;
diag_log format["DEBUG (Load Player) _worldspace 1: %1", _worldspace];
diag_log format["DEBUG (Load Player) _location 1: %1", _location];
_plyrGroup = _arr select 10;
_canBeRevived = _arr select 11;
@ -257,6 +265,7 @@ if (typename _this == "ARRAY") then {
// Add magazines
{_newPlyr addMagazine _x} forEach _normalMagazines;
diag_log format["DEBUG (Load Player) _normalMagazines 1: %1", _normalMagazines];
// Load inventory + defaults END
// Final Push

View File

@ -60,7 +60,7 @@ if (typeName _vars == "ARRAY") then {
_group = _plyr getVariable ["GROUP", ""];
_revive = _plyr getVariable ["REVIVE", true];
_pos = getPosATL _plyr;
_pos = (getposATL _plyr call EPOCH_precisionPos);
if (vehicle _plyr != _plyr) then {

View File

@ -13,20 +13,23 @@
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_player/EPOCH_server_unpackBackpack.sqf
*/
private ["_wHPos","_wH","_nearByHolder","_item","_player"];
diag_log str(_this);
_item = _this select 0;
_player = _this select 1;
if !([_player,_this select 2] call EPOCH_server_getPToken) exitWith {};
if (_item isKindOf "Bag_Base") then {
_wH = objNull;
_nearByHolder = nearestObjects [position _player,["groundWeaponHolder"],3];
if (_nearByHolder isEqualTo []) then {
_wHPos = _player modelToWorld [0,1,0];
if (surfaceIsWater _wHPos) then {
_wHPos = ASLToATL _wHPos;
};
_wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"];
if (surfaceIsWater _wHPos) then {
_wHPos = ASLToATL _wHPos;
};
_wH = createVehicle ["groundWeaponHolder",_wHPos, [], 0, "CAN_COLLIDE"];
} else {
_wH = _nearByHolder select 0;
};
_wh addBackpackCargoGlobal [_item,1];
};

View File

@ -32,6 +32,7 @@ EPOCH_server_deadPlayer = compileFinal preprocessFileLineNumbers "\x\ad
EPOCH_server_revivePlayer = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_revivePlayer.sqf";
EPOCH_server_storeCrypto = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_storeCrypto.sqf";
EPOCH_server_equippedItem = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_equippedItem.sqf";
EPOCH_server_unpackBackpack = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_player\EPOCH_server_unpackBackpack.sqf";
EPOCH_server_loadTraders = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_traders\EPOCH_server_loadTraders.sqf";
EPOCH_server_spawnTraders = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_traders\EPOCH_server_spawnTraders.sqf";
EPOCH_server_makeTrade = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_trading\EPOCH_server_makeTrade.sqf";
@ -62,9 +63,9 @@ EPOCH_server_traderKilled = compileFinal preprocessFileLineNumbers "\x\ad
EPOCH_localCleanup = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_server\EPOCH_localCleanup.sqf";
EPOCH_server_createTeleport = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_server\EPOCH_server_createTeleport.sqf";
EPOCH_server_teleportPlayer = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_server\EPOCH_server_teleportPlayer.sqf";
EPOCH_Server_createObject = compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_createObject.sqf";
EPOCH_server_airDropCrate = compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_server_airDropCrate.sqf";
EPOCH_server_fillContainer = compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_fillContainer.sqf";
EPOCH_Server_createObject = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_createObject.sqf";
EPOCH_server_airDropCrate = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_server_airDropCrate.sqf";
EPOCH_server_fillContainer = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_fillContainer.sqf";
EPOCH_server_handle_sapperObjs = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_antagonists\EPOCH_server_handle_sapperObjs.sqf";
EPOCH_Server_createAirDrop = compileFinal preprocessFileLineNumbers "\x\addons\a3_epoch_server\compile\epoch_missions\EPOCH_Server_createAirDrop.sqf";

View File

@ -0,0 +1,9 @@
Epoch Mod for Arma 3
http://epochmod.com
by Epoch Mod Team
https://github.com/EpochModTeam/Epoch
The contents of this pbo are under the following license:
http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Keep this file and file headers with attribution intact for proper use.

View File

@ -0,0 +1,9 @@
Epoch Mod for Arma 3
http://epochmod.com
by Epoch Mod Team
https://github.com/EpochModTeam/Epoch
The contents of this pbo are under the following license:
http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Keep this file and file headers with attribution intact for proper use.

View File

@ -0,0 +1,9 @@
Epoch Mod for Arma 3
http://epochmod.com
by Epoch Mod Team
https://github.com/EpochModTeam/Epoch
The contents of this pbo are under the following license:
http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Keep this file and file headers with attribution intact for proper use.