From 09a7fba440d350780801f7531bb3fc8d1f94ad5e Mon Sep 17 00:00:00 2001 From: ColdEvul Date: Sat, 5 Oct 2019 10:42:45 +0200 Subject: [PATCH] - FIXED lancer spellings - FIXED Missing crate categories - ADDED Error on wrong or faulty category for crates in dev mode. - CHANGED Punisher radio removed and replaced with Lancer - ADDED Warning when player don't have a unit variable set in dev mode. - ADDED Viking loadouts to loadout selector - CHANGED Lancer loadouts being named Viking still in loadout selector --- .../Cav_Lancer_Deployment/composition.sqe | 86 +++++++++---------- .../logistics/fn_doStarterCrateSupplies.sqf | 13 ++- .../modules/fn_moduleCreateStarterCrate.sqf | 10 +-- .../functions/players/fn_getRadioChannel.sqf | 56 ++++++------ .../players/fn_setPostInitPlayerSettings.sqf | 5 ++ .../systems/fn_addQuickSelectionList.sqf | 59 +++++++------ cScripts/Loadouts/script/CfgPoppy.hpp | 2 +- 7 files changed, 124 insertions(+), 107 deletions(-) diff --git a/Compositions/Cav_Lancer_Deployment/composition.sqe b/Compositions/Cav_Lancer_Deployment/composition.sqe index 8722913b7..ffac9586f 100644 --- a/Compositions/Cav_Lancer_Deployment/composition.sqe +++ b/Compositions/Cav_Lancer_Deployment/composition.sqe @@ -14,7 +14,7 @@ class items flags=4; class Attributes { - init="call{[this,""Lance"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Lancer"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; }; id=58; @@ -54,7 +54,7 @@ class items flags=4; class Attributes { - init="call{[this,""Lance"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Lancer"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; }; id=59; @@ -94,7 +94,7 @@ class items flags=4; class Attributes { - init="call{[this,""Lance"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Lancer"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; }; id=60; @@ -134,7 +134,7 @@ class items flags=4; class Attributes { - init="call{[this,""Lance"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; + init="call{[this,""Lancer"",true,true,true,true,false] call cScripts_fnc_doStarterCrate;}"; description="Starter Crate"; }; id=61; @@ -182,7 +182,7 @@ class items class Attributes { rank="SERGEANT"; - init="call{this setgroupID[""Lance-5""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lance-5""];}"; + init="call{this setgroupID[""Lancer-5""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lancer-5""];}"; isPlayable=1; }; id=195; @@ -255,7 +255,7 @@ class items class Attributes { rank="SERGEANT"; - init="call{this setgroupID[""Lance-6""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lance-6""];}"; + init="call{this setgroupID[""Lancer-6""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lancer-6""];}"; isPlayable=1; }; id=197; @@ -328,7 +328,7 @@ class items class Attributes { rank="SERGEANT"; - init="call{this setgroupID[""Lance-7""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lance-7""];}"; + init="call{this setgroupID[""Lancer-7""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lancer-7""];}"; isPlayable=1; }; id=199; @@ -401,7 +401,7 @@ class items class Attributes { rank="SERGEANT"; - init="call{this setgroupID[""Lance-1""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setgroupID[""Lancer-1""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=201; @@ -462,7 +462,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=202; @@ -480,7 +480,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=203; @@ -498,7 +498,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=204; @@ -516,7 +516,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=205; @@ -535,7 +535,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=206; @@ -553,7 +553,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=207; @@ -571,7 +571,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=208; @@ -589,7 +589,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-1""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-1""];}"; isPlayable=1; }; id=209; @@ -620,7 +620,7 @@ class items class Attributes { rank="SERGEANT"; - init="call{this setgroupID[""Lance-2""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setgroupID[""Lancer-2""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=211; @@ -681,7 +681,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=212; @@ -699,7 +699,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=213; @@ -717,7 +717,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=214; @@ -735,7 +735,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=215; @@ -754,7 +754,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=216; @@ -772,7 +772,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=217; @@ -790,7 +790,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=218; @@ -808,7 +808,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-2""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-2""];}"; isPlayable=1; }; id=219; @@ -839,7 +839,7 @@ class items class Attributes { rank="SERGEANT"; - init="call{this setgroupID[""Lance-3""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setgroupID[""Lancer-3""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=221; @@ -900,7 +900,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=222; @@ -918,7 +918,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=223; @@ -936,7 +936,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=224; @@ -954,7 +954,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=225; @@ -973,7 +973,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=226; @@ -991,7 +991,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=227; @@ -1009,7 +1009,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=228; @@ -1027,7 +1027,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-3""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-3""];}"; isPlayable=1; }; id=229; @@ -1058,7 +1058,7 @@ class items class Attributes { rank="SERGEANT"; - init="call{this setgroupID[""Lance-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setgroupID[""Lancer-4""];" \n "this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=231; @@ -1119,7 +1119,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=232; @@ -1137,7 +1137,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=233; @@ -1155,7 +1155,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=234; @@ -1173,7 +1173,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=235; @@ -1192,7 +1192,7 @@ class items { skill=0.44999999; rank="CORPORAL"; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=236; @@ -1210,7 +1210,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=237; @@ -1228,7 +1228,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=238; @@ -1246,7 +1246,7 @@ class items class Attributes { skill=0.40000001; - init="call{this setVariable [""cScripts_Player_Unit"", ""Lance-4""];}"; + init="call{this setVariable [""cScripts_Player_Unit"", ""Lancer-4""];}"; isPlayable=1; }; id=239; diff --git a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf index 5dce8357e..7f86bb181 100644 --- a/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf +++ b/cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf @@ -28,10 +28,10 @@ _companySelector = toUpper(_companySelector); // Create categories private _officer = ["OFFICER"]; -private _alpha = ["ALPHA", "BUFFALO", "TITAN", "RAIDER", "SPARROW"]; -private _bravo = ["BRAVO", "VIKING", "APOLLO", "MUSTANG"]; -private _charlie = ["CHARLIE", "BANDIT", "MISFIT", 'HAVOC']; -private _ranger = ["RANGER", "SNIPER"]; +private _alpha = ["ALPHA", "BUFFALO", "TITAN", "RAIDER", "SPARROW"]; +private _bravo = ["BRAVO", "LANCER", "VIKING", "SABER", "BANSHEE", "APOLLO", "MUSTANG"]; +private _charlie = ["CHARLIE", "BANDIT", "MISFIT"]; +private _ranger = ["RANGER", "SNIPER"]; // Full selector handler private _alwaysAvalible = if (_companySelector == 'FULL' or _companySelector == 'ALL') then {true} else {false}; @@ -745,3 +745,8 @@ if (_companySelector in _ranger or _alwaysAvalible) then { //================== HELMETS ==================\\ }; }; + +if !(_companySelector in (["FULL", "ALL"] + _officer + _alpha + _bravo + _charlie + _ranger)) then { + [formatText["%1 (Starter Crate) is using a unsupported cartegory '%2'.", _crate, _companySelector]] call FUNC(logError); + if (!isMultiplayer || {is3DENMultiplayer}) then { systemChat format["ERROR: %1 (Starter Crate) is using a unsupported cartegory '%2'. This will cause the crate to be empty.", _crate, _companySelector] }; +}; \ No newline at end of file diff --git a/cScripts/CavFnc/functions/modules/fn_moduleCreateStarterCrate.sqf b/cScripts/CavFnc/functions/modules/fn_moduleCreateStarterCrate.sqf index 90ec3a496..4aeeb6552 100644 --- a/cScripts/CavFnc/functions/modules/fn_moduleCreateStarterCrate.sqf +++ b/cScripts/CavFnc/functions/modules/fn_moduleCreateStarterCrate.sqf @@ -24,7 +24,6 @@ private _dialogResult = [ "Bravo", "Bravo - Mustang", "Charlie", - "Charlie - Havoc", "Ranger", "Sniper", "All loadouts" @@ -33,7 +32,7 @@ private _dialogResult = [ ["Heal action",["true","false"],0], ["Insignia Selection",["true","false"],0], ["Company Variable Required",["true","false"],1], - ["Add full arsenal",["true","false"],1] + ["Add Cav Arsenal",["true","false"],1] ] ] call Ares_fnc_ShowChooseDialog; @@ -45,11 +44,10 @@ private _quickSelectScale = switch (_dialogResult select 0) do { case 2: {"bravo";}; case 3: {"mustang";}; case 4: {"charlie";}; - case 5: {"havoc";}; - case 6: {"ranger";}; - case 7: {"sniper";}; + case 5: {"ranger";}; + case 6: {"sniper";}; - case 8: {"all";}; + case 7: {"all";}; }; private _reGearOption = if (_dialogResult select 1 == 0) then {true} else {false}; diff --git a/cScripts/CavFnc/functions/players/fn_getRadioChannel.sqf b/cScripts/CavFnc/functions/players/fn_getRadioChannel.sqf index 158f90b76..d709577f9 100644 --- a/cScripts/CavFnc/functions/players/fn_getRadioChannel.sqf +++ b/cScripts/CavFnc/functions/players/fn_getRadioChannel.sqf @@ -87,13 +87,13 @@ if (_radio == "ACRE_PRC343") then { case "VIKING-6": {_channel = 69}; case "VIKING-7": {_channel = 69}; - case "PUNISHER-1": {_channel = 81}; - case "PUNISHER-2": {_channel = 82}; - case "PUNISHER-3": {_channel = 83}; - case "PUNISHER-4": {_channel = 84}; - case "PUNISHER-5": {_channel = 85}; - case "PUNISHER-6": {_channel = 85}; - case "PUNISHER-7": {_channel = 85}; + case "LANCER-1": {_channel = 81}; + case "LANCER-2": {_channel = 82}; + case "LANCER-3": {_channel = 83}; + case "LANCER-4": {_channel = 84}; + case "LANCER-5": {_channel = 85}; + case "LANCER-6": {_channel = 85}; + case "LANCER-7": {_channel = 85}; case "BANDIT-1": {_channel = 17}; case "BANDIT-2": {_channel = 18}; @@ -181,13 +181,13 @@ if (_radio == "ACRE_PRC343") then { case "VIKING SIX": {_channel = 69}; case "VIKING SEVEN": {_channel = 69}; - case "PUNISHER ONE": {_channel = 81}; - case "PUNISHER TWO": {_channel = 82}; - case "PUNISHER THREE": {_channel = 83}; - case "PUNISHER FOUR": {_channel = 84}; - case "PUNISHER FIVE": {_channel = 85}; - case "PUNISHER SIX": {_channel = 85}; - case "PUNISHER SEVEN": {_channel = 85}; + case "LANCER ONE": {_channel = 81}; + case "LANCER TWO": {_channel = 82}; + case "LANCER THREE": {_channel = 83}; + case "LANCER FOUR": {_channel = 84}; + case "LANCER FIVE": {_channel = 85}; + case "LANCER SIX": {_channel = 85}; + case "LANCER SEVEN": {_channel = 85}; case "BANDIT ONE": {_channel = 17}; case "BANDIT TWO": {_channel = 18}; @@ -280,13 +280,13 @@ if (_radio == "ACRE_PRC343") then { case "VIKING-6": {_channel = 2}; case "VIKING-7": {_channel = 2}; - case "PUNISHER-1": {_channel = 3}; - case "PUNISHER-2": {_channel = 3}; - case "PUNISHER-3": {_channel = 3}; - case "PUNISHER-4": {_channel = 3}; - case "PUNISHER-5": {_channel = 3}; - case "PUNISHER-6": {_channel = 3}; - case "PUNISHER-7": {_channel = 3}; + case "LANCER-1": {_channel = 3}; + case "LANCER-2": {_channel = 3}; + case "LANCER-3": {_channel = 3}; + case "LANCER-4": {_channel = 3}; + case "LANCER-5": {_channel = 3}; + case "LANCER-6": {_channel = 3}; + case "LANCER-7": {_channel = 3}; case "BANDIT-1": {_channel = 7}; case "BANDIT-2": {_channel = 7}; @@ -374,13 +374,13 @@ if (_radio == "ACRE_PRC343") then { case "VIKING SIX": {_channel = 2}; case "VIKING SEVEN": {_channel = 2}; - case "PUNISHER ONE": {_channel = 3}; - case "PUNISHER TWO": {_channel = 3}; - case "PUNISHER THREE": {_channel = 3}; - case "PUNISHER FOUR": {_channel = 3}; - case "PUNISHER FIVE": {_channel = 3}; - case "PUNISHER SIX": {_channel = 3}; - case "PUNISHER SEVEN": {_channel = 3}; + case "LANCER ONE": {_channel = 3}; + case "LANCER TWO": {_channel = 3}; + case "LANCER THREE": {_channel = 3}; + case "LANCER FOUR": {_channel = 3}; + case "LANCER FIVE": {_channel = 3}; + case "LANCER SIX": {_channel = 3}; + case "LANCER SEVEN": {_channel = 3}; case "BANDIT ONE": {_channel = 7}; case "BANDIT TWO": {_channel = 7}; diff --git a/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf b/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf index a64d2f913..6fb0f75ed 100644 --- a/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf +++ b/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf @@ -132,6 +132,11 @@ if (EGVAR(Settings,setMissionType) != 3) then { [_player] call FUNC(doPlayerAnnouncement); }; +if (isNil {_unit getVariable QEGVAR(Player,Unit)}) then { + [formatText["%1 have no unit variable defined.", _player]] call FUNC(logWarning); + if (!isMultiplayer || {is3DENMultiplayer}) then { systemChat format["WARNING: %1 have no unit variable defined.", _player] }; +}; + #ifdef DEBUG_MODE [formatText["postLoadout application completed for %1.", _player]] call FUNC(logInfo); #endif diff --git a/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf b/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf index d58d5a159..8b15490fe 100644 --- a/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf +++ b/cScripts/CavFnc/functions/systems/fn_addQuickSelectionList.sqf @@ -37,10 +37,10 @@ private _icon = "cScripts\Data\Icon\icon_01.paa"; // Create categories private _officer = ["OFFICER"]; -private _alpha = ["ALPHA", "BUFFALO", "TITAN", "RAIDER", "SPARROW"]; -private _bravo = ["BRAVO", "VIKING", "APOLLO", "MUSTANG"]; -private _charlie = ["CHARLIE", "BANDIT", "MISFIT", 'HAVOC']; -private _ranger = ["RANGER", "SNIPER"]; +private _alpha = ["ALPHA", "BUFFALO", "TITAN", "RAIDER", "SPARROW"]; +private _bravo = ["BRAVO", "LANCER", "VIKING", "SABER", "BANSHEE", "APOLLO", "MUSTANG"]; +private _charlie = ["CHARLIE", "BANDIT", "MISFIT"]; +private _ranger = ["RANGER", "SNIPER"]; // Full selector handler private _alwaysAvalible = if (_companySelector == 'FULL' or _companySelector == 'ALL') then {true} else {false}; @@ -83,23 +83,23 @@ if (_companySelector in _bravo or _alwaysAvalible) then { [_object,"cScriptQuickSelection_Bravo","Bravo",_icon,["ACE_MainActions","cScriptQuickSelectionMenu"]] call FUNC(addAceCategory); private _bravoCoCat = ['ACE_MainActions','cScriptQuickSelectionMenu','cScriptQuickSelection_Bravo']; - // Loadouts Viking - if (_companySelector in ['BRAVO', 'VIKING'] or _alwaysAvalible) then { - [_object,"cScriptQuickSelection_Bravo_Viking","Viking",_icon,["ACE_MainActions","cScriptQuickSelectionMenu","cScriptQuickSelection_Bravo"]] call FUNC(addAceCategory); - private _bravoVikingCoCat = ['ACE_MainActions','cScriptQuickSelectionMenu','cScriptQuickSelection_Bravo','cScriptQuickSelection_Bravo_Viking']; - - [_object,"Platoon Sergeant", "Cav_B_B_PlatoonSergeant_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Platoon Leader", "Cav_B_B_PlatoonLeader_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Platoon Medic", "Cav_B_B_PlatoonMedic_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - - [_object,"Squad Leader", "Cav_B_B_SquadLeader_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Fire Team Leader", "Cav_B_B_Alpha_FireTeamLeader_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Automatic Rifleman", "Cav_B_B_Alpha_AutomaticRifleman_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Grenadier", "Cav_B_B_Alpha_Grenadier_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Rifleman", "Cav_B_B_Alpha_Rifleman_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - //[_object,"Rifleman (AT)", "Cav_B_B_Alpha_RiflemanAT_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Rifleman (LAT)", "Cav_B_B_Alpha_RiflemanLAT_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Combat Life Saver", "Cav_B_B_Alpha_CombatLifeSaver_F", "", _bravoVikingCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + // Loadouts Lancer + if (_companySelector in ['BRAVO', 'LANCER'] or _alwaysAvalible) then { + [_object,"cScriptQuickSelection_Bravo_Lancer","Lancer",_icon,["ACE_MainActions","cScriptQuickSelectionMenu","cScriptQuickSelection_Bravo"]] call FUNC(addAceCategory); + private _bravoLancerCoCat = ['ACE_MainActions','cScriptQuickSelectionMenu','cScriptQuickSelection_Bravo','cScriptQuickSelection_Bravo_Lancer']; + + [_object,"Platoon Sergeant", "Cav_B_B_PlatoonSergeant_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Platoon Leader", "Cav_B_B_PlatoonLeader_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Platoon Medic", "Cav_B_B_PlatoonMedic_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + + [_object,"Squad Leader", "Cav_B_B_SquadLeader_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Fire Team Leader", "Cav_B_B_Alpha_FireTeamLeader_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Automatic Rifleman", "Cav_B_B_Alpha_AutomaticRifleman_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Grenadier", "Cav_B_B_Alpha_Grenadier_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Rifleman", "Cav_B_B_Alpha_Rifleman_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + //[_object,"Rifleman (AT)", "Cav_B_B_Alpha_RiflemanAT_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Rifleman (LAT)", "Cav_B_B_Alpha_RiflemanLAT_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Combat Life Saver", "Cav_B_B_Alpha_CombatLifeSaver_F", "", _bravoLancerCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); }; // Loadouts Mustang @@ -136,11 +136,20 @@ if (_companySelector in _bravo or _alwaysAvalible) then { // Loadouts Banshee if (_companySelector in ['BRAVO', 'BANSHEE'] or _alwaysAvalible) then { [_object,"cScriptQuickSelection_Bravo_Banshee","Banshee",_icon,["ACE_MainActions","cScriptQuickSelectionMenu","cScriptQuickSelection_Bravo"]] call FUNC(addAceCategory); - private _bravoApoCoCat = ['ACE_MainActions','cScriptQuickSelectionMenu','cScriptQuickSelection_Bravo','cScriptQuickSelection_Bravo_Banshee']; + private _bravoBansheeCoCat = ['ACE_MainActions','cScriptQuickSelectionMenu','cScriptQuickSelection_Bravo','cScriptQuickSelection_Bravo_Banshee']; + + [_object,"Commander", "Cav_B_B_Ifv_Commander_F", "", _bravoBansheeCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Driver", "Cav_B_B_Ifv_Driver_F", "", _bravoBansheeCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Gunner", "Cav_B_B_Ifv_Gunner_F", "", _bravoBansheeCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + }; + + // Loadouts Viking + if (_companySelector in ['BRAVO', 'VIKING'] or _alwaysAvalible) then { + [_object,"cScriptQuickSelection_Bravo_Viking","Viking",_icon,["ACE_MainActions","cScriptQuickSelectionMenu","cScriptQuickSelection_Bravo"]] call FUNC(addAceCategory); + private _bravoVikingCat = ['ACE_MainActions','cScriptQuickSelectionMenu','cScriptQuickSelection_Bravo','cScriptQuickSelection_Bravo_Viking']; - [_object,"Commander", "Cav_B_B_Ifv_Commander_F", "", _bravoApoCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Driver", "Cav_B_B_Ifv_Driver_F", "", _bravoApoCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); - [_object,"Gunner", "Cav_B_B_Ifv_Gunner_F", "", _bravoApoCoCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Crew", "Cav_B_B_CavScout_Crewman_Local", "", _bravoVikingCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); + [_object,"Scout", "Cav_B_B_CavScout_Dismount_Local", "", _bravoVikingCat, "Bravo", _allowOnlyForCompany] call FUNC(addQuickSelection); }; }; diff --git a/cScripts/Loadouts/script/CfgPoppy.hpp b/cScripts/Loadouts/script/CfgPoppy.hpp index 772302166..04d3a79c0 100644 --- a/cScripts/Loadouts/script/CfgPoppy.hpp +++ b/cScripts/Loadouts/script/CfgPoppy.hpp @@ -10,7 +10,7 @@ class CfgPoppy { class ACRE { distributeGroupLeaderRadios = 0; groupLeaderRadio = "ACRE_PRC152"; - channelNames[] = {"UNUSED","AVIATION","VIKING","PUNISHER","BANSHEE","SABRE","BANDIT","MISFIT","HAVOC","IDF-1","IDF-2","CAS-1","CAS-2","GROUND-TO-AIR","LOGISTICS","FARP","CONVOY","ZEUS","CAG","COMMAND"}; + channelNames[] = {"UNUSED","AVIATION","VIKING","LANCER","BANSHEE","SABRE","BANDIT","MISFIT","HAVOC","IDF-1","IDF-2","CAS-1","CAS-2","GROUND-TO-AIR","LOGISTICS","FARP","CONVOY","ZEUS","CAG","COMMAND"}; }; };