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.6.006

Browse Source
This commit is contained in:
vbawol 2015-12-08 11:07:43 -06:00
parent f29efacc2d
commit 40327bab0f
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelogs/0.3.6.0.txt
View File

@ -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.

BIN
Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo
View File

Binary file not shown.

10
Sources/epoch_code/compile/inventory/EPOCH_refeshUI.sqf
View File

@ -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;
};

8
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -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];
};

11
Sources/epoch_server/compile/epoch_server/EPOCH_serverLootObject.sqf
View File

@ -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": {
@ -74,7 +77,9 @@ if !(isNull _object) then{
_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;
};
@ -83,8 +88,6 @@ if !(isNull _object) then{
// 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 {