From 55e394d00adb45f95ce712a385edecc0e4c7ccc9 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 4 Jun 2014 14:58:29 -0500 Subject: [PATCH 1/5] one more building --- SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp index 2dd31ec91..cd522fdef 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp @@ -307,8 +307,9 @@ class Land_A_Castle_Gate: Residential { lootPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}}; }; // Qty: 3 class Land_Mil_Barracks: Military { - lootPos[] = {}; - lootPosZombie[] = {{9.02515,-0.694336,-1.16602},{9.01538,0.856445,-1.16602}}; + lootPos[] = {{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}}; + lootPosZombie[] = {{-2.15845,-3.12793,-1.06134},{2.13281,3.24316,-1.06134},{-6.20679,-0.125,-1.06134},{2.09521,-3.36719,-1.06134}}; + lootPosSmall[] = {{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}}; }; // Qty: 8 class Land_Mil_Barracks_L: Military { lootPos[] = {}; From d6a5b6ae6772707be95e7e47178d76a497f27d00 Mon Sep 17 00:00:00 2001 From: icomrade Date: Wed, 4 Jun 2014 19:22:31 -0400 Subject: [PATCH 2/5] Config errors --- SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp index b470c9d51..7db1937fb 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp @@ -116,7 +116,7 @@ class CfgBuildingLoot { {"specialclothes","specialclothes",0.01}, {"WeaponHolder_MeleeCrowbar","object",0.03}, {"ItemBriefcaseEmpty","magazine",0.01}, - { "shotgunsingleshot", "cfglootweapon", 0.05}, + { "shotgunsingleshot", "cfglootweapon", 0.05} }; lootTypeSmall[] = { { "ItemSodaMdew","magazine",0.01 }, @@ -225,7 +225,7 @@ class CfgBuildingLoot { {"ItemFishingPole","weapon",0.02}, {"ItemLightBulb","magazine",0.02}, {"ItemSledgeHandle","magazine",0.02}, - { "farmweapons", "cfglootweapon", 0.15}, + { "farmweapons", "cfglootweapon", 0.15} }; lootTypeSmall[] = { { "","generic", 0.79}, From 40b1063fa91b18d1cfdc38eaad356f34a1dc3e65 Mon Sep 17 00:00:00 2001 From: icomrade Date: Wed, 4 Jun 2014 20:26:31 -0400 Subject: [PATCH 3/5] Blood bag issue #1310 Needs a test. Fixed timer. --- SQF/dayz_code/init/variables.sqf | 3 +-- .../medical/publicEH/medTransfuse.sqf | 9 +++++---- SQF/dayz_code/system/player_monitor.fsm | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 0190f2e56..5128228da 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -436,7 +436,6 @@ dayz_spawnArea = 200; // radius around player where we can spawn loot & Z dayz_cantseeDist = 150; // distance from which we can spawn a Z in front of any player without ray-tracing && angle checks dayz_cantseefov = 70; // half player field-of-view. Visible Z won't be spawned in front of any near players dayz_canDelete = 300; // Z, further than this distance from its "owner", will be deleted -selfTransfusionTime = time; //time to keep for last self transfusion. if(isNil "DZE_SelfTransfuse") then { DZE_SelfTransfuse = false; @@ -469,7 +468,7 @@ if(isNil "DZEdebug") then { DZEdebug = false; }; if (isNil "DZE_Debug_Damage") then { - DZE_Debug_Damage = true; //enable by default + DZE_Debug_Damage = true; }; if(isNil "DZE_TRADER_SPAWNMODE") then { DZE_TRADER_SPAWNMODE = false; diff --git a/SQF/dayz_code/medical/publicEH/medTransfuse.sqf b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf index 610eb6c02..71161cc8f 100644 --- a/SQF/dayz_code/medical/publicEH/medTransfuse.sqf +++ b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf @@ -5,14 +5,15 @@ _unit = _this select 0; _rndInfection = (random 15); _TransfusionInfection = (_rndInfection < 1); if (_unit == player) then { - if ((count _this) > 1) then { + if (((count _this) > 1) && {(typeName (_this select 1)) == "ARRAY"}) then { //DO NOT TOUCH THE CODE BRACKETS! _selfTransValues = _this select 1; - r_player_blood = (_selfTransValues select 0); + r_player_blood = r_player_blood + (_selfTransValues select 0); + if (r_player_blood > 12000) then {r_player_blood = 12000;}; _TransfusionInfection = ((random (_selfTransValues select 1)) < 1); } else { r_player_blood = r_player_bloodTotal; }; - r_player_lowblood = false; + r_player_lowblood = false; 10 fadeSound 1; "dynamicBlur" ppEffectAdjust [0]; "dynamicBlur" ppEffectCommit 5; "colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 1], [1, 1, 1, 1]];"colorCorrections" ppEffectCommit 5; @@ -27,5 +28,5 @@ if (_unit == player) then { _control = _display displayCtrl 1300; _control ctrlShow true; - player setVariable["USEC_BloodQty",r_player_bloodTotal,true]; + player setVariable["USEC_BloodQty",r_player_blood,true]; }; \ No newline at end of file diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index dd04ffbf8..e48188405 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -20,7 +20,7 @@ item15[] = {"Parse_Login",2,250,-75.000000,500.000000,25.000000,550.000000,0.000 item16[] = {"Hive_Bad",4,218,50.000000,500.000000,150.000000,550.000000,10.000000,"Hive" \n "Bad"}; item17[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"}; item18[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"}; -item19[] = {"Phase_One",2,4346,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; +item19[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; item20[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"}; item21[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"}; item22[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"}; @@ -34,7 +34,7 @@ item29[] = {"ERROR__Bad_Versi",2,250,175.000000,800.000000,275.000000,850.000000 item30[] = {"Display_Ready",4,218,-175.000000,1050.000000,-75.000000,1100.000000,0.000000,"Display" \n "Ready"}; item31[] = {"Preload_Display",2,250,-75.000000,1100.000000,25.000000,1150.000000,0.000000,"Preload" \n "Display"}; item32[] = {"Preload_Done",4,218,-175.000000,1150.000000,-75.000000,1200.000000,0.000000,"Preload" \n "Done"}; -item33[] = {"Initialize",2,250,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"}; +item33[] = {"Initialize",2,4346,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"}; item34[] = {"Finish",1,250,-75.000000,1300.000000,25.000000,1350.000000,0.000000,"Finish"}; item35[] = {"True",8,218,25.000000,1250.000000,125.000000,1300.000000,0.000000,"True"}; item36[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.000000,"Too" \n "Long"}; @@ -60,7 +60,7 @@ item55[] = {"get_ready_to_clo",2,250,400.000000,400.000000,500.000000,450.000000 item56[] = {"sleep_",4,218,550.000000,400.000000,650.000000,450.000000,0.000000,"sleep" \n ""}; item57[] = {"Disconnect",2,250,825.000000,400.000000,925.000000,450.000000,0.000000,"Disconnect"}; item58[] = {"No_time_date",4,218,25.000000,1150.000000,125.000000,1200.000000,0.000000,"No time/date"}; -item59[] = {"ERROR__No_Date_or",2,250,175.000000,1150.000000,275.000000,1200.000000,0.000000,"ERROR:" \n "No Date || Time"}; +item59[] = {"ERROR__No_Date_",2,250,175.000000,1150.000000,275.000000,1200.000000,0.000000,"ERROR:" \n "No Date || Time"}; item60[] = {"Too_Long",4,218,300.000000,1150.000000,400.000000,1200.000000,0.000000,"Too" \n "Long"}; item61[] = {"get_ready_to_clo_1",2,250,450.000000,800.000000,550.000000,850.000000,0.000000,"get ready to close"}; item62[] = {"sleep_",4,218,600.000000,800.000000,700.000000,850.000000,0.000000,"sleep" \n ""}; @@ -169,8 +169,8 @@ link85[] = {75,57}; link86[] = {76,78}; link87[] = {77,76}; link88[] = {78,57}; -globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-772.896301,771.877197,613.135803,-671.376831,864,612,1}; -window[] = {0,-1,-1,-1,-1,862,104,1593,104,1,882}; +globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-406.882782,405.863464,1403.492432,827.797180,864,612,1}; +window[] = {0,-1,-1,-1,-1,940,182,1671,182,1,882}; *//*%FSM*/ class FSM { @@ -1212,6 +1212,7 @@ class FSM "r_player_cardiac = player getVariable[""USEC_isCardiac"",false];" \n "r_player_lowblood = player getVariable[""USEC_lowBlood"",false];" \n "r_player_blood = player getVariable[""USEC_BloodQty"",r_player_bloodTotal];" \n + "selfTransfusionTime = time; //time to keep for last self transfusion." \n "" \n """colorCorrections"" ppEffectEnable true;" \n """colorCorrections"" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 1 min (4*r_player_blood/3/r_player_bloodTotal)], [1, 1, 1, 0.0]];" \n @@ -1312,7 +1313,7 @@ class FSM class No_time_date { priority = 0.000000; - to="ERROR__No_Date_or"; + to="ERROR__No_Date_"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!isNil ""PVDZE_plr_SetDate"""/*%FSM*/; action=/*%FSM*/""/*%FSM*/; @@ -1575,10 +1576,10 @@ class FSM }; }; /*%FSM*/ - /*%FSM*/ - class ERROR__No_Date_or + /*%FSM*/ + class ERROR__No_Date_ { - name = "ERROR__No_Date_or"; + name = "ERROR__No_Date_"; init = /*%FSM*/"endLoadingScreen;" \n "selectNoPlayer;" \n "_myTime = diag_tickTime;" \n From 65c08ace6354363478f3d370c4411b06d9ac49c1 Mon Sep 17 00:00:00 2001 From: icomrade Date: Wed, 4 Jun 2014 20:33:32 -0400 Subject: [PATCH 4/5] Fix #1279 --- SQF/dayz_code/compile/fn_selfActions.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 8117efc22..94665a745 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -468,7 +468,7 @@ if (!isNull cursorTarget && !_inVehicle && !_isPZombie && (player distance curso if (_player_SurrenderedGear) then { if (s_player_SurrenderedGear < 0) then { - s_player_SurrenderedGear = player addAction [localize "STR_EPOCH_ACTION_GEAR", "\z\addons\dayz_code\actions\surrender_gear.sqf",_cursorTarget, 1, true, true, "", ""]; + s_player_SurrenderedGear = player addAction [localize "STR_EPOCH_ACTIONS_GEAR", "\z\addons\dayz_code\actions\surrender_gear.sqf",_cursorTarget, 1, true, true, "", ""]; }; } else { player removeAction s_player_SurrenderedGear; From 6fc575caccf2876eb36b252d5ea0a9f3d6e6f67a Mon Sep 17 00:00:00 2001 From: icomrade Date: Wed, 4 Jun 2014 20:41:50 -0400 Subject: [PATCH 5/5] Fix #1278 --- SQF/dayz_code/init/variables.sqf | 2 +- SQF/dayz_code/medical/load/load_act.sqf | 2 +- SQF/dayz_code/medical/load/unLoad_act.sqf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 5128228da..5c8b0eebd 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -297,7 +297,7 @@ r_action_targets = []; r_pitchWhine = false; r_isBandit = false; isInTraderCity = false; - +NORRN_dropAction = -1; DZE_PROTOBOX = objNull; //ammo routine diff --git a/SQF/dayz_code/medical/load/load_act.sqf b/SQF/dayz_code/medical/load/load_act.sqf index 0e1f2a07a..557903399 100644 --- a/SQF/dayz_code/medical/load/load_act.sqf +++ b/SQF/dayz_code/medical/load/load_act.sqf @@ -12,7 +12,7 @@ r_action = false; r_action_load = false; call fnc_usec_medic_removeActions; -_dragger removeAction NORRN_loadWoundedAction; +//_dragger removeAction NORRN_loadWoundedAction; if ((_vcl emptyPositions "cargo") > 0) then { diff --git a/SQF/dayz_code/medical/load/unLoad_act.sqf b/SQF/dayz_code/medical/load/unLoad_act.sqf index 787d3ca06..668be19b3 100644 --- a/SQF/dayz_code/medical/load/unLoad_act.sqf +++ b/SQF/dayz_code/medical/load/unLoad_act.sqf @@ -8,7 +8,7 @@ _name = _args select 0; _vcl = _args select 1; _crewVcl = crew _vcl; -_name removeAction NORRN_pullOutAction; +_name removeAction (_this select 2); for [{ _loop = 0 },{ _loop < count _crewVcl },{ _loop = _loop + 1}] do {