From 6bee7a17f03ff998ad99d3f9f795d0092d63d300 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sat, 23 Apr 2016 19:51:56 -0400 Subject: [PATCH] Change R3F weight overburden to break legs Also BAF_L110A1_Aim_DZE wasn't in 1051, so no need to swap it in DB. --- CHANGE LOG 1.0.6.txt | 3 ++- .../external/R3F_Realism/R3F_Tired/R3F_DoTired.sqf | 4 ++-- .../external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf | 9 +++++---- .../external/R3F_Realism/R3F_Tired/R3F_Tired_Init.sqf | 3 +-- SQF/dayz_code/stringtable.xml | 9 +++++++++ Server Files/SQL/1.0.6_Updates.sql | 5 ----- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 1ab6576a2..eab3a5018 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -42,10 +42,11 @@ [CHANGED] Several getPosATL changed to call FNC_GetPos for water compatibility @icomrade [CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebaydayz [CHANGED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebaydayz +[CHANGED] When R3Fweight is enabled overburdened players now get their legs broken instead of being knocked out. The scream was also removed. #1145 @ebaydayz [FIXED] Zombies now target and attack players correctly with 1.8.7 code [FIXED] Server position sync bug after falling unconscious #1522 @ebaydayz -[FIXED] Character sometimes failing to sync after changing clothes #1545 @ebaydayz +[FIXED] Character sometimes failing to sync after changing clothes #1545 [FIXED] Backpack wipes when changing clothes. #1361 @icomrade [FIXED] CH53 gear when locked #1364 @icomrade [FIXED] Infinite loop when crafting ore into bars #1351 @icomrade diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_DoTired.sqf b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_DoTired.sqf index 68d2b0e60..8f22350cb 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_DoTired.sqf +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_DoTired.sqf @@ -88,8 +88,8 @@ while {true} do { [_level] call R3F_TIRED_FNCT_Voile_Noir; - if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL && scriptDone R3F_TIRED_Handle_Blackout_Effect && scriptDone R3F_TIRED_Handle_Blur_Effect) then { - R3F_TIRED_Handle_Blackout_Effect = [] spawn R3F_TIRED_FNCT_DoBlackVanish; + if (R3F_TIRED_Accumulator > R3F_TIRED_BLACKOUT_LEVEL && scriptDone R3F_TIRED_Handle_Blur_Effect) then { + call R3F_TIRED_FNCT_DoBlackVanish; }; } else { R3F_TIRED_Accumulator = 0; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf index a22222340..4528f34b3 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Fnct.sqf @@ -23,9 +23,10 @@ R3F_TIRED_FNCT_Voile_Noir = { }; R3F_TIRED_FNCT_DoBlackVanish = { - [player,0.1] call fnc_usec_damageUnconscious; - _refObj = player; - [_refObj,"scream",3,false] call dayz_zombieSpeak; - "You are overburdened." call dayz_rollingMessages; + if (!r_fracture_legs) then { + player setHit["legs",1]; + r_fracture_legs = true; + }; + localize "STR_R3F_WEIGHT_Overburdened" call dayz_rollingMessages; }; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Init.sqf b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Init.sqf index db9833ea4..aada5dbdc 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Init.sqf +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Tired/R3F_Tired_Init.sqf @@ -16,8 +16,7 @@ R3F_Weight = 0; R3F_TIRED_Ratio_Position = 0; R3F_TIRED_Accumulator = 0; -R3F_TIRED_Handle_Blur_Effect = [] spawn {}; -R3F_TIRED_Handle_Blackout_Effect = [] spawn {}; +R3F_TIRED_Handle_Blur_Effect = [] spawn {}; R3F_TIRED_Counter_Time = 0; R3F_TIRED_Ratio_Recovery = R3F_TIRED_RATIO_RECOVERING; R3F_TIRED_Ratio_Overweight = 1; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 36a9b36c8..8ef4ba26c 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -13791,6 +13791,15 @@ Kg Kg + + You are overburdened. + Sie sind überfordert. + Вы перегружена. + Usted está sobrecargado. + Je bent overbelast. + Vous êtes surchargé. + Jste přetížené. + You will auto-join the game in %1 seconds. Press ESC to cancel and leave the lobby. Sie werden automatisch in das Spiel in %1 Sekunden. Drücken Sie ESC, um den Vorgang abzubrechen und lassen Sie die Lobby. diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index 09bb5128b..f646acff8 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -220,11 +220,6 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'G36K_camo', 'G36K_Camo_D UPDATE character_data SET Inventory = REPLACE(Inventory, 'G36K_camo', 'G36K_Camo_DZ') WHERE INSTR(Inventory, 'G36K_camo') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'G36K_camo', 'G36K_Camo_DZ') WHERE INSTR(Inventory, 'G36K_camo') > 0; -UPDATE `Traders_DATA` SET `item` = '["L110A1_CCO_DZ",1]' WHERE `item` = '["BAF_L110A1_Aim_DZE",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'BAF_L110A1_Aim_DZE', 'L110A1_CCO_DZ') WHERE INSTR(Backpack, 'BAF_L110A1_Aim_DZE') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'BAF_L110A1_Aim_DZE', 'L110A1_CCO_DZ') WHERE INSTR(Inventory, 'BAF_L110A1_Aim_DZE') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'BAF_L110A1_Aim_DZE', 'L110A1_CCO_DZ') WHERE INSTR(Inventory, 'BAF_L110A1_Aim_DZE') > 0; - UPDATE `Traders_DATA` SET `item` = '["L85_Holo_DZ",1]' WHERE `item` = '["BAF_L85A2_RIS_Holo",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'BAF_L85A2_RIS_Holo', 'L85_Holo_DZ') WHERE INSTR(Backpack, 'BAF_L85A2_RIS_Holo') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, 'BAF_L85A2_RIS_Holo', 'L85_Holo_DZ') WHERE INSTR(Inventory, 'BAF_L85A2_RIS_Holo') > 0;