Merge pull request #219 from Vdauphin/FIX-setdamege_error

FIX: side mission healing civilians
Vdauphin · Oct 2, 2016 · 22a10f5 · 22a10f5
2 parents 5815952 + 5146d05
commit 22a10f5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 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
@@ -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
@@ -142,6 +142,6 @@ player createDiaryRecord ["Documentation", ["Interaction", "
 
 player createDiaryRecord ["Documentation", [
 	"Version",
-	format ["<img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/> Version %1 <img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/>",(str(btc_version) + ".0")]
+	format ["<img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/> Version %1 <img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/>",(str(btc_version) + ".1")]
 	]
 ];
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
@@ -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, (_selection select (random ((count _selection) - 1))), 0.7 + (random 0.15), objNull, (_type select (random ((count _type) - 1))),-1] call ace_medical_fnc_handleDamage;
+	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, (_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.05 + (random 0.6), selectRandom _selection, selectRandom _type] call ace_medical_fnc_addDamageToUnit;
 };
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
@@ -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];
 };