From e28f8c3116aa572c1338d2b90bad5272390045ed Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Sun, 2 Oct 2016 18:50:30 +0200 Subject: [PATCH 1/3] FIX: setdamage error by using ace_medical_fnc_addDamageToUnit --- .../core/fnc/common/set_damage.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf index 5de1bf84c..d167687fe 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf @@ -27,7 +27,7 @@ if (ace_medical_level isEqualTo 1) then { _unconsciousTime = 120 + round (random 600); [_unit,true,_unconsciousTime,true] call ace_medical_fnc_setUnconscious; for "_i" from 0 to 2 do { - [_unit, (_selection select (random ((count _selection) - 1))), 0.7 + (random 0.15), objNull, (_type select (random ((count _type) - 1))),-1] call ace_medical_fnc_handleDamage; + [_unit, 0.7 + (random 0.15), selectRandom _selection, selectRandom _type] call ace_medical_fnc_addDamageToUnit; }; [{ params ["_args","_id"]; @@ -44,5 +44,5 @@ if (ace_medical_level isEqualTo 1) then { [_unit, 0.5] call ace_medical_fnc_adjustPainLevel; [_unit,true,10,true] call ace_medical_fnc_setUnconscious; [_unit] call ace_medical_fnc_setCardiacArrest; - [_unit, (_selection select (random ((count _selection) - 1))), 0, objNull, (_type select (random ((count _type) - 1))), 0, 0.2] call ace_medical_fnc_handleDamage_advanced; + [_unit, 0.4 + (random 0.45), selectRandom _selection, selectRandom _type] call ace_medical_fnc_addDamageToUnit; }; \ No newline at end of file From d9df6adb5a6efa121b54b62ee9a765ab46907d6b Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Sun, 2 Oct 2016 18:55:26 +0200 Subject: [PATCH 2/3] add version 1.5.1 --- =BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf | 2 +- =BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf index dced2b1e6..fd26c8116 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf @@ -1,7 +1,7 @@ private ["_p_civ_veh","_p_db","_p_en","_hideout_n","_cache_info_def","_cache_info_ratio","_info_chance","_p_rep","_p_skill","_c_array","_tower","_array","_chopper","_p_civ","_btc_rearming_vehicles","_vehicles","_magazines","_p_city_radius","_magazines_static","_static","_btc_rearming_static"]; -btc_version = 1.15; diag_log format ["=BTC= HEARTS AND MINDS VERSION %1",(str(btc_version) + ".0")]; +btc_version = 1.15; diag_log format ["=BTC= HEARTS AND MINDS VERSION %1",(str(btc_version) + ".1")]; //Param diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf index da1cd659d..8c44257b8 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf @@ -142,6 +142,6 @@ player createDiaryRecord ["Documentation", ["Interaction", " player createDiaryRecord ["Documentation", [ "Version", - format [" Version %1 ",(str(btc_version) + ".0")] + format [" Version %1 ",(str(btc_version) + ".1")] ] ]; \ No newline at end of file From 5146d058be49a40c0470d7b40717306f66962242 Mon Sep 17 00:00:00 2001 From: Vdauphin Date: Sun, 2 Oct 2016 20:57:55 +0200 Subject: [PATCH 3/3] tweak damage --- .../core/fnc/common/set_damage.sqf | 6 +++--- .../core/fnc/side/civtreatment.sqf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf index d167687fe..6de9c9288 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/set_damage.sqf @@ -26,8 +26,8 @@ _type = [ if (ace_medical_level isEqualTo 1) then { _unconsciousTime = 120 + round (random 600); [_unit,true,_unconsciousTime,true] call ace_medical_fnc_setUnconscious; - for "_i" from 0 to 2 do { - [_unit, 0.7 + (random 0.15), selectRandom _selection, selectRandom _type] call ace_medical_fnc_addDamageToUnit; + for "_i" from 0 to 1 do { + [_unit, 0.1 + (random 0.6), selectRandom _selection, selectRandom _type] call ace_medical_fnc_addDamageToUnit; }; [{ params ["_args","_id"]; @@ -44,5 +44,5 @@ if (ace_medical_level isEqualTo 1) then { [_unit, 0.5] call ace_medical_fnc_adjustPainLevel; [_unit,true,10,true] call ace_medical_fnc_setUnconscious; [_unit] call ace_medical_fnc_setCardiacArrest; - [_unit, 0.4 + (random 0.45), selectRandom _selection, selectRandom _type] call ace_medical_fnc_addDamageToUnit; + [_unit, 0.05 + (random 0.6), selectRandom _selection, selectRandom _type] call ace_medical_fnc_addDamageToUnit; }; \ No newline at end of file diff --git a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/civtreatment.sqf b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/civtreatment.sqf index 73ab54b9b..276c2d7e3 100644 --- a/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/civtreatment.sqf +++ b/=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/civtreatment.sqf @@ -17,7 +17,7 @@ if ( _r < 1) then { _vehpos = [_pos, 10] call btc_fnc_randomize_pos; } else { _houses = [[(_pos select 0),(_pos select 1),0],200] call btc_fnc_getHouses; - _pos = getPos (selectRandom _houses); + _pos = selectRandom ((selectRandom _houses) buildingPos -1); _vehpos = [(_pos select 0),(_pos select 1),(_pos select 2) + 0.1]; };