Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

0.3.7.006

Browse Source
This commit is contained in:
vbawol 2015-12-29 12:22:24 -06:00
parent ba8702d9ed
commit 834a28fa01
4 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Changelogs/0.3.7.0.txt
View File

@ -1,13 +1,14 @@
**Client** **Client**
[ADDED] Hotwire Kit (ItemHotwire) [ADDED] Repack magazines option.
[ADDED] Key Makers Kit (ItemKeyKit) [ADDED-WIP] Hotwire Kit (ItemHotwire)
[ADDED] Keys in colors: (Black ItemKey,ItemKeyRed,ItemKeyGreen,ItemKeyBlue,ItemKeyYellow) [ADDED-WIP] Key Makers Kit (ItemKeyKit)
[ADDED] 55 Gallon Fuel Barrel (Full - ItemBarrelF | Empty - ItemBarrelE) [ADDED-WIP] Keys in colors: (Black ItemKey,ItemKeyRed,ItemKeyGreen,ItemKeyBlue,ItemKeyYellow)
[ADDED] Metal Pipes (ItemPipe) [ADDED-WIP] 55 Gallon Fuel Barrel (Full - ItemBarrelF | Empty - ItemBarrelE)
[ADDED-WIP] Metal Pipes (ItemPipe)
[ADDED-WIP] Documents (Trash,Books,Vehicle Upgrades) (ItemDoc1, ItemDoc2)
[WIP] Light Bulb (ItemBulb) [WIP] Light Bulb (ItemBulb)
[WIP] Burlap (ItemBurlap) [WIP] Burlap (ItemBurlap)
[WIP] Briefcase (Empty - ItemBriefcaseE) [WIP] Briefcase (Empty - ItemBriefcaseE)
[WIP] Documents (Trash,Books,Vehicle Upgrades) (ItemDoc1, ItemDoc2)
[Changed] Change all publicVariableServer calls to use remoteExec calls for better performance. [Changed] Change all publicVariableServer calls to use remoteExec calls for better performance.
[Fixed] Custom epoch swing animations for Hatchet and sledge now work correctly. [Fixed] Custom epoch swing animations for Hatchet and sledge now work correctly.
**Server** **Server**

2
Server_Install_Pack/sc/battleye/remoteexec.txt
View File

@ -1 +1 @@
5 "" !="epoch_server_checkplayer [A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3} \(.+\) REMOTE" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(tradeRequest|equippeditem|packJack|localCleanup|createAirDrop|airDropCrate|destroytrash) \[.+\]" 5 "" !="epoch_server_checkplayer [A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3} \(.+\) REMOTE" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(tradeRequest|equippeditem|packJack|createAirDrop|airDropCrate|destroytrash) \[.+\]" !="epoch_localcleanup \[.+\]"

31
Sources/epoch_code/compile/EPOCH_consumeItem.sqf
View File

@ -100,6 +100,37 @@ _unifiedInteract = {
}; };
switch _interactOption do { switch _interactOption do {
case 0: {
_magCount = getNumber (_config >> "count");
// allow repack for all magazines with greater than 1 bullet
if (_magCount > 1) then {
_ammoTotal = 0;
_magazinesAmmoFull = magazinesAmmoFull player;
{
if (_item isEqualTo (_x select 0)) then {
_ammoTotal = _ammoTotal + (_x select 1);
};
} forEach _magazinesAmmoFull;
_magazineSize = _ammoTotal;
_magazineSizeMax = _magCount;
// remove all
player removeMagazines _item;
// Add full magazines back to player
for "_i" from 1 to floor (_magazineSize / _magazineSizeMax) do
{
player addMagazine [_item, _magazineSizeMax];
};
// Add last non full magazine
if ((_magazineSize % _magazineSizeMax) > 0) then {
player addMagazine [_item, floor (_magazineSize % _magazineSizeMax)];
};
_dt = ["<t size='0.8' shadow='0' color='#99ffffff'>Ammo Repacked</t>", 0, 1, 5, 2, 0, 1] spawn bis_fnc_dynamictext;
};
};
case 1: _unifiedInteract; // Eat 1 case 1: _unifiedInteract; // Eat 1
case 2: _unifiedInteract; //Drink 2 case 2: _unifiedInteract; //Drink 2
case 3: { // Build 3 case 3: { // Build 3

11
Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf
View File

@ -43,6 +43,7 @@ EPOCH_InteractedItem = [_text,_data,_pic];
_interactOption = 0; _interactOption = 0;
_buttonTXT = ""; _buttonTXT = "";
_magCount = 1;
if (isClass (configfile >> "cfgweapons" >> _data)) then { if (isClass (configfile >> "cfgweapons" >> _data)) then {
_type = getNumber (configfile >> "CfgWeapons" >> _data >> "type"); _type = getNumber (configfile >> "CfgWeapons" >> _data >> "type");
_interactOption = getNumber (configfile >> "CfgWeapons" >> _data >> "interactAction"); _interactOption = getNumber (configfile >> "CfgWeapons" >> _data >> "interactAction");
@ -51,6 +52,7 @@ if (isClass (configfile >> "cfgweapons" >> _data)) then {
_type = getNumber (configfile >> "CfgMagazines" >> _data >> "type"); _type = getNumber (configfile >> "CfgMagazines" >> _data >> "type");
_interactOption = getNumber (configfile >> "CfgMagazines" >> _data >> "interactAction"); _interactOption = getNumber (configfile >> "CfgMagazines" >> _data >> "interactAction");
_buttonTXT = getText(configfile >> "CfgMagazines" >> _data >> "interactText"); _buttonTXT = getText(configfile >> "CfgMagazines" >> _data >> "interactText");
_magCount = getNumber (configfile >> "CfgMagazines" >> _data >> "count");
}; };
_display = (findDisplay 602); _display = (findDisplay 602);
@ -60,8 +62,13 @@ if (_buttonTXT != "") then {
_useBtn ctrlSetText _buttonTXT; _useBtn ctrlSetText _buttonTXT;
_useBtn ctrlEnable true; _useBtn ctrlEnable true;
} else { } else {
_useBtn ctrlSetText "EXAMINE"; if (_magCount > 1) then {
_useBtn ctrlEnable false; _useBtn ctrlEnable true;
_useBtn ctrlSetText "REPACK";
} else {
_useBtn ctrlSetText "EXAMINE";
_useBtn ctrlEnable false;
};
}; };
_useBtn = _display displayCtrl -14; _useBtn = _display displayCtrl -14;