From 549f3d7063aeb24270e2476297c5d4c38642e45a Mon Sep 17 00:00:00 2001 From: Teh Dango Date: Tue, 2 Jan 2018 22:51:15 -0500 Subject: [PATCH] 2.4.2 Fixing undefined variables for vehicle arrays --- Sarge.pbo | Bin 785412 -> 785365 bytes .../configs/loadouts/epoch/epoch_bandits.sqf | 6 +++--- .../configs/loadouts/epoch/epoch_soldiers.sqf | 6 +++--- .../loadouts/epoch/epoch_survivors.sqf | 6 +++--- Sarge/code/configs/main.sqf | 6 +++--- sarge/code/functions/fn_AI_hit.sqf | 2 +- sarge/code/functions/fn_AI_killed.sqf | 2 +- sarge/code/functions/fn_functions.sqf | 2 -- sarge/init/fn_postInit.sqf | 2 +- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Sarge.pbo b/Sarge.pbo index c9929cce94bd4b07d9e4876f15d1afe76127d3d1..440f99165353c25201ffb6e04620bbe4f41984e8 100644 GIT binary patch delta 461 zcmZqqp?~$e{)8&NtpW^SaLmdhYOBCxMMk}e+uridhz@%Ti&5}cgKE*W=65j00 z-pG287D8!5!zgv zY-=((u7GFr@#%|MCUf<3Z!VkD$uc>zl4tVq=^m5+ot(Y-{lawS$=$Ue0q4p3t5_%N zovWC%rbewHH3=Zwpp7U*H2)ceEt?haA()b&8IeBW(L^+ z*79b10?XuEk0G+MPgYJowb^3w{ip1kZ$05>o;+c?7RXVP*IYB-bnwa)=ETgR?KeUh ztAjwS=|I+(?cOUHKW%GIN?-zF=Iu!dEbrx*jFhGyEM<{t&#z|zVpbq#17da{<^W<& hAm-YhU(elCBdi?vNB2asu(p&%!L~@_1>qBHqyQ!Ct*!t7 delta 530 zcmccmUBBgr{)8&NEdmT+VAJUpwMAgEBBS2KZEtz!@Ipl6Ub#ojnY@9~jJFyp;sF$? z28yUnmShs-eFGJp|JFU~4Nz2Sb0E_fX1>>g5bc%0zan1?PEKSOpPa?Eg)c${AsnFs z65j00-pd-1OcVo6KPDW3c@(Hh23+8miA z%*Y*Fl9`jEkf;#u8L+u3+0le8JvA>SwP^CiO?Sz^u0#aWz_np&V>pl4{^u9d(9#LU~Z z5?Fr7F&QXLmVYDD?oiJH#H>Kf2E^<@%mKulK+Lt>p`N>`Mp)hOo-3!usRbu?bQMo1 Kj9Xf|XdM86wZ(q` diff --git a/Sarge/code/configs/loadouts/epoch/epoch_bandits.sqf b/Sarge/code/configs/loadouts/epoch/epoch_bandits.sqf index 7f12d3b..c6045fd 100644 --- a/Sarge/code/configs/loadouts/epoch/epoch_bandits.sqf +++ b/Sarge/code/configs/loadouts/epoch/epoch_bandits.sqf @@ -1,5 +1,5 @@ // Leader lodout options -SAR_band_leader_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_band_leader_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_band_leader_uniform = [["U_I_C_Soldier_Bandit_1_F","U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_I_C_Soldier_Bandit_4_F","U_I_C_Soldier_Bandit_5_F"],["U_CamoBiker_uniform"]]; SAR_band_leader_vest = []; SAR_band_leader_backpack = []; @@ -21,7 +21,7 @@ SAR_band_leader_skills = [ ]; // Riflemen loadout options -SAR_band_rifleman_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_band_rifleman_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_band_rifleman_uniform = [["U_I_C_Soldier_Bandit_1_F","U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_I_C_Soldier_Bandit_4_F","U_I_C_Soldier_Bandit_5_F"],["U_CamoBiker_uniform"]]; SAR_band_rifleman_vest = []; SAR_band_rifleman_backpack = []; @@ -43,7 +43,7 @@ SAR_band_rifleman_skills = [ ]; // Sniper loadout options -SAR_band_sniper_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_band_sniper_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_band_sniper_uniform = [["U_I_C_Soldier_Bandit_1_F","U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_I_C_Soldier_Bandit_4_F","U_I_C_Soldier_Bandit_5_F"],["U_CamoBiker_uniform"]]; SAR_band_sniper_vest = []; SAR_band_sniper_backpack = []; diff --git a/Sarge/code/configs/loadouts/epoch/epoch_soldiers.sqf b/Sarge/code/configs/loadouts/epoch/epoch_soldiers.sqf index 0c07ac8..2662111 100644 --- a/Sarge/code/configs/loadouts/epoch/epoch_soldiers.sqf +++ b/Sarge/code/configs/loadouts/epoch/epoch_soldiers.sqf @@ -1,5 +1,5 @@ // Leader lodout options -SAR_sold_leader_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_sold_leader_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_sold_leader_uniform = [["U_I_C_Soldier_Para_1_F","U_I_C_Soldier_Para_2_F","U_I_C_Soldier_Para_3_F","U_I_C_Soldier_Para_4_F"],["U_Camo_uniform"]]; SAR_sold_leader_vest = []; SAR_sold_leader_backpack = []; @@ -21,7 +21,7 @@ SAR_sold_leader_skills = [ ]; // Riflemen loadout options -SAR_sold_rifleman_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_sold_rifleman_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_sold_rifleman_uniform = [["U_I_C_Soldier_Para_1_F","U_I_C_Soldier_Para_2_F","U_I_C_Soldier_Para_3_F","U_I_C_Soldier_Para_4_F"],["U_Camo_uniform"]]; SAR_sold_rifleman_vest = []; SAR_sold_rifleman_backpack = []; @@ -44,7 +44,7 @@ SAR_sold_rifleman_skills = [ ]; // Sniper loadout options -SAR_sold_sniper_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_sold_sniper_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_sold_sniper_uniform = [["U_O_FullGhillie_lsh","U_O_FullGhillie_sard","U_O_FullGhillie_ard","U_I_FullGhillie_lsh","U_I_FullGhillie_sard","U_I_FullGhillie_ard"],["U_ghillie1_uniform","U_ghillie2_uniform","U_ghillie3_uniform"]]; SAR_sold_sniper_vest = []; SAR_sold_sniper_backpack = []; diff --git a/Sarge/code/configs/loadouts/epoch/epoch_survivors.sqf b/Sarge/code/configs/loadouts/epoch/epoch_survivors.sqf index 747d9a2..5477085 100644 --- a/Sarge/code/configs/loadouts/epoch/epoch_survivors.sqf +++ b/Sarge/code/configs/loadouts/epoch/epoch_survivors.sqf @@ -1,5 +1,5 @@ // Leader lodout options -SAR_surv_leader_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_surv_leader_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_surv_leader_uniform = [["U_C_Mechanic_01_F","U_C_IDAP_Man_Jeans_F","U_C_Man_casual_1_F","U_C_Man_casual_2_F","U_C_Man_casual_3_F","U_C_Journalist","U_C_HunterBody_grn"],["U_CamoBlue_uniform","U_CamoBrn_uniform"]]; SAR_surv_leader_vest = []; SAR_surv_leader_backpack = []; @@ -21,7 +21,7 @@ SAR_surv_leader_skills = [ ]; // Riflemen loadout options -SAR_surv_rifleman_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_surv_rifleman_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_surv_rifleman_uniform = [["U_C_Mechanic_01_F","U_C_IDAP_Man_Jeans_F","U_C_Man_casual_1_F","U_C_Man_casual_2_F","U_C_Man_casual_3_F","U_C_Journalist","U_C_HunterBody_grn"],["U_CamoBlue_uniform","U_CamoBrn_uniform"]]; SAR_surv_rifleman_vest = []; SAR_surv_rifleman_backpack = []; @@ -43,7 +43,7 @@ SAR_surv_rifleman_skills = [ ]; // Sniper loadout options -SAR_surv_sniper_gender = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! +SAR_surv_sniper_model = ["Epoch_Male_F","Epoch_Female_F"]; // DO NOT CHANGE THIS ARRAY! SAR_surv_sniper_uniform = [["U_C_Mechanic_01_F","U_C_IDAP_Man_Jeans_F","U_C_Man_casual_1_F","U_C_Man_casual_2_F","U_C_Man_casual_3_F","U_C_Journalist","U_C_HunterBody_grn"],["U_CamoBlue_uniform","U_CamoBrn_uniform"]]; SAR_surv_sniper_vest = []; SAR_surv_sniper_backpack = []; diff --git a/Sarge/code/configs/main.sqf b/Sarge/code/configs/main.sqf index 4e8fde9..9add65a 100644 --- a/Sarge/code/configs/main.sqf +++ b/Sarge/code/configs/main.sqf @@ -20,11 +20,11 @@ SAR_useBlacklist = false; // Only works for Altis Exile, Namalsk Exile and Tanoa Exile currently. Do not use for non Exile servers! /* Debug Settings */ -SAR_DEBUG = false; // Set to true for RPT info on AI -SAR_EXTREME_DEBUG = false; // Set to true for RPT info on damn near everything +SAR_DEBUG = true; // Set to true for RPT info on AI +SAR_EXTREME_DEBUG = true; // Set to true for RPT info on damn near everything SAR_HITKILL_DEBUG = true; // Set to true for RPT info on AI shooting and killing SAR_log_AI_kills = false; // Set to true for kill logging by variable. ! IN DEVELOPMENT ! -SAR_KILL_MSG = true; // Set to true for announcing AI kills to the server ! Still a WIP ! +SAR_KILL_MSG = true; // Set to true for announcing AI kills to the server ! IN DEVELOPMENT ! /* AI Settings */ SAR_dynamic_spawning = true; // Turn dynamic grid spawns on or off diff --git a/sarge/code/functions/fn_AI_hit.sqf b/sarge/code/functions/fn_AI_hit.sqf index 4ec9f7e..3716f50 100644 --- a/sarge/code/functions/fn_AI_hit.sqf +++ b/sarge/code/functions/fn_AI_hit.sqf @@ -23,7 +23,7 @@ _aikilled_group_side = side (group _ai); _aikiller_type = typeof _aikiller; -if ((alive _aiKiller) && !(_aikiller_type in SAR_heli_type) && !("LandVehicle" countType [vehicle _aikiller] > 0)) then { +if ((alive _aiKiller) && !(_aikiller_type in SAR_air_type) && !("LandVehicle" countType [vehicle _aikiller] > 0)) then { _aikiller_name = name _aikiller; } else { _aikiller_name = _aikiller_type; diff --git a/sarge/code/functions/fn_AI_killed.sqf b/sarge/code/functions/fn_AI_killed.sqf index 14ed4fa..0b14b9e 100644 --- a/sarge/code/functions/fn_AI_killed.sqf +++ b/sarge/code/functions/fn_AI_killed.sqf @@ -25,7 +25,7 @@ _aikilled_group_side = side (group _ai); _aikiller_type = typeof _aikiller; -if ((alive _aiKiller) && !(_aikiller_type in SAR_heli_type) && !("LandVehicle" countType [vehicle _aikiller] > 0)) then { +if ((alive _aiKiller) && !(_aikiller_type in SAR_air_type) && !("LandVehicle" countType [vehicle _aikiller] > 0)) then { _aikiller_name = name _aikiller; } else { _aikiller_name = _aikiller_type; diff --git a/sarge/code/functions/fn_functions.sqf b/sarge/code/functions/fn_functions.sqf index 814a01a..1699e03 100644 --- a/sarge/code/functions/fn_functions.sqf +++ b/sarge/code/functions/fn_functions.sqf @@ -200,8 +200,6 @@ SAR_unit_loadout = { _items = _this select 5; _tools = _this select 6; - removeHeadgear _unit; - sleep 0.1; removeUniform _unit; sleep 0.1; diff --git a/sarge/init/fn_postInit.sqf b/sarge/init/fn_postInit.sqf index 2eefe4d..8144f17 100644 --- a/sarge/init/fn_postInit.sqf +++ b/sarge/init/fn_postInit.sqf @@ -13,7 +13,7 @@ */ private ["_SAR_supportedMaps","_config","_modConfigs","_modPatches","_modName","_worldname","_startx","_starty","_gridsize_x","_gridsize_y","_gridwidth","_markername","_triggername","_trig_act_stmnt","_trig_deact_stmnt","_trig_cond","_legendname"]; -_SAR_version = "2.4.0"; +_SAR_version = "2.4.2"; diag_log format ["Sarge's AI System: Welcome to Sarge AI!"]; diag_log format ["Sarge's AI System: Now initializing Sarge AI version %1 for %2",_SAR_version,worldName];