From 40327bab0fadff2723bbff0e9e1ad5aab0e86b55 Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 8 Dec 2015 11:07:43 -0600 Subject: [PATCH] 0.3.6.006 --- Changelogs/0.3.6.0.txt | 3 +++ .../@epochhive/addons/a3_epoch_server.pbo | Bin 362169 -> 362412 bytes .../compile/inventory/EPOCH_refeshUI.sqf | 10 +++---- .../compile/setup/masterLoop/Event1.sqf | 8 +++--- .../epoch_server/EPOCH_serverLootObject.sqf | 25 ++++++++++-------- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Changelogs/0.3.6.0.txt b/Changelogs/0.3.6.0.txt index 44abf36f..2fa1bc78 100644 --- a/Changelogs/0.3.6.0.txt +++ b/Changelogs/0.3.6.0.txt @@ -1,4 +1,5 @@ **Client** + [Fixed] Updated Hitpoints to 1.54 for all custom Epoch characters, this fixes the hitpoint .rpt errors since 1.54 as well. [Fixed] Reduce run speed of Sappers since 1.54 update. @@ -6,5 +7,7 @@ [Fixed] Typo in server side AH event handler code and repacked a3_server_settings.pbo. [Fixed] Storage was incorrectly set to set damage to 99% instead of 1% to temp force maintenance option after restart. [Fixed] Add player objects to remains collector, this should allow for proper corpse cleanup. +[Changed] Weapons will now only spawn with a single magazine and a random ammo count. +[Changed] Magazines now spawn with a random ammo count. [Changed] Disable simulation of locked storage devices. This also prevents removal of items until device is unlocked/re-simulated. [Info] Removed old .bikey and added new one for 0360. diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 275923c6c29d8c72ad74d43f39f45c0e5d578b4f..b2a8ce38feaea8c93b8e4116e2ac345bc11ba7c0 100644 GIT binary patch delta 444 zcmdnlE4HRzY{O|@w$D82VW;^wU*tW^#{8Ejy?MIG_UR&w3-XzGxu(~3Fq+1&s!NY7@73-r~9`v+D%>&#y?$3lSxOtC^0W3Ki9J)HCMsTPC+R- zzcjBzNz#21z(=IJOTr)K78K*TlTa}(1Ot1|Oa zgEOmAH8o>nfyPYdZfDfrzNwv2gmL=m4n`w0eSL+*loW;hyqroPk*bhZl$xpl)2L9M zS(2duF-{>dH#c7a>>!{qi5g52AQx-vfvqW4C{E1*x=X=86T7=PksL0ijZm(mV2Iz* z(*yNc#HNe3GpbIn=wuX{-q*>fG<{1Eu0q?f5sn#J76 p)S%sRB@+-cZ?{~@l5&>MW4FY+E{V|LX_Yo0E$eYyzaf_xTEPF}9*`Q40`+lyKl z#Tl76Ij48FGDZOD?GIZSGZ?2=b}({Jf8Wl?F+HxGQF}UnJEQ9MlnzD_MpjM`m|oGz zXf)lci%}RP&!>=^m|m<ZwsRq$R(NGjHb+!8~2H|Z|h^+ yzO9d`NSeja#Kf#!XB86=GjG>f#gcPZgts)UbBf^Q{yq2Jxh!+vb$>S3$xi@)`BmQl diff --git a/Sources/epoch_code/compile/inventory/EPOCH_refeshUI.sqf b/Sources/epoch_code/compile/inventory/EPOCH_refeshUI.sqf index 862a7a8e..693a9250 100644 --- a/Sources/epoch_code/compile/inventory/EPOCH_refeshUI.sqf +++ b/Sources/epoch_code/compile/inventory/EPOCH_refeshUI.sqf @@ -21,7 +21,7 @@ if (!isNull findDisplay 602) then { _bar = uiNameSpace getVariable "RscCustomProgressUniform"; _uniformArmor = (uniform player) call EPOCH_uniformArmorCalc; _totalArmor = _totalArmor + _uniformArmor; - _finalArmor = linearConversion [0,EPOCH_MAX_ARMOR select 0,_uniformArmor,0.01,1]; + _finalArmor = linearConversion [0,EPOCH_MAX_ARMOR select 0,_uniformArmor,0.01,1,true]; _bar progressSetPosition _finalArmor; if (_selectedItem == 801) then { @@ -33,7 +33,7 @@ if (!isNull findDisplay 602) then { _bar = uiNameSpace getVariable "RscCustomProgressVest"; _vestArmor = (vest player) call EPOCH_gearArmorCalc; _totalArmor = _totalArmor + _vestArmor; - _finalArmor = linearConversion [0,EPOCH_MAX_ARMOR select 1,_vestArmor,0.01,1]; + _finalArmor = linearConversion [0,EPOCH_MAX_ARMOR select 1,_vestArmor,0.01,1,true]; _bar progressSetPosition _finalArmor; if (_selectedItem == 701) then { @@ -45,7 +45,7 @@ if (!isNull findDisplay 602) then { _bar = uiNameSpace getVariable "RscCustomProgressHeadgear"; _headgearArmor = (headgear player) call EPOCH_gearArmorCalc; _totalArmor = _totalArmor + _headgearArmor; - _finalArmor = linearConversion [0,EPOCH_MAX_ARMOR select 2,_headgearArmor,0.01,1]; + _finalArmor = linearConversion [0,EPOCH_MAX_ARMOR select 2,_headgearArmor,0.01,1,true]; _bar progressSetPosition _finalArmor; if (_selectedItem == 605) then { @@ -56,11 +56,11 @@ if (!isNull findDisplay 602) then { _totalArmorUI = uiNameSpace getVariable "RscCustomProgressTotal"; _bar = _totalArmorUI select 0; - _finalArmor = linearConversion [0,_totalArmorMax,_totalArmor,0.01,1]; + _finalArmor = linearConversion [0,_totalArmorMax,_totalArmor,0.01,1,true]; _bar progressSetPosition _finalArmor; _bar_compare = _totalArmorUI select 1; - _finalArmor = linearConversion [0,_totalArmorMax,_newArmor,0.01,1]; + _finalArmor = linearConversion [0,_totalArmorMax,_newArmor,0.01,1,true]; _bar_compare progressSetPosition _finalArmor; }; diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf index 274445fb..acc8a276 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf @@ -71,14 +71,14 @@ _thirst ctrlShow (EPOCH_playerThirst <= 625); if (ctrlShown _thirst) then { [_thirst,_thirsty] call _fadeUI; - _thirstScale = linearConversion [0,EPOCH_playerThirst,2500,0.01,1]; + _thirstScale = linearConversion [0,EPOCH_playerThirst,2500,0.01,1,true]; _thirst ctrlSetTextColor [_thirstScale, _thirstScale, 0.9, 1]; }; _hunger ctrlShow (EPOCH_playerHunger <= 1250); if (ctrlShown _hunger) then { [_hunger,_hungry] call _fadeUI; - _hungerScale = linearConversion [0,EPOCH_playerHunger,5000,0.01,1]; + _hungerScale = linearConversion [0,EPOCH_playerHunger,5000,0.01,1,true]; _hunger ctrlSetTextColor [1, _hungerScale, _hungerScale, 1]; }; @@ -92,7 +92,7 @@ _hazzard ctrlShow (EPOCH_playerToxicity > 1); if (ctrlShown _hazzard) then { [_hazzard,(EPOCH_playerToxicity >= 55)] call _fadeUI; - _toxicScale = 1-linearConversion [0,EPOCH_playerToxicity,100,0.01,1]; + _toxicScale = 1-linearConversion [0,EPOCH_playerToxicity,100,0.01,1,true]; _hazzard ctrlSetTextColor [_toxicScale, 1, _toxicScale, 1]; }; @@ -122,7 +122,7 @@ _emergency ctrlShow _critical; if (ctrlShown _emergency) then { [_emergency,(EPOCH_playerBloodP > 140)] call _fadeUI; - _emergencyScale = 1-linearConversion [0,EPOCH_playerBloodP,180,0.01,1]; + _emergencyScale = 1-linearConversion [0,EPOCH_playerBloodP,180,0.01,1,true]; _emergency ctrlSetTextColor [1, _emergencyScale, _emergencyScale, 1]; }; diff --git a/Sources/epoch_server/compile/epoch_server/EPOCH_serverLootObject.sqf b/Sources/epoch_server/compile/epoch_server/EPOCH_serverLootObject.sqf index 40667cfd..a4f5c99c 100644 --- a/Sources/epoch_server/compile/epoch_server/EPOCH_serverLootObject.sqf +++ b/Sources/epoch_server/compile/epoch_server/EPOCH_serverLootObject.sqf @@ -32,17 +32,17 @@ if !(isNull _object) then{ _lootItemWeightedArray = [_x, "CfgLootTable", "items"] call EPOCH_weightedArray; // diag_log format["%1: lootItemWeightedArray1 %2", __FILE__, _lootItemWeightedArray]; - + _lootItemArray = _lootItemWeightedArray select 0; if !(_lootItemArray isEqualTo[]) then { _weightedItemArray = _lootItemWeightedArray select 1; _weightedItemArrayCount = _lootItemWeightedArray select 2; _randomItemArray = _lootItemArray select (_weightedItemArray select floor(random _weightedItemArrayCount)); - + _randomItem = _randomItemArray select 0; _type = _randomItemArray select 1; - + _quan = 1; /* @@ -62,7 +62,10 @@ if !(isNull _object) then{ _loop = false; }; case "magazine": { - _object addMagazineCargoGlobal [_randomItem, _quan]; + //_object addMagazineCargoGlobal [_randomItem, _quan]; + _magazineSize = getNumber (configFile >> "CfgMagazines" >> _randomItem >> "count"); + _object addMagazineAmmoCargo[_randomItem, _quan, ceil(random(_magazineSize))]]; + _loop = false; }; case "backpack": { @@ -72,19 +75,19 @@ if !(isNull _object) then{ case "weapon": { _object addWeaponCargoGlobal [_randomItem, _quan]; _mags = getArray (configFile >> "CfgWeapons" >> _randomItem >> "magazines"); - + if !(_mags isEqualTo []) then { - _object addMagazineCargoGlobal [_mags select 0, ceil(random 2)]; + // add only one free magazine with random ammo count + _magazineSize = getNumber (configFile >> "CfgMagazines" >> (_mags select 0) >> "count"); + _object addMagazineAmmoCargo[_mags select 0, 1, ceil(random(_magazineSize))]; }; _loop = false; }; case "CfgLootTable": { - - // go down the rabit hole + + // go down the rabit hole _lootItemWeightedArray = [_randomItem, "CfgLootTable", "items"] call EPOCH_weightedArray; - // diag_log format["%1: lootItemWeightedArray2 %2", __FILE__, _lootItemWeightedArray]; - _lootItemArray = _lootItemWeightedArray select 0; if !(_lootItemArray isEqualTo[]) then { @@ -111,4 +114,4 @@ if !(isNull _object) then{ } forEach _loots; }; -}; \ No newline at end of file +};