diff --git a/dayz_code/actions/player_wearClothes.sqf b/dayz_code/actions/player_wearClothes.sqf index 65399d29a..aafa79f83 100644 --- a/dayz_code/actions/player_wearClothes.sqf +++ b/dayz_code/actions/player_wearClothes.sqf @@ -21,9 +21,9 @@ if (_isFemale) exitWith {cutText ["Currently Female Characters cannot change to private["_itemNew","_myModel","_humanity","_isBandit","_isHero"]; _myModel = (typeOf player); -_humanity = player getVariable ["humanity",0]; -_isBandit = _humanity < -2000; -_isHero = _humanity > 5000; +//_humanity = player getVariable ["humanity",0]; +//_isBandit = _humanity < -2000; +//_isHero = _humanity > 5000; _itemNew = "Skin_" + _myModel; if ( !(isClass(_config >> _itemNew)) ) then { diff --git a/dayz_code/compile/player_fired.sqf b/dayz_code/compile/player_fired.sqf index caf682ec5..8b054d4d2 100644 --- a/dayz_code/compile/player_fired.sqf +++ b/dayz_code/compile/player_fired.sqf @@ -43,6 +43,14 @@ if (_ammo isKindOf "SmokeShell") then { //Check if need to place arrow if (_ammo isKindOf "Bolt") then { _id = _this spawn player_crossbowBolt; + + // Reload animation if more that 1 in mag/pack + _count = player ammo _weapon; + if(_count >= 1) then { + _unit playActionNow "reloadMagazine"; + }; + + }; if (_ammo isKindOf "GrenadeHand") then { diff --git a/dayz_code/system/player_spawn_2.sqf b/dayz_code/system/player_spawn_2.sqf index 11c53428e..6bda5a7f0 100644 --- a/dayz_code/system/player_spawn_2.sqf +++ b/dayz_code/system/player_spawn_2.sqf @@ -72,6 +72,7 @@ while {true} do { }; }; + /* if (_humanity < -2000 and !_isBandit) then { _isBandit = true; _model = typeOf player; @@ -101,7 +102,8 @@ while {true} do { [dayz_playerUID,dayz_characterID,"Survivor3_DZ"] spawn player_humanityMorph; }; }; - + */ + //Has infection? if (r_player_infected) then { [player,"cough",8,false] call dayz_zombieSpeak; @@ -199,7 +201,7 @@ while {true} do { }; }; - //Record low bloow + //Record low blood _lowBlood = player getVariable ["USEC_lowBlood", false]; if ((r_player_blood < r_player_bloodTotal) and !_lowBlood) then { player setVariable["USEC_lowBlood",true,true]; diff --git a/dayz_weapons/config.cpp b/dayz_weapons/config.cpp index ad6074fac..6702c1f77 100644 --- a/dayz_weapons/config.cpp +++ b/dayz_weapons/config.cpp @@ -458,7 +458,7 @@ class cfgWeapons { dispersion = 0.001; soundContinuous = 0; - reloadTime = 2.5; + reloadTime = 3.0; reloadMagazineSound[] = {"\ca\sounds\weapons\rifles\M1014-reload",0.316228,1,20}; begin1[] = {"dayz_weapons\sounds\crossbow_fire_0",0.177828,1,15}; begin2[] = {"dayz_weapons\sounds\crossbow_fire_1",0.177828,1,15}; @@ -708,11 +708,21 @@ class cfgMagazines initSpeed = 150; descriptionShort = "$STR_MAG_DESC_3"; displayNameShort = "$STR_MAG_ACTION_3"; + class ItemActions + { + class ReloadMag + { + text = "Combine to 4 pack"; + script = "spawn player_reloadMag;"; + use[] = {"BoltSteel","BoltSteel","BoltSteel","BoltSteel"}; + output[] = {"BoltSteel4pack"}; + }; + }; }; class BoltSteel4pack: CA_Magazine { scope = 2; - displayName = "$STR_MAG_NAME_3"; + displayName = "Steel Bolt 4 Pack"; model = "\dayz_weapons\models\bolt_gear"; picture = "\dayz_weapons\textures\equip_bolt_ca.paa"; ammo = "BoltSteel"; @@ -720,11 +730,21 @@ class cfgMagazines initSpeed = 150; descriptionShort = "$STR_MAG_DESC_3"; displayNameShort = "$STR_MAG_ACTION_3"; + class ItemActions + { + class ReloadMag + { + text = "Combine to 8 pack"; + script = "spawn player_reloadMag;"; + use[] = {"BoltSteel4pack","BoltSteel4pack"}; + output[] = {"BoltSteel8pack"}; + }; + }; }; class BoltSteel8pack: CA_Magazine { scope = 2; - displayName = "$STR_MAG_NAME_3"; + displayName = "Steel Bolt 8 Pack"; model = "\dayz_weapons\models\bolt_gear"; picture = "\dayz_weapons\textures\equip_bolt_ca.paa"; ammo = "BoltSteel";