From cf850acc21851d3be632269b4bc722e42a5add1f Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 10 May 2020 12:41:32 +0200 Subject: [PATCH 001/115] WIP state of config organizing --- .../{KPLIB_debriefs.hpp => CfgDebriefing.hpp} | 4 +- ...liberation_config.sqf => KPLIB_config.sqf} | 501 ++++++++---------- Missionframework/KPLIB_transportConfigs.sqf | 185 +++++++ Missionframework/description.ext | 4 +- .../functions/fn_getSaveableParam.sqf | 11 +- Missionframework/init.sqf | 3 +- 6 files changed, 415 insertions(+), 293 deletions(-) rename Missionframework/{KPLIB_debriefs.hpp => CfgDebriefing.hpp} (86%) rename Missionframework/{kp_liberation_config.sqf => KPLIB_config.sqf} (58%) create mode 100644 Missionframework/KPLIB_transportConfigs.sqf diff --git a/Missionframework/KPLIB_debriefs.hpp b/Missionframework/CfgDebriefing.hpp similarity index 86% rename from Missionframework/KPLIB_debriefs.hpp rename to Missionframework/CfgDebriefing.hpp index 92f9bc011..a6198ef79 100644 --- a/Missionframework/KPLIB_debriefs.hpp +++ b/Missionframework/CfgDebriefing.hpp @@ -1,8 +1,8 @@ /* - File: KPLIB_debriefs.hpp + File: CfgDebriefing.hpp Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-09 - Last Update: 2020-05-09 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: diff --git a/Missionframework/kp_liberation_config.sqf b/Missionframework/KPLIB_config.sqf similarity index 58% rename from Missionframework/kp_liberation_config.sqf rename to Missionframework/KPLIB_config.sqf index 80c730fc8..dfee181dc 100644 --- a/Missionframework/kp_liberation_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -1,6 +1,12 @@ /* - CONFIG FILE FOR KP LIBERATION - https://github.com/KillahPotatoes/KP-Liberation + File: KPLIB_config.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-16 + Last Update: 2020-05-10 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Contains all settings which are meant to be adjustable by players. */ // Vehicle classnames which also function as ACE medical vehicles. @@ -72,140 +78,242 @@ KP_liberation_ace_crates = [ "ACE_medicalSupplyCrate_advanced" ]; -/* - Custom unit and arsenal preset settings. -If you want to change a preset, it's recommended to set all four presets to 0 and edit the appropriate custom.sqf files in the preset folders.*/ - -/* BLUFOR preset: -0 = Custom (default vanilla with many optional mods supported) -1 = Apex Tanoa (apex vanilla with many optional mods supported) -2 = 3cb BAF (MTP) -3 = 3cb BAF (Desert) -4 = BWMod Bundeswehr (Flecktarn) -5 = BWMod Bundeswehr (Tropentarn) -6 = RHS USAF (Woodland) -7 = RHS USAF (Desert) -8 = RHS AFRF (VDV/MSV) -9 = Germany West (Global Mobilization) -10 = Germany West Winter (Global Mobilization) -11 = Germany East (Global Mobilization) -12 = Germany East Winter (Global Mobilization) -13 = CSAT Brown -14 = CSAT Green -15 = Unsung US -16 = CUP British Armed Forces (Desert) -17 = CUP British Armed Forces (Woodland) -18 = CUP US Marine Corps (Desert) -19 = CUP US Marine Corps (Woodland) -20 = CUP US Army (Desert) -21 = CUP US Army (Woodland) -22 = CUP Chernarus Defense Force -23 = CUP Army of the Czech Republic (Desert) -24 = CUP Army of the Czech Republic (Woodland) -25 = CUP Chernarussian Movement of the Red Star -26 = CUP Sahrani Liberation Army -27 = CUP Takistani Army -28 = SFP (Woodland) -29 = SFP (Desert) -30 = LDF (Contact DLC) */ +/* +------------------------------------------------------------ + --- PRESET SETTINGS --- + If you want to change a preset, it's recommended to + set all four presets to 0 and edit the appropriate + custom.sqf files in the preset folders. +------------------------------------------------------------ +*/ + +/* + ----- Playerside preset ----- + 0 = Custom (default vanilla with many optional mods supported) + 1 = Apex Tanoa (apex vanilla with many optional mods supported) + 2 = 3cb BAF (MTP) + 3 = 3cb BAF (Desert) + 4 = BWMod Bundeswehr (Flecktarn) + 5 = BWMod Bundeswehr (Tropentarn) + 6 = RHS USAF (Woodland) + 7 = RHS USAF (Desert) + 8 = RHS AFRF (VDV/MSV) + 9 = Germany West (Global Mobilization) + 10 = Germany West Winter (Global Mobilization) + 11 = Germany East (Global Mobilization) + 12 = Germany East Winter (Global Mobilization) + 13 = CSAT Brown + 14 = CSAT Green + 15 = Unsung US + 16 = CUP British Armed Forces (Desert) + 17 = CUP British Armed Forces (Woodland) + 18 = CUP US Marine Corps (Desert) + 19 = CUP US Marine Corps (Woodland) + 20 = CUP US Army (Desert) + 21 = CUP US Army (Woodland) + 22 = CUP Chernarus Defense Force + 23 = CUP Army of the Czech Republic (Desert) + 24 = CUP Army of the Czech Republic (Woodland) + 25 = CUP Chernarussian Movement of the Red Star + 26 = CUP Sahrani Liberation Army + 27 = CUP Takistani Army + 28 = SFP (Woodland) + 29 = SFP (Desert) + 30 = LDF (Contact DLC) +*/ KP_liberation_preset_blufor = 0; -/* OPFOR preset: -0 = Custom (default vanilla CSAT) -1 = Apex Tanoa (apex vanilla CSAT) -2 = RHS AFRF (EMR/MSV) -3 = Project OPFOR (Takistan) -4 = Project OPFOR (Islamic State) -5 = Project OPFOR (Sahrani) -6 = AAF -7 = NATO -8 = Germany West (Global Mobilization) -9 = Germany West Winter (Global Mobilization) -10 = Germany East (Global Mobilization) -11 = Germany East Winter (Global Mobilization) -12 = Unsung NVA -13 = CUP Sahrani Liberation Army -14 = CUP Takistani Army -15 = CUP Chernarussian Movement of the Red Star -16 = CUP Armed Forces of the Russian Federation (MSV - EMR) -17 = CUP Armed Forces of the Russian Federation (Modern MSV) -18 = CUP Chernarus Defense Force -19 = CUP British Armed Forces (Desert) -20 = CUP British Armed Forces (Woodland) */ +/* + ----- Enemy preset ----- + 0 = Custom (default vanilla CSAT) + 1 = Apex Tanoa (apex vanilla CSAT) + 2 = RHS AFRF (EMR/MSV) + 3 = Project OPFOR (Takistan) + 4 = Project OPFOR (Islamic State) + 5 = Project OPFOR (Sahrani) + 6 = AAF + 7 = NATO + 8 = Germany West (Global Mobilization) + 9 = Germany West Winter (Global Mobilization) + 10 = Germany East (Global Mobilization) + 11 = Germany East Winter (Global Mobilization) + 12 = Unsung NVA + 13 = CUP Sahrani Liberation Army + 14 = CUP Takistani Army + 15 = CUP Chernarussian Movement of the Red Star + 16 = CUP Armed Forces of the Russian Federation (MSV - EMR) + 17 = CUP Armed Forces of the Russian Federation (Modern MSV) + 18 = CUP Chernarus Defense Force + 19 = CUP British Armed Forces (Desert) + 20 = CUP British Armed Forces (Woodland) +*/ KP_liberation_preset_opfor = 0; -/* Resistance preset: -0 = Custom (default vanilla FIA) -1 = Apex Tanoa (apex vanilla Syndikat) -2 = RHS GREF -3 = Project OPFOR (Middle Eastern) -4 = Project OPFOR (Sahrani) -5 = Germany (Global Mobilization) -6 = Unsung -7 = CUP Takistani Locals -8 = CUP National Party of Chernarus */ +/* + ----- Resistance preset ----- + 0 = Custom (default vanilla FIA) + 1 = Apex Tanoa (apex vanilla Syndikat) + 2 = RHS GREF + 3 = Project OPFOR (Middle Eastern) + 4 = Project OPFOR (Sahrani) + 5 = Germany (Global Mobilization) + 6 = Unsung + 7 = CUP Takistani Locals + 8 = CUP National Party of Chernarus +*/ KP_liberation_preset_resistance = 0; -/* Civilians preset: -0 = Custom (default vanilla) -1 = Apex Tanoa (apex vanilla) -2 = Project OPFOR (Middle Eastern) -3 = RDS Civilians -4 = Germany (Global Mobilization) -5 = Unsung -6 = CUP Takistani Civilians -7 = CUP Chernarussian Civilians */ +/* + ----- Civilians preset ----- + 0 = Custom (default vanilla) + 1 = Apex Tanoa (apex vanilla) + 2 = Project OPFOR (Middle Eastern) + 3 = RDS Civilians + 4 = Germany (Global Mobilization) + 5 = Unsung + 6 = CUP Takistani Civilians + 7 = CUP Chernarussian Civilians +*/ KP_liberation_preset_civilians = 0; -/* Which arsenal preset should be used? -0 = Use the default blacklist method (defined below) -1 = Custom arsenal preset (edit the custom.sqf in the arsenal_presets\ folder to change things for your own versions and tweaks) -2 = RHS USAF arsenal preset -3 = 3cbBAF and RHS USAF arsenal preset -4 = GM West arsenal preset -5 = GM East arsenal preset -6 = CSAT arsenal preset -7 = Unsung US arsenal preset -8 = SFP arsenal preset -9 = BWMod arsenal preset */ +/* + ----- Arsenal preset ----- + 0 = Use the default blacklist method (defined below) + 1 = Custom arsenal preset (custom.sqf in the arsenal_presets\ folder) + 2 = RHS USAF arsenal preset + 3 = 3cbBAF and RHS USAF arsenal preset + 4 = GM West arsenal preset + 5 = GM East arsenal preset + 6 = CSAT arsenal preset + 7 = Unsung US arsenal preset + 8 = SFP arsenal preset + 9 = BWMod arsenal preset +*/ KP_liberation_arsenal = 0; -/* - Fuel consumption settings. -Time in minutes till a full tank depletes whilst the vehicle is standing still with a running engine. */ + +/* +------------------------------------------------------------ + --- SIDE SETTINGS --- + Sides of each faction. In basically any cases this + doesn't need to be tweaked, even if using e.g. the + CSAT preset for the players. +------------------------------------------------------------ +*/ + +// Player side +GRLIB_side_friendly = WEST; + +// Enemy side +GRLIB_side_enemy = EAST; + +// Resistance side +GRLIB_side_resistance = RESISTANCE; + +// Civilian side +GRLIB_side_civilian = CIVILIAN; + +// Friendly sector marker color +GRLIB_color_friendly = "ColorBLUFOR"; + +// Enemy sector marker color +GRLIB_color_enemy = "ColorOPFOR"; + +// Enemy sector marker color (activated) +GRLIB_color_enemy_bright = "ColorRED"; + + +/* +------------------------------------------------------------ + --- SAVE SETTINGS --- + Settings concerning the internal save system. +------------------------------------------------------------ +*/ + +// Name of the save data variable inside of the [ServerProfileName].vars.Arma3Profile file. +GRLIB_save_key = "KP_LIBERATION_" + (toUpper worldName) + "_SAVEGAME"; + +// Name of the parameter save data variable inside of the [ServerProfileName].vars.Arma3Profile file. +KPLIB_paramSaveKey = "KP_LIBERATION_" + (toUpper worldName) + "_SAVE_PARAMS"; + +// Interval in seconds for automatic save. +KP_liberation_save_interval = 60; + + +/* +------------------------------------------------------------ + --- RANGES AND HEIGHTS --- + All values in meters. +------------------------------------------------------------ +*/ + +// Build range around the main FOB building +GRLIB_fob_range = 125; + +// Altitude in metres for the HALO jump +GRLIB_halo_altitude = 2500; + +// Range to activate a sector +GRLIB_sector_size = 1000; + +// Range to capture a sector +GRLIB_capture_size = 175; + +// Radio Tower scanning range +GRLIB_radiotower_size = 2500; + + +/* +------------------------------------------------------------ + --- SECONDARY MISSION SETTINGS --- + Settings which are connected to the available + secondary missions which can be started by players + via the secondary mission dialog. +------------------------------------------------------------ +*/ + +// Intel price for the secondary missions [FOB hunting, Convoy ambush, SAR] +GRLIB_secondary_missions_costs = [15, 10, 8]; + +// The percentage impact against enemy combat readiness for a successful FOB hunt +GRLIB_secondary_objective_impact = 0.6; + + +/* +------------------------------------------------------------ + --- FUEL CONSUMPTION SETTINGS --- + Values for the KP Fuel Consumption Script. +------------------------------------------------------------ +*/ + +// Time in minutes till a full tank depletes whilst the vehicle is standing still with a running engine. KP_liberation_fuel_neutral = 180; + // Time in minutes till a full tank depletes whilst the vehicle is driving below max speed. KP_liberation_fuel_normal = 90; + // Time in minutes till a full tank depletes whilst the vehicle is driving at max speed. KP_liberation_fuel_max = 45; -/* - Gameplay constant settings. -Name of the savegame namespace inside of the [ServerProfileName].vars.Arma3Profile file. */ -GRLIB_save_key = "KP_LIBERATION_" + (toUpper worldName) + "_SAVEGAME"; -KP_liberation_save_interval = 60; // Interval in seconds for automatic save. -GRLIB_side_friendly = WEST; // Friendly side. -GRLIB_side_enemy = EAST; // Enemy side. -GRLIB_side_resistance = RESISTANCE; // Resistance side. -GRLIB_side_civilian = CIVILIAN; // Civilian side. + + + GRLIB_respawn_marker = "respawn"; // Respawn marker name. -GRLIB_color_friendly = "ColorBLUFOR"; // Friendly sector marker color. -GRLIB_color_enemy = "ColorOPFOR"; // Enemy sector marker color. -GRLIB_color_enemy_bright = "ColorRED"; // Enemy sector marker color (activated). -GRLIB_fob_range = 125; // Build range around the main FOB building. -GRLIB_halo_altitude = 2500; // Altitude in metres for the HALO jump. -GRLIB_secondary_missions_costs = [15, 10, 8]; // Intel price for the secondary missions [FOB hunting, Convoy ambush, SAR]. -GRLIB_secondary_objective_impact = 0.6; // The percentage impact against enemy combat readiness for a successful FOB hunt. + + + GRLIB_recycling_percentage = 0.5; // Percentage of resources you get back from recycling. KP_liberation_production_interval = 30; // Time in minutes until a production process is finished, when resources multiplier is set to 1. -GRLIB_sector_size = 1000; // Range to activate a sector. -GRLIB_capture_size = 175; // Range to capture a sector. + GRLIB_defended_buildingpos_part = 0.4; // Multiplier for defenders in buildings. GRLIB_battlegroup_size = 6; // Size of enemy battlegroups. GRLIB_vulnerability_timer = 1200; // Time in seconds how long a captured sector is vulnerable to enemy troops. -GRLIB_radiotower_size = 2500; // Radio Tower scanning range. + GRLIB_surrender_chance = 80; // Chance that enemy infantry will surrender after heavy losses are encountered. GRLIB_civilians_amount = 10; // Civilian count multiplier. @@ -505,179 +613,8 @@ KP_liberation_allowed_items_extension = [ "UK3CB_BAF_Javelin_Launcher" ]; -/* - Configuration settings for crates transported by vehicles. -Format = ["classname", distance behind vehicle to unload crate, attachTo positions for each box], */ -KPLIB_transportConfigs = [ - ["B_Heli_Transport_03_F", -8, [0,2.2,-1], [0,0.5,-1], [0,-1.2,-1]], - ["B_Heli_Transport_03_unarmed_F", -8, [0,2.2,-1], [0,0.5,-1], [0,-1.2,-1]], - ["B_T_Truck_01_cargo_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["B_T_Truck_01_covered_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["B_T_Truck_01_flatbed_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["B_T_Truck_01_transport_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["B_T_VTOL_01_infantry_F", -7.5,[0,4.7,-4.88],[0,3,-4.88],[0,1.3,-4.88],[0,-0.4,-4.88],[0,-2.1,-4.88]], - ["B_T_VTOL_01_vehicle_F", -7.5,[0,4.7,-4.88],[0,3,-4.88],[0,1.3,-4.88],[0,-0.4,-4.88],[0,-2.1,-4.88]], - ["B_Truck_01_cargo_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["B_Truck_01_covered_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["B_Truck_01_flatbed_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["B_Truck_01_transport_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], - ["BW_AW101_Trans_Heer_F", -6.5, [0,4.2,-1.45], [0,2.5,-1.45], [0,0.8,-1.45], [0,-0.9,-1.45]], - ["BW_LKW7T_Trans_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], - ["C_IDAP_Van_02_transport_F", -5, [0,-1.75,0]], - ["C_IDAP_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], - ["C_Offroad_01_F", -6.5, [0,-1.7,0.4]], - ["C_Truck_02_covered_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], - ["C_Truck_02_transport_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], - ["C_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], - ["C_Van_02_service_F", -5, [0,0.5,0], [0,-1.75,0]], - ["C_Van_02_transport_F", -5, [0,-1.75,0]], - ["C_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], - ["CUP_B_C130J_Cargo_USMC",-10,[0,0.6,-3.76],[0,-0.9,-3.76],[0,-2.5,-3.76],[0,-4.2,-3.76],[0,2.2,-3.76],[0,3.8,-3.76],[0,5.5,-3.76]], - ["CUP_B_CH47F_GB", -8, [0,-3.535,-1.9], [0,-1.819,-1.9], [0,0.98,-1.9], [0,3.037,-1.9]], - ["CUP_B_CH47F_USA", -8, [0,-3.535,-1.9], [0,-1.819,-1.9], [0,0.98,-1.9], [0,3.037,-1.9]], - ["CUP_B_CH53E_USMC", -8, [0,7.566,-3], [0,5.749,-3], [0,3.847,-3], [0,2,-3], [0,0.338,-3]], - ["CUP_B_Kamaz_CDF", -6.5, [0,-0.4,0], [0,-2.6,0]], - ["CUP_B_Kamaz_Open_CDF", -6.5, [0.12,0.4,0], [0.12,-1.8,0]], - ["CUP_B_Mi17_CDF", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], - ["CUP_B_Mi171Sh_ACR", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], - ["CUP_B_Mi171Sh_Unarmed_ACR", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], - ["CUP_B_MI6A_CDF", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], - ["CUP_B_MTVR_USA", -6.5, [-0.009,-0.647,0.112], [-0.054,-2.535,0.112]], - ["CUP_B_MTVR_USMC", -6.5, [-0.009,-0.647,0.112], [-0.054,-2.535,0.112]], - ["CUP_B_MV22_USMC_RAMPGUN", -8, [0,3.3,-1.6], [0,1,-1.6], [0,-1.3,-1.6]], - ["CUP_B_MV22_USMC", -8, [0,3.3,-1.6], [0,1,-1.6], [0,-1.3,-1.6]], - ["CUP_B_MV22_VIV_USMC", -8, [0,3.3,-1.6], [0,1,-1.6], [0,-1.3,-1.6]], - ["CUP_B_T810_Armed_CZ_DES", -6.5, [0,0,-0.5], [0,-2,-0.5]], - ["CUP_B_T810_Armed_CZ_WDL", -6.5, [0,0,-0.5], [0,-2,-0.5]], - ["CUP_B_T810_Unarmed_CZ_DES", -6.5, [0,0,0.2], [0,-2,0.2]], - ["CUP_B_T810_Unarmed_CZ_WDL", -6.5, [0,0,0.2], [0,-2,0.2]], - ["CUP_B_Ural_CDF", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_B_Ural_Open_CDF", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_B_Wolfhound_GMG_GB_D", -6.5, [0,-3.5,2.3]], - ["CUP_B_Wolfhound_GMG_GB_W", -6.5, [0,-3.5,2.3]], - ["CUP_B_Wolfhound_HMG_GB_D", -6.5, [0,-3.5,2.3]], - ["CUP_B_Wolfhound_HMG_GB_W", -6.5, [0,-3.5,2.3]], - ["CUP_B_Wolfhound_LMG_GB_D", -6.5, [0,-3.5,2.3]], - ["CUP_B_Wolfhound_LMG_GB_W", -6.5, [0,-3.5,2.3]], - ["CUP_C_Ural_Civ_01", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_C_Ural_Civ_03", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_C_Ural_Open_Civ_03", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Kamaz_Open_RU", -6.5, [0.12,0.4,0], [0.12,-1.8,0]], - ["CUP_O_Kamaz_RU", -6.5, [0,-0.4,0], [0,-2.6,0]], - ["CUP_O_Ural_CHDKZ", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Ural_Open_CHDKZ", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Ural_Open_SLA", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Ural_Open_TKA", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Ural_SLA", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Ural_TKA", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Mi8_SLA_1", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], - ["CUP_O_MI6A_CHDKZ", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], - ["CUP_O_MI6A_TKA", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], - ["CUP_O_C130J_Cargo_TKA",-10,[0,0.6,-3.76],[0,-0.9,-3.76],[0,-2.5,-3.76],[0,-4.2,-3.76],[0,2.2,-3.76],[0,3.8,-3.76],[0,5.5,-3.76]], - ["gm_gc_army_ural4320_cargo_win", -5, [0.0722656,-0.539063,-0.1], [0.076416,-1.76904,-0.1], [0.0773926,-2.85742,-0.1]], - ["gm_gc_army_ural4320_cargo", -5, [0.0722656,-0.539063,-0.1], [0.076416,-1.76904,-0.1], [0.0773926,-2.85742,-0.1]], - ["gm_gc_bgs_ural4320_cargo", -5, [-0.0373535,-0.535156,-0.1], [-0.0344238,-1.76611,-0.1], [-0.0334473,-2.85547,-0.1]], - ["gm_ge_army_kat1_451_container_win", -5, [-0.0280762,0.222656,-0.2], [-0.0202637,-1.31152,-0.2],[-0.0222168,-2.79834,-0.2]], - ["gm_ge_army_kat1_451_container", -5, [-0.0280762,0.222656,-0.2], [-0.0202637,-1.31152,-0.2], [-0.0222168,-2.79834,-0.2]], - ["gm_ge_army_kat1_454_cargo_win",-6.5, [-0.0217285,1.32764,0.35], [-0.00170898,-0.337891,0.35], [-0.0441895,-1.90332,0.35], [-0.0615234,-3.59033,0.35]], - ["gm_ge_army_kat1_454_cargo",-6.5, [-0.0217285,1.32764,0.35], [-0.00170898,-0.337891,0.35], [-0.0441895,-1.90332,0.35], [-0.0615234,-3.59033,0.35]], - ["gm_ge_army_u1300l_container_win", -5, [-0.0495605,-0.609863,-0.6], [0.147461,-2.06787,-0.6]], - ["gm_ge_army_u1300l_container", -5, [-0.0495605,-0.609863,-0.6], [0.147461,-2.06787,-0.6]], - ["greuh_eh101_gr", -6.5, [0,4.2,-1.45], [0,2.5,-1.45], [0,0.8,-1.45], [0,-0.9,-1.45]], - ["I_C_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], - ["I_C_Van_02_transport_F", -5, [0,-1.75,0]], - ["I_C_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], - ["I_E_Truck_02_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], - ["I_E_Truck_02_transport_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], - ["I_E_Van_02_transport_F", -5, [0,-1.75,0]], - ["I_E_Van_02_transport_MP_F", -5, [0,-1.75,0]], - ["I_E_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], - ["I_G_Offroad_01_F", -6.5, [0,-1.7,0.4]], - ["I_G_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], - ["I_G_Van_02_transport_F", -5, [0,-1.75,0]], - ["I_G_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], - ["I_Heli_Transport_02_F", -6.5, [0,4.2,-1.45], [0,2.5,-1.45], [0,0.8,-1.45], [0,-0.9,-1.45]], - ["LOP_ISTS_OPF_Truck", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], - ["LOP_SLA_Ural_open", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["LOP_TAK_Civ_Ural_open", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["LOP_TAK_Civ_Ural", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["LOP_TKA_Ural_open", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["LOP_TKA_Ural", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["O_G_Offroad_01_F", -6.5, [0,-1.7,0.4]], - ["O_G_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], - ["O_T_Truck_03_covered_ghex_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], - ["O_T_Truck_03_transport_ghex_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], - ["O_Truck_03_covered_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], - ["O_Truck_03_transport_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], - ["RHS_C130J", -9.5, [-0.8,8.0,-4.0], [0.8,8.0,-4.0], [-0.8,8.0,-2.8], [0.8,8.0,-2.8], [-0.8,6.5,-4.0], [0.8,6.5,-4.0], [-0.8,6.5,-2.8], [0.8,6.5,-2.8], [-0.8,5.0,-4.0], [0.8,5.0,-4.0], [-0.8,5.0,-2.8], [0.8,5.0,-2.8], [-0.8,3.5,-4.0], [0.8,3.5,-4.0], [-0.8,3.5,-2.8], [0.8,3.5,-2.8], [-0.8,2.0,-4.0], [0.8,2.0,-4.0], [-0.8,2.0,-2.8], [0.8,2.0,-2.8], [-0.8,0.5,-4.0], [0.8,0.5,-4.0], [-0.8,0.5,-2.8], [0.8,0.5,-2.8]], - ["RHS_CH_47F_10", -8, [0,2.2,-1.7], [0,0.5,-1.7], [0,-1.2,-1.7]], - ["RHS_CH_47F_light", -8, [0,2.2,-1.7], [0,0.5,-1.7], [0,-1.2,-1.7]], - ["RHS_CH_47F", -8, [0,2.2,-1.7], [0,0.5,-1.7], [0,-1.2,-1.7]], - ["rhs_kamaz5350_flatbed_cover_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], - ["rhs_kamaz5350_flatbed_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], - ["rhs_kamaz5350_open_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], - ["rhs_kamaz5350_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], - ["RHS_Ural_Civ_03", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["RHS_Ural_MSV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["RHS_Ural_Open_Civ_03", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["RHS_Ural_Open_Flat_MSV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["RHS_Ural_Open_Flat_VDV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["RHS_Ural_Open_MSV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["RHS_Ural_Open_VDV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["RHS_Ural_VDV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], - ["rhsusf_CH53E_USMC_D", -11.0, [0,7,-3.2], [0,7,-2.0], [0,5.5,-3.2], [0,5.5,-2.0], [0,4,-3.2], [0,4,-2.0], [0,2.5,-3.2], [0,2.5,-2.0], [0,1.0,-3.2], [0,1.0,-2.0], [0,-0.5,-3.2], [0,-0.5,-2.0]], - ["rhsusf_CH53E_USMC", -11.0, [0,7,-3.2], [0,7,-2.0], [0,5.5,-3.2], [0,5.5,-2.0], [0,4,-3.2], [0,4,-2.0], [0,2.5,-3.2], [0,2.5,-2.0], [0,1.0,-3.2], [0,1.0,-2.0], [0,-0.5,-3.2], [0,-0.5,-2.0]], - ["rhsusf_M1078A1P2_B_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_B_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_B_M2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_B_M2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_B_M2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_B_M2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_B_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_B_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1078A1P2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_B_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_B_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_B_M2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_B_M2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_B_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_B_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M1083A1P2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], - ["rhsusf_M977A4_BKIT_M2_usarmy_d", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]], - ["rhsusf_M977A4_BKIT_M2_usarmy_wd", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]], - ["rhsusf_M977A4_BKIT_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], - ["rhsusf_M977A4_BKIT_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], - ["rhsusf_M977A4_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], - ["rhsusf_M977A4_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], - ["rhsusf_m998_d_2dr_halftop", -4.5, [0,-0.9,-0.2]], - ["rhsusf_m998_w_2dr_halftop", -4.5, [0,-0.9,-0.2]], - ["rhsusf_M1239_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], - ["rhsusf_M1239_M2_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], - ["rhsusf_M1239_MK19_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], - ["sfp_tgb30", -5, [0.2,-0.1,2], [0.2,-2.1,2]], - ["sfp_tgb40", -5, [0.1,-0.7,2], [0.1,-2.7,2]], - ["UK3CB_BAF_Merlin_HC3_18_DPMT", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["UK3CB_BAF_Merlin_HC3_32_MTP", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["UK3CB_BAF_Merlin_HC3_CSAR_MTP", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["UK3CB_BAF_Merlin_HC4_18_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["UK3CB_BAF_Merlin_HC4_18_GPMG_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["UK3CB_BAF_Merlin_HC4_32_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["UK3CB_BAF_Merlin_HC4_CSAR_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["USAF_C17",-10,[-1.2,14.4,-0.43],[-1.2,12.8,-0.43],[-1.2,11.1,-0.43],[-1.2,9.5,-0.43],[-1.2,7.9,-0.43],[-1.2,6.3,-0.43],[-1.2,4.6,-0.43],[-1.2,3,-0.43],[-1.2,1.4,-0.43],[-1.2,-0.1,-0.43],[-1.2,-1.8,-0.43],[1.2,14.4,-0.43],[1.2,12.8,-0.43],[1.2,11.2,-0.43],[1.2,9.6,-0.43],[1.2,7.9,-0.43],[1.2,6.3,-0.43],[1.2,4.7,-0.43],[1.2,3.1,-0.43],[1.2,1.5,-0.43],[1.2,0,-0.43],[1.2,-1.7,-0.43],[-1.2,14.5,1.22],[-1.2,12.8,1.22],[-1.2,11.2,1.2],[-1.2,9.5,1.22],[-1.2,7.9,1.22],[-1.2,6.3,1.22],[-1.2,4.7,1.22],[-1.2,3,1.22],[-1.2,1.4,1.22],[-1.2,-0.1,1.22],[-1.2,-1.7,1.22],[1.2,14.5,1.22],[1.2,12.8,1.22],[1.2,11.2,1.22],[1.2,9.6,1.22],[1.2,8,1.22],[1.2,6.3,1.22],[1.2,4.7,1.22],[1.2,3.1,1.22],[1.2,1.5,1.22],[1.2,0,1.22],[1.2,-1.6,1.22]], - ["USAF_C130J",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08]], - ["USAF_C130J_Cargo",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08],[0,5.3,2.08],[0,7,2.08]], - ["uns_M35A2_Open", -5, [0,-0.6,0.1], [0,-2.3,0.1]], - ["uns_M35A2", -5, [0,-0.6,0.1], [0,-2.3,0.1]], - ["uns_m37b1", -5, [0,-1.8,0.15]], - ["uns_nvatruck_mg", -5, [0,-1.05,0.8], [0,-2.75,0.8]], - ["uns_nvatruck_open", -5, [0,-1.05,0.8], [0,-2.75,0.8]], - ["uns_nvatruck", -5, [0,-1.05,0.8], [0,-2.75,0.8]] -]; + + /* Various other settings. Everything the AI troups should be able to resupply from. */ diff --git a/Missionframework/KPLIB_transportConfigs.sqf b/Missionframework/KPLIB_transportConfigs.sqf new file mode 100644 index 000000000..eb105a374 --- /dev/null +++ b/Missionframework/KPLIB_transportConfigs.sqf @@ -0,0 +1,185 @@ +/* + File: KPLIB_transportConfigs.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-05-10 + Last Update: 2020-05-10 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Configuration settings for crates transported by vehicles. + + Format: + ["classname", , ] +*/ + +KPLIB_transportConfigs = [ + ["B_Heli_Transport_03_F", -8, [0,2.2,-1], [0,0.5,-1], [0,-1.2,-1]], + ["B_Heli_Transport_03_unarmed_F", -8, [0,2.2,-1], [0,0.5,-1], [0,-1.2,-1]], + ["B_T_Truck_01_cargo_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["B_T_Truck_01_covered_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["B_T_Truck_01_flatbed_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["B_T_Truck_01_transport_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["B_T_VTOL_01_infantry_F", -7.5,[0,4.7,-4.88],[0,3,-4.88],[0,1.3,-4.88],[0,-0.4,-4.88],[0,-2.1,-4.88]], + ["B_T_VTOL_01_vehicle_F", -7.5,[0,4.7,-4.88],[0,3,-4.88],[0,1.3,-4.88],[0,-0.4,-4.88],[0,-2.1,-4.88]], + ["B_Truck_01_cargo_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["B_Truck_01_covered_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["B_Truck_01_flatbed_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["B_Truck_01_transport_F", -6.5, [0,-0.4,0.4], [0,-2.1,0.4], [0,-3.8,0.4]], + ["BW_AW101_Trans_Heer_F", -6.5, [0,4.2,-1.45], [0,2.5,-1.45], [0,0.8,-1.45], [0,-0.9,-1.45]], + ["BW_LKW7T_Trans_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], + ["C_IDAP_Van_02_transport_F", -5, [0,-1.75,0]], + ["C_IDAP_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], + ["C_Offroad_01_F", -6.5, [0,-1.7,0.4]], + ["C_Truck_02_covered_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], + ["C_Truck_02_transport_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], + ["C_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], + ["C_Van_02_service_F", -5, [0,0.5,0], [0,-1.75,0]], + ["C_Van_02_transport_F", -5, [0,-1.75,0]], + ["C_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], + ["CUP_B_C130J_Cargo_USMC",-10,[0,0.6,-3.76],[0,-0.9,-3.76],[0,-2.5,-3.76],[0,-4.2,-3.76],[0,2.2,-3.76],[0,3.8,-3.76],[0,5.5,-3.76]], + ["CUP_B_CH47F_GB", -8, [0,-3.535,-1.9], [0,-1.819,-1.9], [0,0.98,-1.9], [0,3.037,-1.9]], + ["CUP_B_CH47F_USA", -8, [0,-3.535,-1.9], [0,-1.819,-1.9], [0,0.98,-1.9], [0,3.037,-1.9]], + ["CUP_B_CH53E_USMC", -8, [0,7.566,-3], [0,5.749,-3], [0,3.847,-3], [0,2,-3], [0,0.338,-3]], + ["CUP_B_Kamaz_CDF", -6.5, [0,-0.4,0], [0,-2.6,0]], + ["CUP_B_Kamaz_Open_CDF", -6.5, [0.12,0.4,0], [0.12,-1.8,0]], + ["CUP_B_Mi17_CDF", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], + ["CUP_B_Mi171Sh_ACR", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], + ["CUP_B_Mi171Sh_Unarmed_ACR", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], + ["CUP_B_MI6A_CDF", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], + ["CUP_B_MTVR_USA", -6.5, [-0.009,-0.647,0.112], [-0.054,-2.535,0.112]], + ["CUP_B_MTVR_USMC", -6.5, [-0.009,-0.647,0.112], [-0.054,-2.535,0.112]], + ["CUP_B_MV22_USMC_RAMPGUN", -8, [0,3.3,-1.6], [0,1,-1.6], [0,-1.3,-1.6]], + ["CUP_B_MV22_USMC", -8, [0,3.3,-1.6], [0,1,-1.6], [0,-1.3,-1.6]], + ["CUP_B_MV22_VIV_USMC", -8, [0,3.3,-1.6], [0,1,-1.6], [0,-1.3,-1.6]], + ["CUP_B_T810_Armed_CZ_DES", -6.5, [0,0,-0.5], [0,-2,-0.5]], + ["CUP_B_T810_Armed_CZ_WDL", -6.5, [0,0,-0.5], [0,-2,-0.5]], + ["CUP_B_T810_Unarmed_CZ_DES", -6.5, [0,0,0.2], [0,-2,0.2]], + ["CUP_B_T810_Unarmed_CZ_WDL", -6.5, [0,0,0.2], [0,-2,0.2]], + ["CUP_B_Ural_CDF", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_B_Ural_Open_CDF", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_B_Wolfhound_GMG_GB_D", -6.5, [0,-3.5,2.3]], + ["CUP_B_Wolfhound_GMG_GB_W", -6.5, [0,-3.5,2.3]], + ["CUP_B_Wolfhound_HMG_GB_D", -6.5, [0,-3.5,2.3]], + ["CUP_B_Wolfhound_HMG_GB_W", -6.5, [0,-3.5,2.3]], + ["CUP_B_Wolfhound_LMG_GB_D", -6.5, [0,-3.5,2.3]], + ["CUP_B_Wolfhound_LMG_GB_W", -6.5, [0,-3.5,2.3]], + ["CUP_C_Ural_Civ_01", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_C_Ural_Civ_03", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_C_Ural_Open_Civ_03", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_Kamaz_Open_RU", -6.5, [0.12,0.4,0], [0.12,-1.8,0]], + ["CUP_O_Kamaz_RU", -6.5, [0,-0.4,0], [0,-2.6,0]], + ["CUP_O_Ural_CHDKZ", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_Ural_Open_CHDKZ", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_Ural_Open_SLA", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_Ural_Open_TKA", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_Ural_SLA", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_Ural_TKA", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_Mi8_SLA_1", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], + ["CUP_O_MI6A_CHDKZ", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], + ["CUP_O_MI6A_TKA", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], + ["CUP_O_C130J_Cargo_TKA",-10,[0,0.6,-3.76],[0,-0.9,-3.76],[0,-2.5,-3.76],[0,-4.2,-3.76],[0,2.2,-3.76],[0,3.8,-3.76],[0,5.5,-3.76]], + ["gm_gc_army_ural4320_cargo_win", -5, [0.0722656,-0.539063,-0.1], [0.076416,-1.76904,-0.1], [0.0773926,-2.85742,-0.1]], + ["gm_gc_army_ural4320_cargo", -5, [0.0722656,-0.539063,-0.1], [0.076416,-1.76904,-0.1], [0.0773926,-2.85742,-0.1]], + ["gm_gc_bgs_ural4320_cargo", -5, [-0.0373535,-0.535156,-0.1], [-0.0344238,-1.76611,-0.1], [-0.0334473,-2.85547,-0.1]], + ["gm_ge_army_kat1_451_container_win", -5, [-0.0280762,0.222656,-0.2], [-0.0202637,-1.31152,-0.2],[-0.0222168,-2.79834,-0.2]], + ["gm_ge_army_kat1_451_container", -5, [-0.0280762,0.222656,-0.2], [-0.0202637,-1.31152,-0.2], [-0.0222168,-2.79834,-0.2]], + ["gm_ge_army_kat1_454_cargo_win",-6.5, [-0.0217285,1.32764,0.35], [-0.00170898,-0.337891,0.35], [-0.0441895,-1.90332,0.35], [-0.0615234,-3.59033,0.35]], + ["gm_ge_army_kat1_454_cargo",-6.5, [-0.0217285,1.32764,0.35], [-0.00170898,-0.337891,0.35], [-0.0441895,-1.90332,0.35], [-0.0615234,-3.59033,0.35]], + ["gm_ge_army_u1300l_container_win", -5, [-0.0495605,-0.609863,-0.6], [0.147461,-2.06787,-0.6]], + ["gm_ge_army_u1300l_container", -5, [-0.0495605,-0.609863,-0.6], [0.147461,-2.06787,-0.6]], + ["greuh_eh101_gr", -6.5, [0,4.2,-1.45], [0,2.5,-1.45], [0,0.8,-1.45], [0,-0.9,-1.45]], + ["I_C_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], + ["I_C_Van_02_transport_F", -5, [0,-1.75,0]], + ["I_C_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], + ["I_E_Truck_02_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], + ["I_E_Truck_02_transport_F", -6.5, [0,0.3,0.05], [0,-1.3,0.05], [0,-2.9,0.05]], + ["I_E_Van_02_transport_F", -5, [0,-1.75,0]], + ["I_E_Van_02_transport_MP_F", -5, [0,-1.75,0]], + ["I_E_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], + ["I_G_Offroad_01_F", -6.5, [0,-1.7,0.4]], + ["I_G_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], + ["I_G_Van_02_transport_F", -5, [0,-1.75,0]], + ["I_G_Van_02_vehicle_F", -5, [0,0.5,0], [0,-1.75,0]], + ["I_Heli_Transport_02_F", -6.5, [0,4.2,-1.45], [0,2.5,-1.45], [0,0.8,-1.45], [0,-0.9,-1.45]], + ["LOP_ISTS_OPF_Truck", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], + ["LOP_SLA_Ural_open", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["LOP_TAK_Civ_Ural_open", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["LOP_TAK_Civ_Ural", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["LOP_TKA_Ural_open", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["LOP_TKA_Ural", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["O_G_Offroad_01_F", -6.5, [0,-1.7,0.4]], + ["O_G_Van_01_transport_F", -6.5, [0,-1.1,0.25], [0,-2.6,0.25]], + ["O_T_Truck_03_covered_ghex_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], + ["O_T_Truck_03_transport_ghex_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], + ["O_Truck_03_covered_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], + ["O_Truck_03_transport_F", -6.5, [0,-0.8,0.4], [0,-2.4,0.4], [0,-4.0,0.4]], + ["RHS_C130J", -9.5, [-0.8,8.0,-4.0], [0.8,8.0,-4.0], [-0.8,8.0,-2.8], [0.8,8.0,-2.8], [-0.8,6.5,-4.0], [0.8,6.5,-4.0], [-0.8,6.5,-2.8], [0.8,6.5,-2.8], [-0.8,5.0,-4.0], [0.8,5.0,-4.0], [-0.8,5.0,-2.8], [0.8,5.0,-2.8], [-0.8,3.5,-4.0], [0.8,3.5,-4.0], [-0.8,3.5,-2.8], [0.8,3.5,-2.8], [-0.8,2.0,-4.0], [0.8,2.0,-4.0], [-0.8,2.0,-2.8], [0.8,2.0,-2.8], [-0.8,0.5,-4.0], [0.8,0.5,-4.0], [-0.8,0.5,-2.8], [0.8,0.5,-2.8]], + ["RHS_CH_47F_10", -8, [0,2.2,-1.7], [0,0.5,-1.7], [0,-1.2,-1.7]], + ["RHS_CH_47F_light", -8, [0,2.2,-1.7], [0,0.5,-1.7], [0,-1.2,-1.7]], + ["RHS_CH_47F", -8, [0,2.2,-1.7], [0,0.5,-1.7], [0,-1.2,-1.7]], + ["rhs_kamaz5350_flatbed_cover_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], + ["rhs_kamaz5350_flatbed_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], + ["rhs_kamaz5350_open_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], + ["rhs_kamaz5350_vdv", -4.5, [0,0.67,-0.4], [0,-0.88,-0.4], [0,-2.43,-0.4]], + ["RHS_Ural_Civ_03", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["RHS_Ural_MSV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["RHS_Ural_Open_Civ_03", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["RHS_Ural_Open_Flat_MSV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["RHS_Ural_Open_Flat_VDV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["RHS_Ural_Open_MSV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["RHS_Ural_Open_VDV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["RHS_Ural_VDV_01", -6.5, [0,-0.2,0.55], [0,-1.4,0.55], [0,-2.55,0.55]], + ["rhsusf_CH53E_USMC_D", -11.0, [0,7,-3.2], [0,7,-2.0], [0,5.5,-3.2], [0,5.5,-2.0], [0,4,-3.2], [0,4,-2.0], [0,2.5,-3.2], [0,2.5,-2.0], [0,1.0,-3.2], [0,1.0,-2.0], [0,-0.5,-3.2], [0,-0.5,-2.0]], + ["rhsusf_CH53E_USMC", -11.0, [0,7,-3.2], [0,7,-2.0], [0,5.5,-3.2], [0,5.5,-2.0], [0,4,-3.2], [0,4,-2.0], [0,2.5,-3.2], [0,2.5,-2.0], [0,1.0,-3.2], [0,1.0,-2.0], [0,-0.5,-3.2], [0,-0.5,-2.0]], + ["rhsusf_M1078A1P2_B_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_B_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_B_M2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_B_M2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_B_M2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_B_M2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_B_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_B_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1078A1P2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_B_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_B_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_B_M2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_B_M2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_B_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_B_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_D_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1083A1P2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M977A4_BKIT_M2_usarmy_d", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]], + ["rhsusf_M977A4_BKIT_M2_usarmy_wd", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]], + ["rhsusf_M977A4_BKIT_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], + ["rhsusf_M977A4_BKIT_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], + ["rhsusf_M977A4_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], + ["rhsusf_M977A4_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], + ["rhsusf_m998_d_2dr_halftop", -4.5, [0,-0.9,-0.2]], + ["rhsusf_m998_w_2dr_halftop", -4.5, [0,-0.9,-0.2]], + ["rhsusf_M1239_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], + ["rhsusf_M1239_M2_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], + ["rhsusf_M1239_MK19_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], + ["sfp_tgb30", -5, [0.2,-0.1,2], [0.2,-2.1,2]], + ["sfp_tgb40", -5, [0.1,-0.7,2], [0.1,-2.7,2]], + ["UK3CB_BAF_Merlin_HC3_18_DPMT", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], + ["UK3CB_BAF_Merlin_HC3_32_MTP", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], + ["UK3CB_BAF_Merlin_HC3_CSAR_MTP", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], + ["UK3CB_BAF_Merlin_HC4_18_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], + ["UK3CB_BAF_Merlin_HC4_18_GPMG_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], + ["UK3CB_BAF_Merlin_HC4_32_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], + ["UK3CB_BAF_Merlin_HC4_CSAR_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], + ["USAF_C17",-10,[-1.2,14.4,-0.43],[-1.2,12.8,-0.43],[-1.2,11.1,-0.43],[-1.2,9.5,-0.43],[-1.2,7.9,-0.43],[-1.2,6.3,-0.43],[-1.2,4.6,-0.43],[-1.2,3,-0.43],[-1.2,1.4,-0.43],[-1.2,-0.1,-0.43],[-1.2,-1.8,-0.43],[1.2,14.4,-0.43],[1.2,12.8,-0.43],[1.2,11.2,-0.43],[1.2,9.6,-0.43],[1.2,7.9,-0.43],[1.2,6.3,-0.43],[1.2,4.7,-0.43],[1.2,3.1,-0.43],[1.2,1.5,-0.43],[1.2,0,-0.43],[1.2,-1.7,-0.43],[-1.2,14.5,1.22],[-1.2,12.8,1.22],[-1.2,11.2,1.2],[-1.2,9.5,1.22],[-1.2,7.9,1.22],[-1.2,6.3,1.22],[-1.2,4.7,1.22],[-1.2,3,1.22],[-1.2,1.4,1.22],[-1.2,-0.1,1.22],[-1.2,-1.7,1.22],[1.2,14.5,1.22],[1.2,12.8,1.22],[1.2,11.2,1.22],[1.2,9.6,1.22],[1.2,8,1.22],[1.2,6.3,1.22],[1.2,4.7,1.22],[1.2,3.1,1.22],[1.2,1.5,1.22],[1.2,0,1.22],[1.2,-1.6,1.22]], + ["USAF_C130J",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08]], + ["USAF_C130J_Cargo",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08],[0,5.3,2.08],[0,7,2.08]], + ["uns_M35A2_Open", -5, [0,-0.6,0.1], [0,-2.3,0.1]], + ["uns_M35A2", -5, [0,-0.6,0.1], [0,-2.3,0.1]], + ["uns_m37b1", -5, [0,-1.8,0.15]], + ["uns_nvatruck_mg", -5, [0,-1.05,0.8], [0,-2.75,0.8]], + ["uns_nvatruck_open", -5, [0,-1.05,0.8], [0,-2.75,0.8]], + ["uns_nvatruck", -5, [0,-1.05,0.8], [0,-2.75,0.8]] +]; diff --git a/Missionframework/description.ext b/Missionframework/description.ext index ac8b44a8f..16937bf86 100644 --- a/Missionframework/description.ext +++ b/Missionframework/description.ext @@ -2,7 +2,7 @@ File: description.ext Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-16 - Last Update: 2020-05-09 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -213,7 +213,7 @@ taskManagement_drawDist = 5000; */ class CfgDebriefing { - #include "KPLIB_debriefs.hpp" + #include "CfgDebriefing.hpp" }; class CfgDiscordRichPresence { diff --git a/Missionframework/functions/fn_getSaveableParam.sqf b/Missionframework/functions/fn_getSaveableParam.sqf index 3ab50ab4c..9362794bd 100644 --- a/Missionframework/functions/fn_getSaveableParam.sqf +++ b/Missionframework/functions/fn_getSaveableParam.sqf @@ -2,7 +2,7 @@ File: fn_getSaveableParam.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2018-01-27 - Last Update: 2020-04-17 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,7 +25,6 @@ params [ ["_action", nil, [0]] ]; -private _saveKey = "KP_LIBERATION_" + (toUpper worldName) + "_SAVE_PARAMS"; private _value = nil; // Use lobby value if no action specified @@ -38,7 +37,7 @@ switch (_action) do { // Save to profileNamespace case 0: { _value = [_paramName, _defaultValue] call bis_fnc_getParamValue; - private _savedParams = profileNamespace getVariable _saveKey; + private _savedParams = profileNamespace getVariable KPLIB_paramSaveKey; if(isNil "_savedParams") then { if (KP_liberation_savegame_debug > 0) then {["Param save data is corrupted, creating new.", "PARAM"] call KPLIB_fnc_log;}; @@ -59,16 +58,16 @@ switch (_action) do { }; // Save params to profile namespace - profileNamespace setVariable [_saveKey, _savedParams]; + profileNamespace setVariable [KPLIB_paramSaveKey, _savedParams]; saveProfileNamespace; }; // Load from profileNamespace case 1: { - private _savedParams = profileNamespace getVariable _saveKey; + private _savedParams = profileNamespace getVariable KPLIB_paramSaveKey; if(isNil "_savedParams") then { if (KP_liberation_savegame_debug > 0) then {["Param save data is corrupted, can't load!", "PARAM"] call KPLIB_fnc_log;}; // Fix param save data - profileNamespace setVariable [_saveKey, []]; + profileNamespace setVariable [KPLIB_paramSaveKey, []]; if (KP_liberation_savegame_debug > 0) then {[format ["No saved value for param: %1, fetching value.", _paramName], "PARAM"] call KPLIB_fnc_log;}; _value = [_paramName, _defaultValue] call bis_fnc_getParamValue; } else { diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index b985d77b7..800f1ec31 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -11,7 +11,8 @@ if (isDedicated) then {debug_source = "Server";} else {debug_source = name playe [] call KPLIB_fnc_initSectors; if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; [] call compileFinal preprocessFileLineNumbers "scripts\shared\fetch_params.sqf"; -[] call compileFinal preprocessFileLineNumbers "kp_liberation_config.sqf"; +[] call compileFinal preprocessFileLineNumbers "KPLIB_config.sqf"; +[] call compileFinal preprocessFileLineNumbers "KPLIB_transportConfigs.sqf"; [] call compileFinal preprocessFileLineNumbers "presets\init_presets.sqf"; [] call compileFinal preprocessFileLineNumbers "kp_objectInits.sqf"; From 3c3307e05feb827d138f6e0eb9153f9eb9a8e81e Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 10 May 2020 16:37:25 +0200 Subject: [PATCH 002/115] Organized config file --- Missionframework/KPLIB_classnameLists.sqf | 680 +++++++++++++ Missionframework/KPLIB_config.sqf | 921 +++--------------- Missionframework/KPLIB_transportConfigs.sqf | 63 +- Missionframework/init.sqf | 1 + .../scripts/server/secondary/fob_hunting.sqf | 2 +- .../scripts/shared/kill_manager.sqf | 8 - 6 files changed, 883 insertions(+), 792 deletions(-) create mode 100644 Missionframework/KPLIB_classnameLists.sqf diff --git a/Missionframework/KPLIB_classnameLists.sqf b/Missionframework/KPLIB_classnameLists.sqf new file mode 100644 index 000000000..d08755a47 --- /dev/null +++ b/Missionframework/KPLIB_classnameLists.sqf @@ -0,0 +1,680 @@ +/* + File: KPLIB_lists.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-05-10 + Last Update: 2020-05-10 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + No description added yet. +*/ + + +/* +------------------------------------------------------------ + --- Default arsenal blacklist --- + Useless if you're using anything other than + "kp_liberation_arsenal = 0;" in KPLIB_config.sqf. + A whitelisted arsenal is always more performance + friendly then a blacklisted arsenal. + + All static turret and UAV bags should be defined + here, to stop players from exploiting free resources + via the virtual arsenal. +------------------------------------------------------------ +*/ + +// Blacklisted item classnames +blacklisted_from_arsenal = [ + "B_AA_01_weapon_F", + "B_AT_01_weapon_F", + "B_GMG_01_A_weapon_F", + "B_GMG_01_high_weapon_F", + "B_GMG_01_weapon_F", + "B_HMG_01_A_weapon_F", + "B_HMG_01_high_weapon_F", + "B_HMG_01_support_F", + "B_HMG_01_support_high_F", + "B_HMG_01_weapon_F", + "B_Mortar_01_support_F", + "B_Mortar_01_weapon_F", + "B_Respawn_Sleeping_bag_blue_F", + "B_Respawn_Sleeping_bag_brown_F", + "B_Respawn_Sleeping_bag_F", + "B_Respawn_TentA_F", + "B_Respawn_TentDome_F", + "B_UAV_01_backpack_F", + "B_UAV_06_backpack_F", + "B_UAV_06_medical_backpack_F", + "B_UGV_02_Demining_backpack_F", + "B_UGV_02_Science_backpack_F", + "C_IDAP_UAV_01_backpack_F", + "C_IDAP_UAV_06_antimine_backpack_F", + "C_IDAP_UAV_06_backpack_F", + "C_IDAP_UAV_06_medical_backpack_F", + "C_IDAP_UGV_02_Demining_backpack_F", + "C_UAV_06_backpack_F", + "C_UAV_06_medical_backpack_F", + "I_AA_01_weapon_F", + "I_AT_01_weapon_F", + "I_E_AA_01_weapon_F", + "I_E_AT_01_weapon_F", + "I_E_GMG_01_A_Weapon_F", + "I_E_GMG_01_high_Weapon_F", + "I_E_GMG_01_Weapon_F", + "I_E_HMG_01_A_Weapon_F", + "I_E_HMG_01_high_Weapon_F", + "I_E_HMG_01_support_F", + "I_E_HMG_01_support_high_F", + "I_E_HMG_01_Weapon_F", + "I_E_Mortar_01_support_F", + "I_E_Mortar_01_Weapon_F", + "I_E_UAV_01_backpack_F", + "I_E_UAV_06_backpack_F", + "I_E_UAV_06_medical_backpack_F", + "I_E_UGV_02_Demining_backpack_F", + "I_E_UGV_02_Science_backpack_F", + "I_GMG_01_A_weapon_F", + "I_GMG_01_high_weapon_F", + "I_GMG_01_weapon_F", + "I_HMG_01_A_weapon_F", + "I_HMG_01_high_weapon_F", + "I_HMG_01_support_F", + "I_HMG_01_support_high_F", + "I_HMG_01_weapon_F", + "I_Mortar_01_support_F", + "I_Mortar_01_weapon_F", + "I_UAV_01_backpack_F", + "I_UAV_06_backpack_F", + "I_UAV_06_medical_backpack_F", + "I_UGV_02_Demining_backpack_F", + "I_UGV_02_Science_backpack_F", + "O_AA_01_weapon_F", + "O_AT_01_weapon_F", + "O_GMG_01_A_weapon_F", + "O_GMG_01_high_weapon_F", + "O_GMG_01_weapon_F", + "O_HMG_01_A_weapon_F", + "O_HMG_01_high_weapon_F", + "O_HMG_01_support_F", + "O_HMG_01_support_high_F", + "O_HMG_01_weapon_F", + "O_Mortar_01_support_F", + "O_Mortar_01_weapon_F", + "O_UAV_01_backpack_F", + "O_UAV_06_backpack_F", + "O_UAV_06_medical_backpack_F", + "O_UGV_02_Demining_backpack_F", + "O_UGV_02_Science_backpack_F", + "RHS_AGS30_Gun_Bag", + "RHS_AGS30_Tripod_Bag", + "RHS_DShkM_Gun_Bag", + "RHS_DShkM_TripodHigh_Bag", + "RHS_DShkM_TripodLow_Bag", + "RHS_Kord_Gun_Bag", + "RHS_Kord_Tripod_Bag", + "RHS_Kornet_Gun_Bag", + "RHS_Kornet_Tripod_Bag", + "RHS_M2_Gun_Bag", + "RHS_M2_MiniTripod_Bag", + "RHS_M2_Tripod_Bag", + "rhs_M252_Bipod_Bag", + "rhs_M252_Gun_Bag", + "RHS_Metis_Gun_Bag", + "RHS_Metis_Tripod_Bag", + "RHS_Mk19_Gun_Bag", + "RHS_Mk19_Tripod_Bag", + "RHS_NSV_Gun_Bag", + "RHS_NSV_Tripod_Bag", + "RHS_Podnos_Bipod_Bag", + "RHS_Podnos_Gun_Bag", + "RHS_SPG9_Gun_Bag", + "RHS_SPG9_Tripod_Bag", + "rhs_Tow_Gun_Bag", + "rhs_TOW_Tripod_Bag", + "UK3CB_BAF_L111A1", + "UK3CB_BAF_L134A1", + "UK3CB_BAF_L16_Tripod", + "UK3CB_BAF_L16", + "UK3CB_BAF_M6", + "UK3CB_BAF_Tripod", + "uns_M1_81mm_mortar_US_Bag", + "uns_M1919_low_US_Bag", + "uns_M2_60mm_mortar_US_Bag", + "uns_m2_high_US_Bag", + "uns_M2_low_US_Bag", + "uns_M30_107mm_mortar_US_Bag", + "uns_M60_high_US_Bag", + "uns_M60_low_US_Bag", + "uns_MK18_low_US_Bag", + "uns_STABO_US_Bag", + "uns_Tripod_Bag", + "Uns_US_searchlight_Bag" +]; + +// Classnames of items which are always added to each arsenal list (handy for generic classnames) +KP_liberation_allowed_items_extension = [ + "ACE_Chemlight_Shield_Blue", + "ACE_Chemlight_Shield_Green", + "ACE_Chemlight_Shield_Orange", + "ACE_Chemlight_Shield_Red", + "ACE_Chemlight_Shield_White", + "ACE_Chemlight_Shield_Yellow", + "ACE_launch_NLAW_Used_F", + "ACE_PreloadedMissileDummy_CUP", + "ACE_PreloadedMissileDummy_Igla_CUP", + "ACE_PreloadedMissileDummy_M72A6_CUP", + "ACE_PreloadedMissileDummy_NLAW_CUP", + "ACE_PreloadedMissileDummy_RPG18_CUP", + "ACE_PreloadedMissileDummy_Stinger_CUP", + "ACE_PreloadedMissileDummy_Strela_2_CUP", + "ACE_ReserveParachute", + "BWA3_acc_LLM01_flash_tan", + "BWA3_acc_LLM01_flash_underbarrel", + "BWA3_acc_LLM01_flash", + "BWA3_acc_LLM01_laser_tan", + "BWA3_acc_LLM01_laser_underbarrel", + "BWA3_acc_LLM01_laser", + "BWA3_acc_VarioRay_flash", + "BWA3_acc_VarioRay_laser", + "BWA3_Bunkerfaust", + "BWA3_G36A2_pip", + "BWA3_G36A2_tan_pip", + "BWA3_optic_CompM2_G36A2", + "BWA3_optic_CompM2_tan_G36A2", + "BWA3_optic_EOTech_G36A2", + "BWA3_optic_EOTech_Mag_Off", + "BWA3_optic_EOTech_Mag_On", + "BWA3_optic_EOTech_sand_G36A2", + "BWA3_optic_EOTech_tan_Mag_Off", + "BWA3_optic_EOTech_tan_Mag_On", + "BWA3_optic_EOTech552_G36A2", + "BWA3_optic_EOTech552_tan_G36A2", + "BWA3_optic_Hensoldt_NSV", + "BWA3_optic_M5Xi_MSR_MicroT2_pip", + "BWA3_optic_M5Xi_MSR_pip", + "BWA3_optic_M5Xi_Tremor3_MicroT2_pip", + "BWA3_optic_M5Xi_Tremor3_pip", + "BWA3_optic_MicroT1_G36A2", + "BWA3_optic_MicroT2_G36A2", + "BWA3_optic_NSA80_G36", + "BWA3_optic_PMII_DMR_MicroT1_front_NSV_pip", + "BWA3_optic_PMII_DMR_MicroT1_front_NSV", + "BWA3_optic_PMII_DMR_MicroT1_front_pip", + "BWA3_optic_PMII_DMR_MicroT1_rear_NSV_pip", + "BWA3_optic_PMII_DMR_MicroT1_rear_NSV", + "BWA3_optic_PMII_DMR_MicroT1_rear_pip", + "BWA3_optic_PMII_DMR_NSV_pip", + "BWA3_optic_PMII_DMR_NSV", + "BWA3_optic_PMII_DMR_pip", + "BWA3_optic_PMII_ShortdotCC_pip", + "BWA3_optic_RSAS_brown_G36A2", + "BWA3_optic_RSAS_G36A2", + "BWA3_optic_RSAS_sand_G36A2", + "BWA3_optic_RSAS_tan_G36A2", + "BWA3_optic_ZO4x30_brown_IRV", + "BWA3_optic_ZO4x30_brown_NSV", + "BWA3_optic_ZO4x30_brown_pip", + "BWA3_optic_ZO4x30_brown_RSAS_IRV_pip", + "BWA3_optic_ZO4x30_brown_RSAS_IRV", + "BWA3_optic_ZO4x30_brown_RSAS_NSV_pip", + "BWA3_optic_ZO4x30_brown_RSAS_NSV", + "BWA3_optic_ZO4x30_brown_RSAS_pip", + "BWA3_optic_ZO4x30_IRV", + "BWA3_optic_ZO4x30_MicroT2_brown_IRV", + "BWA3_optic_ZO4x30_MicroT2_brown_NSV", + "BWA3_optic_ZO4x30_MicroT2_IRV", + "BWA3_optic_ZO4x30_MicroT2_NSV", + "BWA3_optic_ZO4x30_NSV", + "BWA3_optic_ZO4x30_pip", + "BWA3_optic_ZO4x30_RSAS_IRV_pip", + "BWA3_optic_ZO4x30_RSAS_IRV", + "BWA3_optic_ZO4x30_RSAS_NSV_pip", + "BWA3_optic_ZO4x30_RSAS_NSV", + "BWA3_optic_ZO4x30_RSAS_pip", + "BWA3_optic_ZO4x30i_MicroT2_pip", + "BWA3_optic_ZO4x30i_MicroT2_sand_pip", + "BWA3_optic_ZO4x30i_pip", + "BWA3_optic_ZO4x30i_RSAS_pip", + "BWA3_optic_ZO4x30i_RSAS_sand_pip", + "BWA3_optic_ZO4x30i_sand_pip", + "BWA3_PzF3_Used", + "BWA3_PzF3", + "BWA3_RGW90_Used", + "BWA3_RGW90", + "ItemRadioAcreFlagged", + "rhs_acc_ekp8_18b", + "rhs_acc_ekp8_18c", + "rhs_acc_ekp8_18d", + "rhs_m136_hedp_mag", + "rhs_m136_hp_mag", + "rhs_m136_mag", + "rhs_m72a7_mag", + "rhs_rpg26_mag", + "rhs_rshg2_mag", + "rhs_weap_M136_used", + "rhsusf_acc_anpeq15_bk_light_h", + "rhsusf_acc_g33_T1_flip", + "rhsusf_acc_g33_xps3_flip", + "rhsusf_acc_g33_xps3_tan_flip", + "sma_spitfire_03_rds_low_ard_red", + "UK3CB_BAF_AT4_CS_AP_Mag", + "UK3CB_BAF_Javelin_Launcher" +]; + +// Vehicle classnames which also function as ACE medical vehicles. +KP_liberation_medical_vehicles = [ + "B_T_Truck_01_medical_F", + "B_Truck_01_medical_F", + "C_Van_02_medevac_F", + "CUP_O_M113_Med_TKA", + "CUP_B_BMP2_AMB_CDF", + "CUP_O_BMP2_AMB_CHDKZ", + "CUP_O_BMP2_AMB_sla", + "CUP_B_HMMWV_Ambulance_USA", + "CUP_B_HMMWV_Ambulance_USMC", + "CUP_B_LR_Ambulance_CZ_D", + "CUP_B_LR_Ambulance_CZ_W", + "CUP_B_LR_Ambulance_GB_D", + "CUP_B_LR_Ambulance_GB_W", + "CUP_O_LR_Ambulance_TKA", + "CUP_B_FV432_GB_Ambulance", + "CUP_B_S1203_Ambulance_CDF", + "CUP_B_UH1Y_MEV_USMC", + "CUP_B_UH60M_Unarmed_FFV_MEV_US", + "CUP_B_BMP2_AMB_CZ", + "CUP_B_BMP2_AMB_CZ_Des", + "CUP_B_HMMWV_Ambulance_ACR", + "gm_gc_army_ural375d_medic_win", + "gm_gc_army_ural375d_medic", + "gm_ge_army_u1300l_medic_win_rc", + "gm_ge_army_u1300l_medic", + "I_E_Truck_02_Medical_F", + "I_E_Van_02_medevac_F", + "O_T_Truck_03_medical_ghex_F", + "O_Truck_03_medical_F", + "RHS_UH60M_MEV_d", + "RHS_UH60M_MEV", + "RHS_UH60M_MEV2_d", + "RHS_UH60M_MEV2", + "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy", + "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy", + "rhsusf_m113_usarmy_medical", + "rhsusf_m113d_usarmy_medical", + "rhsusf_M1230a1_usarmy_d", + "rhsusf_M1230a1_usarmy_wd", + "UK3CB_BAF_LandRover_Amb_FFR_Green_A_MTP", + "UK3CB_BAF_LandRover_Amb_FFR_Sand_A_DDPM", + "uns_ch47a_medevac", + "uns_H13_medevac_CAV", + "uns_M577_amb", + "uns_uh1D_med" +]; + +// Building classnames which also function as ACE medical facilities. +KP_liberation_medical_facilities = [ + "Land_Medevac_house_V1_F", + "Land_Medevac_HQ_V1_F", + "LAND_uns_army_med", + "LAND_uns_tent3mash", + "uns_mash_main", + "uns_mash", + "US_Tent_2", + "US_Tent_MASH" +]; + +// Classnames of ACE crates +KP_liberation_ace_crates = [ + "ACE_Box_82mm_Mo_HE", + "ACE_Box_82mm_Mo_Illum", + "ACE_Box_82mm_Mo_Smoke", + "ACE_medicalSupplyCrate_advanced" +]; + +// Everything the AI troups should be able to resupply from. +KPLIB_aiResupplySources = [ + "B_APC_Tracked_01_CRV_F", + "B_Slingload_01_Ammo_F", + "B_T_APC_Tracked_01_CRV_F", + "B_T_Truck_01_ammo_F", + "B_Truck_01_ammo_F", + "BW_LKW15T_Ammo_F", + "CUP_B_Kamaz_Reammo_CDF", + "CUP_B_MTVR_Ammo_USA", + "CUP_B_MTVR_Ammo_USMC", + "CUP_B_T810_Reammo_CZ_DES", + "CUP_B_T810_Reammo_CZ_WDL", + "CUP_O_Kamaz_Reammo_RU", + "CUP_O_Ural_Reammo_CHDKZ", + "CUP_O_Ural_Reammo_SLA", + "CUP_O_Ural_Reammo_TKA", + "CUP_O_V3S_Rearm_TKA", + "gm_gc_army_ural4320_reammo_win", + "gm_gc_army_ural4320_reammo", + "gm_ge_army_kat1_451_reammo_win", + "gm_ge_army_kat1_451_reammo", + "I_E_Truck_02_Ammo_F", + "Land_Pod_Heli_Transport_04_ammo_F", + "O_Heli_Transport_04_ammo_F", + "O_T_Truck_03_ammo_ghex_F", + "O_Truck_03_ammo_F", + "rhs_gaz66_ammo_msv", + "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", + "rhsusf_M1239_MK19_Deploy_socom_d", + "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d", + "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd", + "rhsusf_M977A4_AMMO_BKIT_usarmy_d", + "rhsusf_M977A4_AMMO_BKIT_usarmy_wd", + "rhsusf_M977A4_AMMO_usarmy_d", + "rhsusf_M977A4_AMMO_usarmy_wd", + "sfp_tgb40_ammo", + "uns_M113_ENG", + "uns_M35A2_ammo", + "uns_motorpool1_repair" +]; + +// Everything that can repair other vehicles. +vehicle_repair_sources = [ + "B_APC_Tracked_01_CRV_F", + "B_Slingload_01_Repair_F", + "B_T_APC_Tracked_01_CRV_F", + "B_T_Truck_01_Repair_F", + "B_Truck_01_Repair_F", + "BW_LKW15T_Repair_F", + "C_Offroad_01_repair_F", + "CUP_B_Kamaz_Repair_CDF", + "CUP_B_MTVR_Repair_USA", + "CUP_B_MTVR_Repair_USMC", + "CUP_B_T810_Repair_CZ_DES", + "CUP_B_T810_Repair_CZ_WDL", + "CUP_O_V3S_Repair_TKA", + "CUP_O_Ural_Repair_SLA", + "CUP_O_Ural_Repair_CHDKZ", + "gm_gc_army_ural4320_repair_win", + "gm_gc_army_ural4320_repair", + "gm_ge_army_u1300l_repair_win", + "gm_ge_army_u1300l_repair", + "I_E_Truck_02_Box_F", + "Land_Pod_Heli_Transport_04_repair_F", + "O_Heli_Transport_04_repair_F", + "O_T_Truck_03_repair_ghex_F", + "O_Truck_03_repair_F", + "RHS_Ural_Repair_VDV_01", + "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", + "rhsusf_M1239_MK19_Deploy_socom_d", + "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_d", + "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_wd", + "rhsusf_M977A4_REPAIR_BKIT_usarmy_d", + "rhsusf_M977A4_REPAIR_BKIT_usarmy_wd", + "rhsusf_M977A4_REPAIR_usarmy_d", + "rhsusf_M977A4_REPAIR_usarmy_wd", + "sfp_tgb30_repair", + "UNS_Hanger_repair", + "uns_M113_ENG", + "uns_M35A2_repair", + "uns_motorpool1_repair" +]; + +// Everything that can rearm other vehicles. +vehicle_rearm_sources = [ + "B_APC_Tracked_01_CRV_F", + "B_Slingload_01_Ammo_F", + "B_T_APC_Tracked_01_CRV_F", + "B_T_Truck_01_ammo_F", + "B_Truck_01_ammo_F", + "BW_LKW15T_Ammo_F", + "CUP_B_Kamaz_Reammo_CDF", + "CUP_B_MTVR_Ammo_USA", + "CUP_B_MTVR_Ammo_USMC", + "CUP_B_T810_Reammo_CZ_DES", + "CUP_B_T810_Reammo_CZ_WDL", + "CUP_O_Kamaz_Reammo_RU", + "CUP_O_Ural_Reammo_CHDKZ", + "CUP_O_Ural_Reammo_SLA", + "CUP_O_Ural_Reammo_TKA", + "CUP_O_V3S_Rearm_TKA", + "gm_gc_army_ural4320_reammo_win", + "gm_gc_army_ural4320_reammo", + "gm_ge_army_kat1_451_reammo_win", + "gm_ge_army_kat1_451_reammo", + "I_E_Truck_02_Ammo_F", + "Land_Pod_Heli_Transport_04_ammo_F", + "O_Heli_Transport_04_ammo_F", + "O_T_Truck_03_ammo_ghex_F", + "O_Truck_03_ammo_F", + "rhs_gaz66_ammo_msv", + "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", + "rhsusf_M1239_MK19_Deploy_socom_d", + "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d", + "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd", + "rhsusf_M977A4_AMMO_BKIT_usarmy_d", + "rhsusf_M977A4_AMMO_BKIT_usarmy_wd", + "rhsusf_M977A4_AMMO_usarmy_d", + "rhsusf_M977A4_AMMO_usarmy_wd", + "sfp_tgb40_ammo", + "uns_M113_ENG", + "uns_M35A2_ammo" +]; + +// Everything that can refuel other vehicles. +vehicle_refuel_sources = [ + "B_APC_Tracked_01_CRV_F", + "B_Slingload_01_Fuel_F", + "B_T_APC_Tracked_01_CRV_F", + "B_T_Truck_01_fuel_F", + "B_Truck_01_fuel_F", + "BW_LKW15T_Fuel_F", + "C_Truck_02_fuel_F", + "C_Van_01_fuel_F", + "CUP_B_Kamaz_Refuel_CDF", + "CUP_B_MTVR_Refuel_USA", + "CUP_B_MTVR_Refuel_USMC", + "CUP_B_T810_Refuel_CZ_DES", + "CUP_B_T810_Refuel_CZ_WDL", + "CUP_O_Kamaz_Refuel_RU", + "CUP_O_Ural_Refuel_CHDKZ", + "CUP_O_Ural_Refuel_SLA", + "CUP_O_Ural_Refuel_TKA", + "CUP_O_V3S_Refuel_TKA", + "gm_gc_army_ural375d_refuel_win", + "gm_gc_army_ural375d_refuel", + "gm_ge_army_kat1_451_refuel_win", + "gm_ge_army_kat1_451_refuel", + "I_E_Truck_02_fuel_F", + "Land_Pod_Heli_Transport_04_fuel_F", + "O_Heli_Transport_04_fuel_F", + "O_T_Truck_03_fuel_ghex_F", + "O_Truck_03_fuel_F", + "RHS_Ural_Fuel_VDV_01", + "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", + "rhsusf_M1239_MK19_Deploy_socom_d", + "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M978A4_BKIT_usarmy_d", + "rhsusf_M978A4_BKIT_usarmy_wd", + "rhsusf_M978A4_usarmy_d", + "rhsusf_M978A4_usarmy_wd", + "sfp_tgb40_fuel", + "uns_M113_ENG", + "uns_M35A2_fuel", + "uns_M35A2_fueltanker" +]; + +// Classnames of boats, so they can be built on water. +boats_names = [ + "B_Boat_Armed_01_minigun_F", + "B_Boat_Transport_01_F", + "B_SDV_01_F", + "B_T_Boat_Armed_01_minigun_F", + "B_T_Boat_Transport_01_F", + "O_Boat_Armed_01_hmg_F", + "O_Boat_Transport_01_F", + "O_T_Boat_Armed_01_hmg_F", + "O_T_Boat_Transport_01_F", + "CUP_B_MK10_GB", + "CUP_B_RHIB_USMC", + "CUP_B_RHIB2Turret_USMC", + "CUP_B_LCU1600_USMC", + "CUP_O_LCVP_SLA", + "CUP_O_LCVP_VIV_SLA", + "CUP_O_PBX_SLA", + "rhsusf_mkvsoc", + "sfp_gruppbat", + "sfp_rbb_norrkoping", + "sfp_strb90_rws", + "sfp_strb90", + "uns_PBR_M10", + "uns_pbr_mk18", + "uns_pbr", + "UNS_Zodiac_W" +]; + +// Classnames of artillery vehicles, which should be added to the support module +KP_liberation_suppMod_artyVeh = [ + "B_G_Mortar_01_F", + "B_MBT_01_arty_F", + "B_MBT_01_mlrs_F", + "B_Mortar_01_F", + "B_Ship_Gun_01_F", + "B_T_MBT_01_arty_F", + "B_T_MBT_01_mlrs_F", + "B_T_Mortar_01_F", + "CUP_B_2b14_82mm_ACR", + "CUP_B_2b14_82mm_CDF", + "CUP_B_BM21_CDF", + "CUP_B_D30_CDF", + "CUP_B_L16A2_BAF_DDPM", + "CUP_B_L16A2_BAF_MPT", + "CUP_B_L16A2_BAF_WDL", + "CUP_B_M1129_MC_MK19_Desert_Slat", + "CUP_B_M1129_MC_MK19_Desert", + "CUP_B_M1129_MC_MK19_Woodland_Slat", + "CUP_B_M1129_MC_MK19_Woodland", + "CUP_B_M119_US", + "CUP_B_M119_USMC", + "CUP_B_M252_US", + "CUP_B_M252_USMC", + "CUP_B_M270_DPICM_BAF_DES", + "CUP_B_M270_DPICM_BAF_WOOD", + "CUP_B_M270_DPICM_USA", + "CUP_B_M270_DPICM_USMC", + "CUP_B_M270_HE_BAF_DES", + "CUP_B_M270_HE_BAF_WOOD", + "CUP_B_M270_HE_USA", + "CUP_B_M270_HE_USMC", + "CUP_B_RM70_CZ", + "CUP_I_2b14_82mm_TK_GUE", + "CUP_I_D30_TK_GUE", + "CUP_I_Hilux_armored_MLRS_TK", + "CUP_I_Hilux_armored_podnos_TK", + "CUP_I_Hilux_armored_UB32_TK", + "CUP_I_Hilux_MLRS_TK", + "CUP_I_Hilux_podnos_TK", + "CUP_I_Hilux_UB32_TK", + "CUP_I_M119_RACS", + "CUP_I_M252_RACS", + "CUP_I_M270_DPICM_AAF", + "CUP_I_M270_DPICM_RACS", + "CUP_I_M270_HE_AAF", + "CUP_I_M270_HE_RACS", + "CUP_O_2b14_82mm_ChDKZ", + "CUP_O_2b14_82mm_RU", + "CUP_O_2b14_82mm_SLA", + "CUP_O_2b14_82mm_TK_INS", + "CUP_O_2b14_82mm_TK", + "CUP_O_BM21_CHDKZ", + "CUP_O_BM21_RU", + "CUP_O_BM21_SLA", + "CUP_O_BM21_TKA", + "CUP_O_D30_ChDKZ", + "CUP_O_D30_RU", + "CUP_O_D30_SLA", + "CUP_O_D30_TK_INS", + "CUP_O_D30_TK", + "CUP_O_Hilux_armored_MLRS_TK_INS", + "CUP_O_Hilux_armored_podnos_TK_INS", + "CUP_O_Hilux_armored_UB32_TK_INS", + "CUP_O_Hilux_MLRS_TK_INS", + "CUP_O_Hilux_podnos_TK_INS", + "CUP_O_Hilux_UB32_TK_INS", + "I_E_Mortar_01_F", + "I_E_Truck_02_MRL_F", + "I_G_Mortar_01_F", + "I_Mortar_01_F", + "I_Truck_02_MRL_F", + "O_G_Mortar_01_F", + "O_MBT_02_arty_F", + "O_Mortar_01_F", + "O_T_MBT_02_arty_ghex_F", + "rhs_2b14_82mm_msv", + "rhs_2b14_82mm_vdv", + "rhs_2b14_82mm_vmf", + "rhs_2s1_tv", + "rhs_2s1_vmf", + "rhs_2s3_tv", + "RHS_BM21_MSV_01", + "RHS_BM21_VDV_01", + "RHS_BM21_VMF_01", + "RHS_BM21_VV_01", + "rhs_D30_msv", + "rhs_D30_vdv", + "rhs_D30_vmf", + "RHS_M119_D", + "RHS_M119_WD", + "RHS_M252_D", + "RHS_M252_USMC_D", + "RHS_M252_USMC_WD", + "RHS_M252_WD", + "rhsusf_m109_usarmy", + "rhsusf_m109d_usarmy", + "rhsusf_M142_usarmy_D", + "rhsusf_M142_usarmy_WD", + "rhsusf_M142_usmc_WD", + "Uns_D20_artillery", + "Uns_D30_artillery", + "uns_M1_81mm_mortar_arty", + "uns_M1_81mm_mortar_pvp", + "uns_M1_81mm_mortar", + "Uns_M102_artillery", + "uns_m107sp", + "uns_m110sp", + "uns_M113_M30_HQ", + "uns_M113_M30", + "Uns_M114_artillery", + "uns_m1941_82mm_mortarNVA_arty", + "uns_m1941_82mm_mortarNVA_pvp", + "uns_m1941_82mm_mortarNVA", + "uns_m1941_82mm_mortarVC", + "uns_M2_60mm_mortar_pvp", + "uns_M2_60mm_mortar", + "uns_M30_107mm_mortar", + "uns_Type55_mortar" +]; + +// Objects which are spawned as intel objects for pickup +KPLIB_intelObjectClasses = [ + "Land_File_research_F", + "Land_Document_01_F" +]; + +// Classnames of buildings inside military sectors, which are valid to hold intel items +KPLIB_intelBuildingClasses = [ + "Land_Cargo_House_V1_F", + "Land_Cargo_House_V2_F", + "Land_Cargo_House_V3_F", + "Land_Cargo_HQ_V1_F", + "Land_Cargo_HQ_V2_F", + "Land_Cargo_HQ_V3_F", + "Land_i_Barracks_V1_dam_F", + "Land_i_Barracks_V1_F", + "Land_i_Barracks_V2_dam_F", + "Land_i_Barracks_V2_F", + "Land_Medevac_house_V1_F", + "Land_Medevac_HQ_V1_F", + "Land_MilOffices_V1_F", + "Land_Research_house_V1_F", + "Land_Research_HQ_F", + "Land_u_Barracks_V2_F" +]; diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index dfee181dc..bc9e31a61 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -9,74 +9,6 @@ Contains all settings which are meant to be adjustable by players. */ -// Vehicle classnames which also function as ACE medical vehicles. -KP_liberation_medical_vehicles = [ - "B_T_Truck_01_medical_F", - "B_Truck_01_medical_F", - "C_Van_02_medevac_F", - "CUP_O_M113_Med_TKA", - "CUP_B_BMP2_AMB_CDF", - "CUP_O_BMP2_AMB_CHDKZ", - "CUP_O_BMP2_AMB_sla", - "CUP_B_HMMWV_Ambulance_USA", - "CUP_B_HMMWV_Ambulance_USMC", - "CUP_B_LR_Ambulance_CZ_D", - "CUP_B_LR_Ambulance_CZ_W", - "CUP_B_LR_Ambulance_GB_D", - "CUP_B_LR_Ambulance_GB_W", - "CUP_O_LR_Ambulance_TKA", - "CUP_B_FV432_GB_Ambulance", - "CUP_B_S1203_Ambulance_CDF", - "CUP_B_UH1Y_MEV_USMC", - "CUP_B_UH60M_Unarmed_FFV_MEV_US", - "CUP_B_BMP2_AMB_CZ", - "CUP_B_BMP2_AMB_CZ_Des", - "CUP_B_HMMWV_Ambulance_ACR", - "gm_gc_army_ural375d_medic_win", - "gm_gc_army_ural375d_medic", - "gm_ge_army_u1300l_medic_win_rc", - "gm_ge_army_u1300l_medic", - "I_E_Truck_02_Medical_F", - "I_E_Van_02_medevac_F", - "O_T_Truck_03_medical_ghex_F", - "O_Truck_03_medical_F", - "RHS_UH60M_MEV_d", - "RHS_UH60M_MEV", - "RHS_UH60M_MEV2_d", - "RHS_UH60M_MEV2", - "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy", - "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy", - "rhsusf_m113_usarmy_medical", - "rhsusf_m113d_usarmy_medical", - "rhsusf_M1230a1_usarmy_d", - "rhsusf_M1230a1_usarmy_wd", - "UK3CB_BAF_LandRover_Amb_FFR_Green_A_MTP", - "UK3CB_BAF_LandRover_Amb_FFR_Sand_A_DDPM", - "uns_ch47a_medevac", - "uns_H13_medevac_CAV", - "uns_M577_amb", - "uns_uh1D_med" -]; - -// Building classnames which also function as ACE medical facilities. -KP_liberation_medical_facilities = [ - "Land_Medevac_house_V1_F", - "Land_Medevac_HQ_V1_F", - "LAND_uns_army_med", - "LAND_uns_tent3mash", - "uns_mash_main", - "uns_mash", - "US_Tent_2", - "US_Tent_MASH" -]; - -// Classnames of ACE3 crates (which have to be in the unit preset as well). -KP_liberation_ace_crates = [ - "ACE_Box_82mm_Mo_HE", - "ACE_Box_82mm_Mo_Illum", - "ACE_Box_82mm_Mo_Smoke", - "ACE_medicalSupplyCrate_advanced" -]; /* ------------------------------------------------------------ @@ -201,25 +133,25 @@ KP_liberation_arsenal = 0; ------------------------------------------------------------ */ -// Player side +// Player side. GRLIB_side_friendly = WEST; -// Enemy side +// Enemy side. GRLIB_side_enemy = EAST; -// Resistance side +// Resistance side. GRLIB_side_resistance = RESISTANCE; -// Civilian side +// Civilian side. GRLIB_side_civilian = CIVILIAN; -// Friendly sector marker color +// Friendly sector marker color. GRLIB_color_friendly = "ColorBLUFOR"; -// Enemy sector marker color +// Enemy sector marker color. GRLIB_color_enemy = "ColorOPFOR"; -// Enemy sector marker color (activated) +// Enemy sector marker color. (activated) GRLIB_color_enemy_bright = "ColorRED"; @@ -247,36 +179,113 @@ KP_liberation_save_interval = 60; ------------------------------------------------------------ */ -// Build range around the main FOB building +// Build range around the main FOB building. GRLIB_fob_range = 125; -// Altitude in metres for the HALO jump +// Altitude in metres for the HALO jump. GRLIB_halo_altitude = 2500; -// Range to activate a sector +// Range to activate a sector. GRLIB_sector_size = 1000; -// Range to capture a sector +// Range to capture a sector. GRLIB_capture_size = 175; -// Radio Tower scanning range +// Radio Tower scanning range. GRLIB_radiotower_size = 2500; +/* +------------------------------------------------------------ + --- CAP SETTINGS --- + Maximum amounts/values for different mechanics. +------------------------------------------------------------ +*/ + +// Cap for BLUFOR. +GRLIB_blufor_cap = 100; + +// Cap for sector defenders. +GRLIB_sector_cap = 180; + +// Cap for enemy battlegroups. +GRLIB_battlegroup_cap = 150; + +// Cap for enemy patrols. +GRLIB_patrol_cap = 150; + +// Size of enemy battlegroups. +GRLIB_battlegroup_size = 6; + +// Cap for civilian vehicles traveling between sectors. +GRLIB_civilians_amount = 10; + + +/* +------------------------------------------------------------ + --- CIVIL REPUTATION SETTINGS --- + Values connected to the civil reputation system. +------------------------------------------------------------ +*/ + +// Civil Reputation penalty for killing a civilian. +KP_liberation_cr_kill_penalty = 5; + +// Civil Reputation penalty for destroying/damaging a building. +KP_liberation_cr_building_penalty = 3; + +// Civil Reputation penalty for stealing a civilian vehicle. +KP_liberation_cr_vehicle_penalty = 2; + +// Civil Reputation penalty for killing a friendly resistance soldier. +KP_liberation_cr_resistance_penalty = 3; + +// Civil Reputation gain for liberate a sector. +KP_liberation_cr_sector_gain = 5; + +// Chance (0-100) that there are wounded civilians right after capturing a sector. +KP_liberation_cr_wounded_chance = 35; + +// Civil Reputation gain for providing medical assistance for wounded civilians. +KP_liberation_cr_wounded_gain = 2; + + /* ------------------------------------------------------------ --- SECONDARY MISSION SETTINGS --- Settings which are connected to the available secondary missions which can be started by players - via the secondary mission dialog. + via the secondary mission dialog or happen + randomly. ------------------------------------------------------------ */ -// Intel price for the secondary missions [FOB hunting, Convoy ambush, SAR] +// Intel price for the secondary missions. [FOB hunting, Convoy ambush, SAR] GRLIB_secondary_missions_costs = [15, 10, 8]; -// The percentage impact against enemy combat readiness for a successful FOB hunt -GRLIB_secondary_objective_impact = 0.6; +// Proportionate reduction of the actual (!) enemy combat readiness for a successful FOB hunt. (e.g. 0.4 -> reduction of 24 by an actual value of 60) +GRLIB_secondary_objective_impact = 0.4; + +// Minimum time until a civil Informant can spawn. (seconds) +KP_liberation_civinfo_min = 5400; + +// Maximum time until a civil Informant spawns. (seconds) +KP_liberation_civinfo_max = 10800; + +// Civil Informant spawn chance. (0-100) +KP_liberation_civinfo_chance = 75; + +// Intel gain for talking to a civil informant. +KP_liberation_civinfo_intel = 5; + +// Time until a civil informant will despawn after spawning. (seconds) +KP_liberation_civinfo_duration = 1200; + +// Chance (0-100) that the delivered informant will spawn a time critical task +KP_liberation_civinfo_task_chance = 40; + +// Time until the task will despawn if no player is near. (seconds) +KP_liberation_civinfo_task_duration = 900; /* @@ -296,60 +305,57 @@ KP_liberation_fuel_normal = 90; KP_liberation_fuel_max = 45; +/* +------------------------------------------------------------ + --- RESISTANCE SETTINGS --- + Values connected to the resistance faction. +------------------------------------------------------------ +*/ +// Chance (0-100) that a logistic convoy will be ambushed, when civil reputation is low. (Checked every minute) +KP_liberation_convoy_ambush_chance = 2; +// Duration of the convoy ambush event until nothing can be retrieved. (seconds) +KP_liberation_convoy_ambush_duration = 1200; +// Resistance strength (0-100) needed for tier 2 equipment. +KP_liberation_resistance_tier2 = 30; -GRLIB_respawn_marker = "respawn"; // Respawn marker name. - - - - +// Resistance strength (0-100) needed for tier 3 equipment. +KP_liberation_resistance_tier3 = 70; -GRLIB_recycling_percentage = 0.5; // Percentage of resources you get back from recycling. -KP_liberation_production_interval = 30; // Time in minutes until a production process is finished, when resources multiplier is set to 1. +// Chance (0-100) that a resistance unit has a RPG. (tier 2 and 3) +KP_liberation_resistance_at_chance = 20; +// Chance (0-100) that a resistance squad will join an ongoing sector attack. +KP_liberation_resistance_sector_chance = 35; -GRLIB_defended_buildingpos_part = 0.4; // Multiplier for defenders in buildings. -GRLIB_battlegroup_size = 6; // Size of enemy battlegroups. -GRLIB_vulnerability_timer = 1200; // Time in seconds how long a captured sector is vulnerable to enemy troops. +// Chance that some resistance units will spawn in blufor sectors for an ambush, if reputation is low. +KP_liberation_resistance_ambush_chance = 25; -GRLIB_surrender_chance = 80; // Chance that enemy infantry will surrender after heavy losses are encountered. -GRLIB_civilians_amount = 10; // Civilian count multiplier. -GRLIB_cleanup_delay = 1200; // Time in seconds until bodies of dead soldiers are cleaned up. +/* +------------------------------------------------------------ + --- MISC SETTINGS --- + Values or arrays of misc mechanics. +------------------------------------------------------------ +*/ -GRLIB_blufor_cap = 100; // Cap for BLUFOR. -GRLIB_sector_cap = 180; // Cap for sector defenders. -GRLIB_battlegroup_cap = 150; // Cap for enemy battlegroups. -GRLIB_patrol_cap = 150; // Cap for enemy patrols. +// Time in minutes until a resource crate is produced, when resources multiplier is set to 1. +KP_liberation_production_interval = 30; -KP_liberation_cr_kill_penalty = 5; // Civil Reputation penalty for killing a civilian. -KP_liberation_cr_building_penalty = 3; // Civil Reputation penalty for destroying/damaging a building. -KP_liberation_cr_vehicle_penalty = 2; // Civil Reputation penalty for stealing a civilian vehicle. -KP_liberation_cr_resistance_penalty = 3; // Civil Reputation penalty for killing a friendly resistance soldier. -KP_liberation_cr_sector_gain = 5; // Civil Reputation gain for liberate a sector. -KP_liberation_cr_wounded_chance = 35; // Chance (0-100) that there are wounded civilians right after capturing a sector. -KP_liberation_cr_wounded_gain = 2; // Civil Reputation gain for providing medical assistance for wounded civilians. +// Percentage of resources you get back from recycling. +GRLIB_recycling_percentage = 0.5; -KP_liberation_civinfo_min = 5400; // Civil Informant minimum spawn time. (seconds) -KP_liberation_civinfo_max = 10800; // Civil Informant maximum spawn time. (seconds) -KP_liberation_civinfo_chance = 75; // Civil Informant spawn chance. (0-100) -KP_liberation_civinfo_intel = 5; // Civil Informant intel amount. -KP_liberation_civinfo_duration = 1200; // Civil Informant staytime until despawning. (seconds) -KP_liberation_civinfo_task_chance = 40; // Chance (0-100) that the delivered informant will spawn a time critical task. -KP_liberation_civinfo_task_duration = 900; // Duration until the task will despawn if no player is near. (seconds) +// Multiplier for defenders in buildings. +GRLIB_defended_buildingpos_part = 0.4; -KP_liberation_convoy_ambush_chance = 2; // Chance that a logistic convoy will be ambushed, when civil reputation is low. -KP_liberation_convoy_ambush_duration = 1200; // Duration of the convoy ambush event. (seconds) +// Time in seconds how long a captured sector is vulnerable to enemy troops. +GRLIB_vulnerability_timer = 1200; -KP_liberation_resistance_tier2 = 30; // At which strength (0-100) the guerilla forces will be at tier 2? -KP_liberation_resistance_tier3 = 70; // At which strength (0-100) the guerilla forces will be at tier 3? -KP_liberation_resistance_at_chance = 20; // Chance that a guerilla unit has a RPG. (tier 2 and 3) -KP_liberation_resistance_sector_chance = 35; // Chance that a guerilla squad will join an ongoing sector attack. -KP_liberation_resistance_ambush_chance = 25; // Chance that some guerilla units will spawn in blufor sectors for an ambush, if reputation is low. +// Chance that enemy infantry will surrender after heavy losses are encountered. +GRLIB_surrender_chance = 80; -// Array of worldName values. // When playing on this map, it'll create a clearance (remove terrain objects) in a 15m radius around the battlegroup/reinforcements spawnpoint. KP_liberation_battlegroup_clearance = [ "song_bin_tanh" @@ -373,663 +379,14 @@ KP_liberation_suppMod_whitelist = [ ]; -/* - Default arsenal blacklist method. -Useless if you're using anything other than "kp_liberation_arsenal = 0;" above. A whitelisted arsenal is always more performance friendly then a blacklisted arsenal. -REMEMBER: All static turret and UAV bags should be defined here, to stop players from exploiting free resources via the virtual arsenal. */ -blacklisted_from_arsenal = [ - "B_AA_01_weapon_F", - "B_AT_01_weapon_F", - "B_GMG_01_A_weapon_F", - "B_GMG_01_high_weapon_F", - "B_GMG_01_weapon_F", - "B_HMG_01_A_weapon_F", - "B_HMG_01_high_weapon_F", - "B_HMG_01_support_F", - "B_HMG_01_support_high_F", - "B_HMG_01_weapon_F", - "B_Mortar_01_support_F", - "B_Mortar_01_weapon_F", - "B_Respawn_Sleeping_bag_blue_F", - "B_Respawn_Sleeping_bag_brown_F", - "B_Respawn_Sleeping_bag_F", - "B_Respawn_TentA_F", - "B_Respawn_TentDome_F", - "B_UAV_01_backpack_F", - "B_UAV_06_backpack_F", - "B_UAV_06_medical_backpack_F", - "B_UGV_02_Demining_backpack_F", - "B_UGV_02_Science_backpack_F", - "C_IDAP_UAV_01_backpack_F", - "C_IDAP_UAV_06_antimine_backpack_F", - "C_IDAP_UAV_06_backpack_F", - "C_IDAP_UAV_06_medical_backpack_F", - "C_IDAP_UGV_02_Demining_backpack_F", - "C_UAV_06_backpack_F", - "C_UAV_06_medical_backpack_F", - "I_AA_01_weapon_F", - "I_AT_01_weapon_F", - "I_E_AA_01_weapon_F", - "I_E_AT_01_weapon_F", - "I_E_GMG_01_A_Weapon_F", - "I_E_GMG_01_high_Weapon_F", - "I_E_GMG_01_Weapon_F", - "I_E_HMG_01_A_Weapon_F", - "I_E_HMG_01_high_Weapon_F", - "I_E_HMG_01_support_F", - "I_E_HMG_01_support_high_F", - "I_E_HMG_01_Weapon_F", - "I_E_Mortar_01_support_F", - "I_E_Mortar_01_Weapon_F", - "I_E_UAV_01_backpack_F", - "I_E_UAV_06_backpack_F", - "I_E_UAV_06_medical_backpack_F", - "I_E_UGV_02_Demining_backpack_F", - "I_E_UGV_02_Science_backpack_F", - "I_GMG_01_A_weapon_F", - "I_GMG_01_high_weapon_F", - "I_GMG_01_weapon_F", - "I_HMG_01_A_weapon_F", - "I_HMG_01_high_weapon_F", - "I_HMG_01_support_F", - "I_HMG_01_support_high_F", - "I_HMG_01_weapon_F", - "I_Mortar_01_support_F", - "I_Mortar_01_weapon_F", - "I_UAV_01_backpack_F", - "I_UAV_06_backpack_F", - "I_UAV_06_medical_backpack_F", - "I_UGV_02_Demining_backpack_F", - "I_UGV_02_Science_backpack_F", - "O_AA_01_weapon_F", - "O_AT_01_weapon_F", - "O_GMG_01_A_weapon_F", - "O_GMG_01_high_weapon_F", - "O_GMG_01_weapon_F", - "O_HMG_01_A_weapon_F", - "O_HMG_01_high_weapon_F", - "O_HMG_01_support_F", - "O_HMG_01_support_high_F", - "O_HMG_01_weapon_F", - "O_Mortar_01_support_F", - "O_Mortar_01_weapon_F", - "O_UAV_01_backpack_F", - "O_UAV_06_backpack_F", - "O_UAV_06_medical_backpack_F", - "O_UGV_02_Demining_backpack_F", - "O_UGV_02_Science_backpack_F", - "RHS_AGS30_Gun_Bag", - "RHS_AGS30_Tripod_Bag", - "RHS_DShkM_Gun_Bag", - "RHS_DShkM_TripodHigh_Bag", - "RHS_DShkM_TripodLow_Bag", - "RHS_Kord_Gun_Bag", - "RHS_Kord_Tripod_Bag", - "RHS_Kornet_Gun_Bag", - "RHS_Kornet_Tripod_Bag", - "RHS_M2_Gun_Bag", - "RHS_M2_MiniTripod_Bag", - "RHS_M2_Tripod_Bag", - "rhs_M252_Bipod_Bag", - "rhs_M252_Gun_Bag", - "RHS_Metis_Gun_Bag", - "RHS_Metis_Tripod_Bag", - "RHS_Mk19_Gun_Bag", - "RHS_Mk19_Tripod_Bag", - "RHS_NSV_Gun_Bag", - "RHS_NSV_Tripod_Bag", - "RHS_Podnos_Bipod_Bag", - "RHS_Podnos_Gun_Bag", - "RHS_SPG9_Gun_Bag", - "RHS_SPG9_Tripod_Bag", - "rhs_Tow_Gun_Bag", - "rhs_TOW_Tripod_Bag", - "UK3CB_BAF_L111A1", - "UK3CB_BAF_L134A1", - "UK3CB_BAF_L16_Tripod", - "UK3CB_BAF_L16", - "UK3CB_BAF_M6", - "UK3CB_BAF_Tripod", - "uns_M1_81mm_mortar_US_Bag", - "uns_M1919_low_US_Bag", - "uns_M2_60mm_mortar_US_Bag", - "uns_m2_high_US_Bag", - "uns_M2_low_US_Bag", - "uns_M30_107mm_mortar_US_Bag", - "uns_M60_high_US_Bag", - "uns_M60_low_US_Bag", - "uns_MK18_low_US_Bag", - "uns_STABO_US_Bag", - "uns_Tripod_Bag", - "Uns_US_searchlight_Bag" -]; - -// Items which should be added as allowed Items, when they get blacklisted, even if they are not in the blacklisted_from_arsenal array -KP_liberation_allowed_items_extension = [ - "ACE_Chemlight_Shield_Blue", - "ACE_Chemlight_Shield_Green", - "ACE_Chemlight_Shield_Orange", - "ACE_Chemlight_Shield_Red", - "ACE_Chemlight_Shield_White", - "ACE_Chemlight_Shield_Yellow", - "ACE_launch_NLAW_Used_F", - "ACE_PreloadedMissileDummy_CUP", - "ACE_PreloadedMissileDummy_Igla_CUP", - "ACE_PreloadedMissileDummy_M72A6_CUP", - "ACE_PreloadedMissileDummy_NLAW_CUP", - "ACE_PreloadedMissileDummy_RPG18_CUP", - "ACE_PreloadedMissileDummy_Stinger_CUP", - "ACE_PreloadedMissileDummy_Strela_2_CUP", - "ACE_ReserveParachute", - "BWA3_acc_LLM01_flash_tan", - "BWA3_acc_LLM01_flash_underbarrel", - "BWA3_acc_LLM01_flash", - "BWA3_acc_LLM01_laser_tan", - "BWA3_acc_LLM01_laser_underbarrel", - "BWA3_acc_LLM01_laser", - "BWA3_acc_VarioRay_flash", - "BWA3_acc_VarioRay_laser", - "BWA3_Bunkerfaust", - "BWA3_G36A2_pip", - "BWA3_G36A2_tan_pip", - "BWA3_optic_CompM2_G36A2", - "BWA3_optic_CompM2_tan_G36A2", - "BWA3_optic_EOTech_G36A2", - "BWA3_optic_EOTech_Mag_Off", - "BWA3_optic_EOTech_Mag_On", - "BWA3_optic_EOTech_sand_G36A2", - "BWA3_optic_EOTech_tan_Mag_Off", - "BWA3_optic_EOTech_tan_Mag_On", - "BWA3_optic_EOTech552_G36A2", - "BWA3_optic_EOTech552_tan_G36A2", - "BWA3_optic_Hensoldt_NSV", - "BWA3_optic_M5Xi_MSR_MicroT2_pip", - "BWA3_optic_M5Xi_MSR_pip", - "BWA3_optic_M5Xi_Tremor3_MicroT2_pip", - "BWA3_optic_M5Xi_Tremor3_pip", - "BWA3_optic_MicroT1_G36A2", - "BWA3_optic_MicroT2_G36A2", - "BWA3_optic_NSA80_G36", - "BWA3_optic_PMII_DMR_MicroT1_front_NSV_pip", - "BWA3_optic_PMII_DMR_MicroT1_front_NSV", - "BWA3_optic_PMII_DMR_MicroT1_front_pip", - "BWA3_optic_PMII_DMR_MicroT1_rear_NSV_pip", - "BWA3_optic_PMII_DMR_MicroT1_rear_NSV", - "BWA3_optic_PMII_DMR_MicroT1_rear_pip", - "BWA3_optic_PMII_DMR_NSV_pip", - "BWA3_optic_PMII_DMR_NSV", - "BWA3_optic_PMII_DMR_pip", - "BWA3_optic_PMII_ShortdotCC_pip", - "BWA3_optic_RSAS_brown_G36A2", - "BWA3_optic_RSAS_G36A2", - "BWA3_optic_RSAS_sand_G36A2", - "BWA3_optic_RSAS_tan_G36A2", - "BWA3_optic_ZO4x30_brown_IRV", - "BWA3_optic_ZO4x30_brown_NSV", - "BWA3_optic_ZO4x30_brown_pip", - "BWA3_optic_ZO4x30_brown_RSAS_IRV_pip", - "BWA3_optic_ZO4x30_brown_RSAS_IRV", - "BWA3_optic_ZO4x30_brown_RSAS_NSV_pip", - "BWA3_optic_ZO4x30_brown_RSAS_NSV", - "BWA3_optic_ZO4x30_brown_RSAS_pip", - "BWA3_optic_ZO4x30_IRV", - "BWA3_optic_ZO4x30_MicroT2_brown_IRV", - "BWA3_optic_ZO4x30_MicroT2_brown_NSV", - "BWA3_optic_ZO4x30_MicroT2_IRV", - "BWA3_optic_ZO4x30_MicroT2_NSV", - "BWA3_optic_ZO4x30_NSV", - "BWA3_optic_ZO4x30_pip", - "BWA3_optic_ZO4x30_RSAS_IRV_pip", - "BWA3_optic_ZO4x30_RSAS_IRV", - "BWA3_optic_ZO4x30_RSAS_NSV_pip", - "BWA3_optic_ZO4x30_RSAS_NSV", - "BWA3_optic_ZO4x30_RSAS_pip", - "BWA3_optic_ZO4x30i_MicroT2_pip", - "BWA3_optic_ZO4x30i_MicroT2_sand_pip", - "BWA3_optic_ZO4x30i_pip", - "BWA3_optic_ZO4x30i_RSAS_pip", - "BWA3_optic_ZO4x30i_RSAS_sand_pip", - "BWA3_optic_ZO4x30i_sand_pip", - "BWA3_PzF3_Used", - "BWA3_PzF3", - "BWA3_RGW90_Used", - "BWA3_RGW90", - "ItemRadioAcreFlagged", - "rhs_acc_ekp8_18b", - "rhs_acc_ekp8_18c", - "rhs_acc_ekp8_18d", - "rhs_m136_hedp_mag", - "rhs_m136_hp_mag", - "rhs_m136_mag", - "rhs_m72a7_mag", - "rhs_rpg26_mag", - "rhs_rshg2_mag", - "rhs_weap_M136_used", - "rhsusf_acc_anpeq15_bk_light_h", - "rhsusf_acc_g33_T1_flip", - "rhsusf_acc_g33_xps3_flip", - "rhsusf_acc_g33_xps3_tan_flip", - "sma_spitfire_03_rds_low_ard_red", - "UK3CB_BAF_AT4_CS_AP_Mag", - "UK3CB_BAF_Javelin_Launcher" -]; - - - - -/* Various other settings. -Everything the AI troups should be able to resupply from. */ -KPLIB_aiResupplySources = [ - "B_APC_Tracked_01_CRV_F", - "B_Slingload_01_Ammo_F", - "B_T_APC_Tracked_01_CRV_F", - "B_T_Truck_01_ammo_F", - "B_Truck_01_ammo_F", - "BW_LKW15T_Ammo_F", - "CUP_B_Kamaz_Reammo_CDF", - "CUP_B_MTVR_Ammo_USA", - "CUP_B_MTVR_Ammo_USMC", - "CUP_B_T810_Reammo_CZ_DES", - "CUP_B_T810_Reammo_CZ_WDL", - "CUP_O_Kamaz_Reammo_RU", - "CUP_O_Ural_Reammo_CHDKZ", - "CUP_O_Ural_Reammo_SLA", - "CUP_O_Ural_Reammo_TKA", - "CUP_O_V3S_Rearm_TKA", - "gm_gc_army_ural4320_reammo_win", - "gm_gc_army_ural4320_reammo", - "gm_ge_army_kat1_451_reammo_win", - "gm_ge_army_kat1_451_reammo", - "I_E_Truck_02_Ammo_F", - "Land_Pod_Heli_Transport_04_ammo_F", - "O_Heli_Transport_04_ammo_F", - "O_T_Truck_03_ammo_ghex_F", - "O_Truck_03_ammo_F", - "rhs_gaz66_ammo_msv", - "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", - "rhsusf_M1239_M2_Deploy_socom_d", - "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d", - "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd", - "rhsusf_M977A4_AMMO_BKIT_usarmy_d", - "rhsusf_M977A4_AMMO_BKIT_usarmy_wd", - "rhsusf_M977A4_AMMO_usarmy_d", - "rhsusf_M977A4_AMMO_usarmy_wd", - "sfp_tgb40_ammo", - "uns_M113_ENG", - "uns_M35A2_ammo", - "uns_motorpool1_repair" -]; - -// Everything that can resupply other vehicles. -vehicle_repair_sources = [ - "B_APC_Tracked_01_CRV_F", - "B_Slingload_01_Repair_F", - "B_T_APC_Tracked_01_CRV_F", - "B_T_Truck_01_Repair_F", - "B_Truck_01_Repair_F", - "BW_LKW15T_Repair_F", - "C_Offroad_01_repair_F", - "CUP_B_Kamaz_Repair_CDF", - "CUP_B_MTVR_Repair_USA", - "CUP_B_MTVR_Repair_USMC", - "CUP_B_T810_Repair_CZ_DES", - "CUP_B_T810_Repair_CZ_WDL", - "CUP_O_V3S_Repair_TKA", - "CUP_O_Ural_Repair_SLA", - "CUP_O_Ural_Repair_CHDKZ", - "gm_gc_army_ural4320_repair_win", - "gm_gc_army_ural4320_repair", - "gm_ge_army_u1300l_repair_win", - "gm_ge_army_u1300l_repair", - "I_E_Truck_02_Box_F", - "Land_Pod_Heli_Transport_04_repair_F", - "O_Heli_Transport_04_repair_F", - "O_T_Truck_03_repair_ghex_F", - "O_Truck_03_repair_F", - "RHS_Ural_Repair_VDV_01", - "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", - "rhsusf_M1239_M2_Deploy_socom_d", - "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_d", - "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_wd", - "rhsusf_M977A4_REPAIR_BKIT_usarmy_d", - "rhsusf_M977A4_REPAIR_BKIT_usarmy_wd", - "rhsusf_M977A4_REPAIR_usarmy_d", - "rhsusf_M977A4_REPAIR_usarmy_wd", - "sfp_tgb30_repair", - "UNS_Hanger_repair", - "uns_M113_ENG", - "uns_M35A2_repair", - "uns_motorpool1_repair" -]; - -vehicle_rearm_sources = [ - "B_APC_Tracked_01_CRV_F", - "B_Slingload_01_Ammo_F", - "B_T_APC_Tracked_01_CRV_F", - "B_T_Truck_01_ammo_F", - "B_Truck_01_ammo_F", - "BW_LKW15T_Ammo_F", - "CUP_B_Kamaz_Reammo_CDF", - "CUP_B_MTVR_Ammo_USA", - "CUP_B_MTVR_Ammo_USMC", - "CUP_B_T810_Reammo_CZ_DES", - "CUP_B_T810_Reammo_CZ_WDL", - "CUP_O_Kamaz_Reammo_RU", - "CUP_O_Ural_Reammo_CHDKZ", - "CUP_O_Ural_Reammo_SLA", - "CUP_O_Ural_Reammo_TKA", - "CUP_O_V3S_Rearm_TKA", - "gm_gc_army_ural4320_reammo_win", - "gm_gc_army_ural4320_reammo", - "gm_ge_army_kat1_451_reammo_win", - "gm_ge_army_kat1_451_reammo", - "I_E_Truck_02_Ammo_F", - "Land_Pod_Heli_Transport_04_ammo_F", - "O_Heli_Transport_04_ammo_F", - "O_T_Truck_03_ammo_ghex_F", - "O_Truck_03_ammo_F", - "rhs_gaz66_ammo_msv", - "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", - "rhsusf_M1239_M2_Deploy_socom_d", - "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d", - "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd", - "rhsusf_M977A4_AMMO_BKIT_usarmy_d", - "rhsusf_M977A4_AMMO_BKIT_usarmy_wd", - "rhsusf_M977A4_AMMO_usarmy_d", - "rhsusf_M977A4_AMMO_usarmy_wd", - "sfp_tgb40_ammo", - "uns_M113_ENG", - "uns_M35A2_ammo" -]; - -vehicle_refuel_sources = [ - "B_APC_Tracked_01_CRV_F", - "B_Slingload_01_Fuel_F", - "B_T_APC_Tracked_01_CRV_F", - "B_T_Truck_01_fuel_F", - "B_Truck_01_fuel_F", - "BW_LKW15T_Fuel_F", - "C_Truck_02_fuel_F", - "C_Van_01_fuel_F", - "CUP_B_Kamaz_Refuel_CDF", - "CUP_B_MTVR_Refuel_USA", - "CUP_B_MTVR_Refuel_USMC", - "CUP_B_T810_Refuel_CZ_DES", - "CUP_B_T810_Refuel_CZ_WDL", - "CUP_O_Kamaz_Refuel_RU", - "CUP_O_Ural_Refuel_CHDKZ", - "CUP_O_Ural_Refuel_SLA", - "CUP_O_Ural_Refuel_TKA", - "CUP_O_V3S_Refuel_TKA", - "gm_gc_army_ural375d_refuel_win", - "gm_gc_army_ural375d_refuel", - "gm_ge_army_kat1_451_refuel_win", - "gm_ge_army_kat1_451_refuel", - "I_E_Truck_02_fuel_F", - "Land_Pod_Heli_Transport_04_fuel_F", - "O_Heli_Transport_04_fuel_F", - "O_T_Truck_03_fuel_ghex_F", - "O_Truck_03_fuel_F", - "RHS_Ural_Fuel_VDV_01", - "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", - "rhsusf_M1239_M2_Deploy_socom_d", - "rhsusf_M978A4_BKIT_usarmy_d", - "rhsusf_M978A4_BKIT_usarmy_wd", - "rhsusf_M978A4_usarmy_d", - "rhsusf_M978A4_usarmy_wd", - "sfp_tgb40_fuel", - "uns_M113_ENG", - "uns_M35A2_fuel", - "uns_M35A2_fueltanker" -]; - -// Classnames of boats, so they can be built on water. -boats_names = [ - "B_Boat_Armed_01_minigun_F", - "B_Boat_Transport_01_F", - "B_SDV_01_F", - "B_T_Boat_Armed_01_minigun_F", - "B_T_Boat_Transport_01_F", - "O_Boat_Armed_01_hmg_F", - "O_Boat_Transport_01_F", - "O_T_Boat_Armed_01_hmg_F", - "O_T_Boat_Transport_01_F", - "CUP_B_MK10_GB", - "CUP_B_RHIB_USMC", - "CUP_B_RHIB2Turret_USMC", - "CUP_B_LCU1600_USMC", - "CUP_O_LCVP_SLA", - "CUP_O_LCVP_VIV_SLA", - "CUP_O_PBX_SLA", - "rhsusf_mkvsoc", - "sfp_gruppbat", - "sfp_rbb_norrkoping", - "sfp_strb90_rws", - "sfp_strb90", - "uns_PBR_M10", - "uns_pbr_mk18", - "uns_pbr", - "UNS_Zodiac_W" -]; - -// Classnames of artillery vehicles, which should be added to the support module -// (Needed/Favorized as BIS_SUPP_eligible_Artillery from the support module isn't broadcasted over the network and may hold unwanted vehicles) -KP_liberation_suppMod_artyVeh = [ - "B_G_Mortar_01_F", - "B_MBT_01_arty_F", - "B_MBT_01_mlrs_F", - "B_Mortar_01_F", - "B_Ship_Gun_01_F", - "B_T_MBT_01_arty_F", - "B_T_MBT_01_mlrs_F", - "B_T_Mortar_01_F", - "CUP_B_2b14_82mm_ACR", - "CUP_B_2b14_82mm_CDF", - "CUP_B_BM21_CDF", - "CUP_B_D30_CDF", - "CUP_B_L16A2_BAF_DDPM", - "CUP_B_L16A2_BAF_MPT", - "CUP_B_L16A2_BAF_WDL", - "CUP_B_M1129_MC_MK19_Desert_Slat", - "CUP_B_M1129_MC_MK19_Desert", - "CUP_B_M1129_MC_MK19_Woodland_Slat", - "CUP_B_M1129_MC_MK19_Woodland", - "CUP_B_M119_US", - "CUP_B_M119_USMC", - "CUP_B_M252_US", - "CUP_B_M252_USMC", - "CUP_B_M270_DPICM_BAF_DES", - "CUP_B_M270_DPICM_BAF_WOOD", - "CUP_B_M270_DPICM_USA", - "CUP_B_M270_DPICM_USMC", - "CUP_B_M270_HE_BAF_DES", - "CUP_B_M270_HE_BAF_WOOD", - "CUP_B_M270_HE_USA", - "CUP_B_M270_HE_USMC", - "CUP_B_RM70_CZ", - "CUP_I_2b14_82mm_TK_GUE", - "CUP_I_D30_TK_GUE", - "CUP_I_Hilux_armored_MLRS_TK", - "CUP_I_Hilux_armored_podnos_TK", - "CUP_I_Hilux_armored_UB32_TK", - "CUP_I_Hilux_MLRS_TK", - "CUP_I_Hilux_podnos_TK", - "CUP_I_Hilux_UB32_TK", - "CUP_I_M119_RACS", - "CUP_I_M252_RACS", - "CUP_I_M270_DPICM_AAF", - "CUP_I_M270_DPICM_RACS", - "CUP_I_M270_HE_AAF", - "CUP_I_M270_HE_RACS", - "CUP_O_2b14_82mm_ChDKZ", - "CUP_O_2b14_82mm_RU", - "CUP_O_2b14_82mm_SLA", - "CUP_O_2b14_82mm_TK_INS", - "CUP_O_2b14_82mm_TK", - "CUP_O_BM21_CHDKZ", - "CUP_O_BM21_RU", - "CUP_O_BM21_SLA", - "CUP_O_BM21_TKA", - "CUP_O_D30_ChDKZ", - "CUP_O_D30_RU", - "CUP_O_D30_SLA", - "CUP_O_D30_TK_INS", - "CUP_O_D30_TK", - "CUP_O_Hilux_armored_MLRS_TK_INS", - "CUP_O_Hilux_armored_podnos_TK_INS", - "CUP_O_Hilux_armored_UB32_TK_INS", - "CUP_O_Hilux_MLRS_TK_INS", - "CUP_O_Hilux_podnos_TK_INS", - "CUP_O_Hilux_UB32_TK_INS", - "I_E_Mortar_01_F", - "I_E_Truck_02_MRL_F", - "I_G_Mortar_01_F", - "I_Mortar_01_F", - "I_Truck_02_MRL_F", - "O_G_Mortar_01_F", - "O_MBT_02_arty_F", - "O_Mortar_01_F", - "O_T_MBT_02_arty_ghex_F", - "rhs_2b14_82mm_msv", - "rhs_2b14_82mm_vdv", - "rhs_2b14_82mm_vmf", - "rhs_2s1_tv", - "rhs_2s1_vmf", - "rhs_2s3_tv", - "RHS_BM21_MSV_01", - "RHS_BM21_VDV_01", - "RHS_BM21_VMF_01", - "RHS_BM21_VV_01", - "rhs_D30_msv", - "rhs_D30_vdv", - "rhs_D30_vmf", - "RHS_M119_D", - "RHS_M119_WD", - "RHS_M252_D", - "RHS_M252_USMC_D", - "RHS_M252_USMC_WD", - "RHS_M252_WD", - "rhsusf_m109_usarmy", - "rhsusf_m109d_usarmy", - "rhsusf_M142_usarmy_D", - "rhsusf_M142_usarmy_WD", - "rhsusf_M142_usmc_WD", - "Uns_D20_artillery", - "Uns_D30_artillery", - "uns_M1_81mm_mortar_arty", - "uns_M1_81mm_mortar_pvp", - "uns_M1_81mm_mortar", - "Uns_M102_artillery", - "uns_m107sp", - "uns_m110sp", - "uns_M113_M30_HQ", - "uns_M113_M30", - "Uns_M114_artillery", - "uns_m1941_82mm_mortarNVA_arty", - "uns_m1941_82mm_mortarNVA_pvp", - "uns_m1941_82mm_mortarNVA", - "uns_m1941_82mm_mortarVC", - "uns_M2_60mm_mortar_pvp", - "uns_M2_60mm_mortar", - "uns_M30_107mm_mortar", - "uns_Type55_mortar" -]; - -// Objects which are spawned as intel objects for pickup -KPLIB_intelObjectClasses = [ - "Land_File_research_F", - "Land_Document_01_F" -]; - -// Classnames of buildings inside military sectors, which are valid to hold intel items -KPLIB_intelBuildingClasses = [ - "Land_Cargo_House_V1_F", - "Land_Cargo_House_V2_F", - "Land_Cargo_House_V3_F", - "Land_Cargo_HQ_V1_F", - "Land_Cargo_HQ_V2_F", - "Land_Cargo_HQ_V3_F", - "Land_i_Barracks_V1_dam_F", - "Land_i_Barracks_V1_F", - "Land_i_Barracks_V2_dam_F", - "Land_i_Barracks_V2_F", - "Land_Medevac_house_V1_F", - "Land_Medevac_HQ_V1_F", - "Land_MilOffices_V1_F", - "Land_Research_house_V1_F", - "Land_Research_HQ_F", - "Land_u_Barracks_V2_F" -]; - -// Large storage area placement position offsets. -KP_liberation_large_storage_positions = [ - [-5.59961,3.60938,0.6], - [-3.99902,3.60938,0.6], - [-2.39941,3.60938,0.6], - [-0.799805,3.60938,0.6], - [0.800781,3.60938,0.6], - [2.40039,3.60938,0.6], - [4.00098,3.60938,0.6], - [5.60059,3.60938,0.6], - [-5.59961,1.80859,0.6], - [-3.99902,1.80859,0.6], - [-2.39941,1.80859,0.6], - [-0.799805,1.80859,0.6], - [0.800781,1.80859,0.6], - [2.40039,1.80859,0.6], - [4.00098,1.80859,0.6], - [5.60059,1.80859,0.6], - [-5.59961,0.00976563,0.6], - [-3.99902,0.00976563,0.6], - [-2.39941,0.00976563,0.6], - [-0.799805,0.00976563,0.6], - [0.800781,0.00976563,0.6], - [2.40039,0.00976563,0.6], - [4.00098,0.00976563,0.6], - [5.60059,0.00976563,0.6], - [-5.59961,-1.79102,0.6], - [-3.99902,-1.79102,0.6], - [-2.39941,-1.79102,0.6], - [-0.799805,-1.79102,0.6], - [0.800781,-1.79102,0.6], - [2.40039,-1.79102,0.6], - [4.00098,-1.79102,0.6], - [5.60059,-1.79102,0.6], - [-5.59961,-3.58984,0.6], - [-3.99902,-3.58984,0.6], - [-2.39941,-3.58984,0.6], - [-0.799805,-3.58984,0.6], - [0.800781,-3.58984,0.6], - [2.40039,-3.58984,0.6], - [4.00098,-3.58984,0.6], - [5.60059,-3.58984,0.6] -]; - -// Small storage area placement position offsets. -KP_liberation_small_storage_positions = [ - [-2.34961,1.80078,0.6], - [-0.75,1.80078,0.6], - [0.850586,1.80078,0.6], - [2.4502,1.80078,0.6], - [-2.34961,0,0.6], - [-0.75,0,0.6], - [0.850586,0,0.6], - [2.4502,0,0.6], - [-2.34961,-1.79883,0.6], - [-0.75,-1.79883,0.6], - [0.850586,-1.79883,0.6], - [2.4502,-1.79883,0.6] -]; -// DO NOT CHANGE (unless you know what you are doing). -GRLIB_endgame = 0; -KP_liberation_production_interval = ceil (KP_liberation_production_interval / GRLIB_resources_multiplier); -GRLIB_battlegroup_size = GRLIB_battlegroup_size * (sqrt GRLIB_unitcap) * (sqrt GRLIB_csat_aggressivity); -GRLIB_civilians_amount = GRLIB_civilians_amount * GRLIB_civilian_activity; -GRLIB_blufor_cap = (GRLIB_blufor_cap * GRLIB_unitcap) min 100; -GRLIB_sector_cap = GRLIB_sector_cap * GRLIB_unitcap; -GRLIB_battlegroup_cap = GRLIB_battlegroup_cap * GRLIB_unitcap; -GRLIB_patrol_cap = GRLIB_patrol_cap * GRLIB_unitcap; +// Adjustments calculation depending on selected mission parameters (shouldn't be edited) +GRLIB_endgame = 0; +GRLIB_respawn_marker = "respawn"; +KP_liberation_production_interval = ceil (KP_liberation_production_interval / GRLIB_resources_multiplier); +GRLIB_battlegroup_size = GRLIB_battlegroup_size * (sqrt GRLIB_unitcap) * (sqrt GRLIB_csat_aggressivity); +GRLIB_civilians_amount = GRLIB_civilians_amount * GRLIB_civilian_activity; +GRLIB_blufor_cap = (GRLIB_blufor_cap * GRLIB_unitcap) min 100; +GRLIB_sector_cap = GRLIB_sector_cap * GRLIB_unitcap; +GRLIB_battlegroup_cap = GRLIB_battlegroup_cap * GRLIB_unitcap; +GRLIB_patrol_cap = GRLIB_patrol_cap * GRLIB_unitcap; diff --git a/Missionframework/KPLIB_transportConfigs.sqf b/Missionframework/KPLIB_transportConfigs.sqf index eb105a374..9984f9327 100644 --- a/Missionframework/KPLIB_transportConfigs.sqf +++ b/Missionframework/KPLIB_transportConfigs.sqf @@ -6,12 +6,13 @@ License: MIT License - http://www.opensource.org/licenses/MIT Description: - Configuration settings for crates transported by vehicles. + Position configs for objects which can hold/transport crates. Format: ["classname", , ] */ +// Vehicle transport configs KPLIB_transportConfigs = [ ["B_Heli_Transport_03_F", -8, [0,2.2,-1], [0,0.5,-1], [0,-1.2,-1]], ["B_Heli_Transport_03_unarmed_F", -8, [0,2.2,-1], [0,0.5,-1], [0,-1.2,-1]], @@ -183,3 +184,63 @@ KPLIB_transportConfigs = [ ["uns_nvatruck_open", -5, [0,-1.05,0.8], [0,-2.75,0.8]], ["uns_nvatruck", -5, [0,-1.05,0.8], [0,-2.75,0.8]] ]; + +// Large storage area placement position offsets. +KP_liberation_large_storage_positions = [ + [-5.59961,3.60938,0.6], + [-3.99902,3.60938,0.6], + [-2.39941,3.60938,0.6], + [-0.799805,3.60938,0.6], + [0.800781,3.60938,0.6], + [2.40039,3.60938,0.6], + [4.00098,3.60938,0.6], + [5.60059,3.60938,0.6], + [-5.59961,1.80859,0.6], + [-3.99902,1.80859,0.6], + [-2.39941,1.80859,0.6], + [-0.799805,1.80859,0.6], + [0.800781,1.80859,0.6], + [2.40039,1.80859,0.6], + [4.00098,1.80859,0.6], + [5.60059,1.80859,0.6], + [-5.59961,0.00976563,0.6], + [-3.99902,0.00976563,0.6], + [-2.39941,0.00976563,0.6], + [-0.799805,0.00976563,0.6], + [0.800781,0.00976563,0.6], + [2.40039,0.00976563,0.6], + [4.00098,0.00976563,0.6], + [5.60059,0.00976563,0.6], + [-5.59961,-1.79102,0.6], + [-3.99902,-1.79102,0.6], + [-2.39941,-1.79102,0.6], + [-0.799805,-1.79102,0.6], + [0.800781,-1.79102,0.6], + [2.40039,-1.79102,0.6], + [4.00098,-1.79102,0.6], + [5.60059,-1.79102,0.6], + [-5.59961,-3.58984,0.6], + [-3.99902,-3.58984,0.6], + [-2.39941,-3.58984,0.6], + [-0.799805,-3.58984,0.6], + [0.800781,-3.58984,0.6], + [2.40039,-3.58984,0.6], + [4.00098,-3.58984,0.6], + [5.60059,-3.58984,0.6] +]; + +// Small storage area placement position offsets. +KP_liberation_small_storage_positions = [ + [-2.34961,1.80078,0.6], + [-0.75,1.80078,0.6], + [0.850586,1.80078,0.6], + [2.4502,1.80078,0.6], + [-2.34961,0,0.6], + [-0.75,0,0.6], + [0.850586,0,0.6], + [2.4502,0,0.6], + [-2.34961,-1.79883,0.6], + [-0.75,-1.79883,0.6], + [0.850586,-1.79883,0.6], + [2.4502,-1.79883,0.6] +]; diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index 800f1ec31..65e150cbe 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -13,6 +13,7 @@ if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; [] call compileFinal preprocessFileLineNumbers "scripts\shared\fetch_params.sqf"; [] call compileFinal preprocessFileLineNumbers "KPLIB_config.sqf"; [] call compileFinal preprocessFileLineNumbers "KPLIB_transportConfigs.sqf"; +[] call compileFinal preprocessFileLineNumbers "KPLIB_classnameLists.sqf"; [] call compileFinal preprocessFileLineNumbers "presets\init_presets.sqf"; [] call compileFinal preprocessFileLineNumbers "kp_objectInits.sqf"; diff --git a/Missionframework/scripts/server/secondary/fob_hunting.sqf b/Missionframework/scripts/server/secondary/fob_hunting.sqf index 63d1c6799..009fd8765 100644 --- a/Missionframework/scripts/server/secondary/fob_hunting.sqf +++ b/Missionframework/scripts/server/secondary/fob_hunting.sqf @@ -127,7 +127,7 @@ waitUntil { (_base_objectives select {alive _x}) isEqualTo [] }; -combat_readiness = round (combat_readiness * GRLIB_secondary_objective_impact); +combat_readiness = round (combat_readiness * (1 - GRLIB_secondary_objective_impact)); stats_secondary_objectives = stats_secondary_objectives + 1; sleep 1; [] spawn KPLIB_fnc_doSave; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 7c0176b0c..40dcc0843 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -166,11 +166,3 @@ if (isServer) then { publicVariable "KP_liberation_ace_killer"; }; }; - -// Body/Wreck deletion after cleanup delay -if (isServer && !isplayer _unit) then { - sleep GRLIB_cleanup_delay; - hidebody _unit; - sleep 10; - deleteVehicle _unit; -}; From 24dc8985ab8aedce30f9919502bfd2d7cb932e6d Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 10 May 2020 16:55:22 +0200 Subject: [PATCH 003/115] `GRLIB_` prefix to `KPLIB_` --- .../GREUH/Scripts/GREUH_cache_units.sqf | 8 +- .../GREUH/Scripts/GREUH_platoonoverlay.sqf | 10 +- .../GREUH/Scripts/GREUH_playermarkers.sqf | 6 +- Missionframework/KPLIB_config.sqf | 68 +++---- Missionframework/arsenal_presets/3cbBAF.sqf | 10 +- Missionframework/arsenal_presets/bwmod.sqf | 10 +- Missionframework/arsenal_presets/csat.sqf | 10 +- Missionframework/arsenal_presets/custom.sqf | 10 +- Missionframework/arsenal_presets/gm_east.sqf | 8 +- Missionframework/arsenal_presets/gm_west.sqf | 8 +- Missionframework/arsenal_presets/rhsusaf.sqf | 10 +- Missionframework/arsenal_presets/sfp.sqf | 10 +- Missionframework/arsenal_presets/unsung.sqf | 10 +- .../functions/fn_addActionsPlayer.sqf | 22 +-- Missionframework/functions/fn_doSave.sqf | 4 +- .../functions/fn_forceBluforCrew.sqf | 6 +- .../functions/fn_getBluforRatio.sqf | 8 +- Missionframework/functions/fn_getFobName.sqf | 4 +- Missionframework/functions/fn_getLocalCap.sqf | 4 +- .../fn_getNearestBluforObjective.sqf | 6 +- .../functions/fn_getNearestFob.sqf | 6 +- .../functions/fn_getNearestTower.sqf | 8 +- Missionframework/functions/fn_getOpforCap.sqf | 4 +- .../functions/fn_getOpforFactor.sqf | 6 +- .../functions/fn_getOpforSpawnPoint.sqf | 6 +- Missionframework/functions/fn_getSaveData.sqf | 22 +-- .../functions/fn_getSectorOwnership.sqf | 18 +- .../functions/fn_getSectorRange.sqf | 8 +- .../functions/fn_getSquadComp.sqf | 4 +- .../functions/fn_getUnitsCount.sqf | 6 +- .../functions/fn_hasPermission.sqf | 18 +- .../functions/fn_spawnBuildingSquad.sqf | 10 +- .../functions/fn_spawnCivilians.sqf | 8 +- .../functions/fn_spawnGuerillaGroup.sqf | 4 +- .../functions/fn_spawnMilitaryPostSquad.sqf | 6 +- .../functions/fn_spawnMilitiaCrew.sqf | 4 +- .../functions/fn_spawnRegularSquad.sqf | 4 +- .../functions/fn_spawnVehicle.sqf | 4 +- Missionframework/kp_objectInits.sqf | 2 +- Missionframework/onPlayerRespawn.sqf | 4 +- Missionframework/presets/init_presets.sqf | 2 +- .../scripts/client/actions/do_recycle.sqf | 8 +- .../client/actions/do_repackage_fob.sqf | 4 +- .../scripts/client/actions/intel_manager.sqf | 10 +- .../scripts/client/actions/open_arsenal.sqf | 2 +- .../client/actions/recycle_manager.sqf | 4 +- .../scripts/client/actions/unflip_manager.sqf | 4 +- .../ammoboxes/ammobox_action_manager.sqf | 12 +- .../scripts/client/ammoboxes/do_load_box.sqf | 4 +- .../client/ammoboxes/do_unload_truck.sqf | 4 +- .../scripts/client/build/build_overlay.sqf | 16 +- .../scripts/client/build/do_build.sqf | 32 ++-- .../scripts/client/build/do_build_fob.sqf | 12 +- .../scripts/client/build/do_sector_build.sqf | 8 +- .../scripts/client/build/open_build_menu.sqf | 10 +- .../client/civinformant/civinfo_escort.sqf | 2 +- .../civinformant/civinfo_notifications.sqf | 4 +- .../client/commander/enforce_whitelist.sqf | 8 +- .../client/commander/open_permissions.sqf | 8 +- .../scripts/client/init_client.sqf | 6 +- .../scripts/client/markers/fob_markers.sqf | 8 +- .../scripts/client/markers/group_icons.sqf | 8 +- .../scripts/client/markers/hostile_groups.sqf | 2 +- .../scripts/client/markers/sector_manager.sqf | 12 +- .../scripts/client/markers/spot_timer.sqf | 4 +- .../markers/update_production_sites.sqf | 2 +- .../client/misc/broadcast_squad_colors.sqf | 4 +- .../scripts/client/misc/init_arsenal.sqf | 32 ++-- .../scripts/client/misc/init_markers.sqf | 4 +- .../client/misc/permissions_warning.sqf | 6 +- .../scripts/client/misc/playerNamespace.sqf | 8 +- .../scripts/client/misc/secondary_jip.sqf | 6 +- .../client/remotecall/remote_call_endgame.sqf | 2 +- .../client/remotecall/remote_call_fob.sqf | 2 +- .../remotecall/remote_call_incoming.sqf | 8 +- .../client/remotecall/remote_call_intel.sqf | 8 +- .../remotecall/remote_call_prisonner.sqf | 4 +- .../client/remotecall/remote_call_sector.sqf | 6 +- .../scripts/client/spawn/do_halo.sqf | 10 +- .../scripts/client/spawn/redeploy_manager.sqf | 12 +- .../scripts/client/spawn/spawn_camera.sqf | 4 +- .../scripts/client/tutorial/fn_tutorial.fsm | 18 +- .../scripts/client/ui/cinematic_camera.sqf | 14 +- Missionframework/scripts/client/ui/intro.sqf | 2 +- .../scripts/client/ui/secondary_ui.sqf | 14 +- .../scripts/client/ui/squad_management.sqf | 30 ++-- .../scripts/client/ui/ui_manager.sqf | 20 +-- .../scripts/server/ai/battlegroup_ai.sqf | 2 +- .../scripts/server/ai/building_defence_ai.sqf | 4 +- .../scripts/server/ai/prisonner_ai.sqf | 8 +- .../scripts/server/ai/troup_transport.sqf | 2 +- .../server/asymmetric/asymmetric_loop.sqf | 6 +- .../server/asymmetric/ied/manage_asymIED.sqf | 4 +- .../asymmetric/random/asym_sector_ambush.sqf | 2 +- .../asymmetric/random/sector_guerilla.sqf | 2 +- .../scripts/server/base/startgame.sqf | 12 +- .../battlegroup/counter_battlegroup.sqf | 4 +- .../battlegroup/random_battlegroups.sqf | 16 +- .../server/battlegroup/readiness_increase.sqf | 2 +- .../scripts/server/battlegroup/spawn_air.sqf | 2 +- .../server/battlegroup/spawn_battlegroup.sqf | 16 +- .../server/civinformant/civinfo_loop.sqf | 6 +- .../civinformant/tasks/civinfo_task.sqf | 2 +- .../server/civrep/fnc/f_kp_cr_changeCR.sqf | 10 +- .../civrep/fnc/f_kp_cr_getBuildings.sqf | 4 +- .../civrep/wounded/civrep_wounded_civs.sqf | 6 +- .../server/game/apply_default_permissions.sqf | 16 +- .../server/game/check_victory_conditions.sqf | 6 +- .../scripts/server/game/cleanup_vehicles.sqf | 10 +- .../scripts/server/game/manage_time.sqf | 6 +- .../scripts/server/game/manage_weather.sqf | 6 +- .../scripts/server/game/save_manager.sqf | 62 +++---- .../scripts/server/game/zeus_synchro.sqf | 4 +- .../server/highcommand/fn_highcommand.fsm | 12 +- .../scripts/server/init_server.sqf | 2 +- .../scripts/server/offloading/show_fps.sqf | 2 +- .../server/patrols/civilian_patrols.sqf | 4 +- .../patrols/manage_one_civilian_patrol.sqf | 12 +- .../server/patrols/manage_one_patrol.sqf | 12 +- .../scripts/server/patrols/manage_patrols.sqf | 8 +- .../server/patrols/reinforcements_manager.sqf | 10 +- .../server/patrols/send_paratroopers.sqf | 4 +- .../remotecall/add_logiTruck_remote_call.sqf | 2 +- .../remotecall/build_fob_remote_call.sqf | 4 +- .../remotecall/del_logiTruck_remote_call.sqf | 2 +- .../sector_liberated_remote_call.sqf | 16 +- .../start_secondary_remote_call.sqf | 10 +- .../server/resources/manage_logistics.sqf | 2 +- .../server/resources/manage_resources.sqf | 2 +- .../resources/recalculate_resources.sqf | 10 +- .../scripts/server/resources/unit_cap.sqf | 2 +- .../server/secondary/convoy_hijack.sqf | 14 +- .../scripts/server/secondary/fob_hunting.sqf | 14 +- .../server/secondary/search_and_rescue.sqf | 12 +- .../server/sector/attack_in_progress_fob.sqf | 28 +-- .../sector/attack_in_progress_sector.sqf | 24 +-- .../scripts/server/sector/fn_destroyFob.sqf | 4 +- .../server/sector/fn_sectorMonitor.fsm | 6 +- .../server/sector/fn_spawnSectorCrates.sqf | 4 +- .../scripts/server/sector/ied_manager.sqf | 4 +- .../scripts/server/sector/lose_sectors.sqf | 10 +- .../server/sector/manage_one_sector.sqf | 50 +++--- .../server/sector/wait_to_spawn_sector.sqf | 12 +- .../scripts/shared/fetch_params.sqf | 170 +++++++++--------- .../scripts/shared/kill_manager.sqf | 26 +-- Missionframework/ui/liberation_squad.hpp | 10 +- Missionframework/whitelist.sqf | 6 +- 147 files changed, 762 insertions(+), 762 deletions(-) diff --git a/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf b/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf index eccb4d175..ed1b32791 100644 --- a/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf +++ b/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf @@ -4,14 +4,14 @@ waitUntil { !isNil "nametags_distance" }; while { true } do { - _scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == GRLIB_side_friendly ) } ] call BIS_fnc_conditionalSelect; + _scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == KPLIB_side_friendly ) } ] call BIS_fnc_conditionalSelect; _scanned_units = [ _scanned_units, { (_x == leader group player ) || (_x distance player < nametags_distance) } ] call BIS_fnc_conditionalSelect; _scanned_units = [ _scanned_units, { (_x != player) && (( vehicle player ) != ( vehicle _x )) } ] call BIS_fnc_conditionalSelect; - GRLIB_nametag_units = [] + _scanned_units; + KPLIB_nametag_units = [] + _scanned_units; _scanned_groups = [ allGroups, { ( side _x == side player ) && ( isplayer (leader _x) ) } ] call BIS_fnc_conditionalSelect; _scanned_groups = [ _scanned_groups, { ( count units _x > 1 ) || ( count units _x == 1 && leader _x != player ) } ] call BIS_fnc_conditionalSelect; - GRLIB_overlay_groups = [] + _scanned_groups; + KPLIB_overlay_groups = [] + _scanned_groups; sleep 1; -}; \ No newline at end of file +}; diff --git a/Missionframework/GREUH/Scripts/GREUH_platoonoverlay.sqf b/Missionframework/GREUH/Scripts/GREUH_platoonoverlay.sqf index a23601db8..0f12e687d 100644 --- a/Missionframework/GREUH/Scripts/GREUH_platoonoverlay.sqf +++ b/Missionframework/GREUH/Scripts/GREUH_platoonoverlay.sqf @@ -10,8 +10,8 @@ nametags_distance = 32.0; private [ "_groups", "_unitstocount", "_totalx", "_totaly", "_totalz", "_alpha", "_textalpha", "_size", "_screenpos", "_grouppos", "_distlabel", "_dist", "_nextunit", "_color", "_drawicon", "_displayname", "_iconpos" ]; -waitUntil { !isNil "GRLIB_overlay_groups" }; -waitUntil { !isNil "GRLIB_nametag_units" }; +waitUntil { !isNil "KPLIB_overlay_groups" }; +waitUntil { !isNil "KPLIB_nametag_units" }; ["platoon_overlay", "onEachFrame", { @@ -73,7 +73,7 @@ waitUntil { !isNil "GRLIB_nametag_units" }; drawIcon3D [platoon_icon1, _color, _grouppos, _size / 2, _size / 2,0, format ["%1 - %2%3",groupID _x, name (leader _x),_distlabel], 2, 0.03 * _textalpha, "puristaMedium"]; drawIcon3D [platoon_icon2, _color, _grouppos, _size, _size,0, "", 2, 0.04, "puristaMedium"]; }; - } foreach GRLIB_overlay_groups; + } foreach KPLIB_overlay_groups; }; if ( show_nametags ) then { @@ -92,7 +92,7 @@ waitUntil { !isNil "GRLIB_nametag_units" }; _color = []; if ( _nextunit in (units group player)) then { - switch ( _nextunit getVariable [ "GRLIB_squad_color", "MAIN" ] ) do { + switch ( _nextunit getVariable [ "KPLIB_squad_color", "MAIN" ] ) do { case "BLUE" : { _color = [0.15,0.35,1.0,_alpha] }; case "RED" : { _color = [0.8,0,0,_alpha] }; case "YELLOW" : { _color = [0.85,0.85,0,_alpha] }; @@ -133,7 +133,7 @@ waitUntil { !isNil "GRLIB_nametag_units" }; drawIcon3D [ _drawicon, _color, _iconpos , 0.75, 0.75,0, format [ "%1", _displayname] , 2, 0.032, "puristaMedium"]; - } foreach GRLIB_nametag_units; + } foreach KPLIB_nametag_units; }; }] call BIS_fnc_addStackedEventHandler; diff --git a/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf b/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf index 65ff6ca13..b56cac7af 100644 --- a/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf +++ b/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf @@ -6,10 +6,10 @@ private _color = ""; private _ticks = 0; private _cfg = configFile >> "cfgVehicles"; -if ( side player == GRLIB_side_friendly ) then { - _color = GRLIB_color_friendly; +if ( side player == KPLIB_side_friendly ) then { + _color = KPLIB_color_friendly; } else { - _color = GRLIB_color_enemy; + _color = KPLIB_color_enemy; }; while { true } do { diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index bc9e31a61..07d672e26 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -134,25 +134,25 @@ KP_liberation_arsenal = 0; */ // Player side. -GRLIB_side_friendly = WEST; +KPLIB_side_friendly = WEST; // Enemy side. -GRLIB_side_enemy = EAST; +KPLIB_side_enemy = EAST; // Resistance side. -GRLIB_side_resistance = RESISTANCE; +KPLIB_side_resistance = RESISTANCE; // Civilian side. -GRLIB_side_civilian = CIVILIAN; +KPLIB_side_civilian = CIVILIAN; // Friendly sector marker color. -GRLIB_color_friendly = "ColorBLUFOR"; +KPLIB_color_friendly = "ColorBLUFOR"; // Enemy sector marker color. -GRLIB_color_enemy = "ColorOPFOR"; +KPLIB_color_enemy = "ColorOPFOR"; // Enemy sector marker color. (activated) -GRLIB_color_enemy_bright = "ColorRED"; +KPLIB_color_enemy_bright = "ColorRED"; /* @@ -163,7 +163,7 @@ GRLIB_color_enemy_bright = "ColorRED"; */ // Name of the save data variable inside of the [ServerProfileName].vars.Arma3Profile file. -GRLIB_save_key = "KP_LIBERATION_" + (toUpper worldName) + "_SAVEGAME"; +KPLIB_save_key = "KP_LIBERATION_" + (toUpper worldName) + "_SAVEGAME"; // Name of the parameter save data variable inside of the [ServerProfileName].vars.Arma3Profile file. KPLIB_paramSaveKey = "KP_LIBERATION_" + (toUpper worldName) + "_SAVE_PARAMS"; @@ -180,19 +180,19 @@ KP_liberation_save_interval = 60; */ // Build range around the main FOB building. -GRLIB_fob_range = 125; +KPLIB_fob_range = 125; // Altitude in metres for the HALO jump. -GRLIB_halo_altitude = 2500; +KPLIB_halo_altitude = 2500; // Range to activate a sector. -GRLIB_sector_size = 1000; +KPLIB_sector_size = 1000; // Range to capture a sector. -GRLIB_capture_size = 175; +KPLIB_capture_size = 175; // Radio Tower scanning range. -GRLIB_radiotower_size = 2500; +KPLIB_radiotower_size = 2500; /* @@ -203,22 +203,22 @@ GRLIB_radiotower_size = 2500; */ // Cap for BLUFOR. -GRLIB_blufor_cap = 100; +KPLIB_blufor_cap = 100; // Cap for sector defenders. -GRLIB_sector_cap = 180; +KPLIB_sector_cap = 180; // Cap for enemy battlegroups. -GRLIB_battlegroup_cap = 150; +KPLIB_battlegroup_cap = 150; // Cap for enemy patrols. -GRLIB_patrol_cap = 150; +KPLIB_patrol_cap = 150; // Size of enemy battlegroups. -GRLIB_battlegroup_size = 6; +KPLIB_battlegroup_size = 6; // Cap for civilian vehicles traveling between sectors. -GRLIB_civilians_amount = 10; +KPLIB_civilians_amount = 10; /* @@ -261,10 +261,10 @@ KP_liberation_cr_wounded_gain = 2; */ // Intel price for the secondary missions. [FOB hunting, Convoy ambush, SAR] -GRLIB_secondary_missions_costs = [15, 10, 8]; +KPLIB_secondary_missions_costs = [15, 10, 8]; // Proportionate reduction of the actual (!) enemy combat readiness for a successful FOB hunt. (e.g. 0.4 -> reduction of 24 by an actual value of 60) -GRLIB_secondary_objective_impact = 0.4; +KPLIB_secondary_objective_impact = 0.4; // Minimum time until a civil Informant can spawn. (seconds) KP_liberation_civinfo_min = 5400; @@ -345,16 +345,16 @@ KP_liberation_resistance_ambush_chance = 25; KP_liberation_production_interval = 30; // Percentage of resources you get back from recycling. -GRLIB_recycling_percentage = 0.5; +KPLIB_recycling_percentage = 0.5; // Multiplier for defenders in buildings. -GRLIB_defended_buildingpos_part = 0.4; +KPLIB_defended_buildingpos_part = 0.4; // Time in seconds how long a captured sector is vulnerable to enemy troops. -GRLIB_vulnerability_timer = 1200; +KPLIB_vulnerability_timer = 1200; // Chance that enemy infantry will surrender after heavy losses are encountered. -GRLIB_surrender_chance = 80; +KPLIB_surrender_chance = 80; // When playing on this map, it'll create a clearance (remove terrain objects) in a 15m radius around the battlegroup/reinforcements spawnpoint. KP_liberation_battlegroup_clearance = [ @@ -381,12 +381,12 @@ KP_liberation_suppMod_whitelist = [ // Adjustments calculation depending on selected mission parameters (shouldn't be edited) -GRLIB_endgame = 0; -GRLIB_respawn_marker = "respawn"; -KP_liberation_production_interval = ceil (KP_liberation_production_interval / GRLIB_resources_multiplier); -GRLIB_battlegroup_size = GRLIB_battlegroup_size * (sqrt GRLIB_unitcap) * (sqrt GRLIB_csat_aggressivity); -GRLIB_civilians_amount = GRLIB_civilians_amount * GRLIB_civilian_activity; -GRLIB_blufor_cap = (GRLIB_blufor_cap * GRLIB_unitcap) min 100; -GRLIB_sector_cap = GRLIB_sector_cap * GRLIB_unitcap; -GRLIB_battlegroup_cap = GRLIB_battlegroup_cap * GRLIB_unitcap; -GRLIB_patrol_cap = GRLIB_patrol_cap * GRLIB_unitcap; +KPLIB_endgame = 0; +KPLIB_respawn_marker = "respawn"; +KP_liberation_production_interval = ceil (KP_liberation_production_interval / KPLIB_resources_multiplier); +KPLIB_battlegroup_size = KPLIB_battlegroup_size * (sqrt KPLIB_unitcap) * (sqrt KPLIB_csat_aggressivity); +KPLIB_civilians_amount = KPLIB_civilians_amount * KPLIB_civilian_activity; +KPLIB_blufor_cap = (KPLIB_blufor_cap * KPLIB_unitcap) min 100; +KPLIB_sector_cap = KPLIB_sector_cap * KPLIB_unitcap; +KPLIB_battlegroup_cap = KPLIB_battlegroup_cap * KPLIB_unitcap; +KPLIB_patrol_cap = KPLIB_patrol_cap * KPLIB_unitcap; diff --git a/Missionframework/arsenal_presets/3cbBAF.sqf b/Missionframework/arsenal_presets/3cbBAF.sqf index 3ee0f17ed..962259ebe 100644 --- a/Missionframework/arsenal_presets/3cbBAF.sqf +++ b/Missionframework/arsenal_presets/3cbBAF.sqf @@ -1,6 +1,6 @@ /* 3CB BAF Arsenal Preset - Last Update: 2020-05-08 + Last Update: 2020-05-10 Needed: - 3CB BAF Weapons - https://steamcommunity.com/sharedfiles/filedetails/?id=893339590 @@ -12,7 +12,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ "UK3CB_BAF_AT4_CS_AP_Launcher", // ILAW HEDP Launcher "UK3CB_BAF_AT4_CS_AT_Launcher", // ILAW HP Launcher "UK3CB_BAF_L103A2", // L130A2 DP @@ -66,7 +66,7 @@ GRLIB_arsenal_weapons = [ "UK3CB_BAF_NLAW_Launcher" // NLAW Launcher ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ "UK3CB_BAF_12G_Pellets", // 12G 8rnd Buckshot "UK3CB_BAF_12G_Slugs", // 12G 8rnd Slug "UK3CB_BAF_1Rnd_Blank_Grenade_Shell", // 40mm Practice Round (L123) @@ -154,7 +154,7 @@ GRLIB_arsenal_magazines = [ "TrainingMine_Mag" // Training Mine ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Uniforms "UK3CB_BAF_U_CombatUniform_Arctic_Ghillie_RM", // Combat Uniform Arctic Ghillie RM [BAF] "UK3CB_BAF_U_CombatUniform_DDPM_Ghillie_RM", // Combat Uniform DDPPM Ghillie RM [BAF] @@ -658,7 +658,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "UK3CB_BAF_B_Bergen_Arctic_JTAC_A", // Bergen Arctic JTAC/FAC [BAF] "UK3CB_BAF_B_Bergen_Arctic_JTAC_H_A", // Bergen Arctic JTAC/FAC H [BAF] "UK3CB_BAF_B_Bergen_Arctic_Rifleman_A", // Bergen Arctic Rifleman A [BAF] diff --git a/Missionframework/arsenal_presets/bwmod.sqf b/Missionframework/arsenal_presets/bwmod.sqf index 45a9c2c40..3c123ef42 100644 --- a/Missionframework/arsenal_presets/bwmod.sqf +++ b/Missionframework/arsenal_presets/bwmod.sqf @@ -1,6 +1,6 @@ /* BWMod Arsenal Preset - Last Update: 2020-05-08 + Last Update: 2020-05-10 Needed: - BWMod - https://steamcommunity.com/sharedfiles/filedetails/?id=1200127537 @@ -11,7 +11,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ "BWA3_Bunkerfaust", // Bunkerfaust "BWA3_CarlGustav", // Leuchtbüchse 84 mm "BWA3_Fliegerfaust", // Fliegerfaust 2 Stinger @@ -77,7 +77,7 @@ GRLIB_arsenal_weapons = [ "BWA3_RGW90" // RGW 90 ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ "BWA3_10Rnd_127x99_G82_AP_Tracer", // G82 12.7x99mm 10Rnd Mag (AP Tracer) "BWA3_10Rnd_127x99_G82_AP", // G82 12.7x99mm 10Rnd Mag (AP) "BWA3_10Rnd_127x99_G82_Raufoss_Tracer_Dim", // G82 12.7x99mm Mk211 10Rnd Mag (Raufoss IR-DIM) @@ -170,7 +170,7 @@ GRLIB_arsenal_magazines = [ "UGL_FlareYellow_F" // Flare Round (Yellow) ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Uniforms "BWA3_Uniform_Crew_Fleck", // Boilersuit (Flecktart) "BWA3_Uniform_Crew_Multi", // Boilersuit (Multitarn) @@ -470,7 +470,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "BWA3_AssaultPack_Fleck_Medic", // Assault Pack (Flecktarn, Medic) "BWA3_AssaultPack_Fleck", // Assault Pack (Flecktarn) "BWA3_AssaultPack_Multi_Medic", // Assault Pack (Multitarn, Medic) diff --git a/Missionframework/arsenal_presets/csat.sqf b/Missionframework/arsenal_presets/csat.sqf index f271cbd63..e4e057ecd 100644 --- a/Missionframework/arsenal_presets/csat.sqf +++ b/Missionframework/arsenal_presets/csat.sqf @@ -1,6 +1,6 @@ /* CSAT Arsenal Preset - Last Update: 2020-05-08 + Last Update: 2020-05-10 Needed: - None @@ -11,7 +11,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ "arifle_AK12_arid_F", // AK-12 7.62 mm (Arid) "arifle_AK12_F", // AK-12 7.62 mm "arifle_AK12_GL_arid_F", // AK-12 7.62 mm (Arid) @@ -100,11 +100,11 @@ GRLIB_arsenal_weapons = [ "srifle_GM6_ghex_F" // GM6 Lynx 12.7 mm (Green Hex) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -374,7 +374,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "B_AssaultPack_blk", // Assault Pack (Black) "B_AssaultPack_ocamo", // Assault Pack (Hex) "B_AssaultPack_rgr", // Assault Pack (Green) diff --git a/Missionframework/arsenal_presets/custom.sqf b/Missionframework/arsenal_presets/custom.sqf index c441c6025..2f15ea225 100644 --- a/Missionframework/arsenal_presets/custom.sqf +++ b/Missionframework/arsenal_presets/custom.sqf @@ -1,16 +1,16 @@ // Custom Arsenal Preset -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ -]; \ No newline at end of file +]; diff --git a/Missionframework/arsenal_presets/gm_east.sqf b/Missionframework/arsenal_presets/gm_east.sqf index 04058f272..fcc1c7d9a 100644 --- a/Missionframework/arsenal_presets/gm_east.sqf +++ b/Missionframework/arsenal_presets/gm_east.sqf @@ -8,7 +8,7 @@ - None */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ // AK-74 "gm_mpiak74n_brn", "gm_mpiaks74nk_brn", @@ -32,7 +32,7 @@ GRLIB_arsenal_weapons = [ "gm_rpg7_prp_pgo7v" ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ // LP1 26.5mm "gm_1Rnd_265mm_flare_single_grn_gc", @@ -82,7 +82,7 @@ GRLIB_arsenal_magazines = [ "gm_mine_at_tm46" ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Uniforms "gm_gc_army_uniform_dress_80_gry", @@ -121,7 +121,7 @@ GRLIB_arsenal_items = [ "ItemRadio" ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "gm_gc_army_backpack_80_at_str", "gm_gc_army_backpack_80_lmg_str", "gm_gc_army_backpack_80_mgk_str", diff --git a/Missionframework/arsenal_presets/gm_west.sqf b/Missionframework/arsenal_presets/gm_west.sqf index 933c2fe0b..aef8705c0 100644 --- a/Missionframework/arsenal_presets/gm_west.sqf +++ b/Missionframework/arsenal_presets/gm_west.sqf @@ -10,7 +10,7 @@ - None */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ // G3A3 + G3A4 "gm_g3a3_oli", "gm_g3a4_oli", @@ -34,7 +34,7 @@ GRLIB_arsenal_weapons = [ "gm_pzf84_oli" ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ // G3A3 + G3A4 "gm_20rnd_762x51mm_b_t_dm21_g3_blk", "gm_20rnd_762x51mm_b_t_dm21a1_g3_blk", @@ -110,7 +110,7 @@ GRLIB_arsenal_magazines = [ "gm_mine_at_dm21" ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Uniforms "gm_ge_army_uniform_crew_80_oli", "gm_ge_army_uniform_soldier_80_oli", @@ -170,7 +170,7 @@ GRLIB_arsenal_items = [ "ItemRadio" ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "gm_ge_army_backpack_80_oli", "gm_ge_backpack_satchel_80_blk", "gm_ge_backpack_satchel_80_san" diff --git a/Missionframework/arsenal_presets/rhsusaf.sqf b/Missionframework/arsenal_presets/rhsusaf.sqf index 10bb3600c..45048caf3 100644 --- a/Missionframework/arsenal_presets/rhsusaf.sqf +++ b/Missionframework/arsenal_presets/rhsusaf.sqf @@ -1,6 +1,6 @@ /* RHS United States Armed Forces Arsenal Preset - Last Update: 2020-05-08 + Last Update: 2020-05-10 Needed: - RHSUSAF - https://steamcommunity.com/sharedfiles/filedetails/?id=843577117 @@ -11,7 +11,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ "rhs_weap_fgm148", // FGM-148 Javelin "rhs_weap_fim92", // FIM-92F "rhs_weap_hk416d10_LMT_d", // HK416 D10 (SOPMOD Stock/Desert) @@ -134,7 +134,7 @@ GRLIB_arsenal_weapons = [ "rhsusf_weap_MP7A2" // MP7A2 ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ "rhs_fgm148_magazine_AT", // Javelin AT "rhs_fgm172a_magazine_AT", // FGM172A SRAW "rhs_fgm172b_magazine_MPV", // FGM172B SRAW-MPV @@ -356,7 +356,7 @@ GRLIB_arsenal_magazines = [ "TrainingMine_Mag" // Training Mine ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Uniforms "rhs_uniform_abu", // Airman Battle Uniform "rhs_uniform_acu_ocp", // Army Combat Uniform (OCP) @@ -947,7 +947,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "B_rhsusf_B_BACKPACK", // Eagle A-III OCP (Raven) "rhsusf_assault_eagleaiii_coy", // Eagle A-III Coyote "rhsusf_assault_eagleaiii_ocp", // Eagle A-III OEF-CP diff --git a/Missionframework/arsenal_presets/sfp.sqf b/Missionframework/arsenal_presets/sfp.sqf index 970ebcdb4..a58511817 100644 --- a/Missionframework/arsenal_presets/sfp.sqf +++ b/Missionframework/arsenal_presets/sfp.sqf @@ -1,6 +1,6 @@ /* Swedish Forces Pack Arsenal Preset - Last Update: 2020-05-03 + Last Update: 2020-05-10 Needed: - SFP: Swedish Forces Pack - https://steamcommunity.com/sharedfiles/filedetails/?id=826911897 @@ -11,7 +11,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ "sfp_20Rnd_762x51_ak4", // Ak 4C "sfp_ag90_base", // Ag 90B "sfp_ak4_m203", // Ak 4 M203 @@ -60,7 +60,7 @@ GRLIB_arsenal_weapons = [ "sfp_signpist50" // Signalpistol 80 (Flare) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ "sfp_100Rnd_762x51_ksp58", // 7.62mm 100Rnd "sfp_10Rnd_127x99_ag90", // 12.7mm 10Rnd Ag90 Mag "sfp_12Gauge_8rd_Pellets", // 12 Gauge 8 Rnd Buckshopt @@ -165,7 +165,7 @@ GRLIB_arsenal_magazines = [ "UGL_FlareYellow_F" // Flare Round (Yellow) ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Uniforms "sfp_drysuit", // Dry Suit "sfp_ghillie_desert_uniform", // Ghillie suit (Desert) @@ -476,7 +476,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "sfp_backpack_grg_loader", // GRG Loader (Backpack) "sfp_backpack_lk35", // LK 35 "sfp_backpack_sjvv9", // Medic Bag diff --git a/Missionframework/arsenal_presets/unsung.sqf b/Missionframework/arsenal_presets/unsung.sqf index ffb689239..82fc5d1f9 100644 --- a/Missionframework/arsenal_presets/unsung.sqf +++ b/Missionframework/arsenal_presets/unsung.sqf @@ -1,6 +1,6 @@ /* The Unsung Vietnam War Mod US Arsenal Preset - Last Update: 2020-05-06 + Last Update: 2020-05-10 Needed: - Unsung - https://steamcommunity.com/sharedfiles/filedetails/?id=943001311 @@ -11,7 +11,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenal_weapons = [ "uns_357m", // Colt Lawman Mk.III (.357) "uns_38spec", // S/W Model 10 (.38 Spec) "uns_ak47_49", // AK-47/49 @@ -186,7 +186,7 @@ GRLIB_arsenal_weapons = [ "uns_xm177e2" // XM-177E2 ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenal_magazines = [ "Mine", // Mine Type 59 (Anti Tank) "MineE", // Mine TM57 (Anti Vehicle) "PipeBomb", // Explosive Charge @@ -479,7 +479,7 @@ GRLIB_arsenal_magazines = [ "TrainingMine_Mag" // Training Mine ]; -GRLIB_arsenal_items = [ +KPLIB_arsenal_items = [ // Uniforms "UNS_ARMY_BDU_101stAB1stlt", // ARMY BDU_101stAB 1stLT "UNS_ARMY_BDU_101stAB1stsgt", // ARMY BDU_101stAB 1stSGT @@ -1820,7 +1820,7 @@ GRLIB_arsenal_items = [ "tf_microdagr" // MicroDAGR Radio Programmer ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenal_backpacks = [ "UNS_Alice_1", // Alice Pack 1 "UNS_Alice_2", // Alice Pack 2 "UNS_Alice_3", // Alice Pack 3 diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index c4aa0f4a6..bb1d7402b 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -2,7 +2,7 @@ File: fn_addActionsPlayer.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-04-28 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -48,7 +48,7 @@ _player addAction [ true, "", " - GRLIB_halo_param > 0 + KPLIB_halo_param > 0 && {isNull (objectParent _originalTarget)} && {alive _originalTarget} && { @@ -62,7 +62,7 @@ _player addAction [ // Redeploy _player addAction [ ["", localize "STR_DEPLOY_ACTION", ""] joinString "", - {GRLIB_force_redeploy = true;}, + {KPLIB_force_redeploy = true;}, nil, -720, false, @@ -132,7 +132,7 @@ _player addAction [ " isNull (objectParent _originalTarget) && {alive _originalTarget} - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (GRLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} && { _originalTarget getVariable ['KPLIB_hasDirectAccess', false] || {[3] call KPLIB_fnc_hasPermission} @@ -267,7 +267,7 @@ _player addAction [ "", " alive _originalTarget - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (GRLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} && {build_confirmed isEqualTo 0} " ]; @@ -287,7 +287,7 @@ _player addAction [ && {alive _originalTarget} && {!(KP_liberation_production isEqualTo [])} && { - _originalTarget getVariable ['KPLIB_fobDist', 99999] < (GRLIB_fob_range * 0.8) + _originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8) || {!(_originalTarget getVariable ['KPLIB_nearProd', []] isEqualTo [])} } && {build_confirmed isEqualTo 0} @@ -308,9 +308,9 @@ _player addAction [ && {_originalTarget getVariable ['KPLIB_hasDirectAccess', false]} && {isNull (objectParent _originalTarget)} && {alive _originalTarget} - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (GRLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} && {!( - GRLIB_all_fobs isEqualTo [] + KPLIB_all_fobs isEqualTo [] || KP_liberation_production isEqualTo [] )} && {build_confirmed isEqualTo 0} @@ -327,7 +327,7 @@ _player addAction [ true, "", " - GRLIB_permissions_param + KPLIB_permissions_param && {_originalTarget getVariable ['KPLIB_hasDirectAccess', false]} && {alive _originalTarget} && {build_confirmed isEqualTo 0} @@ -355,7 +355,7 @@ if (player == ([] call KPLIB_fnc_getCommander)) then { // Create FOB clearance _player addAction [ ["", localize "STR_CLEARANCE_ACTION", ""] joinString "", - {[player getVariable ["KPLIB_fobPos", [0, 0, 0]], GRLIB_fob_range * 0.9, true] call KPLIB_fnc_createClearanceConfirm;}, + {[player getVariable ["KPLIB_fobPos", [0, 0, 0]], KPLIB_fob_range * 0.9, true] call KPLIB_fnc_createClearanceConfirm;}, nil, -850, false, @@ -365,7 +365,7 @@ _player addAction [ _originalTarget getVariable ['KPLIB_hasDirectAccess', false] && {isNull (objectParent _originalTarget)} && {alive _originalTarget} - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (GRLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} && {build_confirmed isEqualTo 0} " ]; diff --git a/Missionframework/functions/fn_doSave.sqf b/Missionframework/functions/fn_doSave.sqf index 8b09a9ce0..914971a65 100644 --- a/Missionframework/functions/fn_doSave.sqf +++ b/Missionframework/functions/fn_doSave.sqf @@ -2,7 +2,7 @@ File: fn_doSave.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-29 - Last Update: 2020-05-08 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -32,7 +32,7 @@ kp_liberation_saving = true; private _saveData = [] call KPLIB_fnc_getSaveData; // Write data in the server profileNamespace -profileNamespace setVariable [GRLIB_save_key, str _saveData]; +profileNamespace setVariable [KPLIB_save_key, str _saveData]; saveProfileNamespace; kp_liberation_saving = false; diff --git a/Missionframework/functions/fn_forceBluforCrew.sqf b/Missionframework/functions/fn_forceBluforCrew.sqf index 4fe1c3807..2c28209d3 100644 --- a/Missionframework/functions/fn_forceBluforCrew.sqf +++ b/Missionframework/functions/fn_forceBluforCrew.sqf @@ -2,7 +2,7 @@ File: fn_forceBluforCrew.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2019-12-04 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -26,10 +26,10 @@ if (isNull _veh) exitWith {["Null object given"] call BIS_fnc_error; false}; private _grp = createVehicleCrew _veh; // If the config crew isn't the correct side, replace it with the crew classnames from the preset -if ((side _grp) != GRLIB_side_friendly) then { +if ((side _grp) != KPLIB_side_friendly) then { {deleteVehicle _x} forEach (units _grp); - _grp = createGroup [GRLIB_side_friendly, true]; + _grp = createGroup [KPLIB_side_friendly, true]; while {count units _grp < 3} do { [crewman_classname, getPos _veh, _grp] call KPLIB_fnc_createManagedUnit; }; diff --git a/Missionframework/functions/fn_getBluforRatio.sqf b/Missionframework/functions/fn_getBluforRatio.sqf index be9723b35..ce0f51508 100644 --- a/Missionframework/functions/fn_getBluforRatio.sqf +++ b/Missionframework/functions/fn_getBluforRatio.sqf @@ -2,7 +2,7 @@ File: fn_getBluforRatio.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2019-12-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,9 +21,9 @@ params [ if (_sector isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_error; -1}; -private _range = [GRLIB_capture_size, GRLIB_capture_size * 1.4] select (_sector in sectors_bigtown); -private _red = [(markerPos _sector), _range, GRLIB_side_enemy] call KPLIB_fnc_getUnitsCount; -private _blue = [(markerPos _sector), _range, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _range = [KPLIB_capture_size, KPLIB_capture_size * 1.4] select (_sector in sectors_bigtown); +private _red = [(markerPos _sector), _range, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount; +private _blue = [(markerPos _sector), _range, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_blue > 0 || _red > 0) then { _blue / (_blue + _red) diff --git a/Missionframework/functions/fn_getFobName.sqf b/Missionframework/functions/fn_getFobName.sqf index 449f55040..749d4af6d 100644 --- a/Missionframework/functions/fn_getFobName.sqf +++ b/Missionframework/functions/fn_getFobName.sqf @@ -2,7 +2,7 @@ File: fn_getFobName.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-04-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,4 +19,4 @@ params [ ["_fob", [0, 0, 0], [[]], [2, 3]] ]; -military_alphabet param [GRLIB_all_fobs findIf {(_x distance2d _fob) < 100}, ""] +military_alphabet param [KPLIB_all_fobs findIf {(_x distance2d _fob) < 100}, ""] diff --git a/Missionframework/functions/fn_getLocalCap.sqf b/Missionframework/functions/fn_getLocalCap.sqf index 924b485c5..a5c8ef3e8 100644 --- a/Missionframework/functions/fn_getLocalCap.sqf +++ b/Missionframework/functions/fn_getLocalCap.sqf @@ -2,7 +2,7 @@ File: fn_getLocalCap.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,4 +15,4 @@ Blufor unit cap [NUMBER] */ -(round (infantry_cap / 2)) min GRLIB_blufor_cap +(round (infantry_cap / 2)) min KPLIB_blufor_cap diff --git a/Missionframework/functions/fn_getNearestBluforObjective.sqf b/Missionframework/functions/fn_getNearestBluforObjective.sqf index f148d1632..81b244718 100644 --- a/Missionframework/functions/fn_getNearestBluforObjective.sqf +++ b/Missionframework/functions/fn_getNearestBluforObjective.sqf @@ -2,7 +2,7 @@ File: fn_getNearestBluforObjective.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-11 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,9 +19,9 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]] ]; -if (GRLIB_all_fobs isEqualTo [] && blufor_sectors isEqualTo []) exitWith {[]}; +if (KPLIB_all_fobs isEqualTo [] && blufor_sectors isEqualTo []) exitWith {[]}; -private _objectives = GRLIB_all_fobs + (blufor_sectors apply {markerPos _x}); +private _objectives = KPLIB_all_fobs + (blufor_sectors apply {markerPos _x}); _objectives = _objectives apply {[_x distance2d _pos, _x]}; _objectives sort true; diff --git a/Missionframework/functions/fn_getNearestFob.sqf b/Missionframework/functions/fn_getNearestFob.sqf index 6280db5a4..a1a0b4972 100644 --- a/Missionframework/functions/fn_getNearestFob.sqf +++ b/Missionframework/functions/fn_getNearestFob.sqf @@ -2,7 +2,7 @@ File: fn_getNearestFob.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,8 +19,8 @@ params [ ["_pos", getPos player, [[]], [2, 3]] ]; -if !(GRLIB_all_fobs isEqualTo []) then { - private _fobs = GRLIB_all_fobs apply {[_pos distance2d _x, _x]}; +if !(KPLIB_all_fobs isEqualTo []) then { + private _fobs = KPLIB_all_fobs apply {[_pos distance2d _x, _x]}; _fobs sort true; (_fobs select 0) select 1 } else { diff --git a/Missionframework/functions/fn_getNearestTower.sqf b/Missionframework/functions/fn_getNearestTower.sqf index ceab50787..0ba2bb7f0 100644 --- a/Missionframework/functions/fn_getNearestTower.sqf +++ b/Missionframework/functions/fn_getNearestTower.sqf @@ -2,7 +2,7 @@ File: fn_getNearestTower.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-06 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -10,7 +10,7 @@ Parameter(s): _pos - Position from which to look for the nearest radio tower [POSITION, defaults to [0, 0, 0]] - _side - Side of owner for nearest radio tower [SIDE, defaults to GRLIB_side_enemy] + _side - Side of owner for nearest radio tower [SIDE, defaults to KPLIB_side_enemy] _radius - Radius in which to look for the nearest radio tower [NUMBER, defaults to 1000] Returns: @@ -19,11 +19,11 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]], - ["_side", GRLIB_side_enemy, [sideEmpty]], + ["_side", KPLIB_side_enemy, [sideEmpty]], ["_radius", 1000, [0]] ]; -private _towers = [sectors_tower select {_x in blufor_sectors}, sectors_tower - blufor_sectors] select (_side == GRLIB_side_enemy); +private _towers = [sectors_tower select {_x in blufor_sectors}, sectors_tower - blufor_sectors] select (_side == KPLIB_side_enemy); _towers = (_towers apply {[(markerPos _x) distance2d _pos, _x]}) select {(_x select 0) <= _radius}; _towers sort true; diff --git a/Missionframework/functions/fn_getOpforCap.sqf b/Missionframework/functions/fn_getOpforCap.sqf index 0e8aef58e..d9fd6cff1 100644 --- a/Missionframework/functions/fn_getOpforCap.sqf +++ b/Missionframework/functions/fn_getOpforCap.sqf @@ -2,7 +2,7 @@ File: fn_getOpforCap.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-06 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,4 +15,4 @@ Total opfor units [NUMBER] */ -GRLIB_side_enemy countSide allUnits +KPLIB_side_enemy countSide allUnits diff --git a/Missionframework/functions/fn_getOpforFactor.sqf b/Missionframework/functions/fn_getOpforFactor.sqf index f67d90936..ba18026e8 100644 --- a/Missionframework/functions/fn_getOpforFactor.sqf +++ b/Missionframework/functions/fn_getOpforFactor.sqf @@ -2,7 +2,7 @@ File: fn_getOpforFactor.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2019-11-25 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,8 +15,8 @@ Opfor factor [NUMBER] */ -if !(GRLIB_adaptive_opfor) exitWith {1}; +if !(KPLIB_adaptive_opfor) exitWith {1}; -private _bluforcount = (0.2 * (GRLIB_side_friendly countSide allUnits)) + ([] call KPLIB_fnc_getPlayerCount); +private _bluforcount = (0.2 * (KPLIB_side_friendly countSide allUnits)) + ([] call KPLIB_fnc_getPlayerCount); (0.5 + (_bluforcount / 25.0)) min 1 diff --git a/Missionframework/functions/fn_getOpforSpawnPoint.sqf b/Missionframework/functions/fn_getOpforSpawnPoint.sqf index 6b90b118a..0a983dc62 100644 --- a/Missionframework/functions/fn_getOpforSpawnPoint.sqf +++ b/Missionframework/functions/fn_getOpforSpawnPoint.sqf @@ -2,7 +2,7 @@ File: fn_getOpforSpawnPoint.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-04-17 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -53,7 +53,7 @@ private ["_valid", "_current", "_distances"]; if (_valid) then { // Fetch distances to FOBs - _distances = (GRLIB_all_fobs apply {(markerPos _current) distance2d _x}) select {_x < _max}; + _distances = (KPLIB_all_fobs apply {(markerPos _current) distance2d _x}) select {_x < _max}; // Fetch distances to blufor sectors _distances append ((blufor_sectors apply {(markerPos _current) distance2d (markerPos _x)}) select {_x < _max}); @@ -79,7 +79,7 @@ private ["_valid", "_current", "_distances"]; // Make sure that there is no blufor unit inside min dist to spawn if (_valid) then { - if (([markerpos _current, _min, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0) then { + if (([markerpos _current, _min, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0) then { _valid = false; }; }; diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index cc580acff..044e0e4b6 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -2,7 +2,7 @@ File: fn_getSaveData.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-29 - Last Update: 2020-05-03 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -26,7 +26,7 @@ private _allCrates = []; // Get all blufor groups private _allBlueGroups = allGroups select { - (side _x == GRLIB_side_friendly) && // Only blufor groups + (side _x == KPLIB_side_friendly) && // Only blufor groups {isNull objectParent (leader _x)} && // Make sure it's an infantry group {!(((units _x) select {alive _x}) isEqualTo [])} // At least one unit has to be alive }; @@ -35,7 +35,7 @@ private _allBlueGroups = allGroups select { private ["_fobPos", "_fobObjects", "_grpUnits", "_fobMines"]; { _fobPos = _x; - _fobObjects = (_fobPos nearObjects (GRLIB_fob_range * 1.2)) select { + _fobObjects = (_fobPos nearObjects (KPLIB_fob_range * 1.2)) select { ((toLower (typeof _x)) in KPLIB_classnamesToSave) && // Exclude classnames which are not in the presets {alive _x} && // Exclude dead or broken objects {getObjectType _x >= 8} && // Exclude preplaced terrain objects @@ -56,17 +56,17 @@ private ["_fobPos", "_fobObjects", "_grpUnits", "_fobMines"]; _grpUnits = (units _x) select {!(isPlayer _x) && (alive _x)}; // Add to save array _aiGroups pushBack [getPosATL (leader _x), (_grpUnits apply {typeOf _x})]; - } forEach (_allBlueGroups select {(_fobPos distance2D (leader _x)) < (GRLIB_fob_range * 1.2)}); + } forEach (_allBlueGroups select {(_fobPos distance2D (leader _x)) < (KPLIB_fob_range * 1.2)}); // Save all mines around FOB - _fobMines = allMines inAreaArray [_fobPos, GRLIB_fob_range * 1.2, GRLIB_fob_range * 1.2]; + _fobMines = allMines inAreaArray [_fobPos, KPLIB_fob_range * 1.2, KPLIB_fob_range * 1.2]; _allMines append (_fobMines apply {[ getPosWorld _x, [vectorDirVisual _x, vectorUpVisual _x], typeOf _x, - _x mineDetectedBy GRLIB_side_friendly + _x mineDetectedBy KPLIB_side_friendly ]}); -} forEach GRLIB_all_fobs; +} forEach KPLIB_all_fobs; // Save all fetched objects private ["_savedPos", "_savedVecDir", "_savedVecUp", "_class", "_hasCrew"]; @@ -125,7 +125,7 @@ private ["_supplyValue", "_ammoValue", "_fuelValue"]; // Save crates at blufor sectors which spawn crates on activation { _allCrates append ( - ((nearestObjects [markerPos _x, KPLIB_crates, GRLIB_capture_size]) select {isNull attachedTo _x}) apply { + ((nearestObjects [markerPos _x, KPLIB_crates, KPLIB_capture_size]) select {isNull attachedTo _x}) apply { [typeOf _x, _x getVariable ["KP_liberation_crate_value", 0], getPosATL _x] } ); @@ -192,9 +192,9 @@ private _weights = [ _aiGroups, blufor_sectors, combat_readiness, - GRLIB_all_fobs, - GRLIB_permissions, - GRLIB_vehicle_to_military_base_links, + KPLIB_all_fobs, + KPLIB_permissions, + KPLIB_vehicle_to_military_base_links, KP_liberation_civ_rep, KP_liberation_clearances, KP_liberation_guerilla_strength, diff --git a/Missionframework/functions/fn_getSectorOwnership.sqf b/Missionframework/functions/fn_getSectorOwnership.sqf index ff7e33eee..55561adc4 100644 --- a/Missionframework/functions/fn_getSectorOwnership.sqf +++ b/Missionframework/functions/fn_getSectorOwnership.sqf @@ -2,7 +2,7 @@ File: fn_getSectorOwnership.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-02 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -10,7 +10,7 @@ Parameter(s): _pos - Position to get owner [POSITION, defaults to [0, 0, 0]] - _radius - Radius to count units [NUMBER, defaults to GRLIB_capture_size] + _radius - Radius to count units [NUMBER, defaults to KPLIB_capture_size] Returns: Owner of the position [SIDE] @@ -18,22 +18,22 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]], - ["_radius", GRLIB_capture_size, [0]] + ["_radius", KPLIB_capture_size, [0]] ]; private _capCount = 3; private _capRatio = 0.85; private _capRatioMin = 0.51; -private _blufor = [_pos, _radius, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; -private _opfor = [_pos, _radius, GRLIB_side_enemy] call KPLIB_fnc_getUnitsCount; +private _blufor = [_pos, _radius, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _opfor = [_pos, _radius, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount; private _ratio = 0; if (_blufor + _opfor != 0) then { _ratio = _blufor / (_blufor + _opfor); }; -if (_blufor > 0 && {(_opfor <= _capCount && _ratio > _capRatioMin) || _ratio > _capRatio}) exitWith {GRLIB_side_friendly}; -if (_blufor == 0 && _opfor > _capCount) exitWith {GRLIB_side_enemy}; -if (_blufor == 0 && _opfor <= _capCount) exitWith {GRLIB_side_civilian}; +if (_blufor > 0 && {(_opfor <= _capCount && _ratio > _capRatioMin) || _ratio > _capRatio}) exitWith {KPLIB_side_friendly}; +if (_blufor == 0 && _opfor > _capCount) exitWith {KPLIB_side_enemy}; +if (_blufor == 0 && _opfor <= _capCount) exitWith {KPLIB_side_civilian}; -GRLIB_side_resistance +KPLIB_side_resistance diff --git a/Missionframework/functions/fn_getSectorRange.sqf b/Missionframework/functions/fn_getSectorRange.sqf index 657441716..f1ce1a86a 100644 --- a/Missionframework/functions/fn_getSectorRange.sqf +++ b/Missionframework/functions/fn_getSectorRange.sqf @@ -2,7 +2,7 @@ File: fn_getSectorRange.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2019-12-07 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -20,6 +20,6 @@ params [ ]; -if (_unitCount < (GRLIB_sector_cap / 2)) exitWith {GRLIB_sector_size}; -if (_unitCount <= GRLIB_sector_cap) exitWith {GRLIB_sector_size - (GRLIB_sector_size * 0.5 * ((_unitCount / GRLIB_sector_cap) - 0.5))}; -GRLIB_sector_size * 0.75 +if (_unitCount < (KPLIB_sector_cap / 2)) exitWith {KPLIB_sector_size}; +if (_unitCount <= KPLIB_sector_cap) exitWith {KPLIB_sector_size - (KPLIB_sector_size * 0.5 * ((_unitCount / KPLIB_sector_cap) - 0.5))}; +KPLIB_sector_size * 0.75 diff --git a/Missionframework/functions/fn_getSquadComp.sqf b/Missionframework/functions/fn_getSquadComp.sqf index 9ade330f7..bf945ba6f 100644 --- a/Missionframework/functions/fn_getSquadComp.sqf +++ b/Missionframework/functions/fn_getSquadComp.sqf @@ -2,7 +2,7 @@ File: fn_getSquadComp.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-04-24 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -51,7 +51,7 @@ if (_type == "army") then { }; } else { private _multiplier = 1; - if (GRLIB_unitcap < 1) then {_multiplier = GRLIB_unitcap;}; + if (KPLIB_unitcap < 1) then {_multiplier = KPLIB_unitcap;}; while {count _squadcomp < (10 * _multiplier)} do {_squadcomp pushback (selectRandom militia_squad)}; }; diff --git a/Missionframework/functions/fn_getUnitsCount.sqf b/Missionframework/functions/fn_getUnitsCount.sqf index e33f9f27b..e24a3b32a 100644 --- a/Missionframework/functions/fn_getUnitsCount.sqf +++ b/Missionframework/functions/fn_getUnitsCount.sqf @@ -2,7 +2,7 @@ File: fn_getUnitsCount.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-08 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -11,7 +11,7 @@ Parameter(s): _pos - Description [POSITION, defaults to [0, 0, 0] _radius - Description [NUMBER, defaults to 100] - _side - Description [SIDE, defaults to GRLIB_side_friendly] + _side - Description [SIDE, defaults to KPLIB_side_friendly] Returns: Amount of units [NUMBER] @@ -20,7 +20,7 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]], ["_radius", 100, [0]], - ["_side", GRLIB_side_friendly, [sideEmpty]] + ["_side", KPLIB_side_friendly, [sideEmpty]] ]; private _amount = _side countSide ((_pos nearEntities ["Man", _radius]) select {!(captive _x) && ((getpos _x) select 2 < 500)}); diff --git a/Missionframework/functions/fn_hasPermission.sqf b/Missionframework/functions/fn_hasPermission.sqf index 6fcb9600c..602dd11c4 100644 --- a/Missionframework/functions/fn_hasPermission.sqf +++ b/Missionframework/functions/fn_hasPermission.sqf @@ -2,7 +2,7 @@ File: fn_hasPermission.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-04-09 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -20,19 +20,19 @@ params [ ]; if (_permission isEqualTo -1) exitWith {["No permission number given"] call BIS_fnc_error; false}; -if (!GRLIB_permissions_param) exitWith {true}; +if (!KPLIB_permissions_param) exitWith {true}; -if (isNil "GRLIB_last_permission_check_time") then {GRLIB_last_permission_check_time = -1000;}; +if (isNil "KPLIB_last_permission_check_time") then {KPLIB_last_permission_check_time = -1000;}; -if (time > GRLIB_last_permission_check_time + 10) then { - GRLIB_last_permission_check_time = time; - GRLIB_permissions_cache = ((GRLIB_permissions select {(_x select 0) isEqualTo (getPlayerUID player)}) select 0) select 2; +if (time > KPLIB_last_permission_check_time + 10) then { + KPLIB_last_permission_check_time = time; + KPLIB_permissions_cache = ((KPLIB_permissions select {(_x select 0) isEqualTo (getPlayerUID player)}) select 0) select 2; }; -if (isNil "GRLIB_permissions_cache") exitWith {false}; +if (isNil "KPLIB_permissions_cache") exitWith {false}; -if (count GRLIB_permissions_cache > _permission) then { - GRLIB_permissions_cache select _permission +if (count KPLIB_permissions_cache > _permission) then { + KPLIB_permissions_cache select _permission } else { false }; diff --git a/Missionframework/functions/fn_spawnBuildingSquad.sqf b/Missionframework/functions/fn_spawnBuildingSquad.sqf index 30ea8f193..eab49e40d 100644 --- a/Missionframework/functions/fn_spawnBuildingSquad.sqf +++ b/Missionframework/functions/fn_spawnBuildingSquad.sqf @@ -2,7 +2,7 @@ File: fn_spawnBuildingSquad.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-04-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -31,19 +31,19 @@ if (_sector isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_error; [ private _classnames = [[] call KPLIB_fnc_getSquadComp, militia_squad] select (_type == "militia"); // Adjust amount, if needed -if (_amount > floor ((count _positions) * GRLIB_defended_buildingpos_part)) then { - _amount = floor ((count _positions) * GRLIB_defended_buildingpos_part) +if (_amount > floor ((count _positions) * KPLIB_defended_buildingpos_part)) then { + _amount = floor ((count _positions) * KPLIB_defended_buildingpos_part) }; // Spawn units -private _grp = createGroup [GRLIB_side_enemy, true]; +private _grp = createGroup [KPLIB_side_enemy, true]; private _pos = markerPos _sector; private _unit = objNull; private _units = []; for "_i" from 1 to _amount do { // Create new group, if current group has 10 units if (count (units _grp) >= 10) then { - _grp = createGroup [GRLIB_side_enemy, true]; + _grp = createGroup [KPLIB_side_enemy, true]; }; _unit = [selectRandom _classnames, _pos, _grp] call KPLIB_fnc_createManagedUnit; diff --git a/Missionframework/functions/fn_spawnCivilians.sqf b/Missionframework/functions/fn_spawnCivilians.sqf index 67f2c2acd..597e25c76 100644 --- a/Missionframework/functions/fn_spawnCivilians.sqf +++ b/Missionframework/functions/fn_spawnCivilians.sqf @@ -2,7 +2,7 @@ File: fn_spawnCivilians.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-04-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,18 +25,18 @@ private _civs = []; private _sPos = markerPos _sector; // Amount and spread depending if capital or city/factory -private _amount = round ((3 + (floor (random 7))) * GRLIB_civilian_activity); +private _amount = round ((3 + (floor (random 7))) * KPLIB_civilian_activity); private _spread = 1; if (_sector in sectors_bigtown) then { _amount = _amount + 10; _spread = 2.5; }; -_amount = _amount * (sqrt (GRLIB_unitcap)); +_amount = _amount * (sqrt (KPLIB_unitcap)); // Spawn civilians private _grp = grpNull; for "_i" from 1 to _amount do { - _grp = createGroup [GRLIB_side_civilian, true]; + _grp = createGroup [KPLIB_side_civilian, true]; _civs pushBack ( [ diff --git a/Missionframework/functions/fn_spawnGuerillaGroup.sqf b/Missionframework/functions/fn_spawnGuerillaGroup.sqf index 6ebf552cc..2a189a1b6 100644 --- a/Missionframework/functions/fn_spawnGuerillaGroup.sqf +++ b/Missionframework/functions/fn_spawnGuerillaGroup.sqf @@ -2,7 +2,7 @@ File: fn_spawnGuerillaGroup.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-08 - Last Update: 2020-04-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -31,7 +31,7 @@ private _vests = missionNamespace getVariable ("KP_liberation_guerilla_vests_" + private _headgear = missionNamespace getVariable ("KP_liberation_guerilla_headgear_" + str _tier); // Spawn guerilla units -private _grp = createGroup [GRLIB_side_resistance, true]; +private _grp = createGroup [KPLIB_side_resistance, true]; private _unit = objNull; private _weapon = []; for "_i" from 1 to _amount do { diff --git a/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf b/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf index 7e85ff91e..0c8b9c30c 100644 --- a/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf +++ b/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf @@ -2,7 +2,7 @@ File: fn_spawnMilitaryPostSquad.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-04-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,14 +23,14 @@ if (_pos isEqualTo [0, 0, 0]) exitWith {["No or zero pos given"] call BIS_fnc_er // Get all military patrol towers near given position private _allPosts = ( - nearestObjects [_pos, ["Land_Cargo_Patrol_V1_F","Land_Cargo_Patrol_V2_F","Land_Cargo_Patrol_V3_F","Land_Cargo_Patrol_V4_F"], GRLIB_capture_size, true] + nearestObjects [_pos, ["Land_Cargo_Patrol_V1_F","Land_Cargo_Patrol_V2_F","Land_Cargo_Patrol_V3_F","Land_Cargo_Patrol_V4_F"], KPLIB_capture_size, true] ) select {alive _x}; // Exit if no patrol towers were found if (_allPosts isEqualTo []) exitWith {[]}; // Spawn units -private _grp = createGroup [GRLIB_side_enemy, true]; +private _grp = createGroup [KPLIB_side_enemy, true]; private _unit = objNull; private _units = []; { diff --git a/Missionframework/functions/fn_spawnMilitiaCrew.sqf b/Missionframework/functions/fn_spawnMilitiaCrew.sqf index 62b7ee4ec..32d67e20a 100644 --- a/Missionframework/functions/fn_spawnMilitiaCrew.sqf +++ b/Missionframework/functions/fn_spawnMilitiaCrew.sqf @@ -2,7 +2,7 @@ File: fn_spawnMilitiaCrew.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-04-05 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -22,7 +22,7 @@ params [ if (isNull _vehicle) exitWith {["Null object given"] call BIS_fnc_error; false}; // Spawn units -private _grp = createGroup [GRLIB_side_enemy, true]; +private _grp = createGroup [KPLIB_side_enemy, true]; private _units = []; for "_i" from 1 to 3 do { _units pushBack ([selectRandom militia_squad, getPos _vehicle, _grp] call KPLIB_fnc_createManagedUnit); diff --git a/Missionframework/functions/fn_spawnRegularSquad.sqf b/Missionframework/functions/fn_spawnRegularSquad.sqf index af514b6d7..432352715 100644 --- a/Missionframework/functions/fn_spawnRegularSquad.sqf +++ b/Missionframework/functions/fn_spawnRegularSquad.sqf @@ -2,7 +2,7 @@ File: fn_spawnRegularSquad.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-06 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -41,7 +41,7 @@ if (_spawnPos isEqualTo zeroPos) exitWith { // Spawn units of squad private _corrected_amount = round ((count _classnames) * ([] call KPLIB_fnc_getOpforFactor)); -private _grp = createGroup [GRLIB_side_enemy, true]; +private _grp = createGroup [KPLIB_side_enemy, true]; { if (_forEachIndex < _corrected_amount) then { [_x, _spawnPos, _grp] call KPLIB_fnc_createManagedUnit; diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index 40a184491..9a842ed52 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -2,7 +2,7 @@ File: fn_spawnVehicle.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-06 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -80,7 +80,7 @@ if (_classname in opfor_choppers) then { if (_classname in militia_vehicles) then { [_newvehicle] call KPLIB_fnc_spawnMilitiaCrew; } else { - private _grp = createGroup [GRLIB_side_enemy, true]; + private _grp = createGroup [KPLIB_side_enemy, true]; private _crew = units (createVehicleCrew _newvehicle); _crew joinSilent _grp; sleep 0.1; diff --git a/Missionframework/kp_objectInits.sqf b/Missionframework/kp_objectInits.sqf index 1ba6f00fe..e6365b5c0 100644 --- a/Missionframework/kp_objectInits.sqf +++ b/Missionframework/kp_objectInits.sqf @@ -122,7 +122,7 @@ KPLIB_objectInits = [ [ ["Man"], { - if (!(GRLIB_autodanger) && {(side _this) isEqualTo GRLIB_side_friendly}) then { + if (!(KPLIB_autodanger) && {(side _this) isEqualTo KPLIB_side_friendly}) then { _this disableAI "AUTOCOMBAT"; }; _this allowFleeing 0; diff --git a/Missionframework/onPlayerRespawn.sqf b/Missionframework/onPlayerRespawn.sqf index b7e5715d3..1bc1e7e01 100644 --- a/Missionframework/onPlayerRespawn.sqf +++ b/Missionframework/onPlayerRespawn.sqf @@ -1,6 +1,6 @@ params ["_newUnit", "_oldUnit"]; -if (isNil "GRLIB_respawn_loadout") then { +if (isNil "KPLIB_respawn_loadout") then { removeAllWeapons player; removeAllItems player; removeAllAssignedItems player; @@ -14,7 +14,7 @@ if (isNil "GRLIB_respawn_loadout") then { player linkItem "ItemRadio"; } else { sleep 4; - [player, GRLIB_respawn_loadout] call KPLIB_fnc_setLoadout; + [player, KPLIB_respawn_loadout] call KPLIB_fnc_setLoadout; }; [] call KPLIB_fnc_addActionsPlayer; diff --git a/Missionframework/presets/init_presets.sqf b/Missionframework/presets/init_presets.sqf index 5eafe1b0e..e73f62ced 100644 --- a/Missionframework/presets/init_presets.sqf +++ b/Missionframework/presets/init_presets.sqf @@ -110,7 +110,7 @@ squads_names = [ ]; // Classnames of objects which should be ignored when building -GRLIB_ignore_colisions_when_building = [ +KPLIB_ignore_colisions_when_building = [ "Land_HelipadSquare_F", "Land_TentHangar_V1_F", "Land_runway_edgelight", diff --git a/Missionframework/scripts/client/actions/do_recycle.sqf b/Missionframework/scripts/client/actions/do_recycle.sqf index 98bb09943..33c5d55cd 100644 --- a/Missionframework/scripts/client/actions/do_recycle.sqf +++ b/Missionframework/scripts/client/actions/do_recycle.sqf @@ -62,9 +62,9 @@ if ((toLower _type) in KPLIB_o_allVeh_classes) then { }; } else { private _objectinfo = ((light_vehicles + heavy_vehicles + air_vehicles + static_vehicles + support_vehicles + buildings) select {_type == (_x select 0)}) select 0; - _price_s = round ((_objectinfo select 1) * GRLIB_recycling_percentage * _suppMulti); - _price_a = round ((_objectinfo select 2) * GRLIB_recycling_percentage * _ammoMulti); - _price_f = round ((_objectinfo select 3) * GRLIB_recycling_percentage * _fuelMulti); + _price_s = round ((_objectinfo select 1) * KPLIB_recycling_percentage * _suppMulti); + _price_a = round ((_objectinfo select 2) * KPLIB_recycling_percentage * _ammoMulti); + _price_f = round ((_objectinfo select 3) * KPLIB_recycling_percentage * _fuelMulti); }; createDialog "liberation_recycle"; @@ -82,7 +82,7 @@ if (dialog) then {closeDialog 0}; if (dorecycle == 1 && !(isnull _vehToRecycle) && alive _vehToRecycle) then { if (!(KP_liberation_recycle_building_near) && ((_price_s + _price_a + _price_f) > 0)) exitWith {hint localize "STR_NORECBUILDING_ERROR";}; - private _storage_areas = (([] call KPLIB_fnc_getNearestFob) nearobjects (GRLIB_fob_range * 1.2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; + private _storage_areas = (([] call KPLIB_fnc_getNearestFob) nearobjects (KPLIB_fob_range * 1.2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; private _crateSum = (ceil (_price_s / 100)) + (ceil (_price_a / 100)) + (ceil (_price_f / 100)); private _spaceSum = 0; diff --git a/Missionframework/scripts/client/actions/do_repackage_fob.sqf b/Missionframework/scripts/client/actions/do_repackage_fob.sqf index 7ed8a8f53..ec009d87a 100644 --- a/Missionframework/scripts/client/actions/do_repackage_fob.sqf +++ b/Missionframework/scripts/client/actions/do_repackage_fob.sqf @@ -11,9 +11,9 @@ if (dorepackage > 0) then { private _fob = [] call KPLIB_fnc_getNearestFob; if !(_fob isEqualTo []) then { - GRLIB_all_fobs = GRLIB_all_fobs - [_fob]; + KPLIB_all_fobs = KPLIB_all_fobs - [_fob]; KP_liberation_clearances deleteAt (KP_liberation_clearances findIf {(_x select 0) isEqualTo _fob}); - publicVariable "GRLIB_all_fobs"; + publicVariable "KPLIB_all_fobs"; publicVariable "KP_liberation_clearances"; }; diff --git a/Missionframework/scripts/client/actions/intel_manager.sqf b/Missionframework/scripts/client/actions/intel_manager.sqf index 0624841ac..405fbe1e3 100644 --- a/Missionframework/scripts/client/actions/intel_manager.sqf +++ b/Missionframework/scripts/client/actions/intel_manager.sqf @@ -1,6 +1,6 @@ // TODO Remove this loop by adding the actions to the units/intel objects on spawn -waitUntil {!isNil "GRLIB_permissions"}; -waitUntil {!(GRLIB_permissions isEqualTo []) || !GRLIB_permissions_param}; +waitUntil {!isNil "KPLIB_permissions"}; +waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_permissions_param}; private _near_people = []; private _near_intel = []; @@ -12,14 +12,14 @@ while {true} do { _near_people = (getPosATL player) nearEntities [["Man"], 5]; _near_intel = (getPosATL player) nearEntities [KPLIB_intelObjectClasses, 5]; { - if ((captive _x) && !(_x in _actionned_captive_units) && !((side group _x) == GRLIB_side_friendly) && !(_x getVariable ["ACE_isUnconscious", false])) then { - _x addAction ["" + localize "STR_SECONDARY_CAPTURE" + "",{[_this select 0] join (group player);},"",-850,true,true,"","(vehicle player == player) && (side group _target != GRLIB_side_friendly) && (captive _target)"]; + if ((captive _x) && !(_x in _actionned_captive_units) && !((side group _x) == KPLIB_side_friendly) && !(_x getVariable ["ACE_isUnconscious", false])) then { + _x addAction ["" + localize "STR_SECONDARY_CAPTURE" + "",{[_this select 0] join (group player);},"",-850,true,true,"","(vehicle player == player) && (side group _target != KPLIB_side_friendly) && (captive _target)"]; _actionned_captive_units pushback _x; }; } forEach _near_people; { - if (!(alive _x) || ((player distance _x) > 5) || ((side group _x) == GRLIB_side_friendly)) then { + if (!(alive _x) || ((player distance _x) > 5) || ((side group _x) == KPLIB_side_friendly)) then { removeAllActions _x; _actionned_captive_units = _actionned_captive_units - [_x]; }; diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index 2b63b5996..df0aa28bd 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/Missionframework/scripts/client/actions/open_arsenal.sqf @@ -95,7 +95,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do { }; if ( respawn_loadout > 0 ) then { - GRLIB_respawn_loadout = [ player, ["repetitive"] ] call KPLIB_fnc_getLoadout; + KPLIB_respawn_loadout = [ player, ["repetitive"] ] call KPLIB_fnc_getLoadout; hint localize "STR_MAKE_RESPAWN_LOADOUT_HINT"; respawn_loadout = 0; }; diff --git a/Missionframework/scripts/client/actions/recycle_manager.sqf b/Missionframework/scripts/client/actions/recycle_manager.sqf index 3b5c85b0f..526fe288d 100644 --- a/Missionframework/scripts/client/actions/recycle_manager.sqf +++ b/Missionframework/scripts/client/actions/recycle_manager.sqf @@ -15,7 +15,7 @@ veh_action_distance = 10; ]; while {true} do { - waitUntil {sleep 2; player getVariable ['KPLIB_fobDist', 99999] < GRLIB_fob_range}; + waitUntil {sleep 2; player getVariable ['KPLIB_fobDist', 99999] < KPLIB_fob_range}; if ([4] call KPLIB_fnc_hasPermission) then { private _detected_vehicles = (getPos player) nearObjects veh_action_detect_distance select { @@ -32,7 +32,7 @@ while {true} do { || ((typeOf _x) == "rhsusf_mkvsoc") ) && _x distance2d startbase > 1000 && - (_x distance2d ([] call KPLIB_fnc_getNearestFob)) < GRLIB_fob_range && + (_x distance2d ([] call KPLIB_fnc_getNearestFob)) < KPLIB_fob_range && (getObjectType _x) >= 8 }; diff --git a/Missionframework/scripts/client/actions/unflip_manager.sqf b/Missionframework/scripts/client/actions/unflip_manager.sqf index 5dc90c479..226c15124 100644 --- a/Missionframework/scripts/client/actions/unflip_manager.sqf +++ b/Missionframework/scripts/client/actions/unflip_manager.sqf @@ -1,5 +1,5 @@ -waitUntil {!isNil "GRLIB_permissions"}; -waitUntil {!(GRLIB_permissions isEqualTo []) || !GRLIB_permissions_param}; +waitUntil {!isNil "KPLIB_permissions"}; +waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_permissions_param}; private [ "_unflippable_vehicles", "_detected_vehicles", "_next_vehicle", "_next_vehicle_already_in_list", "_idact_next" ]; diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index 10e90d196..7069920ce 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -22,16 +22,16 @@ while {true} do { { _next_truck = _x; - _truck_load = _next_truck getVariable ["GRLIB_ammo_truck_load", 0]; + _truck_load = _next_truck getVariable ["KPLIB_ammo_truck_load", 0]; if (!(_next_truck in _managed_trucks) && (_truck_load > 0)) then { _action_id = _next_truck addAction ["" + localize "STR_ACTION_UNLOAD_BOX" + "","scripts\client\ammoboxes\do_unload_truck.sqf","",-500,true,true,"","build_confirmed == 0 && (_this distance _target < 8) && (vehicle player == player)"]; - _next_truck setVariable [ "GRLIB_ammo_truck_action", _action_id, false ]; + _next_truck setVariable [ "KPLIB_ammo_truck_action", _action_id, false ]; _managed_trucks pushback _next_truck; }; if ((_next_truck in _managed_trucks) && _truck_load == 0) then { - _next_truck removeAction (_next_truck getVariable ["GRLIB_ammo_truck_action", -1]); + _next_truck removeAction (_next_truck getVariable ["KPLIB_ammo_truck_action", -1]); _managed_trucks = _managed_trucks - [_next_truck]; }; @@ -43,7 +43,7 @@ while {true} do { _next_truck = _x; if (!(_next_truck in _checked_trucks)) then { _managed_trucks = _managed_trucks - [_next_truck]; - _next_truck removeAction ( _next_truck getVariable ["GRLIB_ammo_truck_action", -1]); + _next_truck removeAction ( _next_truck getVariable ["KPLIB_ammo_truck_action", -1]); } } foreach _managed_trucks; @@ -57,7 +57,7 @@ while {true} do { _b_action_id2 = _next_box addAction ["" + localize "STR_ACTION_STORE_CRATE" + "",{[(_this select 0), (nearestObjects [player,KPLIB_storageBuildings,20]) select 0,true] call KPLIB_fnc_crateToStorage;},"",-502,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id3 = _next_box addAction ["" + localize "STR_ACTION_CRATE_VALUE" + "",{[_this select 0] call KPLIB_fnc_checkCrateValue;uiSleep 3; hint "";},"",-503,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id4 = _next_box addAction ["" + localize "STR_ACTION_CRATE_PUSH" + "",{(_this select 0) setPos ((_this select 0) getPos [1, (player getDir (_this select 0))]);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; - _next_box setVariable ["GRLIB_ammo_box_action", _b_action_id1, false]; + _next_box setVariable ["KPLIB_ammo_box_action", _b_action_id1, false]; _next_box setVariable ["KP_crate_store_action", _b_action_id2, false]; _next_box setVariable ["KP_crate_value_action", _b_action_id3, false]; _next_box setVariable ["KP_crate_push_action", _b_action_id4, false]; @@ -71,7 +71,7 @@ while {true} do { _next_box = _x; if (!(_next_box in _managed_boxes) || !( isNull attachedTo _next_box )) then { _managed_boxes = _managed_boxes - [_next_box]; - _next_box removeAction (_next_box getVariable ["GRLIB_ammo_box_action", -1]); + _next_box removeAction (_next_box getVariable ["KPLIB_ammo_box_action", -1]); _next_box removeAction (_next_box getVariable ["KP_crate_store_action", -1]); _next_box removeAction (_next_box getVariable ["KP_crate_value_action", -1]); _next_box removeAction (_next_box getVariable ["KP_crate_push_action", -1]); diff --git a/Missionframework/scripts/client/ammoboxes/do_load_box.sqf b/Missionframework/scripts/client/ammoboxes/do_load_box.sqf index 54d16c61e..2fa17c22f 100644 --- a/Missionframework/scripts/client/ammoboxes/do_load_box.sqf +++ b/Missionframework/scripts/client/ammoboxes/do_load_box.sqf @@ -18,12 +18,12 @@ _truck_to_load = objNull; } foreach KPLIB_transportConfigs; if ( isNull _truck_to_load ) then { - _truck_load = _next_truck getVariable ["GRLIB_ammo_truck_load", 0]; + _truck_load = _next_truck getVariable ["KPLIB_ammo_truck_load", 0]; if ( _truck_load < _maxload ) then { _truck_to_load = _next_truck; _ammobox attachTo [ _truck_to_load, _offsets select _truck_load ]; [_ammobox, false] remoteExec ["enableRopeAttach"]; - _truck_to_load setVariable ["GRLIB_ammo_truck_load", _truck_load + 1, true]; + _truck_to_load setVariable ["KPLIB_ammo_truck_load", _truck_load + 1, true]; if ( !isDedicated ) then { hint localize "STR_BOX_LOADED"; }; diff --git a/Missionframework/scripts/client/ammoboxes/do_unload_truck.sqf b/Missionframework/scripts/client/ammoboxes/do_unload_truck.sqf index 9a744a873..d46266ec9 100644 --- a/Missionframework/scripts/client/ammoboxes/do_unload_truck.sqf +++ b/Missionframework/scripts/client/ammoboxes/do_unload_truck.sqf @@ -7,8 +7,8 @@ _offset = 0; if ( _x select 0 == typeof _truck_to_unload ) then { _offset = _x select 1; }; } foreach KPLIB_transportConfigs; -if ( _truck_to_unload getVariable ["GRLIB_ammo_truck_load", 0] > 0 ) then { - _truck_to_unload setVariable ["GRLIB_ammo_truck_load", 0, true]; +if ( _truck_to_unload getVariable ["KPLIB_ammo_truck_load", 0] > 0 ) then { + _truck_to_unload setVariable ["KPLIB_ammo_truck_load", 0, true]; [_truck_to_unload, false] remoteExec ["KPLIB_fnc_protectObject"]; { diff --git a/Missionframework/scripts/client/build/build_overlay.sqf b/Missionframework/scripts/client/build/build_overlay.sqf index d7c1604c9..a09075007 100644 --- a/Missionframework/scripts/client/build/build_overlay.sqf +++ b/Missionframework/scripts/client/build/build_overlay.sqf @@ -1,18 +1,18 @@ -GRLIB_conflicting_objects = []; -GRLIB_buildoverlay_icon = "\A3\ui_f\data\map\markers\handdrawn\objective_CA.paa"; -GRLIB_buildoverlay_color = [ 1, 0, 0, 1 ]; -GRLIB_buildoverlay_cfg = configFile >> "cfgVehicles"; +KPLIB_conflicting_objects = []; +KPLIB_buildoverlay_icon = "\A3\ui_f\data\map\markers\handdrawn\objective_CA.paa"; +KPLIB_buildoverlay_color = [ 1, 0, 0, 1 ]; +KPLIB_buildoverlay_cfg = configFile >> "cfgVehicles"; ["build_overlay", "onEachFrame", { if ( build_confirmed == 1 ) then { - if ( count GRLIB_conflicting_objects > 0 ) then { + if ( count KPLIB_conflicting_objects > 0 ) then { { if ( alive _x ) then { - drawIcon3D [ GRLIB_buildoverlay_icon, GRLIB_buildoverlay_color, [ (getpos _x) select 0, (getpos _x) select 1, 1.5], - 1, 1, 0, format [ "%1", getText (GRLIB_buildoverlay_cfg >> typeof _x >> "displayName") ], 2, 0.04, "puristaMedium"]; + drawIcon3D [ KPLIB_buildoverlay_icon, KPLIB_buildoverlay_color, [ (getpos _x) select 0, (getpos _x) select 1, 1.5], + 1, 1, 0, format [ "%1", getText (KPLIB_buildoverlay_cfg >> typeof _x >> "displayName") ], 2, 0.04, "puristaMedium"]; }; - } foreach GRLIB_conflicting_objects; + } foreach KPLIB_conflicting_objects; }; }; }] call BIS_fnc_addStackedEventHandler; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index f76a65f80..92443259d 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -3,7 +3,7 @@ private [ "_maxdist", "_truepos", "_built_object_remote", "_pos", "_grp", "_classname", "_idx", "_unitrank", "_posfob", "_ghost_spot", "_vehicle", "_dist", "_actualdir", "_near_objects", "_near_objects_25", "_debug_colisions" ]; build_confirmed = 0; -_maxdist = GRLIB_fob_range; +_maxdist = KPLIB_fob_range; _truepos = []; _debug_colisions = false; KP_vector = true; @@ -40,7 +40,7 @@ while { true } do { _price_f = ((KPLIB_buildList select buildtype) select buildindex) select 3; _nearfob = [] call KPLIB_fnc_getNearestFob; - _storage_areas = (_nearfob nearobjects (GRLIB_fob_range * 2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; + _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; [_price_s, _price_a, _price_f, _classname, buildtype, _storage_areas] remoteExec ["build_remote_call",2]; }; @@ -49,14 +49,14 @@ while { true } do { _pos = [(getpos player select 0) + 1,(getpos player select 1) + 1, 0]; _grp = group player; if ( manned ) then { - _grp = createGroup GRLIB_side_friendly; + _grp = createGroup KPLIB_side_friendly; }; _classname createUnit [_pos, _grp,"this addMPEventHandler [""MPKilled"", {_this spawn kill_manager}]", 0.5, "private"]; build_confirmed = 0; } else { if ( buildtype == 8 ) then { _pos = [(getpos player select 0) + 1,(getpos player select 1) + 1, 0]; - _grp = createGroup GRLIB_side_friendly; + _grp = createGroup KPLIB_side_friendly; _grp setGroupId [format ["%1 %2",squads_names select buildindex, groupId _grp]]; _idx = 0; { @@ -84,7 +84,7 @@ while { true } do { _idactplacebis = -1; _idactvector = -1; if (buildtype != 99 ) then { - _idactcancel = player addAction ["" + localize "STR_CANCEL" + " ",{build_confirmed = 3; GRLIB_ui_notif = ""; hint localize "STR_CANCEL_HINT";},"",-725,false,true,"","build_confirmed == 1"]; + _idactcancel = player addAction ["" + localize "STR_CANCEL" + " ",{build_confirmed = 3; KPLIB_ui_notif = ""; hint localize "STR_CANCEL_HINT";},"",-725,false,true,"","build_confirmed == 1"]; }; if (buildtype == 6 ) then { _idactplacebis = player addAction ["" + localize "STR_PLACEMENT_BIS" + " ",{build_confirmed = 2; repeatbuild = true; hint localize "STR_CONFIRM_HINT";},"",-785,false,false,"","build_invalid == 0 && build_confirmed == 1"]; @@ -147,7 +147,7 @@ while { true } do { if !(buildtype isEqualTo 99) then { { - _x setPos (_posfob getPos [GRLIB_fob_range, 10 * _forEachIndex]) + _x setPos (_posfob getPos [KPLIB_fob_range, 10 * _forEachIndex]) } forEach _fob_spheres; }; @@ -171,7 +171,7 @@ while { true } do { private _remove_objects = []; { private _typeOfX = typeOf _x; - if ((_x isKindOf "Animal") || (_typeOfX in GRLIB_ignore_colisions_when_building) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { + if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_ignore_colisions_when_building) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { _remove_objects pushback _x; }; } foreach _near_objects; @@ -179,7 +179,7 @@ while { true } do { private _remove_objects_25 = []; { private _typeOfX = typeOf _x; - if ((_x isKindOf "Animal") || (_typeOfX in GRLIB_ignore_colisions_when_building) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { + if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_ignore_colisions_when_building) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { _remove_objects_25 pushback _x; }; } foreach _near_objects_25; @@ -198,9 +198,9 @@ while { true } do { }; if ( count _near_objects != 0 ) then { - GRLIB_conflicting_objects = _near_objects; + KPLIB_conflicting_objects = _near_objects; } else { - GRLIB_conflicting_objects = []; + KPLIB_conflicting_objects = []; }; if (count _near_objects == 0 && ((_truepos distance _posfob) < _maxdist) && ( ((!surfaceIsWater _truepos) && (!surfaceIsWater getpos player)) || (_classname in boats_names) ) ) then { @@ -224,7 +224,7 @@ while { true } do { _vehicle setVectorUp surfaceNormal position _vehicle; }; if(build_invalid == 1) then { - GRLIB_ui_notif = ""; + KPLIB_ui_notif = ""; {_x setObjectTexture [0, "#(rgb,8,8,3)color(0,1,0,1)"];} foreach _object_spheres; }; @@ -237,7 +237,7 @@ while { true } do { _vehicle setpos _ghost_spot; build_invalid = 1; if(count _near_objects > 0) then { - GRLIB_ui_notif = format [localize "STR_PLACEMENT_IMPOSSIBLE",count _near_objects, round _dist]; + KPLIB_ui_notif = format [localize "STR_PLACEMENT_IMPOSSIBLE",count _near_objects, round _dist]; if (_debug_colisions) then { private [ "_objs_classnames" ]; @@ -247,17 +247,17 @@ while { true } do { }; }; if( ((surfaceIsWater _truepos) || (surfaceIsWater getpos player)) && !(_classname in boats_names)) then { - GRLIB_ui_notif = localize "STR_BUILD_ERROR_WATER"; + KPLIB_ui_notif = localize "STR_BUILD_ERROR_WATER"; }; if((_truepos distance _posfob) > _maxdist) then { - GRLIB_ui_notif = format [localize "STR_BUILD_ERROR_DISTANCE",_maxdist]; + KPLIB_ui_notif = format [localize "STR_BUILD_ERROR_DISTANCE",_maxdist]; }; }; sleep 0.05; }; - GRLIB_ui_notif = ""; + KPLIB_ui_notif = ""; {_x setPos [0, 0, 0];} forEach (_object_spheres + _fob_spheres); @@ -268,7 +268,7 @@ while { true } do { _price_f = ((KPLIB_buildList select buildtype) select buildindex) select 3; _nearfob = [] call KPLIB_fnc_getNearestFob; - _storage_areas = (_nearfob nearobjects (GRLIB_fob_range * 2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; + _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; _supplyCrates = ceil (_price_s / 100); _ammoCrates = ceil (_price_a / 100); diff --git a/Missionframework/scripts/client/build/do_build_fob.sqf b/Missionframework/scripts/client/build/do_build_fob.sqf index b892c4ca4..32b815c19 100644 --- a/Missionframework/scripts/client/build/do_build_fob.sqf +++ b/Missionframework/scripts/client/build/do_build_fob.sqf @@ -1,11 +1,11 @@ private [ "_minfobdist", "_minsectordist", "_distfob", "_clearedtobuildfob", "_distsector", "_clearedtobuildsector", "_idx" ]; -if ( count GRLIB_all_fobs >= GRLIB_maximum_fobs ) exitWith { - hint format [ localize "STR_HINT_FOBS_EXCEEDED", GRLIB_maximum_fobs ]; +if ( count KPLIB_all_fobs >= KPLIB_maximum_fobs ) exitWith { + hint format [ localize "STR_HINT_FOBS_EXCEEDED", KPLIB_maximum_fobs ]; }; _minfobdist = 1000; -_minsectordist = GRLIB_capture_size + GRLIB_fob_range; +_minsectordist = KPLIB_capture_size + KPLIB_fob_range; _distfob = 1; _clearedtobuildfob = true; _distsector = 1; @@ -15,10 +15,10 @@ FOB_build_in_progress = true; publicVariable "FOB_build_in_progress"; _idx = 0; -while { (_idx < (count GRLIB_all_fobs)) && _clearedtobuildfob } do { - if ( player distance (GRLIB_all_fobs select _idx) < _minfobdist ) then { +while { (_idx < (count KPLIB_all_fobs)) && _clearedtobuildfob } do { + if ( player distance (KPLIB_all_fobs select _idx) < _minfobdist ) then { _clearedtobuildfob = false; - _distfob = player distance (GRLIB_all_fobs select _idx); + _distfob = player distance (KPLIB_all_fobs select _idx); }; _idx = _idx + 1; }; diff --git a/Missionframework/scripts/client/build/do_sector_build.sqf b/Missionframework/scripts/client/build/do_sector_build.sqf index bfe1536a2..8710886b1 100644 --- a/Missionframework/scripts/client/build/do_sector_build.sqf +++ b/Missionframework/scripts/client/build/do_sector_build.sqf @@ -38,11 +38,11 @@ if (((_this select 3) select 0) == KP_liberation_small_storage_building) then { build_invalid = 1; if(((surfaceIsWater _truepos) || (surfaceIsWater getpos player))) then { - GRLIB_ui_notif = localize "STR_BUILD_ERROR_WATER"; + KPLIB_ui_notif = localize "STR_BUILD_ERROR_WATER"; }; if((_truepos distance _sectorpos) > 100) then { - GRLIB_ui_notif = format [localize "STR_BUILD_ERROR_DISTANCE",100]; + KPLIB_ui_notif = format [localize "STR_BUILD_ERROR_DISTANCE",100]; }; } else { _building setdir (getDir player); @@ -55,7 +55,7 @@ if (((_this select 3) select 0) == KP_liberation_small_storage_building) then { }; if (build_invalid == 1) then { - GRLIB_ui_notif = ""; + KPLIB_ui_notif = ""; }; build_invalid = 0; @@ -64,7 +64,7 @@ if (((_this select 3) select 0) == KP_liberation_small_storage_building) then { sleep 0.05; }; - GRLIB_ui_notif = ""; + KPLIB_ui_notif = ""; if (!alive player || build_confirmed == 3) then { deleteVehicle _building; diff --git a/Missionframework/scripts/client/build/open_build_menu.sqf b/Missionframework/scripts/client/build/open_build_menu.sqf index 33e9934d2..2f5317257 100644 --- a/Missionframework/scripts/client/build/open_build_menu.sqf +++ b/Missionframework/scripts/client/build/open_build_menu.sqf @@ -1,6 +1,6 @@ private [ "_oldbuildtype", "_cfg", "_initindex", "_dialog", "_iscommandant", "_squadname", "_buildpages", "_build_list", "_classnamevar", "_entrytext", "_icon", "_affordable", "_affordable_crew", "_selected_item", "_linked", "_linked_unlocked", "_base_link", "_link_color", "_link_str", "_nearfob", "_actual_fob"]; -if (([ getpos player , 500 , GRLIB_side_enemy ] call KPLIB_fnc_getUnitsCount ) > 4 ) exitWith { hint localize "STR_BUILD_ENEMIES_NEARBY";}; +if (([ getpos player , 500 , KPLIB_side_enemy ] call KPLIB_fnc_getUnitsCount ) > 4 ) exitWith { hint localize "STR_BUILD_ENEMIES_NEARBY";}; if (isNil "buildtype") then {buildtype = 1}; if (isNil "buildindex") then {buildindex = -1}; @@ -34,7 +34,7 @@ localize "STR_BUILD8" ]; _nearfob = [] call KPLIB_fnc_getNearestFob; -_actual_fob = KP_liberation_fob_resources select {((_x select 0) distance _nearfob) < GRLIB_fob_range}; +_actual_fob = KP_liberation_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { _build_list = KPLIB_buildList select buildtype; @@ -42,7 +42,7 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { if (_oldbuildtype != buildtype || synchro_done) then { synchro_done = false; _oldbuildtype = buildtype; - _actual_fob = KP_liberation_fob_resources select {((_x select 0) distance _nearfob) < GRLIB_fob_range}; + _actual_fob = KP_liberation_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; lbClear 110; { @@ -114,7 +114,7 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { _selected_item = lbCurSel 110; _affordable = false; _squad_full = false; - if ((buildtype == 1) && (count (units group player) >= GRLIB_max_squad_size)) then { + if ((buildtype == 1) && (count (units group player) >= KPLIB_max_squad_size)) then { _squad_full = true; }; _linked = false; @@ -142,7 +142,7 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { }; if ( buildtype != 8 ) then { - { if ( ( _build_item select 0 ) == ( _x select 0 ) ) exitWith { _base_link = _x select 1; _linked = true; } } foreach GRLIB_vehicle_to_military_base_links; + { if ( ( _build_item select 0 ) == ( _x select 0 ) ) exitWith { _base_link = _x select 1; _linked = true; } } foreach KPLIB_vehicle_to_military_base_links; if ( _linked ) then { if ( !(_base_link in blufor_sectors) ) then { _linked_unlocked = false }; diff --git a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf index 1bf3fef9a..bbaa5f0cc 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf @@ -31,7 +31,7 @@ waitUntil {sleep 5; if (alive _informant) then { if (_is_near_fob) then { sleep 5; - private _grp = createGroup [GRLIB_side_friendly, true]; + private _grp = createGroup [KPLIB_side_friendly, true]; [_informant] joinSilent _grp; _informant playmove "AmovPercMstpSnonWnonDnon_AmovPsitMstpSnonWnonDnon_ground"; _informant disableAI "ANIM"; diff --git a/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf b/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf index 317f6d41c..4080da32a 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf @@ -28,11 +28,11 @@ switch (_notif_id) do { case 4: { ["lib_civ_hvt_start", [markertext ([10000, _pos] call KPLIB_fnc_getNearestSector)]] call BIS_fnc_showNotification; private _marker = createMarker ["HVT_marker", _pos]; - _marker setMarkerColor GRLIB_color_enemy_bright; + _marker setMarkerColor KPLIB_color_enemy_bright; _marker setMarkerType "hd_unknown"; private _marker_zone = createMarker ["HVT_zone", _pos]; - _marker_zone setMarkerColor GRLIB_color_enemy_bright; + _marker_zone setMarkerColor KPLIB_color_enemy_bright; _marker_zone setMarkerShape "ELLIPSE"; _marker_zone setMarkerBrush "FDiagonal"; _marker_zone setMarkerSize [500,500]; diff --git a/Missionframework/scripts/client/commander/enforce_whitelist.sqf b/Missionframework/scripts/client/commander/enforce_whitelist.sqf index df2a95486..7d05a68e2 100644 --- a/Missionframework/scripts/client/commander/enforce_whitelist.sqf +++ b/Missionframework/scripts/client/commander/enforce_whitelist.sqf @@ -2,7 +2,7 @@ scriptName "[KPLIB] Enforce Whitelist"; [] call compileFinal preprocessFileLineNumbers "whitelist.sqf"; -if (!GRLIB_use_whitelist) exitWith {}; +if (!KPLIB_use_whitelist) exitWith {}; waitUntil {alive player}; sleep 1; @@ -12,9 +12,9 @@ if (player isEqualTo ([] call KPLIB_fnc_getCommander) && !(serverCommandAvailabl private _match = false; [] call { - if ((getPlayerUID player) in GRLIB_whitelisted_steamids) exitWith {_match = true;}; - if ((name player) in GRLIB_whitelisted_names) exitWith {_match = true;}; - if (!((squadParams player) isEqualTo []) && {(((squadParams player) select 0) select 0) in GRLIB_whitelisted_tags}) exitWith {_match = true;}; + if ((getPlayerUID player) in KPLIB_whitelisted_steamids) exitWith {_match = true;}; + if ((name player) in KPLIB_whitelisted_names) exitWith {_match = true;}; + if (!((squadParams player) isEqualTo []) && {(((squadParams player) select 0) select 0) in KPLIB_whitelisted_tags}) exitWith {_match = true;}; }; if (!_match) then { diff --git a/Missionframework/scripts/client/commander/open_permissions.sqf b/Missionframework/scripts/client/commander/open_permissions.sqf index e48cfa5fb..b5de292d8 100644 --- a/Missionframework/scripts/client/commander/open_permissions.sqf +++ b/Missionframework/scripts/client/commander/open_permissions.sqf @@ -1,4 +1,4 @@ -waitUntil {!isNil "GRLIB_permissions"}; +waitUntil {!isNil "KPLIB_permissions"}; private _players_array = []; private _uids_array = ["Default"]; @@ -11,7 +11,7 @@ color_authorized = [0,0.9,0,1]; color_denied = [0.9,0,0,1]; fontsize = 0.017 * safezoneH; -private _modify_permissions = +GRLIB_permissions; +private _modify_permissions = +KPLIB_permissions; disableSerialization; @@ -193,8 +193,8 @@ while {dialog && alive player} do { } foreach _players_array; if (save_changes == 1) then { - GRLIB_permissions = +_modify_permissions; - publicVariable "GRLIB_permissions"; + KPLIB_permissions = +_modify_permissions; + publicVariable "KPLIB_permissions"; closeDialog 0; }; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index 718abdb22..48266fb4c 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -9,7 +9,7 @@ switch (KP_liberation_arsenal) do { case 7: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\unsung.sqf";}; case 8: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\sfp.sqf";}; case 9: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\bwmod.sqf";}; - default {GRLIB_arsenal_weapons = [];GRLIB_arsenal_magazines = [];GRLIB_arsenal_items = [];GRLIB_arsenal_backpacks = [];}; + default {KPLIB_arsenal_weapons = [];KPLIB_arsenal_magazines = [];KPLIB_arsenal_items = [];KPLIB_arsenal_backpacks = [];}; }; if (typeOf player == "VirtualSpectator_F") exitWith { @@ -68,7 +68,7 @@ player addEventHandler ["SeatSwitchedMan", {[_this select 2] call kp_vehicle_per player addEventHandler ["HandleRating", {if ((_this select 1) < 0) then {0};}]; // Disable stamina, if selected in parameter -if (!GRLIB_fatigue) then { +if (!KPLIB_fatigue) then { player enableStamina false; player addEventHandler ["Respawn", {player enableStamina false;}]; }; @@ -85,7 +85,7 @@ if (!KPLIB_sway) then { execVM "scripts\client\ui\intro.sqf"; -[player] joinSilent (createGroup [GRLIB_side_friendly, true]); +[player] joinSilent (createGroup [KPLIB_side_friendly, true]); // Start Tutorial if (KP_liberation_tutorial && {player isEqualTo ([] call KPLIB_fnc_getCommander)}) then { diff --git a/Missionframework/scripts/client/markers/fob_markers.sqf b/Missionframework/scripts/client/markers/fob_markers.sqf index d174d82c2..5eb8548d1 100644 --- a/Missionframework/scripts/client/markers/fob_markers.sqf +++ b/Missionframework/scripts/client/markers/fob_markers.sqf @@ -1,5 +1,5 @@ waitUntil {!isNil "save_is_loaded"}; -waitUntil {!isNil "GRLIB_all_fobs"}; +waitUntil {!isNil "KPLIB_all_fobs"}; waitUntil {save_is_loaded}; uiSleep 3; @@ -8,15 +8,15 @@ private _markers = []; private _markers_mobilespawns = []; while {true} do { - if (count _markers != count GRLIB_all_fobs) then { + if (count _markers != count KPLIB_all_fobs) then { {deleteMarkerLocal _x;} forEach _markers; _markers = []; - for "_idx" from 0 to ((count GRLIB_all_fobs) - 1) do { + for "_idx" from 0 to ((count KPLIB_all_fobs) - 1) do { private _marker = createMarkerLocal [format ["fobmarker%1", _idx], markers_reset]; _marker setMarkerTypeLocal "b_hq"; _marker setMarkerSizeLocal [1.5, 1.5]; - _marker setMarkerPosLocal (GRLIB_all_fobs select _idx); + _marker setMarkerPosLocal (KPLIB_all_fobs select _idx); _marker setMarkerTextLocal format ["FOB %1",military_alphabet select _idx]; _marker setMarkerColorLocal "ColorYellow"; _markers pushback _marker; diff --git a/Missionframework/scripts/client/markers/group_icons.sqf b/Missionframework/scripts/client/markers/group_icons.sqf index 4ed874e8b..267b57af2 100644 --- a/Missionframework/scripts/client/markers/group_icons.sqf +++ b/Missionframework/scripts/client/markers/group_icons.sqf @@ -7,15 +7,15 @@ setGroupIconsVisible [true,false]; while { true } do { { - if ((_x != group player) && ((side _x == GRLIB_side_friendly))) then { + if ((_x != group player) && ((side _x == KPLIB_side_friendly))) then { if ( (_x in _iconed_groups) && ( - (count units _x == 0) || (side _x == GRLIB_side_friendly && (((leader _x) distance (markerPos GRLIB_respawn_marker) < 100) || ((leader _x) distance startbase < 500))))) then { + (count units _x == 0) || (side _x == KPLIB_side_friendly && (((leader _x) distance (markerPos KPLIB_respawn_marker) < 100) || ((leader _x) distance startbase < 500))))) then { clearGroupIcons _x; _iconed_groups = _iconed_groups - [_x]; }; if ( !(_x in _iconed_groups) && ( - (count units _x > 0) && (side _x == GRLIB_side_friendly && (((leader _x) distance (markerPos GRLIB_respawn_marker) > 100) && ((leader _x) distance startbase > 500))))) then { + (count units _x > 0) && (side _x == KPLIB_side_friendly && (((leader _x) distance (markerPos KPLIB_respawn_marker) > 100) && ((leader _x) distance startbase > 500))))) then { clearGroupIcons _x; _localgroup = _x; _grouptype = [_localgroup] call KPLIB_fnc_getGroupType; @@ -33,7 +33,7 @@ while { true } do { _localgroup addGroupIcon [ _groupicon, [ 0,0 ] ]; - if ( side _localgroup == GRLIB_side_friendly ) then { + if ( side _localgroup == KPLIB_side_friendly ) then { _groupiconsize = "group_0"; _groupsize = (count (units _localgroup)); if ( _groupsize >= 2 ) then { _groupiconsize = "group_1" }; diff --git a/Missionframework/scripts/client/markers/hostile_groups.sqf b/Missionframework/scripts/client/markers/hostile_groups.sqf index 143ef1007..cb7ac2b8f 100644 --- a/Missionframework/scripts/client/markers/hostile_groups.sqf +++ b/Missionframework/scripts/client/markers/hostile_groups.sqf @@ -10,7 +10,7 @@ while {true} do { {deleteMarkerLocal _x;} forEach _kp_markers_array; _kp_markers_array = []; { - if ((side _x == GRLIB_side_enemy) && (({!captive _x} count (units _x) ) > 0) && ([(getpos leader _x), GRLIB_side_friendly, GRLIB_radiotower_size] call KPLIB_fnc_getNearestTower != "")) then { + if ((side _x == KPLIB_side_enemy) && (({!captive _x} count (units _x) ) > 0) && ([(getpos leader _x), KPLIB_side_friendly, KPLIB_radiotower_size] call KPLIB_fnc_getNearestTower != "")) then { _kp_markers_pos = getPosATL leader _x; _kp_markers_posx = floor (_kp_markers_pos select 0); _kp_markers_posx = _kp_markers_posx - (_kp_markers_posx mod 500); diff --git a/Missionframework/scripts/client/markers/sector_manager.sqf b/Missionframework/scripts/client/markers/sector_manager.sqf index e3be8ac60..3de7818f5 100644 --- a/Missionframework/scripts/client/markers/sector_manager.sqf +++ b/Missionframework/scripts/client/markers/sector_manager.sqf @@ -1,5 +1,5 @@ waitUntil {!isNil "save_is_loaded"}; -waitUntil {!isNil "GRLIB_vehicle_to_military_base_links"}; +waitUntil {!isNil "KPLIB_vehicle_to_military_base_links"}; waitUntil {!isNil "blufor_sectors"}; waitUntil {save_is_loaded}; @@ -10,10 +10,10 @@ private _cfg = configFile >> "cfgVehicles"; _x params ["_vehicle", "_base"]; private _marker = createMarkerLocal [format ["vehicleunlockmarker%1", _base], [(markerpos _base) select 0, ((markerpos _base) select 1) + 125]]; _marker setMarkerTextLocal (getText (_cfg >> _vehicle >> "displayName")); - _marker setMarkerColorLocal GRLIB_color_enemy; + _marker setMarkerColorLocal KPLIB_color_enemy; _marker setMarkerTypeLocal "mil_pickup"; _vehicle_unlock_markers pushback [_marker, _base]; -} forEach GRLIB_vehicle_to_military_base_links; +} forEach KPLIB_vehicle_to_military_base_links; private _sector_count = -1; @@ -25,12 +25,12 @@ while {true} do { count blufor_sectors != _sector_count }; - {_x setMarkerColorLocal GRLIB_color_enemy;} forEach (sectors_allSectors - blufor_sectors); - {_x setMarkerColorLocal GRLIB_color_friendly;} forEach blufor_sectors; + {_x setMarkerColorLocal KPLIB_color_enemy;} forEach (sectors_allSectors - blufor_sectors); + {_x setMarkerColorLocal KPLIB_color_friendly;} forEach blufor_sectors; { _x params ["_marker", "_base"]; - _marker setMarkerColorLocal ([GRLIB_color_enemy, GRLIB_color_friendly] select (_base in blufor_sectors)); + _marker setMarkerColorLocal ([KPLIB_color_enemy, KPLIB_color_friendly] select (_base in blufor_sectors)); } forEach _vehicle_unlock_markers; _sector_count = count blufor_sectors; }; diff --git a/Missionframework/scripts/client/markers/spot_timer.sqf b/Missionframework/scripts/client/markers/spot_timer.sqf index 8a5ace2f7..d0c929b38 100644 --- a/Missionframework/scripts/client/markers/spot_timer.sqf +++ b/Missionframework/scripts/client/markers/spot_timer.sqf @@ -1,10 +1,10 @@ createMarkerLocal ["opfor_bg_marker", markers_reset]; "opfor_bg_marker" setMarkerTypeLocal "mil_unknown"; -"opfor_bg_marker" setMarkerColorLocal GRLIB_color_enemy_bright; +"opfor_bg_marker" setMarkerColorLocal KPLIB_color_enemy_bright; createMarkerLocal ["opfor_capture_marker", markers_reset]; "opfor_capture_marker" setMarkerTypeLocal "mil_objective"; -"opfor_capture_marker" setMarkerColorLocal GRLIB_color_enemy_bright; +"opfor_capture_marker" setMarkerColorLocal KPLIB_color_enemy_bright; if ( isNil "sector_timer" ) then { sector_timer = 0 }; diff --git a/Missionframework/scripts/client/markers/update_production_sites.sqf b/Missionframework/scripts/client/markers/update_production_sites.sqf index a0f4b8bba..30ea9fc1b 100644 --- a/Missionframework/scripts/client/markers/update_production_sites.sqf +++ b/Missionframework/scripts/client/markers/update_production_sites.sqf @@ -4,7 +4,7 @@ waitUntil {save_is_loaded}; private _KP_liberation_production_markers_old = [0]; -while {GRLIB_endgame == 0} do { +while {KPLIB_endgame == 0} do { waitUntil {sleep 5; !(_KP_liberation_production_markers_old isEqualTo KP_liberation_production_markers) }; diff --git a/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf b/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf index 04afe19d9..520764c98 100644 --- a/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf +++ b/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf @@ -2,8 +2,8 @@ while { true } do { if ( local group player ) then { { - if ( _x getVariable ["GRLIB_squad_color", "MAIN"] != assignedTeam _x ) then { - _x setVariable ["GRLIB_squad_color", assignedTeam _x, true ]; + if ( _x getVariable ["KPLIB_squad_color", "MAIN"] != assignedTeam _x ) then { + _x setVariable ["KPLIB_squad_color", assignedTeam _x, true ]; }; } foreach (units group player); }; diff --git a/Missionframework/scripts/client/misc/init_arsenal.sqf b/Missionframework/scripts/client/misc/init_arsenal.sqf index a408676f8..5be5b5882 100644 --- a/Missionframework/scripts/client/misc/init_arsenal.sqf +++ b/Missionframework/scripts/client/misc/init_arsenal.sqf @@ -6,13 +6,13 @@ if (KP_liberation_arsenalUsePreset) then { private _backpacks = []; KP_liberation_allowed_items = []; - if (isNil "GRLIB_arsenal_weapons") then {GRLIB_arsenal_weapons = []}; - if (isNil "GRLIB_arsenal_magazines") then {GRLIB_arsenal_magazines = []}; - if (isNil "GRLIB_arsenal_items") then {GRLIB_arsenal_items = []}; - if (isNil "GRLIB_arsenal_backpacks") then {GRLIB_arsenal_backpacks = []}; + if (isNil "KPLIB_arsenal_weapons") then {KPLIB_arsenal_weapons = []}; + if (isNil "KPLIB_arsenal_magazines") then {KPLIB_arsenal_magazines = []}; + if (isNil "KPLIB_arsenal_items") then {KPLIB_arsenal_items = []}; + if (isNil "KPLIB_arsenal_backpacks") then {KPLIB_arsenal_backpacks = []}; if (isNil "blacklisted_from_arsenal") then {blacklisted_from_arsenal = []}; - if ((count GRLIB_arsenal_weapons) == 0) then { + if ((count KPLIB_arsenal_weapons) == 0) then { if ((count blacklisted_from_arsenal) == 0) then { _weapons = _crawled select 0; } else { @@ -21,8 +21,8 @@ if (KP_liberation_arsenalUsePreset) then { [missionNamespace, _weapons] call BIS_fnc_addVirtualWeaponCargo; KP_liberation_allowed_items append _weapons; } else { - [missionNamespace, GRLIB_arsenal_weapons] call BIS_fnc_addVirtualWeaponCargo; - KP_liberation_allowed_items append GRLIB_arsenal_weapons; + [missionNamespace, KPLIB_arsenal_weapons] call BIS_fnc_addVirtualWeaponCargo; + KP_liberation_allowed_items append KPLIB_arsenal_weapons; }; // Support for CBA disposable launchers, https://github.com/CBATeam/CBA_A3/wiki/Disposable-Launchers @@ -43,7 +43,7 @@ if (KP_liberation_arsenalUsePreset) then { KP_liberation_allowed_items append _disposableLaunchers; }; - if ((count GRLIB_arsenal_magazines) == 0) then { + if ((count KPLIB_arsenal_magazines) == 0) then { if ((count blacklisted_from_arsenal) == 0) then { _magazines = _crawled select 1; } else { @@ -52,11 +52,11 @@ if (KP_liberation_arsenalUsePreset) then { [missionNamespace, _magazines] call BIS_fnc_addVirtualMagazineCargo; KP_liberation_allowed_items append _magazines; } else { - [missionNamespace, GRLIB_arsenal_magazines] call BIS_fnc_addVirtualMagazineCargo; - KP_liberation_allowed_items append GRLIB_arsenal_magazines; + [missionNamespace, KPLIB_arsenal_magazines] call BIS_fnc_addVirtualMagazineCargo; + KP_liberation_allowed_items append KPLIB_arsenal_magazines; }; - if ((count GRLIB_arsenal_items) == 0) then { + if ((count KPLIB_arsenal_items) == 0) then { if ((count blacklisted_from_arsenal) == 0) then { _items = _crawled select 2; } else { @@ -65,11 +65,11 @@ if (KP_liberation_arsenalUsePreset) then { [missionNamespace, _items] call BIS_fnc_addVirtualItemCargo; KP_liberation_allowed_items append _items; } else { - [missionNamespace, GRLIB_arsenal_items] call BIS_fnc_addVirtualItemCargo; - KP_liberation_allowed_items append GRLIB_arsenal_items; + [missionNamespace, KPLIB_arsenal_items] call BIS_fnc_addVirtualItemCargo; + KP_liberation_allowed_items append KPLIB_arsenal_items; }; - if ((count GRLIB_arsenal_backpacks) == 0) then { + if ((count KPLIB_arsenal_backpacks) == 0) then { if ((count blacklisted_from_arsenal) == 0) then { _backpacks = _crawled select 3; } else { @@ -78,8 +78,8 @@ if (KP_liberation_arsenalUsePreset) then { [missionNamespace, _backpacks] call BIS_fnc_addVirtualBackpackCargo; KP_liberation_allowed_items append _backpacks; } else { - [missionNamespace, GRLIB_arsenal_backpacks] call BIS_fnc_addVirtualBackpackCargo; - KP_liberation_allowed_items append GRLIB_arsenal_backpacks; + [missionNamespace, KPLIB_arsenal_backpacks] call BIS_fnc_addVirtualBackpackCargo; + KP_liberation_allowed_items append KPLIB_arsenal_backpacks; }; { diff --git a/Missionframework/scripts/client/misc/init_markers.sqf b/Missionframework/scripts/client/misc/init_markers.sqf index a4db6d792..bbc2fe9e5 100644 --- a/Missionframework/scripts/client/misc/init_markers.sqf +++ b/Missionframework/scripts/client/misc/init_markers.sqf @@ -2,8 +2,8 @@ _marker = createMarkerLocal ["zone_capture", markers_reset]; _marker setMarkerColorLocal "ColorUNKNOWN"; _marker setMarkerShapeLocal "Ellipse"; _marker setMarkerBrushLocal "SolidBorder"; -_marker setMarkerSizeLocal [ GRLIB_capture_size, GRLIB_capture_size ]; +_marker setMarkerSizeLocal [ KPLIB_capture_size, KPLIB_capture_size ]; _marker = createMarkerLocal ["spawn_marker", markers_reset]; _marker setMarkerColorLocal "ColorGreen"; -_marker setMarkerTypeLocal "Select"; \ No newline at end of file +_marker setMarkerTypeLocal "Select"; diff --git a/Missionframework/scripts/client/misc/permissions_warning.sqf b/Missionframework/scripts/client/misc/permissions_warning.sqf index d75142280..5a87eede0 100644 --- a/Missionframework/scripts/client/misc/permissions_warning.sqf +++ b/Missionframework/scripts/client/misc/permissions_warning.sqf @@ -1,10 +1,10 @@ -if ( GRLIB_permissions_param ) then { +if ( KPLIB_permissions_param ) then { - waitUntil { !(isNil "GRLIB_permissions") }; + waitUntil { !(isNil "KPLIB_permissions") }; sleep 5; - while { count GRLIB_permissions == 0 } do { + while { count KPLIB_permissions == 0 } do { hint localize "STR_PERMISSION_WARNING"; sleep 5; }; diff --git a/Missionframework/scripts/client/misc/playerNamespace.sqf b/Missionframework/scripts/client/misc/playerNamespace.sqf index 981ca03d0..0cef108f0 100644 --- a/Missionframework/scripts/client/misc/playerNamespace.sqf +++ b/Missionframework/scripts/client/misc/playerNamespace.sqf @@ -2,7 +2,7 @@ File: playerNamespace.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-12 - Last Update: 2020-05-08 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -22,10 +22,10 @@ private _fobName = ""; while {true} do { // FOB distance, name and position - if !(GRLIB_all_fobs isEqualTo []) then { + if !(KPLIB_all_fobs isEqualTo []) then { _fobPos = [] call KPLIB_fnc_getNearestFob; _fobDist = player distance2d _fobPos; - _fobName = ["", ["FOB", [_fobPos] call KPLIB_fnc_getFobName] joinString " "] select (_fobDist < GRLIB_fob_range); + _fobName = ["", ["FOB", [_fobPos] call KPLIB_fnc_getFobName] joinString " "] select (_fobDist < KPLIB_fob_range); } else { _fobPos = [0, 0, 0]; _fobDist = 99999; @@ -57,7 +57,7 @@ while {true} do { // Nearest activated sector and possible production data player setVariable ["KPLIB_nearProd", KP_liberation_production param [KP_liberation_production findIf {(_x select 1) isEqualTo ([100] call KPLIB_fnc_getNearestSector)}, []]]; - player setVariable ["KPLIB_nearSector", [GRLIB_sector_size] call KPLIB_fnc_getNearestSector]; + player setVariable ["KPLIB_nearSector", [KPLIB_sector_size] call KPLIB_fnc_getNearestSector]; // Zeus module synced to player player setVariable ["KPLIB_ownedZeusModule", getAssignedCuratorLogic player]; diff --git a/Missionframework/scripts/client/misc/secondary_jip.sqf b/Missionframework/scripts/client/misc/secondary_jip.sqf index 1ef19ad22..56107faee 100644 --- a/Missionframework/scripts/client/misc/secondary_jip.sqf +++ b/Missionframework/scripts/client/misc/secondary_jip.sqf @@ -2,9 +2,9 @@ waitUntil { time > 20; }; -if ( isNil "GRLIB_secondary_in_progress" ) exitWith {}; -if ( GRLIB_secondary_in_progress < 0 ) exitWith {}; +if ( isNil "KPLIB_secondary_in_progress" ) exitWith {}; +if ( KPLIB_secondary_in_progress < 0 ) exitWith {}; -if ( GRLIB_secondary_in_progress == 0 ) then { +if ( KPLIB_secondary_in_progress == 0 ) then { [ 2 ] call remote_call_intel; }; diff --git a/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf b/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf index 04b855f18..408aeebb7 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf @@ -1,6 +1,6 @@ player allowDamage false; (vehicle player) allowDamage false; -GRLIB_endgame = 1; +KPLIB_endgame = 1; sleep 20; _this call compileFinal preprocessFileLineNumbers "scripts\client\ui\end_screen.sqf"; diff --git a/Missionframework/scripts/client/remotecall/remote_call_fob.sqf b/Missionframework/scripts/client/remotecall/remote_call_fob.sqf index 9c0e20252..0b222b28d 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_fob.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_fob.sqf @@ -14,7 +14,7 @@ if ( _status == 0 ) then { if ( _status == 1 ) then { [ "lib_fob_attacked", [ _fobname ] ] call BIS_fnc_showNotification; "opfor_capture_marker" setMarkerPosLocal _fob; - sector_timer = GRLIB_vulnerability_timer; + sector_timer = KPLIB_vulnerability_timer; }; if ( _status == 2 ) then { diff --git a/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf b/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf index 18e85da3b..7987e7d04 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf @@ -2,11 +2,11 @@ if ( isDedicated ) exitWith {}; params [ "_attack_destination" ]; -if ( isNil "GRLIB_last_incoming_notif_time" ) then { GRLIB_last_incoming_notif_time = -9999 }; +if ( isNil "KPLIB_last_incoming_notif_time" ) then { KPLIB_last_incoming_notif_time = -9999 }; -if ( time > GRLIB_last_incoming_notif_time + 60 ) then { +if ( time > KPLIB_last_incoming_notif_time + 60 ) then { - GRLIB_last_incoming_notif_time = time; + KPLIB_last_incoming_notif_time = time; private [ "_attack_location_name" ]; _attack_location_name = [_attack_destination] call KPLIB_fnc_getLocationName; @@ -16,7 +16,7 @@ if ( time > GRLIB_last_incoming_notif_time + 60 ) then { private [ "_mrk" ]; _mrk = createMarkerLocal [ "opfor_incoming_marker", _attack_destination]; "opfor_incoming_marker" setMarkerTypeLocal "selector_selectedMission"; - "opfor_incoming_marker" setMarkerColorLocal GRLIB_color_enemy_bright; + "opfor_incoming_marker" setMarkerColorLocal KPLIB_color_enemy_bright; sleep 250; deleteMarkerLocal _mrk; diff --git a/Missionframework/scripts/client/remotecall/remote_call_intel.sqf b/Missionframework/scripts/client/remotecall/remote_call_intel.sqf index 7411d6949..09df99594 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_intel.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_intel.sqf @@ -11,11 +11,11 @@ switch (_notiftype) do { waitUntil {secondary_objective_position_marker distance zeropos > 1000}; ["lib_intel_fob", [markertext ([10000, secondary_objective_position_marker] call KPLIB_fnc_getNearestSector)]] call BIS_fnc_showNotification; _secondary_marker = createMarkerLocal ["secondarymarker", secondary_objective_position_marker]; - _secondary_marker setMarkerColorLocal GRLIB_color_enemy_bright; + _secondary_marker setMarkerColorLocal KPLIB_color_enemy_bright; _secondary_marker setMarkerTypeLocal "hd_unknown"; _secondary_marker_zone = createMarkerLocal ["secondarymarkerzone", secondary_objective_position_marker]; - _secondary_marker_zone setMarkerColorLocal GRLIB_color_enemy_bright; + _secondary_marker_zone setMarkerColorLocal KPLIB_color_enemy_bright; _secondary_marker_zone setMarkerShapeLocal "ELLIPSE"; _secondary_marker_zone setMarkerBrushLocal "FDiagonal"; _secondary_marker_zone setMarkerSizeLocal [1500,1500]; @@ -34,11 +34,11 @@ switch (_notiftype) do { waitUntil {secondary_objective_position_marker distance zeropos > 1000}; ["lib_intel_sar", [markertext ([10000, secondary_objective_position_marker] call KPLIB_fnc_getNearestSector)]] call BIS_fnc_showNotification; _secondary_marker = createMarkerLocal ["secondarymarker", secondary_objective_position_marker]; - _secondary_marker setMarkerColorLocal GRLIB_color_enemy_bright; + _secondary_marker setMarkerColorLocal KPLIB_color_enemy_bright; _secondary_marker setMarkerTypeLocal "hd_unknown"; _secondary_marker_zone = createMarkerLocal ["secondarymarkerzone", secondary_objective_position_marker]; - _secondary_marker_zone setMarkerColorLocal GRLIB_color_enemy_bright; + _secondary_marker_zone setMarkerColorLocal KPLIB_color_enemy_bright; _secondary_marker_zone setMarkerShapeLocal "ELLIPSE"; _secondary_marker_zone setMarkerBrushLocal "FDiagonal"; _secondary_marker_zone setMarkerSizeLocal [1500,1500]; diff --git a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf index 4c597d49f..9feaee211 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf @@ -43,7 +43,7 @@ if (alive _unit) then { if (_is_near_fob) then { sleep 5; - _grp = createGroup [GRLIB_side_civilian, true]; + _grp = createGroup [KPLIB_side_civilian, true]; [_unit] joinSilent _grp; _unit playmove "AmovPercMstpSnonWnonDnon_AmovPsitMstpSnonWnonDnon_ground"; _unit disableAI "ANIM"; @@ -56,7 +56,7 @@ if (alive _unit) then { } else { - _grp = createGroup [GRLIB_side_enemy, true]; + _grp = createGroup [KPLIB_side_enemy, true]; [_unit] joinSilent _grp; _unit setUnitPos "AUTO"; _unit setCaptive false; diff --git a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf index 6368ceb61..94196f4df 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf @@ -11,7 +11,7 @@ if ( _status == 0 ) then { if ( _status == 1 ) then { [ "lib_sector_attacked", [ markerText _sector ] ] call BIS_fnc_showNotification; "opfor_capture_marker" setMarkerPosLocal ( markerpos _sector ); - sector_timer = GRLIB_vulnerability_timer; + sector_timer = KPLIB_vulnerability_timer; }; if ( _status == 2 ) then { @@ -26,5 +26,5 @@ if ( _status == 3 ) then { sector_timer = 0; }; -{ _x setMarkerColorLocal GRLIB_color_enemy; } foreach (sectors_allSectors - blufor_sectors); -{ _x setMarkerColorLocal GRLIB_color_friendly; } foreach blufor_sectors; +{ _x setMarkerColorLocal KPLIB_color_enemy; } foreach (sectors_allSectors - blufor_sectors); +{ _x setMarkerColorLocal KPLIB_color_friendly; } foreach blufor_sectors; diff --git a/Missionframework/scripts/client/spawn/do_halo.sqf b/Missionframework/scripts/client/spawn/do_halo.sqf index d475a7887..fcb16d5bb 100644 --- a/Missionframework/scripts/client/spawn/do_halo.sqf +++ b/Missionframework/scripts/client/spawn/do_halo.sqf @@ -1,9 +1,9 @@ private [ "_dialog", "_backpack", "_backpackcontents" ]; -if ( isNil "GRLIB_last_halo_jump" ) then { GRLIB_last_halo_jump = -6000; }; +if ( isNil "KPLIB_last_halo_jump" ) then { KPLIB_last_halo_jump = -6000; }; -if ( GRLIB_halo_param > 1 && ( GRLIB_last_halo_jump + ( GRLIB_halo_param * 60 ) ) >= time ) exitWith { - hint format [ localize "STR_HALO_DENIED_COOLDOWN", ceil ( ( ( GRLIB_last_halo_jump + ( GRLIB_halo_param * 60 ) ) - time ) / 60 ) ]; +if ( KPLIB_halo_param > 1 && ( KPLIB_last_halo_jump + ( KPLIB_halo_param * 60 ) ) >= time ) exitWith { + hint format [ localize "STR_HALO_DENIED_COOLDOWN", ceil ( ( ( KPLIB_last_halo_jump + ( KPLIB_halo_param * 60 ) ) - time ) / 60 ) ]; }; _dialog = createDialog "liberation_halo"; @@ -34,9 +34,9 @@ if ( dialog ) then { [ "halo_map_event", "onMapSingleClick" ] call BIS_fnc_removeStackedEventHandler; if ( dojump > 0 ) then { - GRLIB_last_halo_jump = time; + KPLIB_last_halo_jump = time; halo_position = halo_position getPos [random 250, random 360]; - halo_position = [ halo_position select 0, halo_position select 1, GRLIB_halo_altitude + (random 200) ]; + halo_position = [ halo_position select 0, halo_position select 1, KPLIB_halo_altitude + (random 200) ]; halojumping = true; sleep 0.1; cutRsc ["fasttravel", "PLAIN", 1]; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 2b9e1782a..3caf3ea8c 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -5,9 +5,9 @@ private _oldsel = -999; private _standard_map_pos = []; private _frame_pos = []; -GRLIB_force_redeploy = false; +KPLIB_force_redeploy = false; -waitUntil {!isNil "GRLIB_all_fobs"}; +waitUntil {!isNil "KPLIB_all_fobs"}; waitUntil {!isNil "blufor_sectors"}; waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; @@ -27,7 +27,7 @@ KP_liberation_respawn_mobile_done = false; while {true} do { waitUntil { sleep 0.2; - (GRLIB_force_redeploy || (player distance (markerPos GRLIB_respawn_marker) < 50)) && vehicle player == player && alive player && !dialog && howtoplay == 0 + (KPLIB_force_redeploy || (player distance (markerPos KPLIB_respawn_marker) < 50)) && vehicle player == player && alive player && !dialog && howtoplay == 0 }; private _backpack = backpack player; @@ -35,7 +35,7 @@ while {true} do { fullmap = 0; _old_fullmap = 0; - GRLIB_force_redeploy = false; + KPLIB_force_redeploy = false; createDialog "liberation_deploy"; deploy = 0; @@ -82,8 +82,8 @@ while {true} do { while {dialog && alive player && deploy == 0} do { choiceslist = [[_basenamestr, getposATL startbase]]; - for [{_idx=0},{_idx < count GRLIB_all_fobs},{_idx=_idx+1}] do { - choiceslist = choiceslist + [[format ["FOB %1 - %2", (military_alphabet select _idx),mapGridPosition (GRLIB_all_fobs select _idx)],GRLIB_all_fobs select _idx]]; + for [{_idx=0},{_idx < count KPLIB_all_fobs},{_idx=_idx+1}] do { + choiceslist = choiceslist + [[format ["FOB %1 - %2", (military_alphabet select _idx),mapGridPosition (KPLIB_all_fobs select _idx)],KPLIB_all_fobs select _idx]]; }; if (KP_liberation_mobilerespawn) then { diff --git a/Missionframework/scripts/client/spawn/spawn_camera.sqf b/Missionframework/scripts/client/spawn/spawn_camera.sqf index 9e18e6f27..2bdd6e9e4 100644 --- a/Missionframework/scripts/client/spawn/spawn_camera.sqf +++ b/Missionframework/scripts/client/spawn/spawn_camera.sqf @@ -11,7 +11,7 @@ _datestring = format [ "%3/%2/%1 %4%5:%6%7", date select 0, date select 1, date private [ "_spawn_camera", "_startpos0", "_startpos1", "_endpos1","_startpos2","_endpos2","_startpos3","_endpos3"]; -if ( GRLIB_deployment_cinematic ) then { +if ( KPLIB_deployment_cinematic ) then { camUseNVG false; showCinemaBorder false; @@ -39,7 +39,7 @@ if ( GRLIB_deployment_cinematic ) then { [ format [ "%1
%2
%3
%4", name player, _spawn_str, _datestring, _nearest_sector ],1,0.8,8,1 ] spawn BIS_fnc_dynamictext; -if ( GRLIB_deployment_cinematic ) then { +if ( KPLIB_deployment_cinematic ) then { _spawn_camera camSetRelPos _endpos1; _spawn_camera camcommit 1.75; diff --git a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm index ce7a83ef7..823d3da3a 100644 --- a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm +++ b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm @@ -231,8 +231,8 @@ class FSM "&& {alive player}" \n "&& {" \n " private _locations = [startbase];" \n - " _locations append GRLIB_all_fobs;" \n - " !((_locations select {(_x distance2d player) < GRLIB_fob_range}) isEqualTo [])" \n + " _locations append KPLIB_all_fobs;" \n + " !((_locations select {(_x distance2d player) < KPLIB_fob_range}) isEqualTo [])" \n "}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; @@ -317,7 +317,7 @@ class FSM name = "Set_all_completion"; itemno = 7; init = /*%FSM*/"private _fobComplete = {" \n - " !(GRLIB_all_fobs isEqualTo [])" \n + " !(KPLIB_all_fobs isEqualTo [])" \n " ||" \n " {!(blufor_sectors isEqualTo [])}" \n "};" \n @@ -330,7 +330,7 @@ class FSM " _sectorComplete" \n "];" \n "" \n - "private _nextState = diag_tickTime + ([4, 10] select GRLIB_deployment_cinematic);"/*%FSM*/; + "private _nextState = diag_tickTime + ([4, 10] select KPLIB_deployment_cinematic);"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -536,7 +536,7 @@ class FSM priority = 0.000000; to="Build_storage_ar"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(GRLIB_all_fobs isEqualTo [])"/*%FSM*/; + condition=/*%FSM*/"!(KPLIB_all_fobs isEqualTo [])"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -570,7 +570,7 @@ class FSM priority = 0.000000; to="Build_storage_ar"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(GRLIB_all_fobs isEqualTo [])"/*%FSM*/; + condition=/*%FSM*/"!(KPLIB_all_fobs isEqualTo [])"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -641,7 +641,7 @@ class FSM to="Complete_task"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " (((GRLIB_all_fobs select 0) nearObjects GRLIB_fob_range) select {" \n + " (((KPLIB_all_fobs select 0) nearObjects KPLIB_fob_range) select {" \n " (_x getVariable [""KP_liberation_storage_type"", -1]) == 0" \n " }) isEqualTo []" \n ")"/*%FSM*/; @@ -917,7 +917,7 @@ class FSM to="Start_production"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " (((markerPos _factory) nearObjects GRLIB_fob_range) select {" \n + " (((markerPos _factory) nearObjects KPLIB_fob_range) select {" \n " (_x getVariable [""KP_liberation_storage_type"", -1]) == 1" \n " }) isEqualTo []" \n ")"/*%FSM*/; @@ -1020,4 +1020,4 @@ class FSM "Exit_2", }; }; -/*%FSM*/ \ No newline at end of file +/*%FSM*/ diff --git a/Missionframework/scripts/client/ui/cinematic_camera.sqf b/Missionframework/scripts/client/ui/cinematic_camera.sqf index 354369f69..13b3a56aa 100644 --- a/Missionframework/scripts/client/ui/cinematic_camera.sqf +++ b/Missionframework/scripts/client/ui/cinematic_camera.sqf @@ -1,5 +1,5 @@ if ( isNil "active_sectors" ) then { active_sectors = [] }; -if ( isNil "GRLIB_all_fobs" ) then { GRLIB_all_fobs = [] }; +if ( isNil "KPLIB_all_fobs" ) then { KPLIB_all_fobs = [] }; cinematic_camera_started = true; private _last_transition = -1; @@ -24,9 +24,9 @@ while { cinematic_camera_started } do { private _positions = [ getpos startbase ]; if ( !first_camera_round ) then { - if ( count GRLIB_all_fobs > 0 ) then { + if ( count KPLIB_all_fobs > 0 ) then { for [ {_idx=0},{_idx < 2},{_idx=_idx+1} ] do { - _positions pushback (selectRandom GRLIB_all_fobs); + _positions pushback (selectRandom KPLIB_all_fobs); }; }; @@ -40,8 +40,8 @@ while { cinematic_camera_started } do { }; }; - if ( GRLIB_endgame == 0 ) then { - _activeplayers = (allPlayers select {alive _x && (_x distance (markerPos GRLIB_respawn_marker)) > 100}); + if ( KPLIB_endgame == 0 ) then { + _activeplayers = (allPlayers select {alive _x && (_x distance (markerPos KPLIB_respawn_marker)) > 100}); if ( count _activeplayers > 0 ) then { for [ {_idx=0},{_idx < 3},{_idx=_idx+1} ] do { _positions pushback (getpos (selectRandom _activeplayers)); @@ -256,9 +256,9 @@ while { cinematic_camera_started } do { if ( _nearest_sector != "" ) then { _nearest_sector = markertext _nearest_sector; } else { - _nearfobs = GRLIB_all_fobs select {_x distance _position < 300}; + _nearfobs = KPLIB_all_fobs select {_x distance _position < 300}; if ( count _nearfobs > 0 ) then { - _nearest_sector = format [ "FOB %1", military_alphabet select ( GRLIB_all_fobs find ( _nearfobs select 0 ) ) ]; + _nearest_sector = format [ "FOB %1", military_alphabet select ( KPLIB_all_fobs find ( _nearfobs select 0 ) ) ]; }; }; }; diff --git a/Missionframework/scripts/client/ui/intro.sqf b/Missionframework/scripts/client/ui/intro.sqf index 57d6c9aed..9f220db35 100644 --- a/Missionframework/scripts/client/ui/intro.sqf +++ b/Missionframework/scripts/client/ui/intro.sqf @@ -4,7 +4,7 @@ waitUntil { time > 0 }; [] spawn cinematic_camera; -if ( GRLIB_introduction ) then { +if ( KPLIB_introduction ) then { sleep 1; cutRsc ["intro1","PLAIN",1,true]; diff --git a/Missionframework/scripts/client/ui/secondary_ui.sqf b/Missionframework/scripts/client/ui/secondary_ui.sqf index 05a1bdb4a..84e9cab19 100644 --- a/Missionframework/scripts/client/ui/secondary_ui.sqf +++ b/Missionframework/scripts/client/ui/secondary_ui.sqf @@ -1,5 +1,5 @@ -if ( isNil "GRLIB_secondary_starting" ) then { GRLIB_secondary_starting = false; }; -if ( isNil "GRLIB_secondary_in_progress" ) then { GRLIB_secondary_in_progress = -1; }; +if ( isNil "KPLIB_secondary_starting" ) then { KPLIB_secondary_starting = false; }; +if ( isNil "KPLIB_secondary_in_progress" ) then { KPLIB_secondary_in_progress = -1; }; _dialog = createDialog "liberation_secondary"; dostartsecondary = 0; @@ -39,9 +39,9 @@ while { dialog && alive player && dostartsecondary == 0 } do { ((findDisplay 6842) displayCtrl (102)) ctrlSetStructuredText parseText localize (_briefings select _oldchoice); }; - _missioncost = GRLIB_secondary_missions_costs select _oldchoice; + _missioncost = KPLIB_secondary_missions_costs select _oldchoice; - if ( ( _missioncost <= resources_intel ) && ( !GRLIB_secondary_starting ) ) then { + if ( ( _missioncost <= resources_intel ) && ( !KPLIB_secondary_starting ) ) then { ctrlEnable [ 103, true ]; ((findDisplay 6842) displayCtrl (103)) ctrlSetTooltip ""; } else { @@ -49,13 +49,13 @@ while { dialog && alive player && dostartsecondary == 0 } do { if ( _missioncost > resources_intel ) then { ((findDisplay 6842) displayCtrl (103)) ctrlSetTooltip (localize "STR_SECONDARY_NOT_ENOUGH_INTEL"); }; - if ( GRLIB_secondary_starting ) then { + if ( KPLIB_secondary_starting ) then { ((findDisplay 6842) displayCtrl (103)) ctrlSetTooltip (localize "STR_SECONDARY_IN_PROGRESS"); }; }; - if ( GRLIB_secondary_in_progress >= 0 ) then { - lbSetCurSel [ 101, GRLIB_secondary_in_progress ]; + if ( KPLIB_secondary_in_progress >= 0 ) then { + lbSetCurSel [ 101, KPLIB_secondary_in_progress ]; ctrlEnable [ 101, false ]; } else { ctrlEnable [ 101, true ]; diff --git a/Missionframework/scripts/client/ui/squad_management.sqf b/Missionframework/scripts/client/ui/squad_management.sqf index 27205ad08..ca8510ed5 100644 --- a/Missionframework/scripts/client/ui/squad_management.sqf +++ b/Missionframework/scripts/client/ui/squad_management.sqf @@ -1,7 +1,7 @@ private [ "_dialog", "_membercount", "_memberselection", "_unitname", "_selectedmember", "_cfgVehicles", "_cfgWeapons", "_primary_mags", "_secondary_mags", "_vehstring", "_nearfob", "_fobdistance", "_nearsquad", "_tempgmp", "_destpos", "_destdir", "_resupplied","_firstloop", "_squad_camera", "_targetobject", "_isvehicle" ]; -GRLIB_squadaction = -1; -GRLIB_squadconfirm = -1; +KPLIB_squadaction = -1; +KPLIB_squadconfirm = -1; _membercount = -1; _resupplied = false; _memberselection = -1; @@ -140,11 +140,11 @@ while { dialog && alive player } do { }; } else { { ctrlSetText [ _x, "" ] } foreach [ 201, 202, 203, 204, 205, 206, 207, 208, 209 ]; - GRLIB_squadconfirm = -1; - GRLIB_squadaction = -1; + KPLIB_squadconfirm = -1; + KPLIB_squadaction = -1; }; - if ( GRLIB_squadaction == -1 ) then { + if ( KPLIB_squadaction == -1 ) then { ctrlEnable [ 213, false ]; ctrlEnable [ 214, false ]; if ( !(isPlayer _selectedmember) && (vehicle _selectedmember == _selectedmember) ) then { @@ -166,15 +166,15 @@ while { dialog && alive player } do { ctrlEnable [ 214, true ]; }; - if( GRLIB_squadconfirm == 0 ) then { - GRLIB_squadconfirm = -1; - GRLIB_squadaction = -1; + if( KPLIB_squadconfirm == 0 ) then { + KPLIB_squadconfirm = -1; + KPLIB_squadaction = -1; }; - if ( GRLIB_squadconfirm == 1 ) then { - GRLIB_squadconfirm = -1; + if ( KPLIB_squadconfirm == 1 ) then { + KPLIB_squadconfirm = -1; - if ( GRLIB_squadaction == 1 ) then { + if ( KPLIB_squadaction == 1 ) then { _nearfob = [ getpos _selectedmember ] call KPLIB_fnc_getNearestFob; _fobdistance = 9999; @@ -186,7 +186,7 @@ while { dialog && alive player } do { if ( _fobdistance < 100 || count _nearsquad > 0 ) then { - _tempgmp = createGroup [GRLIB_side_friendly, true]; + _tempgmp = createGroup [KPLIB_side_friendly, true]; (typeof _selectedmember) createUnit [ markers_reset, _tempgmp,'']; [ (units _tempgmp) select 0, _selectedmember ] call KPLIB_fnc_swapInventory; deleteVehicle ((units _tempgmp) select 0); @@ -199,13 +199,13 @@ while { dialog && alive player } do { }; }; - if (GRLIB_squadaction == 2) then { + if (KPLIB_squadaction == 2) then { deleteVehicle _selectedmember; _resupplied = true; hint localize 'STR_REMOVE_OK'; }; - if (GRLIB_squadaction == 3) then { + if (KPLIB_squadaction == 3) then { closeDialog 0; @@ -236,7 +236,7 @@ while { dialog && alive player } do { }; - GRLIB_squadaction = -1; + KPLIB_squadaction = -1; }; diff --git a/Missionframework/scripts/client/ui/ui_manager.sqf b/Missionframework/scripts/client/ui/ui_manager.sqf index ecfc21bd0..372072112 100644 --- a/Missionframework/scripts/client/ui/ui_manager.sqf +++ b/Missionframework/scripts/client/ui/ui_manager.sqf @@ -10,7 +10,7 @@ private _sectorcontrols = [ 244 // Capture Frame BLUFOR ]; -GRLIB_ui_notif = ""; +KPLIB_ui_notif = ""; KP_liberation_supplies = 0; KP_liberation_ammo = 0; KP_liberation_fuel = 0; @@ -87,8 +87,8 @@ while {true} do { if (_overlayVisible) then { - (_overlay displayCtrl (266)) ctrlSetText format [ "%1", GRLIB_ui_notif ]; - (_overlay displayCtrl (267)) ctrlSetText format [ "%1", GRLIB_ui_notif ]; + (_overlay displayCtrl (266)) ctrlSetText format [ "%1", KPLIB_ui_notif ]; + (_overlay displayCtrl (267)) ctrlSetText format [ "%1", KPLIB_ui_notif ]; if ((markerPos "opfor_capture_marker") distance markers_reset > 100 ) then { @@ -114,7 +114,7 @@ while {true} do { if (_uiticks % 25 == 0) then { - if (!isNil "active_sectors" && ([] call KPLIB_fnc_getOpforCap >= GRLIB_sector_cap)) then { + if (!isNil "active_sectors" && ([] call KPLIB_fnc_getOpforCap >= KPLIB_sector_cap)) then { (_overlay displayCtrl (517)) ctrlShow true; @@ -135,18 +135,18 @@ while {true} do { (_overlay displayCtrl (517)) ctrlShow false; }; - _nearest_active_sector = [GRLIB_sector_size] call KPLIB_fnc_getNearestSector; + _nearest_active_sector = [KPLIB_sector_size] call KPLIB_fnc_getNearestSector; if ( _nearest_active_sector != "" ) then { - _zone_size = GRLIB_capture_size; + _zone_size = KPLIB_capture_size; if ( _nearest_active_sector in sectors_bigtown ) then { - _zone_size = GRLIB_capture_size * 1.4; + _zone_size = KPLIB_capture_size * 1.4; }; "zone_capture" setmarkerposlocal (markerpos _nearest_active_sector); _colorzone = "ColorGrey"; - if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == GRLIB_side_friendly ) then { _colorzone = GRLIB_color_friendly }; - if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == GRLIB_side_enemy ) then { _colorzone = GRLIB_color_enemy }; - if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == GRLIB_side_resistance ) then { _colorzone = "ColorCivilian" }; + if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_friendly ) then { _colorzone = KPLIB_color_friendly }; + if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_enemy ) then { _colorzone = KPLIB_color_enemy }; + if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_resistance ) then { _colorzone = "ColorCivilian" }; "zone_capture" setmarkercolorlocal _colorzone; _ratio = [_nearest_active_sector] call KPLIB_fnc_getBluforRatio; diff --git a/Missionframework/scripts/server/ai/battlegroup_ai.sqf b/Missionframework/scripts/server/ai/battlegroup_ai.sqf index b9e7167cd..ef4fef587 100644 --- a/Missionframework/scripts/server/ai/battlegroup_ai.sqf +++ b/Missionframework/scripts/server/ai/battlegroup_ai.sqf @@ -48,6 +48,6 @@ waitUntil { sleep (5 + (random 5)); reset_battlegroups_ai = false; -if (!((units _grp) isEqualTo []) && (GRLIB_endgame == 0)) then { +if (!((units _grp) isEqualTo []) && (KPLIB_endgame == 0)) then { [_grp] spawn battlegroup_ai; }; diff --git a/Missionframework/scripts/server/ai/building_defence_ai.sqf b/Missionframework/scripts/server/ai/building_defence_ai.sqf index d6ceb06ec..af74d2034 100644 --- a/Missionframework/scripts/server/ai/building_defence_ai.sqf +++ b/Missionframework/scripts/server/ai/building_defence_ai.sqf @@ -13,9 +13,9 @@ while {_move_is_disabled && local _unit && alive _unit && !(captive _unit)} do { _ratio = [_sector] call KPLIB_fnc_getBluforRatio; }; - _range = floor (linearConversion [0, 1, _ratio, 0, GRLIB_capture_size / 3 * 2, true]); + _range = floor (linearConversion [0, 1, _ratio, 0, KPLIB_capture_size / 3 * 2, true]); - _hostiles = ((getPos _unit) nearEntities [["Man"], _range]) select {side _x == GRLIB_side_friendly}; + _hostiles = ((getPos _unit) nearEntities [["Man"], _range]) select {side _x == KPLIB_side_friendly}; if (_move_is_disabled && { diff --git a/Missionframework/scripts/server/ai/prisonner_ai.sqf b/Missionframework/scripts/server/ai/prisonner_ai.sqf index c8583f47f..65603008d 100644 --- a/Missionframework/scripts/server/ai/prisonner_ai.sqf +++ b/Missionframework/scripts/server/ai/prisonner_ai.sqf @@ -1,8 +1,8 @@ params ["_unit", ["_force_surrender", false]]; -if ((!_force_surrender) && ((random 100) > GRLIB_surrender_chance)) exitWith {}; +if ((!_force_surrender) && ((random 100) > KPLIB_surrender_chance)) exitWith {}; -if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == GRLIB_side_enemy)) then { +if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == KPLIB_side_enemy)) then { if (vehicle _unit != _unit) then {deleteVehicle _unit}; @@ -22,7 +22,7 @@ if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == GRLIB_side_e _unit removeItem "NVGoggles_INDEP"; _unit setUnitPos "UP"; sleep 1; - private _grp = createGroup [GRLIB_side_civilian, true]; + private _grp = createGroup [KPLIB_side_civilian, true]; [_unit] joinSilent _grp; if (KP_liberation_ace) then { [_unit, true] call ACE_captives_fnc_setSurrendered; @@ -34,7 +34,7 @@ if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == GRLIB_side_e _unit setCaptive true; }; waitUntil {sleep 1; - !alive _unit || side group _unit == GRLIB_side_friendly + !alive _unit || side group _unit == KPLIB_side_friendly }; if (alive _unit) then { diff --git a/Missionframework/scripts/server/ai/troup_transport.sqf b/Missionframework/scripts/server/ai/troup_transport.sqf index 81cbc22a8..c872d70a5 100644 --- a/Missionframework/scripts/server/ai/troup_transport.sqf +++ b/Missionframework/scripts/server/ai/troup_transport.sqf @@ -19,7 +19,7 @@ waitUntil { }; if ((alive _transVeh) && (alive (driver _transVeh))) then { - _infGrp = createGroup [GRLIB_side_enemy, true]; + _infGrp = createGroup [KPLIB_side_enemy, true]; { [_x, _start_pos, _infGrp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; diff --git a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf index 38287d93e..af255421b 100644 --- a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf +++ b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf @@ -6,7 +6,7 @@ if (KP_liberation_asymmetric_debug > 0) then {[format ["Loop spawned on: %1", de KP_liberation_asymmetric_sectors = []; -while {GRLIB_endgame == 0} do { +while {KPLIB_endgame == 0} do { private _sectors_to_remove = []; { @@ -21,7 +21,7 @@ while {GRLIB_endgame == 0} do { { private _sector = _x; private _blocked = false; - private _units_at_sector = [markerPos _sector, GRLIB_sector_size, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; + private _units_at_sector = [markerPos _sector, KPLIB_sector_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; { if ((_x select 0) == _sector) exitWith { @@ -40,7 +40,7 @@ while {GRLIB_endgame == 0} do { if ((random 100) <= KP_liberation_resistance_ambush_chance) then { private _hc = [] call KPLIB_fnc_getLessLoadedHC; - private _ieds = round (([] call KPLIB_fnc_crGetMulti) * GRLIB_difficulty_modifier); + private _ieds = round (([] call KPLIB_fnc_crGetMulti) * KPLIB_difficulty_modifier); if (isNull _hc) then { [_sector, _ieds] spawn manage_asymIED; diff --git a/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf b/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf index 8896d22ad..8f030fcd9 100644 --- a/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf +++ b/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf @@ -31,8 +31,8 @@ if (!(isnull _roadobj)) then { if (KP_liberation_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> IED %1 spawned at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; while {(_sector in KP_liberation_asymmetric_sectors) && (mineActive _ied_obj) && !_goes_boom} do { - _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == GRLIB_side_friendly}; - _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == GRLIB_side_friendly}; + _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_friendly}; + _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_friendly}; if (count _nearinfantry >= _infantry_trigger || count _nearvehicles >= _vehicle_trigger) then { _ied_obj setDamage 1; stats_ieds_detonated = stats_ieds_detonated + 1; publicVariable "stats_ieds_detonated"; diff --git a/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf b/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf index cc4ab3526..796b767d0 100644 --- a/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf +++ b/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf @@ -37,7 +37,7 @@ if (KP_liberation_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf - private _attack = false; while {(_sector in KP_liberation_asymmetric_sectors) && (!isNull _grp)} do { - private _blufor_near = {alive _x && side _x == GRLIB_side_friendly} count ((getpos (leader _grp)) nearEntities [["LAND"], 140]); + private _blufor_near = {alive _x && side _x == KPLIB_side_friendly} count ((getpos (leader _grp)) nearEntities [["LAND"], 140]); if ((_blufor_near > 0) && !_attack) then { _attack = true; { diff --git a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf index 050d575be..9fb37e59a 100644 --- a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf +++ b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf @@ -4,7 +4,7 @@ if (KP_liberation_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - sector_ private _startpos = (markerPos _sector) getPos [(1200 + (round (random 400))), (random 360)]; -while {(([_startpos, 500, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0) || (surfaceIsWater _startpos)} do { +while {(([_startpos, 500, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0) || (surfaceIsWater _startpos)} do { _startpos = (markerPos _sector) getPos [(1200 + (round (random 400))), (random 360)]; }; diff --git a/Missionframework/scripts/server/base/startgame.sqf b/Missionframework/scripts/server/base/startgame.sqf index 47c22f5d2..d600ad93e 100644 --- a/Missionframework/scripts/server/base/startgame.sqf +++ b/Missionframework/scripts/server/base/startgame.sqf @@ -2,10 +2,10 @@ waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; // Check if there is no FOB yet (new campaign) -if (GRLIB_all_fobs isEqualTo []) then { +if (KPLIB_all_fobs isEqualTo []) then { // Prebuild FOB (parameter setting) or spawn FOB box - if (GRLIB_build_first_fob) then { + if (KPLIB_build_first_fob) then { // Only accept spawnpoints which are at least 800m away from any sector private _y = ""; private _validPlaces = sectors_opfor select { @@ -18,7 +18,7 @@ if (GRLIB_all_fobs isEqualTo []) then { } else { // Spawn FOB box and wait until the first FOB was built private _fobbox = objNull; - while {GRLIB_all_fobs isEqualTo []} do { + while {KPLIB_all_fobs isEqualTo []} do { _fobbox = ([FOB_box_typename, FOB_truck_typename] select KP_liberation_fob_vehicle) createVehicle (getposATL base_boxspawn); _fobbox setdir getDir base_boxspawn; _fobbox setposATL (getposATL base_boxspawn); @@ -28,7 +28,7 @@ if (GRLIB_all_fobs isEqualTo []) then { // If the FOB box has fallen into the sea or is destroyed, start again with spawning a new one waitUntil { sleep 1; - !(alive _fobbox) || !(GRLIB_all_fobs isEqualTo []) || (((getPosASL _fobbox) select 2) < 0) + !(alive _fobbox) || !(KPLIB_all_fobs isEqualTo []) || (((getPosASL _fobbox) select 2) < 0) }; sleep 10; }; @@ -36,7 +36,7 @@ if (GRLIB_all_fobs isEqualTo []) then { }; // Wait a short time before paradropping the start resource crates - waitUntil {sleep 1; !(GRLIB_all_fobs isEqualTo [])}; + waitUntil {sleep 1; !(KPLIB_all_fobs isEqualTo [])}; if (KP_liberation_tutorial && {["KPLIB_Tasks_Tutorial_Fob"] call BIS_fnc_taskExists}) then { waitUntil {sleep 1; ["KPLIB_Tasks_Tutorial_Fob_02"] call BIS_fnc_taskCompleted}; sleep 3; @@ -50,7 +50,7 @@ if (GRLIB_all_fobs isEqualTo []) then { for "_i" from 1 to 6 do { _crate = createVehicle [ (KPLIB_crates select (_i % 3)), - [((GRLIB_all_fobs select 0) select 0), ((GRLIB_all_fobs select 0) select 1), 150], + [((KPLIB_all_fobs select 0) select 0), ((KPLIB_all_fobs select 0) select 1), 150], [], 80, "FLY" diff --git a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf index d015897af..6ba8742ae 100644 --- a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf @@ -6,8 +6,8 @@ sleep 1800; private _sleeptime = 0; private _target_player = objNull; private _target_pos = ""; -while {GRLIB_csat_aggressivity >= 0.9 && GRLIB_endgame == 0} do { - _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * GRLIB_csat_aggressivity); +while {KPLIB_csat_aggressivity >= 0.9 && KPLIB_endgame == 0} do { + _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_csat_aggressivity); if (combat_readiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; if (combat_readiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; diff --git a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf index fb391e3bf..a9d72c5e5 100644 --- a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf +++ b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf @@ -1,7 +1,7 @@ -sleep (900 / GRLIB_csat_aggressivity); +sleep (900 / KPLIB_csat_aggressivity); private _sleeptime = 0; -while {GRLIB_csat_aggressivity > 0.9 && GRLIB_endgame == 0} do { - _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * GRLIB_csat_aggressivity); +while {KPLIB_csat_aggressivity > 0.9 && KPLIB_endgame == 0} do { + _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_csat_aggressivity); if (combat_readiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; if (combat_readiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; @@ -9,17 +9,17 @@ while {GRLIB_csat_aggressivity > 0.9 && GRLIB_endgame == 0} do { sleep _sleeptime; - if (!isNil "GRLIB_last_battlegroup_time") then { + if (!isNil "KPLIB_last_battlegroup_time") then { waitUntil { sleep 5; - diag_tickTime > (GRLIB_last_battlegroup_time + (2100 / GRLIB_csat_aggressivity)) + diag_tickTime > (KPLIB_last_battlegroup_time + (2100 / KPLIB_csat_aggressivity)) }; }; if ( - (count (allPlayers - entities "HeadlessClient_F") >= (6 / GRLIB_csat_aggressivity)) - && {combat_readiness >= (60 - (5 * GRLIB_csat_aggressivity))} - && {[] call KPLIB_fnc_getOpforCap < GRLIB_battlegroup_cap} + (count (allPlayers - entities "HeadlessClient_F") >= (6 / KPLIB_csat_aggressivity)) + && {combat_readiness >= (60 - (5 * KPLIB_csat_aggressivity))} + && {[] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap} && {diag_fps > 15.0} ) then { ["", (random 100) < 45] spawn spawn_battlegroup; diff --git a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf index 252047506..a2ba8a89a 100644 --- a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf +++ b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf @@ -14,6 +14,6 @@ while {true} do { stats_readiness_earned = stats_readiness_earned + 0.25; }; }; - if (combat_readiness > 100.0 && GRLIB_difficulty_modifier < 2) then {combat_readiness = 100.0}; + if (combat_readiness > 100.0 && KPLIB_difficulty_modifier < 2) then {combat_readiness = 100.0}; sleep (180 + random (180)); }; diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index 218cdff99..8a56b4916 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -10,7 +10,7 @@ private _class = selectRandom opfor_air; private _spawnPoint = ([sectors_airspawn, [_first_objective], {(markerPos _x) distance _input0}, "ASCEND"] call BIS_fnc_sortBy) select 0; private _spawnPos = []; private _plane = objNull; -private _grp = createGroup [GRLIB_side_enemy, true]; +private _grp = createGroup [KPLIB_side_enemy, true]; for "_i" from 1 to _planes_number do { _spawnPos = markerPos _spawnPoint; diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index 244285c0e..ac203de2f 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -4,16 +4,16 @@ params [ ["_infOnly", false, [false]] ]; -if (GRLIB_endgame == 1) exitWith {}; +if (KPLIB_endgame == 1) exitWith {}; _spawn_marker = [[2000, 1000] select _infOnly, 3000, false, markerPos _spawn_marker] call KPLIB_fnc_getOpforSpawnPoint; if !(_spawn_marker isEqualTo "") then { - GRLIB_last_battlegroup_time = diag_tickTime; + KPLIB_last_battlegroup_time = diag_tickTime; private _bg_groups = []; private _selected_opfor_battlegroup = []; - private _target_size = (round (GRLIB_battlegroup_size * ([] call KPLIB_fnc_getOpforFactor) * (sqrt GRLIB_csat_aggressivity))) min 16; + private _target_size = (round (KPLIB_battlegroup_size * ([] call KPLIB_fnc_getOpforFactor) * (sqrt KPLIB_csat_aggressivity))) min 16; if (combat_readiness < 60) then {_target_size = round (_target_size * 0.65);}; [_spawn_marker] remoteExec ["remote_call_battlegroup"]; @@ -30,11 +30,11 @@ if !(_spawn_marker isEqualTo "") then { _target_size = 12 max (_target_size * 4); // Create infantry groups with up to 8 units per squad - private _grp = createGroup [GRLIB_side_enemy, true]; + private _grp = createGroup [KPLIB_side_enemy, true]; for "_i" from 0 to (_target_size - 1) do { if (_i > 0 && {(_i % 8) isEqualTo 0}) then { _bg_groups pushBack _grp; - _grp = createGroup [GRLIB_side_enemy, true]; + _grp = createGroup [KPLIB_side_enemy, true]; }; [selectRandom _infClasses, markerPos _spawn_marker, _grp] call KPLIB_fnc_createManagedUnit; }; @@ -49,7 +49,7 @@ if !(_spawn_marker isEqualTo "") then { private ["_nextgrp", "_vehicle"]; { - _nextgrp = createGroup [GRLIB_side_enemy, true]; + _nextgrp = createGroup [KPLIB_side_enemy, true]; _vehicle = [markerpos _spawn_marker, _x] call KPLIB_fnc_spawnVehicle; sleep 0.5; @@ -58,7 +58,7 @@ if !(_spawn_marker isEqualTo "") then { [_nextgrp] spawn battlegroup_ai; _bg_groups pushback _nextgrp; - if ((_x in opfor_troup_transports) && ([] call KPLIB_fnc_getOpforCap < GRLIB_battlegroup_cap)) then { + if ((_x in opfor_troup_transports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap)) then { if (_vehicle isKindOf "Air") then { [[markerPos _spawn_marker] call KPLIB_fnc_getNearestBluforObjective, _vehicle] spawn send_paratroopers; } else { @@ -67,7 +67,7 @@ if !(_spawn_marker isEqualTo "") then { }; } forEach _selected_opfor_battlegroup; - if (GRLIB_csat_aggressivity > 0.9) then { + if (KPLIB_csat_aggressivity > 0.9) then { [[markerPos _spawn_marker] call KPLIB_fnc_getNearestBluforObjective] spawn spawn_air; }; }; diff --git a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf index 182856836..e968e79fd 100644 --- a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf +++ b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf @@ -15,11 +15,11 @@ while {true} do { if (KP_liberation_civinfo_debug > 0) then {["Informant waitUntil passed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; - if ((KP_liberation_civinfo_chance >= (random 100)) && GRLIB_endgame == 0) then { + if ((KP_liberation_civinfo_chance >= (random 100)) && KPLIB_endgame == 0) then { private _sector = selectRandom (blufor_sectors select {_x in sectors_capture || _x in sectors_bigtown}); private _house = (nearestObjects [[((markerPos _sector select 0) - 100 + (random 200)), ((markerPos _sector select 1) - 100 + (random 200))],["House", "Building"], 100]) select 0; - private _grp = createGroup [GRLIB_side_civilian, true]; + private _grp = createGroup [KPLIB_side_civilian, true]; private _informant = [selectRandom civilians, markerPos _sector, _grp] call KPLIB_fnc_createManagedUnit; private _waiting_time = KP_liberation_civinfo_duration; @@ -40,7 +40,7 @@ while {true} do { [0, [((((getPos _informant) select 0) + 200) - random 400),((((getPos _informant) select 1) + 200) - random 400),0]] remoteExec ["civinfo_notifications"]; - while {alive _informant && ((side (group _informant)) == GRLIB_side_civilian) && _waiting_time > 0} do { + while {alive _informant && ((side (group _informant)) == KPLIB_side_civilian) && _waiting_time > 0} do { uiSleep 1; private _player_near = false; { diff --git a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf index ae9749c71..c18d56644 100644 --- a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf +++ b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf @@ -13,7 +13,7 @@ _veh setDir (getDir _roadObj); }; } forEach ((getAllHitPointsDamage _veh) select 0); -private _grp = createGroup [GRLIB_side_enemy, true]; +private _grp = createGroup [KPLIB_side_enemy, true]; private _hvt = [opfor_officer, getPos _roadObj, _grp, "CAPTAIN", 30] call KPLIB_fnc_createManagedUnit; for "_i" from 1 to 4 do { diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf index 28adaf3b3..f43f0ccfe 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf @@ -16,10 +16,10 @@ KP_liberation_civ_rep = -100 max (KP_liberation_civ_rep min 100); private _resistanceEnemy = [0, 1] select (KP_liberation_civ_rep < 25); private _resistanceFriendly = [0, 1] select (KP_liberation_civ_rep >= -25); -GRLIB_side_resistance setFriend [GRLIB_side_enemy, _resistanceEnemy]; -GRLIB_side_enemy setFriend [GRLIB_side_resistance, _resistanceEnemy]; -GRLIB_side_resistance setFriend [GRLIB_side_friendly, _resistanceFriendly]; -GRLIB_side_friendly setFriend [GRLIB_side_resistance, _resistanceFriendly]; +KPLIB_side_resistance setFriend [KPLIB_side_enemy, _resistanceEnemy]; +KPLIB_side_enemy setFriend [KPLIB_side_resistance, _resistanceEnemy]; +KPLIB_side_resistance setFriend [KPLIB_side_friendly, _resistanceFriendly]; +KPLIB_side_friendly setFriend [KPLIB_side_resistance, _resistanceFriendly]; if (KP_liberation_civrep_debug > 0) then {[format ["changeCR finished - New value: %1", KP_liberation_civ_rep], "CIVREP"] call KPLIB_fnc_log;}; -if (KP_liberation_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", GRLIB_side_resistance, GRLIB_side_enemy, (GRLIB_side_resistance getFriend GRLIB_side_enemy), GRLIB_side_friendly, (GRLIB_side_resistance getFriend GRLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; +if (KP_liberation_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf index 1aded4374..d4feea5a7 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf @@ -3,9 +3,9 @@ params ["_sector"]; private _return = 0; if (KP_liberation_cr_param_buildings) then { - _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * GRLIB_capture_size] select {(damage _x == 0) && !((typeOf _x) in KP_liberation_cr_ign_buildings)}); + _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(damage _x == 0) && !((typeOf _x) in KP_liberation_cr_ign_buildings)}); } else { - _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * GRLIB_capture_size] select {(alive _x) && !((typeOf _x) in KP_liberation_cr_ign_buildings)}); + _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(alive _x) && !((typeOf _x) in KP_liberation_cr_ign_buildings)}); }; _return diff --git a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf index eda921055..93ad33a0a 100644 --- a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf +++ b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf @@ -5,7 +5,7 @@ if (!(_sector in sectors_bigtown) && !(_sector in sectors_capture) && !(_sector if (KP_liberation_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned for %1 on: %2", markerText _sector, debug_source], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _count = 2 + (ceil (random 2)); -private _grp = creategroup [GRLIB_side_civilian, true]; +private _grp = creategroup [KPLIB_side_civilian, true]; private _civs = []; private _markers = []; @@ -32,11 +32,11 @@ for "_i" from 1 to _count do { if (KP_liberation_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned %1 wounded civilians at %2", _count, markerText _sector], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; -private _units_near = [markerPos _sector, 300, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _units_near = [markerPos _sector, 300, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; private _healed_civs = []; while {_units_near > 0} do { - _units_near = [markerPos _sector, 300, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; + _units_near = [markerPos _sector, 300, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; { if (((damage _x) < 0.5) && !(_x in _healed_civs)) then { (_markers select _forEachIndex) setMarkerAlpha 0; diff --git a/Missionframework/scripts/server/game/apply_default_permissions.sqf b/Missionframework/scripts/server/game/apply_default_permissions.sqf index 471b99200..bcee6fcd0 100644 --- a/Missionframework/scripts/server/game/apply_default_permissions.sqf +++ b/Missionframework/scripts/server/game/apply_default_permissions.sqf @@ -1,29 +1,29 @@ -if (!GRLIB_permissions_param) exitWith {}; +if (!KPLIB_permissions_param) exitWith {}; -waitUntil {!isNil "GRLIB_permissions"}; +waitUntil {!isNil "KPLIB_permissions"}; waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; while {true} do { private _default_permissions = []; - {if ((_x select 0) == "Default") exitWith {_default_permissions = (_x select 2);}} foreach GRLIB_permissions; + {if ((_x select 0) == "Default") exitWith {_default_permissions = (_x select 2);}} foreach KPLIB_permissions; if (count _default_permissions > 0) then { private _all_players_uids = []; - {if ((_x select 0) != "Default") then {_all_players_uids pushback (_x select 0)}} foreach GRLIB_permissions; + {if ((_x select 0) != "Default") then {_all_players_uids pushback (_x select 0)}} foreach KPLIB_permissions; - private _old_count = count GRLIB_permissions; + private _old_count = count KPLIB_permissions; { if (!((name _x) in ["HC1", "HC2", "HC3"])) then { if (!((getPlayerUID _x) in _all_players_uids)) then { - GRLIB_permissions pushback [(getPlayerUID _x), (name _x), _default_permissions]; + KPLIB_permissions pushback [(getPlayerUID _x), (name _x), _default_permissions]; }; }; } foreach allPlayers; - if (_old_count != count GRLIB_permissions) then { - publicVariable "GRLIB_permissions" + if (_old_count != count KPLIB_permissions) then { + publicVariable "KPLIB_permissions" }; }; diff --git a/Missionframework/scripts/server/game/check_victory_conditions.sqf b/Missionframework/scripts/server/game/check_victory_conditions.sqf index a6e3024a0..b8949f563 100644 --- a/Missionframework/scripts/server/game/check_victory_conditions.sqf +++ b/Missionframework/scripts/server/game/check_victory_conditions.sqf @@ -1,8 +1,8 @@ sleep 5; -if ([] call KP_liberation_victoryCheck && GRLIB_endgame != 1) then { - GRLIB_endgame = 1; - publicVariable "GRLIB_endgame"; +if ([] call KP_liberation_victoryCheck && KPLIB_endgame != 1) then { + KPLIB_endgame = 1; + publicVariable "KPLIB_endgame"; {_x allowDamage false; (vehicle _x) allowDamage false;} forEach allPlayers; private _rabbits = round (random 75) + round (random 80); diff --git a/Missionframework/scripts/server/game/cleanup_vehicles.sqf b/Missionframework/scripts/server/game/cleanup_vehicles.sqf index ae353ee8f..fd6dde5ca 100644 --- a/Missionframework/scripts/server/game/cleanup_vehicles.sqf +++ b/Missionframework/scripts/server/game/cleanup_vehicles.sqf @@ -5,7 +5,7 @@ _cleanup_classnames = []; _cleanup_classnames append _x; } forEach [KPLIB_b_light_classes, KPLIB_b_heavy_classes, KPLIB_b_air_classes]; -while { GRLIB_cleanup_vehicles > 0 } do { +while { KPLIB_cleanup_vehicles > 0 } do { sleep 600; @@ -14,10 +14,10 @@ while { GRLIB_cleanup_vehicles > 0 } do { _nextvehicle = _x; _nearestfob = [ getpos _nextvehicle ] call KPLIB_fnc_getNearestFob; if ( count _nearestfob == 3 ) then { - if ( ( _nextvehicle distance _nearestfob > ( 1.2 * GRLIB_fob_range ) ) && ( _nextvehicle distance startbase > ( 1.2 * GRLIB_fob_range ) ) ) then { + if ( ( _nextvehicle distance _nearestfob > ( 1.2 * KPLIB_fob_range ) ) && ( _nextvehicle distance startbase > ( 1.2 * KPLIB_fob_range ) ) ) then { if ((toLower (typeof _nextvehicle)) in _cleanup_classnames) then { if ( count ( crew _nextvehicle ) == 0 ) then { - _nextvehicle setVariable [ "GRLIB_empty_vehicle_ticker", ( _nextvehicle getVariable [ "GRLIB_empty_vehicle_ticker", 0 ] ) + 1 ]; + _nextvehicle setVariable [ "KPLIB_empty_vehicle_ticker", ( _nextvehicle getVariable [ "KPLIB_empty_vehicle_ticker", 0 ] ) + 1 ]; _reset_ticker = false; }; }; @@ -25,10 +25,10 @@ while { GRLIB_cleanup_vehicles > 0 } do { } ; if ( _reset_ticker ) then { - _nextvehicle setVariable [ "GRLIB_empty_vehicle_ticker", 0 ]; + _nextvehicle setVariable [ "KPLIB_empty_vehicle_ticker", 0 ]; }; - if ( _nextvehicle getVariable [ "GRLIB_empty_vehicle_ticker", 0 ] >= ( 6 * GRLIB_cleanup_vehicles ) ) then { + if ( _nextvehicle getVariable [ "KPLIB_empty_vehicle_ticker", 0 ] >= ( 6 * KPLIB_cleanup_vehicles ) ) then { deleteVehicle _nextvehicle; }; diff --git a/Missionframework/scripts/server/game/manage_time.sqf b/Missionframework/scripts/server/game/manage_time.sqf index 8e8d33a9f..231153024 100644 --- a/Missionframework/scripts/server/game/manage_time.sqf +++ b/Missionframework/scripts/server/game/manage_time.sqf @@ -1,8 +1,8 @@ while {true} do { - if (GRLIB_shorter_nights && (daytime > 20 || daytime < 4)) then { - setTimeMultiplier (GRLIB_time_factor * 4); + if (KPLIB_shorter_nights && (daytime > 20 || daytime < 4)) then { + setTimeMultiplier (KPLIB_time_factor * 4); } else { - setTimeMultiplier GRLIB_time_factor; + setTimeMultiplier KPLIB_time_factor; }; sleep 10; }; diff --git a/Missionframework/scripts/server/game/manage_weather.sqf b/Missionframework/scripts/server/game/manage_weather.sqf index eb01fb0ac..523be355c 100644 --- a/Missionframework/scripts/server/game/manage_weather.sqf +++ b/Missionframework/scripts/server/game/manage_weather.sqf @@ -2,15 +2,15 @@ private _weathers = [ [0.25], [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55], [0, 0.1, 0.15, 0.2, 0.25, 0.3, 0.325, 0.35, 0.375, 0.4, 0.425, 0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1] -] select (GRLIB_weather_param - 1); +] select (KPLIB_weather_param - 1); private _newWeather = selectRandom _weathers; 0 setOvercast _newWeather; forceWeatherChange; -[format ["Set initial weather to: %1 - Param Value: %2 - Time: %3", _newWeather, GRLIB_weather_param, diag_tickTime], "WEATHER"] call KPLIB_fnc_log; +[format ["Set initial weather to: %1 - Param Value: %2 - Time: %3", _newWeather, KPLIB_weather_param, diag_tickTime], "WEATHER"] call KPLIB_fnc_log; -while {GRLIB_endgame == 0} do { +while {KPLIB_endgame == 0} do { _newWeather = selectRandom _weathers; (3600 * timeMultiplier) setOvercast _newWeather; [format ["Set next weather transition to: %1 - Time: %2", _newWeather, diag_tickTime], "WEATHER"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 4f1110085..cc5c6ffa2 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -4,8 +4,8 @@ private _start = diag_tickTime; ["----- Loading save data", "SAVE"] call KPLIB_fnc_log; // Handle possible enabled "wipe save" mission parameters -if (GRLIB_param_wipe_savegame_1 == 1 && GRLIB_param_wipe_savegame_2 == 1) then { - profileNamespace setVariable [GRLIB_save_key,nil]; +if (KPLIB_param_wipe_savegame_1 == 1 && KPLIB_param_wipe_savegame_2 == 1) then { + profileNamespace setVariable [KPLIB_save_key,nil]; saveProfileNamespace; ["Save wiped via mission parameters", "SAVE"] call KPLIB_fnc_log; } else { @@ -72,11 +72,11 @@ blufor_sectors = []; // Enemy combat readiness (0-100) combat_readiness = 0; // All FOBs -GRLIB_all_fobs = []; +KPLIB_all_fobs = []; // Player permissions data -GRLIB_permissions = []; +KPLIB_permissions = []; // Vehicle unlock links -GRLIB_vehicle_to_military_base_links = []; +KPLIB_vehicle_to_military_base_links = []; // Enemy weight for anti infantry infantry_weight = 33; // Civilian reputation value (-100 - +100) @@ -158,7 +158,7 @@ stats_vehicles_recycled = 0; } forEach (allMissionObjects ""); // Get possible save data -private _saveData = profileNamespace getVariable GRLIB_save_key; +private _saveData = profileNamespace getVariable KPLIB_save_key; // Load save data, when retrieved if (!isNil "_saveData") then { @@ -179,9 +179,9 @@ if (!isNil "_saveData") then { _aiGroups = _saveData select 6; blufor_sectors = _saveData select 7; combat_readiness = _saveData select 8; - GRLIB_all_fobs = _saveData select 9; - GRLIB_permissions = _saveData select 10; - GRLIB_vehicle_to_military_base_links = _saveData select 11; + KPLIB_all_fobs = _saveData select 9; + KPLIB_permissions = _saveData select 10; + KPLIB_vehicle_to_military_base_links = _saveData select 11; KP_liberation_civ_rep = _saveData select 12; KP_liberation_clearances = _saveData select 13; KP_liberation_guerilla_strength = _saveData select 14; @@ -236,7 +236,7 @@ if (!isNil "_saveData") then { ["Save data from version: pre 0.96.5", "SAVE"] call KPLIB_fnc_log; blufor_sectors = _saveData select 0; - GRLIB_all_fobs = _saveData select 1; + KPLIB_all_fobs = _saveData select 1; _objectsToSave = _saveData select 2; _dateTime = _saveData select 3; combat_readiness = _saveData select 4; @@ -245,8 +245,8 @@ if (!isNil "_saveData") then { KP_liberation_logistics = _saveData select 7; _stats = _saveData select 8; _weights = _saveData select 9; - GRLIB_vehicle_to_military_base_links = _saveData select 10; - GRLIB_permissions = _saveData select 11; + KPLIB_vehicle_to_military_base_links = _saveData select 10; + KPLIB_permissions = _saveData select 11; _aiGroups = _saveData select 12; resources_intel = _saveData select 13; KP_liberation_civ_rep = _saveData select 15; @@ -290,12 +290,12 @@ if (!isNil "_saveData") then { private _resistanceEnemy = [0, 1] select (KP_liberation_civ_rep < 25); private _resistanceFriendly = [0, 1] select (KP_liberation_civ_rep >= -25); - GRLIB_side_resistance setFriend [GRLIB_side_enemy, _resistanceEnemy]; - GRLIB_side_enemy setFriend [GRLIB_side_resistance, _resistanceEnemy]; - GRLIB_side_resistance setFriend [GRLIB_side_friendly, _resistanceFriendly]; - GRLIB_side_friendly setFriend [GRLIB_side_resistance, _resistanceFriendly]; + KPLIB_side_resistance setFriend [KPLIB_side_enemy, _resistanceEnemy]; + KPLIB_side_enemy setFriend [KPLIB_side_resistance, _resistanceEnemy]; + KPLIB_side_resistance setFriend [KPLIB_side_friendly, _resistanceFriendly]; + KPLIB_side_friendly setFriend [KPLIB_side_resistance, _resistanceFriendly]; - if (KP_liberation_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", GRLIB_side_resistance, GRLIB_side_enemy, (GRLIB_side_resistance getFriend GRLIB_side_enemy), GRLIB_side_friendly, (GRLIB_side_resistance getFriend GRLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; + if (KP_liberation_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; // Apply current date and time if (_dateTime isEqualType []) then { @@ -393,7 +393,7 @@ if (!isNil "_saveData") then { // reveal mine to player side if it was detected if (_known) then { - GRLIB_side_friendly revealMine _mine; + KPLIB_side_friendly revealMine _mine; }; } forEach _allMines; @@ -468,7 +468,7 @@ if (!isNil "_saveData") then { if (((_saveData select 0) select 0) isEqualType 0) then { { _x params ["_spawnPos", "_units"]; - _grp = createGroup [GRLIB_side_friendly, true]; + _grp = createGroup [KPLIB_side_friendly, true]; { [_x, [_spawnPos, _grp] select (_forEachIndex > 0), _grp] call KPLIB_fnc_createManagedUnit; } forEach _units; @@ -479,7 +479,7 @@ if (!isNil "_saveData") then { private _dir = 0; private _unit = objNull; { - _grp = createGroup [GRLIB_side_friendly, true]; + _grp = createGroup [KPLIB_side_friendly, true]; { _pos = [(_x select 1) select 0, (_x select 1) select 1, ((_x select 1) select 2) + 0.2]; _dir = _x select 2; @@ -503,17 +503,17 @@ if (!isNil "_saveData") then { publicVariable "stats_civilian_vehicles_seized"; publicVariable "stats_ieds_detonated"; publicVariable "blufor_sectors"; -publicVariable "GRLIB_all_fobs"; +publicVariable "KPLIB_all_fobs"; publicVariable "KP_liberation_clearances"; // Check for deleted military sectors or deleted classnames in the locked vehicles array -GRLIB_vehicle_to_military_base_links = GRLIB_vehicle_to_military_base_links select {((_x select 0) in elite_vehicles) && ((_x select 1) in sectors_military)}; +KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {((_x select 0) in elite_vehicles) && ((_x select 1) in sectors_military)}; // Remove links for vehicles of possibly removed mods -GRLIB_vehicle_to_military_base_links = GRLIB_vehicle_to_military_base_links select {[_x select 0] call KPLIB_fnc_checkClass}; +KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {[_x select 0] call KPLIB_fnc_checkClass}; // Check for additions in the locked vehicles array -private _lockedVehCount = count GRLIB_vehicle_to_military_base_links; +private _lockedVehCount = count KPLIB_vehicle_to_military_base_links; if ((_lockedVehCount < (count sectors_military)) && (_lockedVehCount < (count elite_vehicles))) then { private _assignedVehicles = []; private _assignedBases = []; @@ -523,7 +523,7 @@ if ((_lockedVehCount < (count sectors_military)) && (_lockedVehCount < (count el { _assignedVehicles pushBack (_x select 0); _assignedBases pushBack (_x select 1); - } forEach GRLIB_vehicle_to_military_base_links; + } forEach KPLIB_vehicle_to_military_base_links; // Add new entries, when there are elite vehicles and military sectors are not yet assigned while {((count _assignedVehicles) < (count elite_vehicles)) && ((count _assignedBases) < (count sectors_military))} do { @@ -531,13 +531,13 @@ if ((_lockedVehCount < (count sectors_military)) && (_lockedVehCount < (count el _nextBase = selectRandom (sectors_military - _assignedBases); _assignedVehicles pushBack _nextVehicle; _assignedBases pushBack _nextBase; - GRLIB_vehicle_to_military_base_links pushBack [_nextVehicle, _nextBase]; + KPLIB_vehicle_to_military_base_links pushBack [_nextVehicle, _nextBase]; }; ["Additional military sectors or unlockable vehicles detected and assigned", "SAVE"] call KPLIB_fnc_log; }; -publicVariable "GRLIB_vehicle_to_military_base_links"; -publicVariable "GRLIB_permissions"; +publicVariable "KPLIB_vehicle_to_military_base_links"; +publicVariable "KPLIB_permissions"; save_is_loaded = true; publicVariable "save_is_loaded"; [format ["----- Saved data loaded - Time needed: %1 seconds", diag_tickTime - _start], "SAVE"] call KPLIB_fnc_log; @@ -547,13 +547,13 @@ private _saveTime = time + KP_liberation_save_interval; while {true} do { waitUntil { sleep 0.5; - (time > _saveTime) || {GRLIB_endgame == 1}; + (time > _saveTime) || {KPLIB_endgame == 1}; }; _start = diag_tickTime; // Exit the while and wipe save, if campaign ended - if (GRLIB_endgame == 1) exitWith { - profileNamespace setVariable [GRLIB_save_key, nil]; + if (KPLIB_endgame == 1) exitWith { + profileNamespace setVariable [KPLIB_save_key, nil]; saveProfileNamespace; }; diff --git a/Missionframework/scripts/server/game/zeus_synchro.sqf b/Missionframework/scripts/server/game/zeus_synchro.sqf index ad4766694..48ab5bd5d 100644 --- a/Missionframework/scripts/server/game/zeus_synchro.sqf +++ b/Missionframework/scripts/server/game/zeus_synchro.sqf @@ -25,8 +25,8 @@ while {true} do { _valids = allUnits select { (alive _x) // Alive && { - (KP_liberation_enemies_zeus && {!(side (group _x) isEqualTo GRLIB_side_civilian)}) // Not civilian side, if enemy adding is enabled - || {side (group _x) isEqualTo GRLIB_side_friendly} // Player side if enemy adding is disabled + (KP_liberation_enemies_zeus && {!(side (group _x) isEqualTo KPLIB_side_civilian)}) // Not civilian side, if enemy adding is enabled + || {side (group _x) isEqualTo KPLIB_side_friendly} // Player side if enemy adding is disabled } && {((str _x) find "BIS_SUPP_HQ_") isEqualTo -1} // Not a HQ entity from support module }; diff --git a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm index bc13f2cb8..c98c0c811 100644 --- a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm +++ b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm @@ -179,7 +179,7 @@ class FSM priority = 1.000000; to="Exit_1"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"GRLIB_endgame > 0"/*%FSM*/; + condition=/*%FSM*/"KPLIB_endgame > 0"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -254,7 +254,7 @@ class FSM "// Get all groups with at least one member alive" \n "// and not already added to high command" \n "_newGrps = allGroups select {" \n - " (side _x) isEqualTo GRLIB_side_friendly" \n + " (side _x) isEqualTo KPLIB_side_friendly" \n " && {!(_x in _hcGrps)}" \n " && {!(((units _x) select {alive _x}) isEqualTo [])}" \n " && {!(_cmdr in (units _x))}" \n @@ -357,7 +357,7 @@ class FSM priority = 1.000000; to="Exit_1"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"GRLIB_endgame > 0"/*%FSM*/; + condition=/*%FSM*/"KPLIB_endgame > 0"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -400,8 +400,8 @@ class FSM "// the issue on dedicated servers, if using that module." \n "BIS_marta_mainscope setvariable [""rules""," \n "[" \n - " [""o_"", [[0.5, 0, 0, 1], [0, 0.3, 0.6, 1]] select (GRLIB_side_enemy isEqualTo west)]," \n - " [""b_"", [[0.5, 0, 0, 1], [0, 0.3, 0.6, 1]] select (GRLIB_side_friendly isEqualTo west)]," \n + " [""o_"", [[0.5, 0, 0, 1], [0, 0.3, 0.6, 1]] select (KPLIB_side_enemy isEqualTo west)]," \n + " [""b_"", [[0.5, 0, 0, 1], [0, 0.3, 0.6, 1]] select (KPLIB_side_friendly isEqualTo west)]," \n " [""n_"", [0, 0.5, 0, 1]]," \n " [""n_"", [0.4, 0, 0.5, 1]]" \n "], true];"/*%FSM*/; @@ -430,4 +430,4 @@ class FSM "Exit_1", }; }; -/*%FSM*/ \ No newline at end of file +/*%FSM*/ diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index 16f5c06a0..477b05553 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -117,7 +117,7 @@ execVM "scripts\server\asymmetric\init_module.sqf"; execVM "scripts\server\offloading\group_diag.sqf"; { - if ((_x != player) && (_x distance (markerPos GRLIB_respawn_marker) < 200 )) then { + if ((_x != player) && (_x distance (markerPos KPLIB_respawn_marker) < 200 )) then { deleteVehicle _x; }; } forEach allUnits; diff --git a/Missionframework/scripts/server/offloading/show_fps.sqf b/Missionframework/scripts/server/offloading/show_fps.sqf index e91466f2d..7971cc098 100644 --- a/Missionframework/scripts/server/offloading/show_fps.sqf +++ b/Missionframework/scripts/server/offloading/show_fps.sqf @@ -43,7 +43,7 @@ while {true} do { _myfpsmarker setMarkerColor "ColorGREEN"; if (_myfps < 30) then {_myfpsmarker setMarkerColor "ColorYELLOW";}; if (_myfps < 20) then {_myfpsmarker setMarkerColor "ColorORANGE";}; - if (_myfps < 10) then {_myfpsmarker setMarkerColor GRLIB_color_enemy_bright;}; + if (_myfps < 10) then {_myfpsmarker setMarkerColor KPLIB_color_enemy_bright;}; _myfpsmarker setMarkerText format ["%1: %2 fps, %3 local groups, %4 local units", _sourcestr, (round (_myfps * 100.0)) / 100.0, _localgroups, _localunits]; diff --git a/Missionframework/scripts/server/patrols/civilian_patrols.sqf b/Missionframework/scripts/server/patrols/civilian_patrols.sqf index a64c4c9c1..18bc03442 100644 --- a/Missionframework/scripts/server/patrols/civilian_patrols.sqf +++ b/Missionframework/scripts/server/patrols/civilian_patrols.sqf @@ -1,3 +1,3 @@ -if ( GRLIB_civilian_activity > 0 ) then { - for [ {_i=0}, {_i < GRLIB_civilians_amount}, {_i=_i+1} ] do { [] spawn manage_one_civilian_patrol }; +if ( KPLIB_civilian_activity > 0 ) then { + for [ {_i=0}, {_i < KPLIB_civilians_amount}, {_i=_i+1} ] do { [] spawn manage_one_civilian_patrol }; }; diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index 12d43819f..a0a62727c 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -8,12 +8,12 @@ _spawnsector = ""; if ( isNil "active_sectors" ) then { active_sectors = [] }; -while { GRLIB_endgame == 0 } do { +while { KPLIB_endgame == 0 } do { _spawnsector = ""; _usable_sectors = []; { - if ((([markerPos _x, 1000, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount) == 0) && (count ([markerPos _x, 3500] call KPLIB_fnc_getNearbyPlayers) > 0)) then { + if ((([markerPos _x, 1000, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) == 0) && (count ([markerPos _x, 3500] call KPLIB_fnc_getNearbyPlayers) > 0)) then { _usable_sectors pushback _x; } @@ -22,7 +22,7 @@ while { GRLIB_endgame == 0 } do { if ( count _usable_sectors > 0 ) then { _spawnsector = selectRandom _usable_sectors; - _grp = createGroup [GRLIB_side_civilian, true]; + _grp = createGroup [KPLIB_side_civilian, true]; if ( random 100 < 33) then { _civnumber = 1 + (floor (random 2)); while { count units _grp < _civnumber } do { @@ -43,7 +43,7 @@ while { GRLIB_endgame == 0 } do { _civveh = (selectRandom civilian_vehicles) createVehicle _spawnpos; _civveh setpos _spawnpos; _civveh addMPEventHandler ['MPKilled', {_this spawn kill_manager}]; - _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != GRLIB_side_friendly ) && ( side (_this select 3) != GRLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; + _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_friendly ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; ((units _grp) select 0) moveInDriver _civveh; ((units _grp) select 0) disableAI "FSM"; ((units _grp) select 0) disableAI "AUTOCOMBAT"; @@ -51,7 +51,7 @@ while { GRLIB_endgame == 0 } do { }; - { _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != GRLIB_side_friendly ) && ( side (_this select 3) != GRLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; } foreach units _grp; + { _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_friendly ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; } foreach units _grp; _sectors_patrol = []; _patrol_startpos = getpos (leader _grp); @@ -106,7 +106,7 @@ while { GRLIB_endgame == 0 } do { if (count ([getpos leader _grp, 4000] call KPLIB_fnc_getNearbyPlayers) == 0) then { if ( !(isNull _civveh) ) then { - if ( { ( alive _x ) && (side group _x == GRLIB_side_friendly ) } count (crew _civveh) == 0 ) then { + if ( { ( alive _x ) && (side group _x == KPLIB_side_friendly ) } count (crew _civveh) == 0 ) then { deleteVehicle _civveh }; }; diff --git a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf index 62c7f72f4..f2710b312 100644 --- a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf @@ -4,13 +4,13 @@ private [ "_headless_client" ]; waitUntil { !isNil "blufor_sectors" }; waitUntil { !isNil "combat_readiness" }; -while { GRLIB_endgame == 0 } do { +while { KPLIB_endgame == 0 } do { waitUntil { sleep 0.3; count blufor_sectors >= 3; }; - waitUntil { sleep 0.3; combat_readiness >= (_minimum_readiness / GRLIB_difficulty_modifier); }; + waitUntil { sleep 0.3; combat_readiness >= (_minimum_readiness / KPLIB_difficulty_modifier); }; sleep (random 30); - while { [] call KPLIB_fnc_getOpforCap > GRLIB_patrol_cap } do { + while { [] call KPLIB_fnc_getOpforCap > KPLIB_patrol_cap } do { sleep (random 30); }; @@ -27,7 +27,7 @@ while { GRLIB_endgame == 0 } do { _sector_spawn_pos = [(((markerpos _spawn_marker) select 0) - 500) + (random 1000),(((markerpos _spawn_marker) select 1) - 500) + (random 1000),0]; if (_is_infantry) then { - _grp = createGroup [GRLIB_side_enemy, true]; + _grp = createGroup [KPLIB_side_enemy, true]; _squad = [] call KPLIB_fnc_getSquadComp; { [_x, _sector_spawn_pos, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; @@ -63,7 +63,7 @@ while { GRLIB_endgame == 0 } do { _patrol_continue = false; } else { if ( time - _started_time > 900 ) then { - if ( [ getpos (leader _grp) , 4000 , GRLIB_side_friendly ] call KPLIB_fnc_getUnitsCount == 0 ) then { + if ( [ getpos (leader _grp) , 4000 , KPLIB_side_friendly ] call KPLIB_fnc_getUnitsCount == 0 ) then { _patrol_continue = false; { if ( vehicle _x != _x ) then { @@ -77,7 +77,7 @@ while { GRLIB_endgame == 0 } do { }; if ( !([] call KPLIB_fnc_isBigtownActive) ) then { - sleep (600.0 / GRLIB_difficulty_modifier); + sleep (600.0 / KPLIB_difficulty_modifier); }; }; diff --git a/Missionframework/scripts/server/patrols/manage_patrols.sqf b/Missionframework/scripts/server/patrols/manage_patrols.sqf index 4ebadec5f..e37b1bca5 100644 --- a/Missionframework/scripts/server/patrols/manage_patrols.sqf +++ b/Missionframework/scripts/server/patrols/manage_patrols.sqf @@ -1,10 +1,10 @@ _combat_triggers = [20,40,50,65,80,95]; -if ( GRLIB_unitcap < 0.9 ) then { _combat_triggers = [20,45,90]; }; -if ( GRLIB_unitcap > 1.3 ) then { _combat_triggers = [15,25,40,65,75,85,95]; }; +if ( KPLIB_unitcap < 0.9 ) then { _combat_triggers = [20,45,90]; }; +if ( KPLIB_unitcap > 1.3 ) then { _combat_triggers = [15,25,40,65,75,85,95]; }; _combat_triggers_infantry = [15,35,45,60,70,85]; -if ( GRLIB_unitcap < 0.9 ) then { _combat_triggers_infantry = [15,40,80]; }; -if ( GRLIB_unitcap > 1.3 ) then { _combat_triggers_infantry = [10,20,35,55,70,80,90]; }; +if ( KPLIB_unitcap < 0.9 ) then { _combat_triggers_infantry = [15,40,80]; }; +if ( KPLIB_unitcap > 1.3 ) then { _combat_triggers_infantry = [10,20,35,55,70,80,90]; }; sleep 5; diff --git a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf index df0c2f31b..f09d36231 100644 --- a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf +++ b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf @@ -2,20 +2,20 @@ params ["_targetsector"]; if (combat_readiness > 15) then { - private _init_units_count = (([markerPos _targetsector, GRLIB_capture_size, GRLIB_side_enemy] call KPLIB_fnc_getUnitsCount)); + private _init_units_count = (([markerPos _targetsector, KPLIB_capture_size, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)); if !(_targetsector in sectors_bigtown) then { - while {(_init_units_count * 0.75) <= ([markerPos _targetsector, GRLIB_capture_size, GRLIB_side_enemy] call KPLIB_fnc_getUnitsCount)} do { + while {(_init_units_count * 0.75) <= ([markerPos _targetsector, KPLIB_capture_size, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)} do { sleep 5; }; }; if (_targetsector in active_sectors) then { - private _nearestower = [markerpos _targetsector, GRLIB_side_enemy, GRLIB_radiotower_size * 1.4] call KPLIB_fnc_getNearestTower; + private _nearestower = [markerpos _targetsector, KPLIB_side_enemy, KPLIB_radiotower_size * 1.4] call KPLIB_fnc_getNearestTower; if !(isNil "_nearestower") then { - private _reinforcements_time = (((((markerpos _nearestower) distance (markerpos _targetsector)) / 1000) ^ 1.66 ) * 120) / (GRLIB_difficulty_modifier * GRLIB_csat_aggressivity); + private _reinforcements_time = (((((markerpos _nearestower) distance (markerpos _targetsector)) / 1000) ^ 1.66 ) * 120) / (KPLIB_difficulty_modifier * KPLIB_csat_aggressivity); if (_targetsector in sectors_bigtown) then { _reinforcements_time = _reinforcements_time * 0.35; }; @@ -29,7 +29,7 @@ if (combat_readiness > 15) then { reinforcements_sector_under_attack = _targetsector; reinforcements_set = true; ["lib_reinforcements",[markertext _targetsector]] remoteExec ["bis_fnc_shownotification"]; - if ((random combat_readiness) > (20 + (30 / GRLIB_csat_aggressivity))) then { + if ((random combat_readiness) > (20 + (30 / KPLIB_csat_aggressivity))) then { [_targetsector] spawn send_paratroopers; }; stats_reinforcements_called = stats_reinforcements_called + 1; diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index 4adf3387e..28365fbb7 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -23,7 +23,7 @@ if (isNull _chopper_type) then { createVehicleCrew _newvehicle; sleep 0.1; - _pilot_group = createGroup [GRLIB_side_enemy, true]; + _pilot_group = createGroup [KPLIB_side_enemy, true]; (crew _newvehicle) joinSilent _pilot_group; _newvehicle addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; @@ -33,7 +33,7 @@ if (isNull _chopper_type) then { _pilot_group = group _newvehicle; }; -private _para_group = createGroup [GRLIB_side_enemy, true]; +private _para_group = createGroup [KPLIB_side_enemy, true]; while {(count (units _para_group)) < 8} do { [opfor_paratrooper, markerPos _spawnsector, _para_group] call KPLIB_fnc_createManagedUnit; diff --git a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf index ba2166461..86ca82a13 100644 --- a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf @@ -4,7 +4,7 @@ params ["_index", "_nearfob", "_clientID", "_supplies", "_ammo", "_fuel"]; logiError = 0; -private _storage_areas = (_nearfob nearobjects GRLIB_fob_range) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; +private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; if ((count _storage_areas) == 0) exitWith {(localize "STR_LOGISTIC_CANTAFFORD") remoteExec ["hint",_clientID]; logiError = 1; _clientID publicVariableClient "logiError";}; diff --git a/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf b/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf index 5f633b3fc..5707df94b 100644 --- a/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf @@ -3,8 +3,8 @@ if (!isServer) exitWith {}; params [ "_new_fob", "_create_fob_building" ]; private [ "_fob_building", "_fob_pos" ]; -GRLIB_all_fobs pushback _new_fob; -publicVariable "GRLIB_all_fobs"; +KPLIB_all_fobs pushback _new_fob; +publicVariable "KPLIB_all_fobs"; if ( _create_fob_building ) then { _fob_pos = [ (_new_fob select 0) + 15, (_new_fob select 1) + 2, 0 ]; diff --git a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf index 8a54e584c..cec35912f 100644 --- a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf @@ -6,7 +6,7 @@ logiError = 0; if (((KP_liberation_logistics select _index) select 1) <= 0) exitWith {logiError = 1; _clientID publicVariableClient "logiError";}; -private _storage_areas = (_nearfob nearobjects GRLIB_fob_range) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; +private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; if ((count _storage_areas) == 0) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExec ["hint",_clientID]; logiError = 1; _clientID publicVariableClient "logiError";}; diff --git a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf index 525dd4ea5..1e077b5d4 100644 --- a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf @@ -2,15 +2,15 @@ params ["_liberated_sector"]; private _combat_readiness_increase = 0; switch (true) do { - case (_liberated_sector in sectors_bigtown): {_combat_readiness_increase = floor (random 10) * GRLIB_difficulty_modifier;}; - case (_liberated_sector in sectors_capture): {_combat_readiness_increase = floor (random 6) * GRLIB_difficulty_modifier;}; - case (_liberated_sector in sectors_military): {_combat_readiness_increase = 5 + (floor (random 11)) * GRLIB_difficulty_modifier;}; - case (_liberated_sector in sectors_factory): {_combat_readiness_increase = 3 + (floor (random 7)) * GRLIB_difficulty_modifier;}; + case (_liberated_sector in sectors_bigtown): {_combat_readiness_increase = floor (random 10) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in sectors_capture): {_combat_readiness_increase = floor (random 6) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in sectors_military): {_combat_readiness_increase = 5 + (floor (random 11)) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in sectors_factory): {_combat_readiness_increase = 3 + (floor (random 7)) * KPLIB_difficulty_modifier;}; case (_liberated_sector in sectors_tower): {_combat_readiness_increase = floor (random 4);}; }; combat_readiness = combat_readiness + _combat_readiness_increase; -if (combat_readiness > 100.0 && GRLIB_difficulty_modifier <= 2.0) then {combat_readiness = 100.0}; +if (combat_readiness > 100.0 && KPLIB_difficulty_modifier <= 2.0) then {combat_readiness = 100.0}; stats_readiness_earned = stats_readiness_earned + _combat_readiness_increase; [_liberated_sector, 0] remoteExecCall ["remote_call_sector"]; @@ -58,14 +58,14 @@ sleep 1; sleep 45; -if (GRLIB_endgame == 0) then { +if (KPLIB_endgame == 0) then { if ( !(_liberated_sector in sectors_tower) && { - (random (150 / (GRLIB_difficulty_modifier * GRLIB_csat_aggressivity))) < (combat_readiness - 15) + (random (150 / (KPLIB_difficulty_modifier * KPLIB_csat_aggressivity))) < (combat_readiness - 15) || _liberated_sector in sectors_bigtown } - && {[] call KPLIB_fnc_getOpforCap < GRLIB_battlegroup_cap} + && {[] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap} ) then { [_liberated_sector, (random 100) < 45] spawn spawn_battlegroup; }; diff --git a/Missionframework/scripts/server/remotecall/start_secondary_remote_call.sqf b/Missionframework/scripts/server/remotecall/start_secondary_remote_call.sqf index 7d887489a..5d926c8b9 100644 --- a/Missionframework/scripts/server/remotecall/start_secondary_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/start_secondary_remote_call.sqf @@ -6,18 +6,18 @@ params [ if (_mission_index < 0) exitWith {false}; -if (isNil "GRLIB_secondary_starting") then { GRLIB_secondary_starting = false;}; -if (GRLIB_secondary_starting) exitWith {["Multiple calls to start secondary mission : shouldn't be possible, isn't allowed", "ERROR"] call KPLIB_fnc_log;}; +if (isNil "KPLIB_secondary_starting") then { KPLIB_secondary_starting = false;}; +if (KPLIB_secondary_starting) exitWith {["Multiple calls to start secondary mission : shouldn't be possible, isn't allowed", "ERROR"] call KPLIB_fnc_log;}; if (isNil "used_positions") then {used_positions = [];}; -GRLIB_secondary_starting = true; publicVariable "GRLIB_secondary_starting"; +KPLIB_secondary_starting = true; publicVariable "KPLIB_secondary_starting"; -resources_intel = resources_intel - ( GRLIB_secondary_missions_costs select _mission_index ); +resources_intel = resources_intel - ( KPLIB_secondary_missions_costs select _mission_index ); if (_mission_index == 0) then {[] spawn fob_hunting;}; if (_mission_index == 1) then {[] spawn convoy_hijack;}; if (_mission_index == 2) then {[] spawn search_and_rescue;}; -GRLIB_secondary_starting = false; publicVariable "GRLIB_secondary_starting"; +KPLIB_secondary_starting = false; publicVariable "KPLIB_secondary_starting"; true diff --git a/Missionframework/scripts/server/resources/manage_logistics.sqf b/Missionframework/scripts/server/resources/manage_logistics.sqf index 2a2656cf7..9fb4dd022 100644 --- a/Missionframework/scripts/server/resources/manage_logistics.sqf +++ b/Missionframework/scripts/server/resources/manage_logistics.sqf @@ -7,7 +7,7 @@ waitUntil {save_is_loaded}; KP_liberation_convoy_ambush_inProgress = false; KP_liberation_convoy_ambush_check = 0; private _start = 0; -while {GRLIB_endgame == 0} do { +while {KPLIB_endgame == 0} do { if (((count (allPlayers - entities "HeadlessClient_F")) > 0) && ((count KP_liberation_logistics) > 0)) then { _start = diag_tickTime; diff --git a/Missionframework/scripts/server/resources/manage_resources.sqf b/Missionframework/scripts/server/resources/manage_resources.sqf index b4a83c6e2..bda47bd41 100644 --- a/Missionframework/scripts/server/resources/manage_resources.sqf +++ b/Missionframework/scripts/server/resources/manage_resources.sqf @@ -7,7 +7,7 @@ sectors_timer = false; ["Production management started", "PRODUCTION"] call KPLIB_fnc_log; private _start = 0; -while {GRLIB_endgame == 0} do { +while {KPLIB_endgame == 0} do { recalculate_sectors = false; diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index c7c212558..dbda57459 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -7,7 +7,7 @@ KP_liberation_ammo_global = 0; KP_liberation_fuel_global = 0; KP_liberation_heli_slots = 0; KP_liberation_plane_slots = 0; -infantry_cap = 50 * GRLIB_resources_multiplier; +infantry_cap = 50 * KPLIB_resources_multiplier; please_recalculate = true; @@ -23,10 +23,10 @@ while {true} do { private _local_fuel_global = 0; private _local_heli_slots = 0; private _local_plane_slots = 0; - private _local_infantry_cap = 50 * GRLIB_resources_multiplier; + private _local_infantry_cap = 50 * KPLIB_resources_multiplier; { - private _fob_buildings = _x nearobjects GRLIB_fob_range; + private _fob_buildings = _x nearobjects KPLIB_fob_range; private _storage_areas = _fob_buildings select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; private _heliSlots = {(typeOf _x) == KP_liberation_heli_slot_building;} count _fob_buildings; private _planeSlots = {(typeOf _x) == KP_liberation_plane_slot_building;} count _fob_buildings; @@ -56,11 +56,11 @@ while {true} do { _local_fuel_global = _local_fuel_global + _fuelValue; _local_heli_slots = _local_heli_slots + _heliSlots; _local_plane_slots = _local_plane_slots + _planeSlots; - } forEach GRLIB_all_fobs; + } forEach KPLIB_all_fobs; { if ( _x in sectors_capture ) then { - _local_infantry_cap = _local_infantry_cap + (10 * GRLIB_resources_multiplier); + _local_infantry_cap = _local_infantry_cap + (10 * KPLIB_resources_multiplier); }; } foreach blufor_sectors; diff --git a/Missionframework/scripts/server/resources/unit_cap.sqf b/Missionframework/scripts/server/resources/unit_cap.sqf index e0b6494cb..f331da8b6 100644 --- a/Missionframework/scripts/server/resources/unit_cap.sqf +++ b/Missionframework/scripts/server/resources/unit_cap.sqf @@ -7,7 +7,7 @@ while {true} do { private _local_heli_count = 0; private _local_plane_count = 0; { - if ((side group _x == GRLIB_side_friendly) && (alive _x) && ((_x distance startbase) > 250 || (isPlayer _x))) then { + if ((side group _x == KPLIB_side_friendly) && (alive _x) && ((_x distance startbase) > 250 || (isPlayer _x))) then { _local_unitcap = _local_unitcap + 1; }; } forEach allUnits; diff --git a/Missionframework/scripts/server/secondary/convoy_hijack.sqf b/Missionframework/scripts/server/secondary/convoy_hijack.sqf index 43d557283..35ee963c7 100644 --- a/Missionframework/scripts/server/secondary/convoy_hijack.sqf +++ b/Missionframework/scripts/server/secondary/convoy_hijack.sqf @@ -24,7 +24,7 @@ private _boxes_amount = 0; if ( _boxes_amount == 0 ) exitWith {["Opfor ammobox truck classname doesn't allow for ammobox transport, correct your preset and/or transport config", "ERROR"] call KPLIB_fnc_log;}; -GRLIB_secondary_in_progress = 1; publicVariable "GRLIB_secondary_in_progress"; +KPLIB_secondary_in_progress = 1; publicVariable "KPLIB_secondary_in_progress"; private _boxes_loaded = 0; @@ -48,7 +48,7 @@ private _convoy_group = group driver _scout_vehicle; sleep 0.5; { - _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if ( side (_this select 3) != GRLIB_side_friendly ) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; + _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if ( side (_this select 3) != KPLIB_side_friendly ) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; } foreach [ _scout_vehicle, _escort_vehicle, _transport_vehicle, _troop_vehicle ]; _convoy_group setFormation "FILE"; @@ -75,7 +75,7 @@ _waypoint = _convoy_group addWaypoint [_convoy_destinations select 0, 0]; _waypoint setWaypointType "CYCLE"; _waypoint setWaypointCompletionRadius 50; -private _troops_group = createGroup [GRLIB_side_enemy, true]; +private _troops_group = createGroup [KPLIB_side_enemy, true]; { [_x, _spawnpos, _troops_group, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; } foreach ([] call KPLIB_fnc_getSquadComp); @@ -84,7 +84,7 @@ private _troops_group = createGroup [GRLIB_side_enemy, true]; private _convoy_marker = createMarkerLocal [ format [ "convoymarker%1", round time], getpos _transport_vehicle ]; _convoy_marker setMarkerText (localize "STR_SECONDARY_CSAT_CONVOY"); _convoy_marker setMarkerType "o_armor"; -_convoy_marker setMarkerColor GRLIB_color_enemy_bright; +_convoy_marker setMarkerColor KPLIB_color_enemy_bright; private _convoy_marker_wp1 = createMarkerLocal [ format [ "convoymarkerwp1%1", round time], _convoy_destinations select 0]; private _convoy_marker_wp2 = createMarkerLocal [ format [ "convoymarkerwp2%1", round time], _convoy_destinations select 1]; @@ -93,7 +93,7 @@ private _convoy_marker_wp3 = createMarkerLocal [ format [ "convoymarkerwp3%1", r { _x setMarkerText (localize "STR_SECONDARY_CSAT_CONVOY_WP"); _x setMarkerType "o_armor"; - _x setMarkerColor GRLIB_color_enemy_bright; + _x setMarkerColor KPLIB_color_enemy_bright; _x setMarkerSize [0.6, 0.6]; } foreach [_convoy_marker_wp1, _convoy_marker_wp2, _convoy_marker_wp3]; @@ -121,7 +121,7 @@ while { _mission_in_progress } do { _disembark_troops = true; if (alive (driver _troop_vehicle)) then { - private _troop_driver_group = createGroup [GRLIB_side_enemy, true]; + private _troop_driver_group = createGroup [KPLIB_side_enemy, true]; [ driver _troop_vehicle ] joinSilent _troop_driver_group; sleep 1; while {(count (waypoints _troop_driver_group)) != 0} do {deleteWaypoint ((waypoints _troop_driver_group) select 0);}; @@ -159,6 +159,6 @@ deleteMarker _convoy_marker; combat_readiness = round (combat_readiness * 0.85); stats_secondary_objectives = stats_secondary_objectives + 1; [5] remoteExec ["remote_call_intel"]; -GRLIB_secondary_in_progress = -1; publicVariable "GRLIB_secondary_in_progress"; +KPLIB_secondary_in_progress = -1; publicVariable "KPLIB_secondary_in_progress"; sleep 1; [] spawn KPLIB_fnc_doSave; diff --git a/Missionframework/scripts/server/secondary/fob_hunting.sqf b/Missionframework/scripts/server/secondary/fob_hunting.sqf index 009fd8765..baa774d2e 100644 --- a/Missionframework/scripts/server/secondary/fob_hunting.sqf +++ b/Missionframework/scripts/server/secondary/fob_hunting.sqf @@ -1,5 +1,5 @@ -_defenders_amount = (15 * (sqrt (GRLIB_unitcap))) min 15; +_defenders_amount = (15 * (sqrt (KPLIB_unitcap))) min 15; _spawn_marker = [2000,999999,false] call KPLIB_fnc_getOpforSpawnPoint; if (_spawn_marker == "") exitWith {["Could not find position for fob hunting mission", "ERROR"] call KPLIB_fnc_log;}; @@ -70,7 +70,7 @@ sleep 1; {_x setDamage 0; _x allowDamage true;} foreach (_base_objectives + _base_objects); -_grpdefenders = createGroup [GRLIB_side_enemy, true]; +_grpdefenders = createGroup [KPLIB_side_enemy, true]; _idxselected = []; while {(count _idxselected) < _defenders_amount && (count _idxselected) < (count _defenders_to_build)} do { @@ -91,9 +91,9 @@ while {(count _idxselected) < _defenders_amount && (count _idxselected) < (count [_nextDefender] spawn building_defence_ai; } forEach _idxselected; -private _sentryMax = ceil ((3 + (floor (random 4))) * (sqrt (GRLIB_unitcap))); +private _sentryMax = ceil ((3 + (floor (random 4))) * (sqrt (KPLIB_unitcap))); -_grpsentry = createGroup [GRLIB_side_enemy, true]; +_grpsentry = createGroup [KPLIB_side_enemy, true]; _base_sentry_pos = [(_base_position select 0) + ((_base_corners select 0) select 0), (_base_position select 1) + ((_base_corners select 0) select 1), 0]; for [{_idx=0}, {_idx < _sentryMax}, {_idx=_idx+1}] do { [opfor_sentry, _base_sentry_pos, _grpsentry, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; @@ -119,7 +119,7 @@ secondary_objective_position_marker = [(((secondary_objective_position select 0) publicVariable "secondary_objective_position_marker"; sleep 1; -GRLIB_secondary_in_progress = 0; publicVariable "GRLIB_secondary_in_progress"; +KPLIB_secondary_in_progress = 0; publicVariable "KPLIB_secondary_in_progress"; [2] remoteExec ["remote_call_intel"]; waitUntil { @@ -127,7 +127,7 @@ waitUntil { (_base_objectives select {alive _x}) isEqualTo [] }; -combat_readiness = round (combat_readiness * (1 - GRLIB_secondary_objective_impact)); +combat_readiness = round (combat_readiness * (1 - KPLIB_secondary_objective_impact)); stats_secondary_objectives = stats_secondary_objectives + 1; sleep 1; [] spawn KPLIB_fnc_doSave; @@ -135,4 +135,4 @@ sleep 3; [3] remoteExec ["remote_call_intel"]; -GRLIB_secondary_in_progress = -1; publicVariable "GRLIB_secondary_in_progress"; +KPLIB_secondary_in_progress = -1; publicVariable "KPLIB_secondary_in_progress"; diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index 3863f302a..037883a50 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -15,7 +15,7 @@ private _helofire = KPLIB_sarFire createVehicle (getpos _helowreck); _helofire setpos (getpos _helowreck); _helofire setpos (getpos _helowreck); -private _pilotsGrp = createGroup [GRLIB_side_enemy, true]; +private _pilotsGrp = createGroup [KPLIB_side_enemy, true]; private _pilotsPos = (getpos _helowreck) getPos [25, random 360]; [pilot_classname, _pilotsPos, _pilotsGrp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; @@ -31,7 +31,7 @@ private _pilotUnits = units _pilotsGrp; sleep 0.5 } foreach (_pilotUnits); -private _grppatrol = createGroup [GRLIB_side_enemy, true]; +private _grppatrol = createGroup [KPLIB_side_enemy, true]; private _patrolcorners = [ [ (getpos _helowreck select 0) - 40, (getpos _helowreck select 1) - 40, 0 ], [ (getpos _helowreck select 0) + 40, (getpos _helowreck select 1) - 40, 0 ], @@ -57,7 +57,7 @@ _waypoint = _grppatrol addWaypoint [(_patrolcorners select 0), 0]; _waypoint setWaypointType "CYCLE"; {_x doFollow (leader _grppatrol)} foreach units _grppatrol; -private _grpsentry = createGroup [GRLIB_side_enemy, true]; +private _grpsentry = createGroup [KPLIB_side_enemy, true]; private _nbsentry = 2 + (floor (random 3)); for [ {_idx=0},{_idx < _nbsentry},{_idx=_idx+1} ] do { @@ -82,7 +82,7 @@ secondary_objective_position = getpos _helowreck; secondary_objective_position_marker = secondary_objective_position getPos [800, random 360]; publicVariable "secondary_objective_position_marker"; sleep 1; -GRLIB_secondary_in_progress = 2; publicVariable "GRLIB_secondary_in_progress"; +KPLIB_secondary_in_progress = 2; publicVariable "KPLIB_secondary_in_progress"; [6] remoteExec ["remote_call_intel"]; waitUntil { @@ -97,7 +97,7 @@ if ( _alive_crew_count == 0 ) then { [7] remoteExec ["remote_call_intel"]; } else { [8] remoteExec ["remote_call_intel"]; - private _grp = createGroup [GRLIB_side_friendly, true]; + private _grp = createGroup [KPLIB_side_friendly, true]; { [_x ] joinSilent _grp; } foreach _pilotUnits; while {(count (waypoints _grp)) != 0} do {deleteWaypoint ((waypoints _grp) select 0);}; {_x doFollow (leader _grp)} foreach units _grp; @@ -107,6 +107,6 @@ if ( _alive_crew_count == 0 ) then { resources_intel = resources_intel + (10 * _alive_crew_count); stats_secondary_objectives = stats_secondary_objectives + 1; -GRLIB_secondary_in_progress = -1; publicVariable "GRLIB_secondary_in_progress"; +KPLIB_secondary_in_progress = -1; publicVariable "KPLIB_secondary_in_progress"; sleep 1; doSaveTrigger = true; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf index ee0056c69..c86b93768 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf @@ -4,10 +4,10 @@ private [ "_attacktime", "_ownership", "_grp" ]; sleep 5; _ownership = [ _thispos ] call KPLIB_fnc_getSectorOwnership; -if ( _ownership != GRLIB_side_enemy ) exitWith {}; +if ( _ownership != KPLIB_side_enemy ) exitWith {}; -if ( GRLIB_blufor_defenders ) then { - _grp = creategroup [GRLIB_side_friendly, true]; +if ( KPLIB_blufor_defenders ) then { + _grp = creategroup [KPLIB_side_friendly, true]; { [_x, _thispos, _grp] call KPLIB_fnc_createManagedUnit; } foreach blufor_squad_inf; @@ -18,8 +18,8 @@ if ( GRLIB_blufor_defenders ) then { sleep 60; _ownership = [ _thispos ] call KPLIB_fnc_getSectorOwnership; -if ( _ownership == GRLIB_side_friendly ) exitWith { - if ( GRLIB_blufor_defenders ) then { +if ( _ownership == KPLIB_side_friendly ) exitWith { + if ( KPLIB_blufor_defenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; @@ -27,9 +27,9 @@ if ( _ownership == GRLIB_side_friendly ) exitWith { }; [_thispos, 1] remoteExec ["remote_call_fob"]; -_attacktime = GRLIB_vulnerability_timer; +_attacktime = KPLIB_vulnerability_timer; -while { _attacktime > 0 && ( _ownership == GRLIB_side_enemy || _ownership == GRLIB_side_resistance ) } do { +while { _attacktime > 0 && ( _ownership == KPLIB_side_enemy || _ownership == KPLIB_side_resistance ) } do { _ownership = [ _thispos ] call KPLIB_fnc_getSectorOwnership; _attacktime = _attacktime - 1; sleep 1; @@ -37,28 +37,28 @@ while { _attacktime > 0 && ( _ownership == GRLIB_side_enemy || _ownership == GRL waitUntil { sleep 1; - [ _thispos ] call KPLIB_fnc_getSectorOwnership != GRLIB_side_resistance; + [ _thispos ] call KPLIB_fnc_getSectorOwnership != KPLIB_side_resistance; }; -if ( GRLIB_endgame == 0 ) then { - if ( _attacktime <= 1 && ( [ _thispos ] call KPLIB_fnc_getSectorOwnership == GRLIB_side_enemy ) ) then { +if ( KPLIB_endgame == 0 ) then { + if ( _attacktime <= 1 && ( [ _thispos ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_enemy ) ) then { [_thispos, 2] remoteExec ["remote_call_fob"]; sleep 3; - GRLIB_all_fobs = GRLIB_all_fobs - [_thispos]; - publicVariable "GRLIB_all_fobs"; + KPLIB_all_fobs = KPLIB_all_fobs - [_thispos]; + publicVariable "KPLIB_all_fobs"; reset_battlegroups_ai = true; [_thispos] call KPLIB_fnc_destroyFob; [] spawn KPLIB_fnc_doSave; stats_fobs_lost = stats_fobs_lost + 1; } else { [_thispos, 3] remoteExec ["remote_call_fob"]; - {[_x] spawn prisonner_ai;} foreach ((_thispos nearEntities ["Man", GRLIB_capture_size * 0.8]) select {side group _x == GRLIB_side_enemy}); + {[_x] spawn prisonner_ai;} foreach ((_thispos nearEntities ["Man", KPLIB_capture_size * 0.8]) select {side group _x == KPLIB_side_enemy}); }; }; sleep 60; -if ( GRLIB_blufor_defenders ) then { +if ( KPLIB_blufor_defenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf index 4fe522eab..7fcb70976 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf @@ -4,15 +4,15 @@ private [ "_attacktime", "_ownership", "_grp", "_squad_type" ]; sleep 5; _ownership = [ markerpos _sector ] call KPLIB_fnc_getSectorOwnership; -if ( _ownership != GRLIB_side_enemy ) exitWith {}; +if ( _ownership != KPLIB_side_enemy ) exitWith {}; _squad_type = blufor_squad_inf_light; if ( _sector in sectors_military ) then { _squad_type = blufor_squad_inf; }; -if ( GRLIB_blufor_defenders ) then { - _grp = creategroup [GRLIB_side_friendly, true]; +if ( KPLIB_blufor_defenders ) then { + _grp = creategroup [KPLIB_side_friendly, true]; { [_x, markerPos _sector, _grp] call KPLIB_fnc_createManagedUnit; } foreach _squad_type; @@ -23,8 +23,8 @@ if ( GRLIB_blufor_defenders ) then { sleep 60; _ownership = [ markerpos _sector ] call KPLIB_fnc_getSectorOwnership; -if ( _ownership == GRLIB_side_friendly ) exitWith { - if ( GRLIB_blufor_defenders ) then { +if ( _ownership == KPLIB_side_friendly ) exitWith { + if ( KPLIB_blufor_defenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; @@ -32,9 +32,9 @@ if ( _ownership == GRLIB_side_friendly ) exitWith { }; [_sector, 1] remoteExec ["remote_call_sector"]; -_attacktime = GRLIB_vulnerability_timer; +_attacktime = KPLIB_vulnerability_timer; -while { _attacktime > 0 && ( _ownership == GRLIB_side_enemy || _ownership == GRLIB_side_resistance ) } do { +while { _attacktime > 0 && ( _ownership == KPLIB_side_enemy || _ownership == KPLIB_side_resistance ) } do { _ownership = [markerpos _sector] call KPLIB_fnc_getSectorOwnership; _attacktime = _attacktime - 1; sleep 1; @@ -42,11 +42,11 @@ while { _attacktime > 0 && ( _ownership == GRLIB_side_enemy || _ownership == GRL waitUntil { sleep 1; - [markerpos _sector] call KPLIB_fnc_getSectorOwnership != GRLIB_side_resistance; + [markerpos _sector] call KPLIB_fnc_getSectorOwnership != KPLIB_side_resistance; }; -if ( GRLIB_endgame == 0 ) then { - if ( _attacktime <= 1 && ( [markerpos _sector] call KPLIB_fnc_getSectorOwnership == GRLIB_side_enemy ) ) then { +if ( KPLIB_endgame == 0 ) then { + if ( _attacktime <= 1 && ( [markerpos _sector] call KPLIB_fnc_getSectorOwnership == KPLIB_side_enemy ) ) then { blufor_sectors = blufor_sectors - [ _sector ]; publicVariable "blufor_sectors"; [_sector, 2] remoteExec ["remote_call_sector"]; @@ -68,13 +68,13 @@ if ( GRLIB_endgame == 0 ) then { } forEach KP_liberation_production; } else { [_sector, 3] remoteExec ["remote_call_sector"]; - {[_x] spawn prisonner_ai;} foreach (((markerpos _sector) nearEntities ["Man", GRLIB_capture_size * 0.8]) select {side group _x == GRLIB_side_enemy}); + {[_x] spawn prisonner_ai;} foreach (((markerpos _sector) nearEntities ["Man", KPLIB_capture_size * 0.8]) select {side group _x == KPLIB_side_enemy}); }; }; sleep 60; -if ( GRLIB_blufor_defenders ) then { +if ( KPLIB_blufor_defenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; diff --git a/Missionframework/scripts/server/sector/fn_destroyFob.sqf b/Missionframework/scripts/server/sector/fn_destroyFob.sqf index 4d6d212c6..672934a0c 100644 --- a/Missionframework/scripts/server/sector/fn_destroyFob.sqf +++ b/Missionframework/scripts/server/sector/fn_destroyFob.sqf @@ -2,7 +2,7 @@ File: fn_destroyFob.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-28 - Last Update: 2020-04-29 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -30,7 +30,7 @@ _buildings append KPLIB_b_buildings_classes; _this setDamage 1; }; }; -} forEach ((_fobPos nearObjects (GRLIB_fob_range * 1.2)) select {getObjectType _x >= 8}); +} forEach ((_fobPos nearObjects (KPLIB_fob_range * 1.2)) select {getObjectType _x >= 8}); KP_liberation_clearances deleteAt (KP_liberation_clearances findIf {(_x select 0) isEqualTo _fobPos}); publicVariable "KP_liberation_clearances"; diff --git a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm index 16c2e2daa..de3af7837 100644 --- a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm +++ b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm @@ -182,7 +182,7 @@ class FSM priority = 0.000000; to="Get_adjusted_sector"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"_opforCount < GRLIB_sector_cap"/*%FSM*/; + condition=/*%FSM*/"_opforCount < KPLIB_sector_cap"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -205,7 +205,7 @@ class FSM priority = 1.000000; to="Activate_sector"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"([markerPos _sector, _range, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0"/*%FSM*/; + condition=/*%FSM*/"([markerPos _sector, _range, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -239,7 +239,7 @@ class FSM priority = 2.000000; to="Exit_1"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"GRLIB_endgame > 0"/*%FSM*/; + condition=/*%FSM*/"KPLIB_endgame > 0"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf index 67cb3ae10..87761c931 100644 --- a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf +++ b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf @@ -2,7 +2,7 @@ File: fn_spawnSectorCrates.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-28 - Last Update: 2020-05-07 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -27,7 +27,7 @@ if (isNil "KPLIB_sectorCratesSpawned") then {KPLIB_sectorCratesSpawned = [];}; if !(_sector in KPLIB_sectorCratesSpawned) then { KPLIB_sectorCratesSpawned pushBack _sector; - private _amount = (ceil (random 3)) * GRLIB_resources_multiplier; + private _amount = (ceil (random 3)) * KPLIB_resources_multiplier; private _spawnPos = []; private _j = 0; diff --git a/Missionframework/scripts/server/sector/ied_manager.sqf b/Missionframework/scripts/server/sector/ied_manager.sqf index fdf5e67a6..752ad7cbc 100644 --- a/Missionframework/scripts/server/sector/ied_manager.sqf +++ b/Missionframework/scripts/server/sector/ied_manager.sqf @@ -37,8 +37,8 @@ if (!(isnull _roadobj)) then { if (KP_liberation_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> IED %1 spawned at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; while {_sector in active_sectors && mineActive _ied_obj && !_goes_boom} do { - _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == GRLIB_side_friendly}; - _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == GRLIB_side_friendly}; + _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_friendly}; + _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_friendly}; if (count _nearinfantry >= _infantry_trigger || count _nearvehicles >= _vehicle_trigger) then { if (_ultra_strong) then { "Bomb_04_F" createVehicle (getpos _ied_obj); diff --git a/Missionframework/scripts/server/sector/lose_sectors.sqf b/Missionframework/scripts/server/sector/lose_sectors.sqf index 58af61adc..7b00bffc1 100644 --- a/Missionframework/scripts/server/sector/lose_sectors.sqf +++ b/Missionframework/scripts/server/sector/lose_sectors.sqf @@ -1,15 +1,15 @@ -waitUntil { !isNil "GRLIB_all_fobs" }; +waitUntil { !isNil "KPLIB_all_fobs" }; waitUntil { !isNil "blufor_sectors" }; sleep 5; attack_in_progress = false; -while { GRLIB_endgame == 0 } do { +while { KPLIB_endgame == 0 } do { { _ownership = [ markerpos _x ] call KPLIB_fnc_getSectorOwnership; - if ( _ownership == GRLIB_side_enemy ) then { + if ( _ownership == KPLIB_side_enemy ) then { [ _x ] call attack_in_progress_sector; }; sleep 0.5; @@ -17,11 +17,11 @@ while { GRLIB_endgame == 0 } do { { _ownership = [ _x ] call KPLIB_fnc_getSectorOwnership; - if ( _ownership == GRLIB_side_enemy ) then { + if ( _ownership == KPLIB_side_enemy ) then { [ _x ] call attack_in_progress_fob; }; sleep 0.5; - } foreach GRLIB_all_fobs; + } foreach KPLIB_all_fobs; sleep 1; diff --git a/Missionframework/scripts/server/sector/manage_one_sector.sqf b/Missionframework/scripts/server/sector/manage_one_sector.sqf index 38a8aaef0..e634fb9b2 100644 --- a/Missionframework/scripts/server/sector/manage_one_sector.sqf +++ b/Missionframework/scripts/server/sector/manage_one_sector.sqf @@ -18,7 +18,7 @@ private _spawncivs = false; private _building_ai_max = 0; private _infsquad = "army"; private _building_range = 50; -private _local_capture_size = GRLIB_capture_size; +private _local_capture_size = KPLIB_capture_size; private _iedcount = 0; private _vehtospawn = []; private _managed_units = []; @@ -32,7 +32,7 @@ private _maximum_additional_tickets = (KP_liberation_delayDespawnMax * 60 / SECT private _popfactor = 1; private _guerilla = false; -if (GRLIB_unitcap < 1) then {_popfactor = GRLIB_unitcap;}; +if (KPLIB_unitcap < 1) then {_popfactor = KPLIB_unitcap;}; if (_sector in active_sectors) exitWith {}; active_sectors pushback _sector; publicVariable "active_sectors"; @@ -40,23 +40,23 @@ active_sectors pushback _sector; publicVariable "active_sectors"; private _opforcount = [] call KPLIB_fnc_getOpforCap; [_sector, _opforcount] call wait_to_spawn_sector; -if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call KPLIB_fnc_getSectorRange, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0)) then { +if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call KPLIB_fnc_getSectorRange, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0)) then { if (_sector in sectors_bigtown) then { if (combat_readiness < 30) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); _squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp); - if (GRLIB_unitcap >= 1) then {_squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; - if (GRLIB_unitcap >= 1.5) then {_squad4 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_unitcap >= 1) then {_squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_unitcap >= 1.5) then {_squad4 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; _vehtospawn = [(selectRandom militia_vehicles),(selectRandom militia_vehicles)]; - if ((random 100) > (66 / GRLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; - if ((random 100) > (50 / GRLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; + if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; + if ((random 100) > (50 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; if (_infsquad == "army") then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); - if ((random 100) > (33 / GRLIB_difficulty_modifier)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; + if ((random 100) > (33 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; }; _spawncivs = true; @@ -70,7 +70,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _local_capture_size = _local_capture_size * 1.4; if (KP_liberation_civ_rep < 0) then { - _iedcount = round (2 + (ceil (random 4)) * (round ((KP_liberation_civ_rep * -1) / 33)) * GRLIB_difficulty_modifier); + _iedcount = round (2 + (ceil (random 4)) * (round ((KP_liberation_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); } else { _iedcount = 0; }; @@ -81,13 +81,13 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (combat_readiness < 50) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); - if (GRLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; - if ((random 100) > (66 / GRLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; - if ((random 100) > (33 / GRLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; + if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; + if ((random 100) > (33 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; if (_infsquad == "army") then { _vehtospawn pushback (selectRandom militia_vehicles); - if ((random 100) > (33 / GRLIB_difficulty_modifier)) then { + if ((random 100) > (33 / KPLIB_difficulty_modifier)) then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp); }; @@ -103,7 +103,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _building_range = 120; if (KP_liberation_civ_rep < 0) then { - _iedcount = round ((ceil (random 4)) * (round ((KP_liberation_civ_rep * -1) / 33)) * GRLIB_difficulty_modifier); + _iedcount = round ((ceil (random 4)) * (round ((KP_liberation_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); } else { _iedcount = 0; }; @@ -113,14 +113,14 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (_sector in sectors_military) then { _squad1 = ([] call KPLIB_fnc_getSquadComp); _squad2 = ([] call KPLIB_fnc_getSquadComp); - if (GRLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; _vehtospawn = [([] call KPLIB_fnc_getAdaptiveVehicle),([] call KPLIB_fnc_getAdaptiveVehicle)]; - if ((random 100) > (33 / GRLIB_difficulty_modifier)) then { + if ((random 100) > (33 / KPLIB_difficulty_modifier)) then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _squad4 = ([] call KPLIB_fnc_getSquadComp); }; - if ((random 100) > (66 / GRLIB_difficulty_modifier)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; + if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; _spawncivs = false; @@ -132,7 +132,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (combat_readiness < 40) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); - if (GRLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; if ((random 100) > 66) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; if ((random 100) > 33) then {_vehtospawn pushback (selectRandom militia_vehicles);}; @@ -147,7 +147,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _building_range = 120; if (KP_liberation_civ_rep < 0) then { - _iedcount = round ((ceil (random 3)) * (round ((KP_liberation_civ_rep * -1) / 33)) * GRLIB_difficulty_modifier); + _iedcount = round ((ceil (random 3)) * (round ((KP_liberation_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); } else { _iedcount = 0; }; @@ -157,7 +157,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (_sector in sectors_tower) then { _squad1 = ([] call KPLIB_fnc_getSquadComp); if (combat_readiness > 30) then {_squad2 = ([] call KPLIB_fnc_getSquadComp);}; - if (GRLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; if((random 100) > 95) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; @@ -170,7 +170,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (KP_liberation_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - manage_one_sector calculated -> _infsquad: %3 - _squad1: %4 - _squad2: %5 - _squad3: %6 - _squad4: %7 - _vehtospawn: %8 - _building_ai_max: %9", (markerText _sector), _sector, _infsquad, (count _squad1), (count _squad2), (count _squad3), (count _squad4), (count _vehtospawn), _building_ai_max], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; - if (_building_ai_max > 0 && GRLIB_adaptive_opfor) then { + if (_building_ai_max > 0 && KPLIB_adaptive_opfor) then { _building_ai_max = round (_building_ai_max * ([] call KPLIB_fnc_getOpforFactor)); }; @@ -220,7 +220,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _managed_units = _managed_units + (units _grp); }; - if (_spawncivs && GRLIB_civilian_activity > 0) then { + if (_spawncivs && KPLIB_civilian_activity > 0) then { _managed_units = _managed_units + ([_sector] call KPLIB_fnc_spawnCivilians); }; @@ -243,7 +243,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K // sector lifetime loop while {!_stopit} do { // sector was captured - if (([_sectorpos, _local_capture_size] call KPLIB_fnc_getSectorOwnership == GRLIB_side_friendly) && (GRLIB_endgame == 0)) then { + if (([_sectorpos, _local_capture_size] call KPLIB_fnc_getSectorOwnership == KPLIB_side_friendly) && (KPLIB_endgame == 0)) then { if (isServer) then { [_sector] spawn sector_liberated_remote_call; } else { @@ -262,7 +262,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K { if (_x isKindOf "Man") then { - if (side group _x != GRLIB_side_friendly) then { + if (side group _x != KPLIB_side_friendly) then { deleteVehicle _x; }; } else { @@ -272,7 +272,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K }; } forEach _managed_units; } else { - if (([_sectorpos, (([_opforcount] call KPLIB_fnc_getSectorRange) + 300), GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount) == 0) then { + if (([_sectorpos, (([_opforcount] call KPLIB_fnc_getSectorRange) + 300), KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) == 0) then { _sector_despawn_tickets = _sector_despawn_tickets - 1; } else { // start counting running minutes after ADDITIONAL_TICKETS_DELAY diff --git a/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf b/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf index 81e17d2e2..08031e12c 100644 --- a/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf +++ b/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf @@ -5,38 +5,38 @@ private _start = diag_tickTime; private _corrected_size = [_opforcount] call KPLIB_fnc_getSectorRange; sleep 0.1; -private _unitscount = [markerPos _sector, _corrected_size , GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _unitscount = [markerPos _sector, _corrected_size , KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 10) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 6) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 4) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 3) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 2) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, GRLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_unitscount == 1) then { sleep 5; }; diff --git a/Missionframework/scripts/shared/fetch_params.sqf b/Missionframework/scripts/shared/fetch_params.sqf index d11e0e52b..ead472c7a 100644 --- a/Missionframework/scripts/shared/fetch_params.sqf +++ b/Missionframework/scripts/shared/fetch_params.sqf @@ -4,8 +4,8 @@ if (isClass (configfile >> "CfgPatches" >> "ace_common")) then {KP_liberation_ace = true; ["ACE detected. Deactivating resupply script from Liberation.", "MOD"] call KPLIB_fnc_log;} else {KP_liberation_ace = false}; /* Not saveable params */ -GRLIB_param_wipe_savegame_1 = ["WipeSave1", 0] call bis_fnc_getParamValue; -GRLIB_param_wipe_savegame_2 = ["WipeSave2", 0] call bis_fnc_getParamValue; +KPLIB_param_wipe_savegame_1 = ["WipeSave1", 0] call bis_fnc_getParamValue; +KPLIB_param_wipe_savegame_2 = ["WipeSave2", 0] call bis_fnc_getParamValue; KP_liberation_civinfo_debug = ["DebugCivInfo", 0] call bis_fnc_getParamValue; KP_liberation_civrep_debug = ["DebugCivRep", 0] call bis_fnc_getParamValue; KP_liberation_savegame_debug = ["DebugSave", 0] call bis_fnc_getParamValue; @@ -39,22 +39,22 @@ if(isServer) then { // Mission Options ["--- Mission Options ---", "PARAM"] call KPLIB_fnc_log; - GET_PARAM(GRLIB_unitcap, "Unitcap", 2); - GET_PARAM(GRLIB_difficulty_modifier, "Difficulty", 2); - GET_PARAM(GRLIB_csat_aggressivity, "Aggressivity", 2); - GET_PARAM_BOOL(GRLIB_adaptive_opfor, "AdaptToPlayercount", 1); - GET_PARAM(GRLIB_civilian_activity, "Civilians", 1); - GET_PARAM_BOOL(GRLIB_build_first_fob, "FirstFob", 0); + GET_PARAM(KPLIB_unitcap, "Unitcap", 2); + GET_PARAM(KPLIB_difficulty_modifier, "Difficulty", 2); + GET_PARAM(KPLIB_csat_aggressivity, "Aggressivity", 2); + GET_PARAM_BOOL(KPLIB_adaptive_opfor, "AdaptToPlayercount", 1); + GET_PARAM(KPLIB_civilian_activity, "Civilians", 1); + GET_PARAM_BOOL(KPLIB_build_first_fob, "FirstFob", 0); GET_PARAM_BOOL(KP_liberation_fob_vehicle, "FirstFobVehicle", 0); - GET_PARAM(GRLIB_maximum_fobs, "MaximumFobs", 26); - GET_PARAM(GRLIB_max_squad_size, "MaxSquadSize", 10); - GET_PARAM_BOOL(GRLIB_blufor_defenders, "BluforDefenders", 1); - GET_PARAM_BOOL(GRLIB_autodanger, "Autodanger", 0); - GET_PARAM(GRLIB_time_factor, "DayDuration", 12); - GET_PARAM_BOOL(GRLIB_shorter_nights, "ShorterNights", 0); - GET_PARAM(GRLIB_weather_param, "Weather", 3); + GET_PARAM(KPLIB_maximum_fobs, "MaximumFobs", 26); + GET_PARAM(KPLIB_max_squad_size, "MaxSquadSize", 10); + GET_PARAM_BOOL(KPLIB_blufor_defenders, "BluforDefenders", 1); + GET_PARAM_BOOL(KPLIB_autodanger, "Autodanger", 0); + GET_PARAM(KPLIB_time_factor, "DayDuration", 12); + GET_PARAM_BOOL(KPLIB_shorter_nights, "ShorterNights", 0); + GET_PARAM(KPLIB_weather_param, "Weather", 3); GET_PARAM_BOOL(KP_liberation_fog_param, "VanillaFog", 1); - GET_PARAM(GRLIB_resources_multiplier, "ResourcesMultiplier", 3); + GET_PARAM(KPLIB_resources_multiplier, "ResourcesMultiplier", 3); GET_PARAM_BOOL(KP_liberation_arsenal_type, "ArsenalType", 0); GET_PARAM_BOOL(KP_liberation_playermenu, "PlayerMenu", 1); GET_PARAM(KP_liberation_victoryCondition, "VictoryCondition", 0); @@ -78,7 +78,7 @@ if(isServer) then { // Gameplay Options ["--- Gameplay Options ---", "PARAM"] call KPLIB_fnc_log; - GET_PARAM_BOOL(GRLIB_fatigue, "Fatigue", 1); + GET_PARAM_BOOL(KPLIB_fatigue, "Fatigue", 1); GET_PARAM_BOOL(KPLIB_sway, "WeaponSway", 1); GET_PARAM_BOOL(KP_liberation_arsenalUsePreset, "ArsenalUsePreset", 1); GET_PARAM_BOOL(KP_liberation_mapmarkers, "MapMarkers", 1); @@ -87,7 +87,7 @@ if(isServer) then { GET_PARAM_BOOL(KP_liberation_mobilearsenal, "MobileArsenal", 1); GET_PARAM_BOOL(KP_liberation_ailogistics, "AiLogistics", 1); GET_PARAM_BOOL(KP_liberation_cr_param_buildings, "CR_Building", 0); - GET_PARAM(GRLIB_halo_param, "HaloJump", 1); + GET_PARAM(KPLIB_halo_param, "HaloJump", 1); GET_PARAM_BOOL(KP_liberation_clear_cargo, "ClearCargo", 1); GET_PARAM(KP_liberation_allowEnemiesInImmobile, "AllowEnemiesInImmobile", 50); GET_PARAM(KP_liberation_delayDespawnMax, "DelayDespawnMax", 5); @@ -99,11 +99,11 @@ if(isServer) then { // Technical Options ["--- Technical Options ---", "PARAM"] call KPLIB_fnc_log; - GET_PARAM_BOOL(GRLIB_permissions_param, "Permissions", 1); - GET_PARAM(GRLIB_cleanup_vehicles, "CleanupVehicles", 2); - GET_PARAM_BOOL(GRLIB_introduction, "Introduction", 1); - GET_PARAM_BOOL(GRLIB_deployment_cinematic, "DeploymentCinematic", 1); - GET_PARAM_BOOL(GRLIB_use_whitelist, "Whitelist", 0); + GET_PARAM_BOOL(KPLIB_permissions_param, "Permissions", 1); + GET_PARAM(KPLIB_cleanup_vehicles, "CleanupVehicles", 2); + GET_PARAM_BOOL(KPLIB_introduction, "Introduction", 1); + GET_PARAM_BOOL(KPLIB_deployment_cinematic, "DeploymentCinematic", 1); + GET_PARAM_BOOL(KPLIB_use_whitelist, "Whitelist", 0); GET_PARAM(KP_liberation_restart, "ServerRestart", 0); GREUH_allow_mapmarkers = KP_liberation_mapmarkers; publicVariable "GREUH_allow_mapmarkers"; @@ -116,55 +116,55 @@ if(isServer) then { }; // Fix for not working float values in mission params -switch (GRLIB_unitcap) do { - case 0: {GRLIB_unitcap = 0.5;}; - case 1: {GRLIB_unitcap = 0.75;}; - case 2: {GRLIB_unitcap = 1;}; - case 3: {GRLIB_unitcap = 1.25;}; - case 4: {GRLIB_unitcap = 1.5;}; - case 5: {GRLIB_unitcap = 2;}; - default {GRLIB_unitcap = 1;}; +switch (KPLIB_unitcap) do { + case 0: {KPLIB_unitcap = 0.5;}; + case 1: {KPLIB_unitcap = 0.75;}; + case 2: {KPLIB_unitcap = 1;}; + case 3: {KPLIB_unitcap = 1.25;}; + case 4: {KPLIB_unitcap = 1.5;}; + case 5: {KPLIB_unitcap = 2;}; + default {KPLIB_unitcap = 1;}; }; -switch (GRLIB_difficulty_modifier) do { - case 0: {GRLIB_difficulty_modifier = 0.5;}; - case 1: {GRLIB_difficulty_modifier = 0.75;}; - case 2: {GRLIB_difficulty_modifier = 1;}; - case 3: {GRLIB_difficulty_modifier = 1.25;}; - case 4: {GRLIB_difficulty_modifier = 1.5;}; - case 5: {GRLIB_difficulty_modifier = 2;}; - case 6: {GRLIB_difficulty_modifier = 4;}; - case 7: {GRLIB_difficulty_modifier = 10;}; - default {GRLIB_difficulty_modifier = 1;}; +switch (KPLIB_difficulty_modifier) do { + case 0: {KPLIB_difficulty_modifier = 0.5;}; + case 1: {KPLIB_difficulty_modifier = 0.75;}; + case 2: {KPLIB_difficulty_modifier = 1;}; + case 3: {KPLIB_difficulty_modifier = 1.25;}; + case 4: {KPLIB_difficulty_modifier = 1.5;}; + case 5: {KPLIB_difficulty_modifier = 2;}; + case 6: {KPLIB_difficulty_modifier = 4;}; + case 7: {KPLIB_difficulty_modifier = 10;}; + default {KPLIB_difficulty_modifier = 1;}; }; -switch (GRLIB_csat_aggressivity) do { - case 0: {GRLIB_csat_aggressivity = 0.25;}; - case 1: {GRLIB_csat_aggressivity = 0.5;}; - case 2: {GRLIB_csat_aggressivity = 1;}; - case 3: {GRLIB_csat_aggressivity = 2;}; - case 4: {GRLIB_csat_aggressivity = 4;}; - default {GRLIB_csat_aggressivity = 1;}; +switch (KPLIB_csat_aggressivity) do { + case 0: {KPLIB_csat_aggressivity = 0.25;}; + case 1: {KPLIB_csat_aggressivity = 0.5;}; + case 2: {KPLIB_csat_aggressivity = 1;}; + case 3: {KPLIB_csat_aggressivity = 2;}; + case 4: {KPLIB_csat_aggressivity = 4;}; + default {KPLIB_csat_aggressivity = 1;}; }; -switch (GRLIB_civilian_activity) do { - case 0: {GRLIB_civilian_activity = 0;}; - case 1: {GRLIB_civilian_activity = 0.5;}; - case 2: {GRLIB_civilian_activity = 1;}; - case 3: {GRLIB_civilian_activity = 2;}; - default {GRLIB_csat_aggressivity = 1;}; +switch (KPLIB_civilian_activity) do { + case 0: {KPLIB_civilian_activity = 0;}; + case 1: {KPLIB_civilian_activity = 0.5;}; + case 2: {KPLIB_civilian_activity = 1;}; + case 3: {KPLIB_civilian_activity = 2;}; + default {KPLIB_csat_aggressivity = 1;}; }; -switch (GRLIB_resources_multiplier) do { - case 0: {GRLIB_resources_multiplier = 0.25;}; - case 1: {GRLIB_resources_multiplier = 0.5;}; - case 2: {GRLIB_resources_multiplier = 0.75;}; - case 3: {GRLIB_resources_multiplier = 1;}; - case 4: {GRLIB_resources_multiplier = 1.25;}; - case 5: {GRLIB_resources_multiplier = 1.5;}; - case 6: {GRLIB_resources_multiplier = 2;}; - case 7: {GRLIB_resources_multiplier = 3;}; - default {GRLIB_resources_multiplier = 1;}; +switch (KPLIB_resources_multiplier) do { + case 0: {KPLIB_resources_multiplier = 0.25;}; + case 1: {KPLIB_resources_multiplier = 0.5;}; + case 2: {KPLIB_resources_multiplier = 0.75;}; + case 3: {KPLIB_resources_multiplier = 1;}; + case 4: {KPLIB_resources_multiplier = 1.25;}; + case 5: {KPLIB_resources_multiplier = 1.5;}; + case 6: {KPLIB_resources_multiplier = 2;}; + case 7: {KPLIB_resources_multiplier = 3;}; + default {KPLIB_resources_multiplier = 1;}; }; switch (KP_liberation_victoryCondition) do { @@ -212,11 +212,11 @@ if (!isDedicated && hasInterface) then { player createDiarySubject ["parameters", "Mission Parameters"]; private _param = localize "STR_PARAMS_UNITCAP"; - private _value = (format ["%1", GRLIB_unitcap * 100]) + "%"; + private _value = (format ["%1", KPLIB_unitcap * 100]) + "%"; private _text = format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_DIFFICULTY"; - switch (GRLIB_difficulty_modifier) do { + switch (KPLIB_difficulty_modifier) do { case 0.75: {_value = localize "STR_PARAMS_DIFFICULTY2";}; case 1: {_value = localize "STR_PARAMS_DIFFICULTY3";}; case 1.25: {_value = localize "STR_PARAMS_DIFFICULTY4";}; @@ -229,7 +229,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_AGGRESSIVITY_PARAM"; - switch (GRLIB_csat_aggressivity) do { + switch (KPLIB_csat_aggressivity) do { case 0.5: {_value = localize "STR_AGGRESSIVITY_PARAM1";}; case 1: {_value = localize "STR_AGGRESSIVITY_PARAM2";}; case 2: {_value = localize "STR_AGGRESSIVITY_PARAM3";}; @@ -239,11 +239,11 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_ADAPT_TO_PLAYERCOUNT"; - _value = if (GRLIB_adaptive_opfor) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_adaptive_opfor) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_CIVILIANS"; - switch (GRLIB_civilian_activity) do { + switch (KPLIB_civilian_activity) do { case 0.5: {_value = localize "STR_PARAMS_CIVILIANS2";}; case 1: {_value = localize "STR_PARAMS_CIVILIANS3";}; case 2: {_value = localize "STR_PARAMS_CIVILIANS4";}; @@ -252,7 +252,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_FIRSTFOB"; - _value = if (GRLIB_build_first_fob) then {localize "STR_YES";} else {localize "STR_NO";}; + _value = if (KPLIB_build_first_fob) then {localize "STR_YES";} else {localize "STR_NO";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_FIRSTFOBVEHICLE"; @@ -260,31 +260,31 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_FOBS_COUNT"; - _value = str GRLIB_maximum_fobs; + _value = str KPLIB_maximum_fobs; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_SQUAD_SIZE"; - _value = str GRLIB_max_squad_size; + _value = str KPLIB_max_squad_size; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_BLUFOR_DEFENDERS"; - _value = if (GRLIB_blufor_defenders) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_blufor_defenders) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_AUTODANGER"; - _value = if (GRLIB_autodanger) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_autodanger) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_DAYDURATION"; - _value = str (24 / GRLIB_time_factor); + _value = str (24 / KPLIB_time_factor); _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_SHORTER_NIGHTS_PARAM"; - _value = if (GRLIB_shorter_nights) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_shorter_nights) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_WEATHER_PARAM"; - switch (GRLIB_weather_param) do { + switch (KPLIB_weather_param) do { case 2: {_value = localize "STR_WEATHER_PARAM2";}; case 3: {_value = localize "STR_WEATHER_PARAM3";}; default {_value = localize "STR_WEATHER_PARAM1";}; @@ -296,7 +296,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_RESOURCESMULTIPLIER"; - _value = format ["x%1", GRLIB_resources_multiplier]; + _value = format ["x%1", KPLIB_resources_multiplier]; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_ARSENAL"; @@ -360,7 +360,7 @@ if (!isDedicated && hasInterface) then { }; _param = localize "STR_PARAMS_FATIGUE"; - _value = if (GRLIB_fatigue) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_fatigue) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_WEAPSWAY"; @@ -396,7 +396,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_HALO_PARAM"; - switch (GRLIB_halo_param) do { + switch (KPLIB_halo_param) do { case 1: {_value = localize "STR_HALO_PARAM1";}; case 5: {_value = localize "STR_HALO_PARAM2";}; case 10: {_value = localize "STR_HALO_PARAM3";}; @@ -444,11 +444,11 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PERMISSIONS_PARAM"; - _value = if (GRLIB_permissions_param) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_permissions_param) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_CLEANUP_PARAM"; - switch (GRLIB_cleanup_vehicles) do { + switch (KPLIB_cleanup_vehicles) do { case 1: {_value = localize "STR_CLEANUP_PARAM1";}; case 2: {_value = localize "STR_CLEANUP_PARAM2";}; case 4: {_value = localize "STR_CLEANUP_PARAM3";}; @@ -457,15 +457,15 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_INTRO"; - _value = if (GRLIB_introduction) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_introduction) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_DEPLOYMENTCAMERA"; - _value = if (GRLIB_deployment_cinematic) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_deployment_cinematic) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_WHITELIST_PARAM"; - _value = if (GRLIB_use_whitelist) then {localize "STR_WHITELIST_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_use_whitelist) then {localize "STR_WHITELIST_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_RESTART_PARAM"; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 40dcc0843..e0a0bea82 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -26,14 +26,14 @@ if (isServer) then { if (isNil "air_weight") then {air_weight = 33}; // BLUFOR Killer handling - if ((side _killer) == GRLIB_side_friendly) then { + if ((side _killer) == KPLIB_side_friendly) then { // Increase combat readiness for kills near a capital. private _nearby_bigtown = sectors_bigtown select {!(_x in blufor_sectors) && (_unit distance (markerpos _x) < 250)}; if (count _nearby_bigtown > 0) then { - combat_readiness = combat_readiness + (0.5 * GRLIB_difficulty_modifier); - stats_readiness_earned = stats_readiness_earned + (0.5 * GRLIB_difficulty_modifier); - if (combat_readiness > 100.0 && GRLIB_difficulty_modifier < 2) then {combat_readiness = 100.0}; + combat_readiness = combat_readiness + (0.5 * KPLIB_difficulty_modifier); + stats_readiness_earned = stats_readiness_earned + (0.5 * KPLIB_difficulty_modifier); + if (combat_readiness > 100.0 && KPLIB_difficulty_modifier < 2) then {combat_readiness = 100.0}; }; // Weights adjustments depending on what vehicle the BLUFOR killer used @@ -73,9 +73,9 @@ if (isServer) then { if (_unit isKindOf "Man") then { // OPFOR casualty - if (side (group _unit) == GRLIB_side_enemy) then { + if (side (group _unit) == KPLIB_side_enemy) then { // Killed by BLUFOR - if (side _killer == GRLIB_side_friendly) then { + if (side _killer == KPLIB_side_friendly) then { stats_opfor_soldiers_killed = stats_opfor_soldiers_killed + 1; }; @@ -86,25 +86,25 @@ if (isServer) then { }; // BLUFOR casualty - if (side (group _unit) == GRLIB_side_friendly) then { + if (side (group _unit) == KPLIB_side_friendly) then { stats_blufor_soldiers_killed = stats_blufor_soldiers_killed + 1; // Killed by BLUFOR - if (side _killer == GRLIB_side_friendly) then { + if (side _killer == KPLIB_side_friendly) then { stats_blufor_teamkills = stats_blufor_teamkills + 1; }; }; // Resistance casualty - if (side (group _unit) == GRLIB_side_resistance) then { + if (side (group _unit) == KPLIB_side_resistance) then { KP_liberation_guerilla_strength = KP_liberation_guerilla_strength - 1; stats_resistance_killed = stats_resistance_killed + 1; // Resistance is friendly to BLUFOR - if ((GRLIB_side_friendly getFriend GRLIB_side_resistance) >= 0.6) then { + if ((KPLIB_side_friendly getFriend KPLIB_side_resistance) >= 0.6) then { // Killed by BLUFOR - if (side _killer == GRLIB_side_friendly) then { + if (side _killer == KPLIB_side_friendly) then { if (KP_liberation_asymmetric_debug > 0) then {[format ["Guerilla unit killed by: %1", name _killer], "ASYMMETRIC"] call KPLIB_fnc_log;}; [3, [(name _unit)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; stats_resistance_teamkills = stats_resistance_teamkills + 1; @@ -119,11 +119,11 @@ if (isServer) then { }; // Civilian casualty - if (side (group _unit) == GRLIB_side_civilian) then { + if (side (group _unit) == KPLIB_side_civilian) then { stats_civilians_killed = stats_civilians_killed + 1; // Killed by BLUFOR - if (side _killer == GRLIB_side_friendly) then { + if (side _killer == KPLIB_side_friendly) then { if (KP_liberation_civrep_debug > 0) then {[format ["Civilian killed by: %1", name _killer], "CIVREP"] call KPLIB_fnc_log;}; [2, [(name _unit)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; [KP_liberation_cr_kill_penalty, true] spawn F_cr_changeCR; diff --git a/Missionframework/ui/liberation_squad.hpp b/Missionframework/ui/liberation_squad.hpp index d877744ec..e5201a191 100644 --- a/Missionframework/ui/liberation_squad.hpp +++ b/Missionframework/ui/liberation_squad.hpp @@ -75,7 +75,7 @@ class liberation_squad { sizeEx = 0.025 * safezoneH; text = $STR_RESUPPLY; tooltip = $STR_RESUPPLY_TOOLTIP; - action = "GRLIB_squadaction = 1"; + action = "KPLIB_squadaction = 1"; }; class RemoveButton: StdButton { idc = 211; @@ -86,7 +86,7 @@ class liberation_squad { sizeEx = 0.025 * safezoneH; text = $STR_REMOVE_MEMBER; tooltip = $STR_REMOVE_MEMBER_TOOLTIP; - action = "GRLIB_squadaction = 2"; + action = "KPLIB_squadaction = 2"; }; class ReplaceButton: StdButton { idc = 212; @@ -97,7 +97,7 @@ class liberation_squad { sizeEx = 0.025 * safezoneH; text = $STR_DEPLOY_ON_MEMBER; tooltip = $STR_DEPLOY_ON_MEMBER_TOOLTIP; - action = "GRLIB_squadaction = 3"; + action = "KPLIB_squadaction = 3"; }; class ConfirmButton: StdButton { idc = 213; @@ -107,7 +107,7 @@ class liberation_squad { h = (0.04 * safezoneH); sizeEx = 0.025 * safezoneH; text = $STR_CONFIRM; - action = "GRLIB_squadconfirm = 1"; + action = "KPLIB_squadconfirm = 1"; }; class CancelButton: StdButton { idc = 214; @@ -117,7 +117,7 @@ class liberation_squad { h = (0.04 * safezoneH); sizeEx = 0.025 * safezoneH; text = $STR_RECYCLING_CANCEL; - action = "GRLIB_squadconfirm = 0"; + action = "KPLIB_squadconfirm = 0"; }; class ButtonClose: StdButton { x = 0.785 * safezoneW + safezoneX; diff --git a/Missionframework/whitelist.sqf b/Missionframework/whitelist.sqf index 22c3ab81d..ad2bb2c33 100644 --- a/Missionframework/whitelist.sqf +++ b/Missionframework/whitelist.sqf @@ -3,19 +3,19 @@ // Allowed team tags, as defined in your team's squad.xml // This isn't very secure but efficient to whitelist a lot of people at once. -GRLIB_whitelisted_tags = [ +KPLIB_whitelisted_tags = [ ]; // Allowed individual players based on their SteamID64. This is the most secure way to do. // For example: "76561198016642627" // To know that information: https://steamid.io/ -GRLIB_whitelisted_steamids = [ +KPLIB_whitelisted_steamids = [ ]; // Allowed individual player names. Note that this method is not very secure contrary to SteamIDs. // For exemple: "Zbug" -GRLIB_whitelisted_names = [ +KPLIB_whitelisted_names = [ ]; From 9e5937c8aa4824f4e80090f3497e2064729269ba Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 10 May 2020 17:05:06 +0200 Subject: [PATCH 004/115] `KP_liberation_` prefix to `KPLIB_` --- Missionframework/KPLIB_classnameLists.sqf | 12 +- Missionframework/KPLIB_config.sqf | 70 +++--- Missionframework/KPLIB_transportConfigs.sqf | 4 +- .../functions/fn_addActionsPlayer.sqf | 12 +- .../functions/fn_allowCrewInImmobile.sqf | 6 +- .../functions/fn_checkCrateValue.sqf | 4 +- Missionframework/functions/fn_checkGear.sqf | 24 +- .../functions/fn_checkWeaponCargo.sqf | 18 +- Missionframework/functions/fn_clearCargo.sqf | 4 +- .../functions/fn_crAddAceAction.sqf | 4 +- Missionframework/functions/fn_crGetMulti.sqf | 4 +- Missionframework/functions/fn_crGlobalMsg.sqf | 4 +- .../functions/fn_crateFromStorage.sqf | 6 +- .../functions/fn_crateToStorage.sqf | 6 +- .../functions/fn_createClearance.sqf | 8 +- Missionframework/functions/fn_createCrate.sqf | 10 +- Missionframework/functions/fn_doSave.sqf | 6 +- .../functions/fn_getCrateHeight.sqf | 8 +- .../functions/fn_getFobResources.sqf | 4 +- .../functions/fn_getResistanceTier.sqf | 6 +- Missionframework/functions/fn_getSaveData.sqf | 28 +-- .../functions/fn_getSaveableParam.sqf | 16 +- .../functions/fn_getStoragePositions.sqf | 6 +- .../functions/fn_handlePlacedZeusObject.sqf | 6 +- .../functions/fn_setVehicleSeized.sqf | 4 +- Missionframework/functions/fn_sortStorage.sqf | 8 +- .../functions/fn_spawnGuerillaGroup.sqf | 14 +- .../ui/fn_overlayUpdateResources.sqf | 18 +- Missionframework/init.sqf | 4 +- Missionframework/kp_objectInits.sqf | 14 +- Missionframework/onPlayerRespawn.sqf | 4 +- .../presets/blufor/3cbBAF_des.sqf | 36 +-- .../presets/blufor/3cbBAF_mtp.sqf | 36 +-- .../presets/blufor/CUP_ACR_Desert.sqf | 36 +-- .../presets/blufor/CUP_ACR_Woodland.sqf | 36 +-- .../presets/blufor/CUP_BAF_Desert.sqf | 36 +-- .../presets/blufor/CUP_BAF_Woodland.sqf | 36 +-- Missionframework/presets/blufor/CUP_CDF.sqf | 36 +-- Missionframework/presets/blufor/CUP_ChDKZ.sqf | 36 +-- Missionframework/presets/blufor/CUP_SLA.sqf | 36 +-- .../presets/blufor/CUP_TakiArmy.sqf | 36 +-- .../presets/blufor/CUP_USA_Desert.sqf | 36 +-- .../presets/blufor/CUP_USA_Woodland.sqf | 36 +-- .../presets/blufor/CUP_USMC_Desert.sqf | 36 +-- .../presets/blufor/CUP_USMC_Woodland.sqf | 36 +-- Missionframework/presets/blufor/apex.sqf | 36 +-- Missionframework/presets/blufor/bwmod.sqf | 36 +-- Missionframework/presets/blufor/bwmod_des.sqf | 36 +-- Missionframework/presets/blufor/csat.sqf | 36 +-- Missionframework/presets/blufor/csat_apex.sqf | 36 +-- Missionframework/presets/blufor/custom.sqf | 36 +-- Missionframework/presets/blufor/enoch.sqf | 36 +-- Missionframework/presets/blufor/gm_east.sqf | 36 +-- .../presets/blufor/gm_east_win.sqf | 36 +-- Missionframework/presets/blufor/gm_west.sqf | 36 +-- .../presets/blufor/gm_west_win.sqf | 36 +-- Missionframework/presets/blufor/rhs_afrf.sqf | 36 +-- .../presets/blufor/rhs_usaf_des.sqf | 36 +-- .../presets/blufor/rhs_usaf_wdl.sqf | 36 +-- Missionframework/presets/blufor/sfp_des.sqf | 36 +-- Missionframework/presets/blufor/sfp_wdl.sqf | 48 ++-- Missionframework/presets/blufor/unsung.sqf | 36 +-- Missionframework/presets/init_presets.sqf | 20 +- .../presets/resistance/CUP_NAPA.sqf | 30 +-- .../presets/resistance/CUP_TakiLocals.sqf | 30 +-- Missionframework/presets/resistance/RACS.sqf | 30 +-- Missionframework/presets/resistance/apex.sqf | 30 +-- .../presets/resistance/custom.sqf | 30 +-- .../presets/resistance/germany.sqf | 30 +-- .../presets/resistance/middle_eastern.sqf | 30 +-- .../presets/resistance/rhs_gref.sqf | 30 +-- .../presets/resistance/unsung.sqf | 30 +-- .../scripts/client/actions/do_recycle.sqf | 16 +- .../client/actions/do_repackage_fob.sqf | 4 +- .../scripts/client/actions/open_arsenal.sqf | 12 +- .../client/actions/recycle_manager.sqf | 4 +- .../ammoboxes/ammobox_action_manager.sqf | 6 +- .../client/asymmetric/asymm_notifications.sqf | 2 +- .../scripts/client/build/do_build.sqf | 20 +- .../scripts/client/build/do_sector_build.sqf | 4 +- .../scripts/client/build/open_build_menu.sqf | 42 ++-- .../client/civinformant/civinfo_escort.sqf | 8 +- .../civinformant/civinfo_notifications.sqf | 2 +- .../client/commander/open_logistic.sqf | 26 +- .../client/commander/open_production.sqf | 12 +- .../scripts/client/init_client.sqf | 12 +- .../client/markers/empty_vehicles_marker.sqf | 4 +- .../scripts/client/markers/fob_markers.sqf | 2 +- .../markers/update_production_sites.sqf | 10 +- .../scripts/client/misc/init_arsenal.sqf | 42 ++-- .../client/misc/kp_fuel_consumption.sqf | 6 +- .../scripts/client/misc/playerNamespace.sqf | 8 +- .../scripts/client/misc/synchronise_eco.sqf | 6 +- .../scripts/client/misc/synchronise_vars.sqf | 20 +- .../scripts/client/spawn/redeploy_manager.sqf | 26 +- .../scripts/client/ui/ui_manager.sqf | 38 +-- .../scripts/server/ai/prisonner_ai.sqf | 4 +- .../server/asymmetric/asymmetric_loop.sqf | 30 +-- .../convoy/logistic_convoy_ambush.sqf | 38 +-- .../server/asymmetric/ied/manage_asymIED.sqf | 14 +- .../asymmetric/random/asym_sector_ambush.sqf | 16 +- .../asymmetric/random/sector_guerilla.sqf | 12 +- .../scripts/server/base/startgame.sqf | 8 +- .../server/base/startvehicle_spawn.sqf | 8 +- .../server/battlegroup/spawn_battlegroup.sqf | 2 +- .../server/civinformant/civinfo_delivered.sqf | 4 +- .../server/civinformant/civinfo_loop.sqf | 28 +-- .../civinformant/tasks/civinfo_task.sqf | 16 +- .../server/civrep/fnc/f_kp_cr_changeCR.sqf | 16 +- .../civrep/fnc/f_kp_cr_getBuildings.sqf | 6 +- .../civrep/fnc/f_kp_cr_liberatedSector.sqf | 10 +- .../scripts/server/civrep/ignored/altis.sqf | 4 +- .../server/civrep/ignored/chernarus.sqf | 4 +- .../server/civrep/ignored/chernarus2020.sqf | 2 +- .../scripts/server/civrep/ignored/enoch.sqf | 2 +- .../civrep/ignored/gm_weferlingen_summer.sqf | 2 +- .../civrep/ignored/gm_weferlingen_winter.sqf | 2 +- .../scripts/server/civrep/ignored/lythium.sqf | 4 +- .../scripts/server/civrep/ignored/malden.sqf | 4 +- .../server/civrep/ignored/panthera3.sqf | 2 +- .../scripts/server/civrep/ignored/pja310.sqf | 4 +- .../scripts/server/civrep/ignored/sara.sqf | 4 +- .../server/civrep/ignored/song_bin_tanh.sqf | 2 +- .../server/civrep/ignored/takistan.sqf | 4 +- .../scripts/server/civrep/ignored/tanoa.sqf | 4 +- .../server/civrep/ignored/wl_rosche.sqf | 4 +- .../server/civrep/ignored/xcam_taunus.sqf | 4 +- .../scripts/server/civrep/init_buildings.sqf | 10 +- .../civrep/wounded/civrep_wounded_civs.sqf | 10 +- .../server/game/check_victory_conditions.sqf | 2 +- .../scripts/server/game/save_manager.sqf | 68 +++--- .../scripts/server/game/server_restart.sqf | 2 +- .../scripts/server/game/synchronise_eco.sqf | 28 +-- .../scripts/server/game/synchronise_vars.sqf | 102 ++++---- .../scripts/server/game/zeus_synchro.sqf | 4 +- .../scripts/server/init_server.sqf | 12 +- .../remotecall/abort_logi_remote_call.sqf | 30 +-- .../remotecall/add_logiGroup_remote_call.sqf | 4 +- .../remotecall/add_logiTruck_remote_call.sqf | 18 +- .../remotecall/build_fac_remote_call.sqf | 24 +- .../server/remotecall/build_remote_call.sqf | 14 +- .../remotecall/cancel_build_remote_call.sqf | 14 +- .../remotecall/change_prod_remote_call.sqf | 6 +- .../remotecall/del_logiGroup_remote_call.sqf | 4 +- .../remotecall/del_logiTruck_remote_call.sqf | 28 +-- .../server/remotecall/recycle_remote_call.sqf | 14 +- .../remotecall/save_logi_remote_call.sqf | 14 +- .../sector_liberated_remote_call.sqf | 12 +- .../server/resources/manage_logistics.sqf | 110 ++++----- .../server/resources/manage_resources.sqf | 34 +-- .../resources/recalculate_resources.sqf | 40 ++-- .../scripts/server/resources/unit_cap.sqf | 10 +- .../server/secondary/convoy_hijack.sqf | 2 +- .../sector/attack_in_progress_sector.sqf | 8 +- .../scripts/server/sector/fn_destroyFob.sqf | 4 +- .../server/sector/fn_spawnSectorCrates.sqf | 2 +- .../scripts/server/sector/ied_manager.sqf | 10 +- .../server/sector/manage_one_sector.sqf | 28 +-- .../server/support/fn_createSuppModules.sqf | 4 +- .../scripts/shared/diagnostics.sqf | 12 +- .../scripts/shared/fetch_params.sqf | 120 +++++----- .../scripts/shared/init_shared.sqf | 2 +- .../scripts/shared/kill_manager.sqf | 38 +-- _tools/README.md | 12 +- _tools/_presets.json | 222 +++++++++--------- 165 files changed, 1717 insertions(+), 1717 deletions(-) diff --git a/Missionframework/KPLIB_classnameLists.sqf b/Missionframework/KPLIB_classnameLists.sqf index d08755a47..9c0297192 100644 --- a/Missionframework/KPLIB_classnameLists.sqf +++ b/Missionframework/KPLIB_classnameLists.sqf @@ -14,7 +14,7 @@ ------------------------------------------------------------ --- Default arsenal blacklist --- Useless if you're using anything other than - "kp_liberation_arsenal = 0;" in KPLIB_config.sqf. + "KPLIB_arsenal = 0;" in KPLIB_config.sqf. A whitelisted arsenal is always more performance friendly then a blacklisted arsenal. @@ -153,7 +153,7 @@ blacklisted_from_arsenal = [ ]; // Classnames of items which are always added to each arsenal list (handy for generic classnames) -KP_liberation_allowed_items_extension = [ +KPLIB_allowed_items_extension = [ "ACE_Chemlight_Shield_Blue", "ACE_Chemlight_Shield_Green", "ACE_Chemlight_Shield_Orange", @@ -263,7 +263,7 @@ KP_liberation_allowed_items_extension = [ ]; // Vehicle classnames which also function as ACE medical vehicles. -KP_liberation_medical_vehicles = [ +KPLIB_medical_vehicles = [ "B_T_Truck_01_medical_F", "B_Truck_01_medical_F", "C_Van_02_medevac_F", @@ -312,7 +312,7 @@ KP_liberation_medical_vehicles = [ ]; // Building classnames which also function as ACE medical facilities. -KP_liberation_medical_facilities = [ +KPLIB_medical_facilities = [ "Land_Medevac_house_V1_F", "Land_Medevac_HQ_V1_F", "LAND_uns_army_med", @@ -324,7 +324,7 @@ KP_liberation_medical_facilities = [ ]; // Classnames of ACE crates -KP_liberation_ace_crates = [ +KPLIB_ace_crates = [ "ACE_Box_82mm_Mo_HE", "ACE_Box_82mm_Mo_Illum", "ACE_Box_82mm_Mo_Smoke", @@ -532,7 +532,7 @@ boats_names = [ ]; // Classnames of artillery vehicles, which should be added to the support module -KP_liberation_suppMod_artyVeh = [ +KPLIB_suppMod_artyVeh = [ "B_G_Mortar_01_F", "B_MBT_01_arty_F", "B_MBT_01_mlrs_F", diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 07d672e26..85ff7a7d1 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -53,7 +53,7 @@ 29 = SFP (Desert) 30 = LDF (Contact DLC) */ -KP_liberation_preset_blufor = 0; +KPLIB_preset_blufor = 0; /* ----- Enemy preset ----- @@ -79,7 +79,7 @@ KP_liberation_preset_blufor = 0; 19 = CUP British Armed Forces (Desert) 20 = CUP British Armed Forces (Woodland) */ -KP_liberation_preset_opfor = 0; +KPLIB_preset_opfor = 0; /* ----- Resistance preset ----- @@ -93,7 +93,7 @@ KP_liberation_preset_opfor = 0; 7 = CUP Takistani Locals 8 = CUP National Party of Chernarus */ -KP_liberation_preset_resistance = 0; +KPLIB_preset_resistance = 0; /* ----- Civilians preset ----- @@ -106,7 +106,7 @@ KP_liberation_preset_resistance = 0; 6 = CUP Takistani Civilians 7 = CUP Chernarussian Civilians */ -KP_liberation_preset_civilians = 0; +KPLIB_preset_civilians = 0; /* ----- Arsenal preset ----- @@ -121,7 +121,7 @@ KP_liberation_preset_civilians = 0; 8 = SFP arsenal preset 9 = BWMod arsenal preset */ -KP_liberation_arsenal = 0; +KPLIB_arsenal = 0; /* @@ -169,7 +169,7 @@ KPLIB_save_key = "KP_LIBERATION_" + (toUpper worldName) + "_SAVEGAME"; KPLIB_paramSaveKey = "KP_LIBERATION_" + (toUpper worldName) + "_SAVE_PARAMS"; // Interval in seconds for automatic save. -KP_liberation_save_interval = 60; +KPLIB_save_interval = 60; /* @@ -229,25 +229,25 @@ KPLIB_civilians_amount = 10; */ // Civil Reputation penalty for killing a civilian. -KP_liberation_cr_kill_penalty = 5; +KPLIB_cr_kill_penalty = 5; // Civil Reputation penalty for destroying/damaging a building. -KP_liberation_cr_building_penalty = 3; +KPLIB_cr_building_penalty = 3; // Civil Reputation penalty for stealing a civilian vehicle. -KP_liberation_cr_vehicle_penalty = 2; +KPLIB_cr_vehicle_penalty = 2; // Civil Reputation penalty for killing a friendly resistance soldier. -KP_liberation_cr_resistance_penalty = 3; +KPLIB_cr_resistance_penalty = 3; // Civil Reputation gain for liberate a sector. -KP_liberation_cr_sector_gain = 5; +KPLIB_cr_sector_gain = 5; // Chance (0-100) that there are wounded civilians right after capturing a sector. -KP_liberation_cr_wounded_chance = 35; +KPLIB_cr_wounded_chance = 35; // Civil Reputation gain for providing medical assistance for wounded civilians. -KP_liberation_cr_wounded_gain = 2; +KPLIB_cr_wounded_gain = 2; /* @@ -267,25 +267,25 @@ KPLIB_secondary_missions_costs = [15, 10, 8]; KPLIB_secondary_objective_impact = 0.4; // Minimum time until a civil Informant can spawn. (seconds) -KP_liberation_civinfo_min = 5400; +KPLIB_civinfo_min = 5400; // Maximum time until a civil Informant spawns. (seconds) -KP_liberation_civinfo_max = 10800; +KPLIB_civinfo_max = 10800; // Civil Informant spawn chance. (0-100) -KP_liberation_civinfo_chance = 75; +KPLIB_civinfo_chance = 75; // Intel gain for talking to a civil informant. -KP_liberation_civinfo_intel = 5; +KPLIB_civinfo_intel = 5; // Time until a civil informant will despawn after spawning. (seconds) -KP_liberation_civinfo_duration = 1200; +KPLIB_civinfo_duration = 1200; // Chance (0-100) that the delivered informant will spawn a time critical task -KP_liberation_civinfo_task_chance = 40; +KPLIB_civinfo_task_chance = 40; // Time until the task will despawn if no player is near. (seconds) -KP_liberation_civinfo_task_duration = 900; +KPLIB_civinfo_task_duration = 900; /* @@ -296,13 +296,13 @@ KP_liberation_civinfo_task_duration = 900; */ // Time in minutes till a full tank depletes whilst the vehicle is standing still with a running engine. -KP_liberation_fuel_neutral = 180; +KPLIB_fuel_neutral = 180; // Time in minutes till a full tank depletes whilst the vehicle is driving below max speed. -KP_liberation_fuel_normal = 90; +KPLIB_fuel_normal = 90; // Time in minutes till a full tank depletes whilst the vehicle is driving at max speed. -KP_liberation_fuel_max = 45; +KPLIB_fuel_max = 45; /* @@ -313,25 +313,25 @@ KP_liberation_fuel_max = 45; */ // Chance (0-100) that a logistic convoy will be ambushed, when civil reputation is low. (Checked every minute) -KP_liberation_convoy_ambush_chance = 2; +KPLIB_convoy_ambush_chance = 2; // Duration of the convoy ambush event until nothing can be retrieved. (seconds) -KP_liberation_convoy_ambush_duration = 1200; +KPLIB_convoy_ambush_duration = 1200; // Resistance strength (0-100) needed for tier 2 equipment. -KP_liberation_resistance_tier2 = 30; +KPLIB_resistance_tier2 = 30; // Resistance strength (0-100) needed for tier 3 equipment. -KP_liberation_resistance_tier3 = 70; +KPLIB_resistance_tier3 = 70; // Chance (0-100) that a resistance unit has a RPG. (tier 2 and 3) -KP_liberation_resistance_at_chance = 20; +KPLIB_resistance_at_chance = 20; // Chance (0-100) that a resistance squad will join an ongoing sector attack. -KP_liberation_resistance_sector_chance = 35; +KPLIB_resistance_sector_chance = 35; // Chance that some resistance units will spawn in blufor sectors for an ambush, if reputation is low. -KP_liberation_resistance_ambush_chance = 25; +KPLIB_resistance_ambush_chance = 25; /* @@ -342,7 +342,7 @@ KP_liberation_resistance_ambush_chance = 25; */ // Time in minutes until a resource crate is produced, when resources multiplier is set to 1. -KP_liberation_production_interval = 30; +KPLIB_production_interval = 30; // Percentage of resources you get back from recycling. KPLIB_recycling_percentage = 0.5; @@ -357,14 +357,14 @@ KPLIB_vulnerability_timer = 1200; KPLIB_surrender_chance = 80; // When playing on this map, it'll create a clearance (remove terrain objects) in a 15m radius around the battlegroup/reinforcements spawnpoint. -KP_liberation_battlegroup_clearance = [ +KPLIB_battlegroup_clearance = [ "song_bin_tanh" ]; /* Slot independent commander action access. The Steam UIDs entered in this array will allow corresponding players to access the commander actions (rights, production, etc.), even if they are not in the commander slot. */ -KP_liberation_commander_actions = [ +KPLIB_commander_actions = [ /* Example: "1324678", @@ -375,7 +375,7 @@ KP_liberation_commander_actions = [ /* Whitelist for BI support framework access. Same format as for the commander actions. */ -KP_liberation_suppMod_whitelist = [ +KPLIB_suppMod_whitelist = [ ]; @@ -383,7 +383,7 @@ KP_liberation_suppMod_whitelist = [ // Adjustments calculation depending on selected mission parameters (shouldn't be edited) KPLIB_endgame = 0; KPLIB_respawn_marker = "respawn"; -KP_liberation_production_interval = ceil (KP_liberation_production_interval / KPLIB_resources_multiplier); +KPLIB_production_interval = ceil (KPLIB_production_interval / KPLIB_resources_multiplier); KPLIB_battlegroup_size = KPLIB_battlegroup_size * (sqrt KPLIB_unitcap) * (sqrt KPLIB_csat_aggressivity); KPLIB_civilians_amount = KPLIB_civilians_amount * KPLIB_civilian_activity; KPLIB_blufor_cap = (KPLIB_blufor_cap * KPLIB_unitcap) min 100; diff --git a/Missionframework/KPLIB_transportConfigs.sqf b/Missionframework/KPLIB_transportConfigs.sqf index 9984f9327..2fbbb556d 100644 --- a/Missionframework/KPLIB_transportConfigs.sqf +++ b/Missionframework/KPLIB_transportConfigs.sqf @@ -186,7 +186,7 @@ KPLIB_transportConfigs = [ ]; // Large storage area placement position offsets. -KP_liberation_large_storage_positions = [ +KPLIB_large_storage_positions = [ [-5.59961,3.60938,0.6], [-3.99902,3.60938,0.6], [-2.39941,3.60938,0.6], @@ -230,7 +230,7 @@ KP_liberation_large_storage_positions = [ ]; // Small storage area placement position offsets. -KP_liberation_small_storage_positions = [ +KPLIB_small_storage_positions = [ [-2.34961,1.80078,0.6], [-0.75,1.80078,0.6], [0.850586,1.80078,0.6], diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index bb1d7402b..8816612ed 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -21,7 +21,7 @@ params [ if !(isPlayer _player) exitWith {["No player given"] call BIS_fnc_error; false}; -if (isNil "KP_liberation_resources_global") then {KP_liberation_resources_global = false;}; +if (isNil "KPLIB_resources_global") then {KPLIB_resources_global = false;}; // Tutorial _player addAction [ @@ -169,7 +169,7 @@ _player addAction [ _player addAction [ ["", localize "STR_SECSTORAGEBUILD_ACTION", ""] joinString "", "scripts\client\build\do_sector_build.sqf", - [KP_liberation_small_storage_building], + [KPLIB_small_storage_building], -770, false, true, @@ -259,7 +259,7 @@ _player addAction [ // Switch global/local resources _player addAction [ ["", localize "STR_RESOURCE_GLOBAL_ACTION", ""] joinString "", - {KP_liberation_resources_global = !KP_liberation_resources_global}, + {KPLIB_resources_global = !KPLIB_resources_global}, nil, -810, false, @@ -285,7 +285,7 @@ _player addAction [ _originalTarget getVariable ['KPLIB_hasDirectAccess', false] && {isNull (objectParent _originalTarget)} && {alive _originalTarget} - && {!(KP_liberation_production isEqualTo [])} + && {!(KPLIB_production isEqualTo [])} && { _originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8) || {!(_originalTarget getVariable ['KPLIB_nearProd', []] isEqualTo [])} @@ -304,14 +304,14 @@ _player addAction [ true, "", " - KP_liberation_ailogistics + KPLIB_ailogistics && {_originalTarget getVariable ['KPLIB_hasDirectAccess', false]} && {isNull (objectParent _originalTarget)} && {alive _originalTarget} && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} && {!( KPLIB_all_fobs isEqualTo [] - || KP_liberation_production isEqualTo [] + || KPLIB_production isEqualTo [] )} && {build_confirmed isEqualTo 0} " diff --git a/Missionframework/functions/fn_allowCrewInImmobile.sqf b/Missionframework/functions/fn_allowCrewInImmobile.sqf index a7991f5b5..fe1a2424a 100644 --- a/Missionframework/functions/fn_allowCrewInImmobile.sqf +++ b/Missionframework/functions/fn_allowCrewInImmobile.sqf @@ -2,7 +2,7 @@ File: fn_allowCrewInImmobile.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-09-05 - Last Update: 2019-12-03 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,7 +21,7 @@ params [ if (isNull _vehicle) exitWith {["Null object given"] call BIS_fnc_error; false}; -// KP_liberation_allowEnemiesInImmobile (0-50-100) -_vehicle allowCrewInImmobile (random 100 < KP_liberation_allowEnemiesInImmobile); +// KPLIB_allowEnemiesInImmobile (0-50-100) +_vehicle allowCrewInImmobile (random 100 < KPLIB_allowEnemiesInImmobile); true diff --git a/Missionframework/functions/fn_checkCrateValue.sqf b/Missionframework/functions/fn_checkCrateValue.sqf index 5e9abe73d..c5e1468a3 100644 --- a/Missionframework/functions/fn_checkCrateValue.sqf +++ b/Missionframework/functions/fn_checkCrateValue.sqf @@ -2,7 +2,7 @@ File: fn_checkCrateValue.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-05-26 - Last Update: 2019-12-03 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -24,7 +24,7 @@ params [ if (isNull _crate) exitWith {["Null object given"] call BIS_fnc_error; false}; -hint format [localize "STR_ACTION_CRATE_VALUE_HINT", _crate getVariable ["KP_liberation_crate_value", 0]]; +hint format [localize "STR_ACTION_CRATE_VALUE_HINT", _crate getVariable ["KPLIB_crate_value", 0]]; if !(ropeAttachEnabled _crate) then { [_crate, true] remoteExec ["enableRopeAttach"]; diff --git a/Missionframework/functions/fn_checkGear.sqf b/Missionframework/functions/fn_checkGear.sqf index 57c2627bf..d20796d59 100644 --- a/Missionframework/functions/fn_checkGear.sqf +++ b/Missionframework/functions/fn_checkGear.sqf @@ -2,7 +2,7 @@ File: fn_checkGear.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-11-22 - Last Update: 2020-04-16 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,23 +25,23 @@ params [ private _removedItems = []; // Check single item slots -if !(toLower (headgear player) in KP_liberation_allowed_items) then { +if !(toLower (headgear player) in KPLIB_allowed_items) then { _removedItems pushBack (headgear player); removeHeadgear player; }; -if !(toLower (goggles player) in KP_liberation_allowed_items) then { +if !(toLower (goggles player) in KPLIB_allowed_items) then { _removedItems pushBack (goggles player); removeGoggles player; }; -if !(toLower (uniform player) in KP_liberation_allowed_items) then { +if !(toLower (uniform player) in KPLIB_allowed_items) then { _removedItems pushBack (uniform player); removeUniform player; }; -if !(toLower (vest player) in KP_liberation_allowed_items) then { +if !(toLower (vest player) in KPLIB_allowed_items) then { _removedItems pushBack (vest player); removeVest player; }; -if (!(toLower (backpack player) in KP_liberation_allowed_items) && ((backpack player) != _backpack)) then { +if (!(toLower (backpack player) in KPLIB_allowed_items) && ((backpack player) != _backpack)) then { _removedItems pushBack (backpack player); removeBackpack player; }; @@ -56,7 +56,7 @@ _items = _items apply {toLower _x}; _removedItems pushBack _x; player unassignItem _x; player removeItems _x; -} forEach (((_items arrayIntersect _items) - KP_liberation_allowed_items) select {!([_x] call KPLIB_fnc_isRadio)}); +} forEach (((_items arrayIntersect _items) - KPLIB_allowed_items) select {!([_x] call KPLIB_fnc_isRadio)}); // Check magazines _items = ((getMagazineCargo (uniformContainer player)) select 0); @@ -66,7 +66,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removeMagazines _x; -} forEach ((_items arrayIntersect _items) - KP_liberation_allowed_items); +} forEach ((_items arrayIntersect _items) - KPLIB_allowed_items); // Check weapons stored in inventory containers { @@ -78,7 +78,7 @@ _items = (weapons player) apply {toLower ([_x] call BIS_fnc_baseWeapon)}; { _removedItems pushBack _x; player removeWeapon _x; -} forEach (_items - KP_liberation_allowed_items); +} forEach (_items - KPLIB_allowed_items); // Check weapon items of primary weapon _items = primaryWeaponItems player; @@ -87,7 +87,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removePrimaryWeaponItem _x; -} forEach (_items - KP_liberation_allowed_items); +} forEach (_items - KPLIB_allowed_items); // Check weapon items of secondary weapon _items = secondaryWeaponItems player; @@ -96,7 +96,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removeSecondaryWeaponItem _x; -} forEach (_items - KP_liberation_allowed_items); +} forEach (_items - KPLIB_allowed_items); // Check weapon items of handgun _items = handgunItems player; @@ -105,7 +105,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removeHandgunItem _x; -} forEach (_items - KP_liberation_allowed_items); +} forEach (_items - KPLIB_allowed_items); // Remove duplicates and empty strings _removedItems = (_removedItems arrayIntersect _removedItems) - [""]; diff --git a/Missionframework/functions/fn_checkWeaponCargo.sqf b/Missionframework/functions/fn_checkWeaponCargo.sqf index fc1b75d56..551d7cf96 100644 --- a/Missionframework/functions/fn_checkWeaponCargo.sqf +++ b/Missionframework/functions/fn_checkWeaponCargo.sqf @@ -2,11 +2,11 @@ File: fn_removeWeaponCargo.sqf Author: Zharf - https://github.com/zharf Date: 2019-06-21 - Last Update: 2020-04-13 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: - Removes weapons not found in KP_liberation_allowed_items from a cargo space. + Removes weapons not found in KPLIB_allowed_items from a cargo space. Warning: All weapon attachments/magazines in container will become detached. Warning: Preset weapons without non-preset parents will get their attachments readded (engine limitation). @@ -39,7 +39,7 @@ clearWeaponCargoGlobal _container; _weaponNonPreset = _weapon; }; - if ((toLower ([_x] call BIS_fnc_baseWeapon)) in KP_liberation_allowed_items) then { + if ((toLower ([_x] call BIS_fnc_baseWeapon)) in KPLIB_allowed_items) then { _container addWeaponCargoGlobal [_weaponNonPreset, 1]; // If weapon does not have a non-preset parent, only add attachments that were custom added @@ -51,7 +51,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _muzzle in _presetAttachments) then { - if (toLower _muzzle in KP_liberation_allowed_items) then { + if (toLower _muzzle in KPLIB_allowed_items) then { _container addItemCargoGlobal [_muzzle, 1]; } else { _removed pushBack _muzzle; @@ -59,7 +59,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _pointer in _presetAttachments) then { - if (toLower _pointer in KP_liberation_allowed_items) then { + if (toLower _pointer in KPLIB_allowed_items) then { _container addItemCargoGlobal [_pointer, 1]; } else { _removed pushBack _pointer; @@ -67,7 +67,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _optic in _presetAttachments) then { - if (toLower _optic in KP_liberation_allowed_items) then { + if (toLower _optic in KPLIB_allowed_items) then { _container addItemCargoGlobal [_optic, 1]; } else { _removed pushBack _optic; @@ -75,7 +75,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _bipod in _presetAttachments) then { - if (toLower _bipod in KP_liberation_allowed_items) then { + if (toLower _bipod in KPLIB_allowed_items) then { _container addItemCargoGlobal [_bipod, 1]; } else { _removed pushBack _bipod; @@ -84,7 +84,7 @@ clearWeaponCargoGlobal _container; _magazine params [["_magazineClass", ""], ["_magazineAmmoCount", 0]]; if (_magazineClass != "") then { - if (toLower _magazineClass in KP_liberation_allowed_items) then { + if (toLower _magazineClass in KPLIB_allowed_items) then { _container addMagazineAmmoCargo [_magazineClass, 1, _magazineAmmoCount]; } else { _removed pushBack _magazineClass; @@ -93,7 +93,7 @@ clearWeaponCargoGlobal _container; _magazineGL params [["_magazineGLClass", ""], ["_magazineGLAmmoCount", 0]]; if (_magazineGLClass != "") then { - if (toLower _magazineGLClass in KP_liberation_allowed_items) then { + if (toLower _magazineGLClass in KPLIB_allowed_items) then { _container addMagazineAmmoCargo [_magazineGLClass, 1, _magazineGLAmmoCount]; } else { _removed pushBack _magazineGLClass; diff --git a/Missionframework/functions/fn_clearCargo.sqf b/Missionframework/functions/fn_clearCargo.sqf index 05228eb6a..d8fb7bf35 100644 --- a/Missionframework/functions/fn_clearCargo.sqf +++ b/Missionframework/functions/fn_clearCargo.sqf @@ -2,7 +2,7 @@ File: fn_clearCargo.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-30 - Last Update: 2020-03-30 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -24,7 +24,7 @@ params [ if (isNull _obj) exitWith {["Null object given"] call BIS_fnc_error; false}; -if (_force || {!((typeOf _obj) in KP_liberation_ace_crates) && {KP_liberation_clear_cargo || {!((typeOf _obj) isKindOf "AllVehicles")}}}) then { +if (_force || {!((typeOf _obj) in KPLIB_ace_crates) && {KPLIB_clear_cargo || {!((typeOf _obj) isKindOf "AllVehicles")}}}) then { clearWeaponCargoGlobal _obj; clearMagazineCargoGlobal _obj; clearBackpackCargoGlobal _obj; diff --git a/Missionframework/functions/fn_crAddAceAction.sqf b/Missionframework/functions/fn_crAddAceAction.sqf index f9d1a1d59..5c945ba45 100644 --- a/Missionframework/functions/fn_crAddAceAction.sqf +++ b/Missionframework/functions/fn_crAddAceAction.sqf @@ -2,7 +2,7 @@ File: fn_crAddAceAction.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-04-22 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,7 +21,7 @@ params [ if (isNull _civ) exitWith {["Null object given"] call BIS_fnc_error; false}; -if (KP_liberation_civrep_debug > 0) then {[format ["ace_action called on: %1", debug_source], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civrep_debug > 0) then {[format ["ace_action called on: %1", debug_source], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; _civ addAction [ "" + localize "STR_CR_ACE_ACTION" + "", diff --git a/Missionframework/functions/fn_crGetMulti.sqf b/Missionframework/functions/fn_crGetMulti.sqf index 8e43e45c8..640c250eb 100644 --- a/Missionframework/functions/fn_crGetMulti.sqf +++ b/Missionframework/functions/fn_crGetMulti.sqf @@ -2,7 +2,7 @@ File: fn_crGetMulti.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-08 - Last Update: 2019-12-04 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,4 +15,4 @@ Reputation multiplier [NUMBER] */ -3 min (floor (abs (KP_liberation_civ_rep / 25))) +3 min (floor (abs (KPLIB_civ_rep / 25))) diff --git a/Missionframework/functions/fn_crGlobalMsg.sqf b/Missionframework/functions/fn_crGlobalMsg.sqf index 0c5fed305..29ac88207 100644 --- a/Missionframework/functions/fn_crGlobalMsg.sqf +++ b/Missionframework/functions/fn_crGlobalMsg.sqf @@ -2,7 +2,7 @@ File: fn_crGlobalMsg.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-04-17 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,7 +21,7 @@ params [ ["_data", [], []] ]; -if (KP_liberation_civrep_debug > 0) then {[format ["globalMsg called on: %1 - Parameters: [%2, %3]", debug_source, _msgType, _data], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civrep_debug > 0) then {[format ["globalMsg called on: %1 - Parameters: [%2, %3]", debug_source, _msgType, _data], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; switch (_msgType) do { case 0: {systemChat localize "STR_CR_VEHICLEMSG";}; diff --git a/Missionframework/functions/fn_crateFromStorage.sqf b/Missionframework/functions/fn_crateFromStorage.sqf index c105b7915..06af19a64 100644 --- a/Missionframework/functions/fn_crateFromStorage.sqf +++ b/Missionframework/functions/fn_crateFromStorage.sqf @@ -2,7 +2,7 @@ File: fn_crateFromStorage.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-03-27 - Last Update: 2020-04-25 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -52,7 +52,7 @@ detach _crate; [_crate, true] call KPLIB_fnc_clearCargo; _crate setPos _unloadPos; [_crate, true] remoteExec ["enableRopeAttach"]; -if (KP_liberation_ace) then {[_crate, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; +if (KPLIB_ace) then {[_crate, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; // Fill the possible gap in the storage area reverse _storedCrates; @@ -65,7 +65,7 @@ _i = 0; // Update sector resources if (_update) then { - if ((_storage getVariable ["KP_liberation_storage_type", -1]) == 1) then { + if ((_storage getVariable ["KPLIB_storage_type", -1]) == 1) then { recalculate_sectors = true; publicVariable "recalculate_sectors"; }; diff --git a/Missionframework/functions/fn_crateToStorage.sqf b/Missionframework/functions/fn_crateToStorage.sqf index 8b21110d3..c3bf57b05 100644 --- a/Missionframework/functions/fn_crateToStorage.sqf +++ b/Missionframework/functions/fn_crateToStorage.sqf @@ -2,7 +2,7 @@ File: fn_crateToStorage.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-03-27 - Last Update: 2020-04-23 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -42,11 +42,11 @@ if (!isNull _storage) then { // Store crate _crate attachTo [_storage, [(_storage_positions select _crates_count) select 0, (_storage_positions select _crates_count) select 1, _height]]; [_crate, false] remoteExec ["enableRopeAttach"]; - if(KP_liberation_ace) then {[_crate, false, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; + if(KPLIB_ace) then {[_crate, false, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; // Update sector resource values, if requested if (_update) then { - if ((_storage getVariable ["KP_liberation_storage_type", -1]) == 1) then { + if ((_storage getVariable ["KPLIB_storage_type", -1]) == 1) then { recalculate_sectors = true; publicVariable "recalculate_sectors"; }; diff --git a/Missionframework/functions/fn_createClearance.sqf b/Missionframework/functions/fn_createClearance.sqf index 498760987..96aa04faa 100644 --- a/Missionframework/functions/fn_createClearance.sqf +++ b/Missionframework/functions/fn_createClearance.sqf @@ -2,7 +2,7 @@ File: fn_createClearance.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-04-10 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -29,7 +29,7 @@ params [ if (_centerPos isEqualTo [0, 0, 0]) exitWith {["Zero position given"] call BIS_fnc_error; false}; if (_radius isEqualTo 0) exitWith {["Zero radius given"] call BIS_fnc_error; false}; -if (save_is_loaded && {(KP_liberation_clearances findIf {(_x select 0) isEqualTo _centerPos}) != -1}) exitWith {false}; +if (save_is_loaded && {(KPLIB_clearances findIf {(_x select 0) isEqualTo _centerPos}) != -1}) exitWith {false}; { _x switchLight "OFF"; @@ -38,8 +38,8 @@ if (save_is_loaded && {(KP_liberation_clearances findIf {(_x select 0) isEqualTo } forEach (nearestTerrainObjects [_centerPos, [], _radius, false, true]); if (_save) then { - KP_liberation_clearances pushBackUnique [_centerPos, _radius]; - publicVariable "KP_liberation_clearances"; + KPLIB_clearances pushBackUnique [_centerPos, _radius]; + publicVariable "KPLIB_clearances"; }; true diff --git a/Missionframework/functions/fn_createCrate.sqf b/Missionframework/functions/fn_createCrate.sqf index 290903ec3..503f381aa 100644 --- a/Missionframework/functions/fn_createCrate.sqf +++ b/Missionframework/functions/fn_createCrate.sqf @@ -2,14 +2,14 @@ File: fn_createCrate.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-11 - Last Update: 2020-04-25 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: Spawns a resource crate of given type and with given amount at given position. Parameter(s): - _resource - Type of resource [STRING, defaults to KP_liberation_supply_crate] + _resource - Type of resource [STRING, defaults to KPLIB_supply_crate] _amount - Resource amount [NUMBER, defaults to 100] _pos - Position where to spawn the crate [POSITION, defaults to getPos player] @@ -18,7 +18,7 @@ */ params [ - ["_resource", KP_liberation_supply_crate, [""]], + ["_resource", KPLIB_supply_crate, [""]], ["_amount", 100, [0]], ["_pos", getPos player, [[]], [2, 3]] ]; @@ -32,11 +32,11 @@ if !((toLower _resource) in KPLIB_crates) exitWith { // Create crate private _crate = _resource createVehicle _pos; _crate setMass 500; -_crate setVariable ["KP_liberation_crate_value", _amount, true]; +_crate setVariable ["KPLIB_crate_value", _amount, true]; [_crate, true] call KPLIB_fnc_clearCargo; // Add ACE carry functionality -if (KP_liberation_ace) then {[_crate, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; +if (KPLIB_ace) then {[_crate, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; // Process KP object init [_crate] call KPLIB_fnc_addObjectInit; diff --git a/Missionframework/functions/fn_doSave.sqf b/Missionframework/functions/fn_doSave.sqf index 914971a65..353b3154a 100644 --- a/Missionframework/functions/fn_doSave.sqf +++ b/Missionframework/functions/fn_doSave.sqf @@ -22,12 +22,12 @@ if (!KPLIB_init) exitWith { false }; -if (missionNamespace getVariable ["kp_liberation_saving", false]) exitWith { +if (missionNamespace getVariable ["KPLIB_saving", false]) exitWith { ["Saving already in progress, skipping save!", "SAVE"] call KPLIB_fnc_log; false }; -kp_liberation_saving = true; +KPLIB_saving = true; private _saveData = [] call KPLIB_fnc_getSaveData; @@ -35,6 +35,6 @@ private _saveData = [] call KPLIB_fnc_getSaveData; profileNamespace setVariable [KPLIB_save_key, str _saveData]; saveProfileNamespace; -kp_liberation_saving = false; +KPLIB_saving = false; true diff --git a/Missionframework/functions/fn_getCrateHeight.sqf b/Missionframework/functions/fn_getCrateHeight.sqf index 019acc164..47585a541 100644 --- a/Missionframework/functions/fn_getCrateHeight.sqf +++ b/Missionframework/functions/fn_getCrateHeight.sqf @@ -2,7 +2,7 @@ File: fn_getCrateHeight.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-26 - Last Update: 2020-03-26 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -24,9 +24,9 @@ if (_crateClass isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_erro private _height = 0; switch (_crateClass) do { - case KP_liberation_supply_crate: {_height = 0.4;}; - case KP_liberation_ammo_crate: {_height = 0.6;}; - case KP_liberation_fuel_crate: {_height = 0.3;}; + case KPLIB_supply_crate: {_height = 0.4;}; + case KPLIB_ammo_crate: {_height = 0.6;}; + case KPLIB_fuel_crate: {_height = 0.3;}; default {_height = 0.6;}; }; diff --git a/Missionframework/functions/fn_getFobResources.sqf b/Missionframework/functions/fn_getFobResources.sqf index 5ec32902c..9620be716 100644 --- a/Missionframework/functions/fn_getFobResources.sqf +++ b/Missionframework/functions/fn_getFobResources.sqf @@ -2,7 +2,7 @@ File: fn_getFobResources.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-08 - Last Update: 2020-05-09 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,4 +21,4 @@ params [ ["_fob", [0, 0, 0], [[]], [2, 3]] ]; -KP_liberation_fob_resources param [KP_liberation_fob_resources findIf {(_x select 0) isEqualTo _fob}, NO_RESULT] // return +KPLIB_fob_resources param [KPLIB_fob_resources findIf {(_x select 0) isEqualTo _fob}, NO_RESULT] // return diff --git a/Missionframework/functions/fn_getResistanceTier.sqf b/Missionframework/functions/fn_getResistanceTier.sqf index b078d8e71..c82d3074c 100644 --- a/Missionframework/functions/fn_getResistanceTier.sqf +++ b/Missionframework/functions/fn_getResistanceTier.sqf @@ -2,7 +2,7 @@ File: fn_getResistanceTier.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-08 - Last Update: 2019-12-06 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ switch (true) do { - case (KP_liberation_guerilla_strength >= KP_liberation_resistance_tier3): {3}; - case (KP_liberation_guerilla_strength >= KP_liberation_resistance_tier2): {2}; + case (KPLIB_guerilla_strength >= KPLIB_resistance_tier3): {3}; + case (KPLIB_guerilla_strength >= KPLIB_resistance_tier2): {2}; default {1}; }; diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index 044e0e4b6..0aff01ace 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -42,13 +42,13 @@ private ["_fobPos", "_fobObjects", "_grpUnits", "_fobMines"]; {speed _x < 5} && // Exclude moving objects (like civilians driving through) {isNull attachedTo _x} && // Exclude attachTo'd objects {((getpos _x) select 2) < 10} && // Exclude hovering helicopters and the like - {!(_x getVariable ["KP_liberation_edenObject", false])} && // Exclude all objects placed via editor in mission.sqm - {!(_x getVariable ["KP_liberation_preplaced", false])} && // Exclude preplaced (e.g. little birds from carrier) + {!(_x getVariable ["KPLIB_edenObject", false])} && // Exclude all objects placed via editor in mission.sqm + {!(_x getVariable ["KPLIB_preplaced", false])} && // Exclude preplaced (e.g. little birds from carrier) {!((toLower (typeOf _x)) in KPLIB_crates)} // Exclude storage crates (those are handled separately) }; _allObjects = _allObjects + (_fobObjects select {!((toLower (typeOf _x)) in KPLIB_storageBuildings)}); - _allStorages = _allStorages + (_fobObjects select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}); + _allStorages = _allStorages + (_fobObjects select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}); // Process all groups near this FOB { @@ -111,9 +111,9 @@ private ["_supplyValue", "_ammoValue", "_fuelValue"]; // Sum all stored resources of current storage { switch ((typeOf _x)) do { - case KP_liberation_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KP_liberation_crate_value",0]);}; + case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _x); @@ -126,7 +126,7 @@ private ["_supplyValue", "_ammoValue", "_fuelValue"]; { _allCrates append ( ((nearestObjects [markerPos _x, KPLIB_crates, KPLIB_capture_size]) select {isNull attachedTo _x}) apply { - [typeOf _x, _x getVariable ["KP_liberation_crate_value", 0], getPosATL _x] + [typeOf _x, _x getVariable ["KPLIB_crate_value", 0], getPosATL _x] } ); } forEach (blufor_sectors select {_x in sectors_factory || _x in sectors_capture}); @@ -183,7 +183,7 @@ private _weights = [ // Pack the save data in the save array [ - kp_liberation_version, + KPLIB_version, date, _objectsToSave, _resourceStorages, @@ -195,12 +195,12 @@ private _weights = [ KPLIB_all_fobs, KPLIB_permissions, KPLIB_vehicle_to_military_base_links, - KP_liberation_civ_rep, - KP_liberation_clearances, - KP_liberation_guerilla_strength, - KP_liberation_logistics, - KP_liberation_production, - KP_liberation_production_markers, + KPLIB_civ_rep, + KPLIB_clearances, + KPLIB_guerilla_strength, + KPLIB_logistics, + KPLIB_production, + KPLIB_production_markers, resources_intel, _allMines, _allCrates diff --git a/Missionframework/functions/fn_getSaveableParam.sqf b/Missionframework/functions/fn_getSaveableParam.sqf index 9362794bd..b6bc20441 100644 --- a/Missionframework/functions/fn_getSaveableParam.sqf +++ b/Missionframework/functions/fn_getSaveableParam.sqf @@ -40,18 +40,18 @@ switch (_action) do { private _savedParams = profileNamespace getVariable KPLIB_paramSaveKey; if(isNil "_savedParams") then { - if (KP_liberation_savegame_debug > 0) then {["Param save data is corrupted, creating new.", "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {["Param save data is corrupted, creating new.", "PARAM"] call KPLIB_fnc_log;}; // Create new "associative" array _savedParams = [[_paramName, _value]]; } else { private _singleParam = (_savedParams select {(_x select 0) == _paramName}) select 0; if(isNil "_singleParam") then { - if (KP_liberation_savegame_debug > 0) then {[format ["Saving value: %1 for param: %2", _value, _paramName], "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {[format ["Saving value: %1 for param: %2", _value, _paramName], "PARAM"] call KPLIB_fnc_log;}; _savedParams pushBack [_paramName, _value]; } else { - if (KP_liberation_savegame_debug > 0) then {[format ["Overwriting value: %1 with: %2 for param: %3", (_singleParam select 1), _value, _paramName], "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {[format ["Overwriting value: %1 with: %2 for param: %3", (_singleParam select 1), _value, _paramName], "PARAM"] call KPLIB_fnc_log;}; // _singleparam is an reference to array in _savedParams, we can use "set" _singleParam set [1, _value]; }; @@ -65,25 +65,25 @@ switch (_action) do { case 1: { private _savedParams = profileNamespace getVariable KPLIB_paramSaveKey; if(isNil "_savedParams") then { - if (KP_liberation_savegame_debug > 0) then {["Param save data is corrupted, can't load!", "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {["Param save data is corrupted, can't load!", "PARAM"] call KPLIB_fnc_log;}; // Fix param save data profileNamespace setVariable [KPLIB_paramSaveKey, []]; - if (KP_liberation_savegame_debug > 0) then {[format ["No saved value for param: %1, fetching value.", _paramName], "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {[format ["No saved value for param: %1, fetching value.", _paramName], "PARAM"] call KPLIB_fnc_log;}; _value = [_paramName, _defaultValue] call bis_fnc_getParamValue; } else { private _singleParam = (_savedParams select {(_x select 0) == _paramName}) select 0; if(isNil "_singleParam") then { - if (KP_liberation_savegame_debug > 0) then {[format ["No saved value for param: %1, fetching value.", _paramName], "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {[format ["No saved value for param: %1, fetching value.", _paramName], "PARAM"] call KPLIB_fnc_log;}; _value = [_paramName, _defaultValue] call bis_fnc_getParamValue; } else { - if (KP_liberation_savegame_debug > 0) then {[format ["Found value: %1 for param: %2,", (_singleParam select 1), _paramName], "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {[format ["Found value: %1 for param: %2,", (_singleParam select 1), _paramName], "PARAM"] call KPLIB_fnc_log;}; _value = _singleParam select 1; }; }; }; // Get param default { - if (KP_liberation_savegame_debug > 0) then {[format ["Fetching selected value for param: %1", _paramName], "PARAM"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {[format ["Fetching selected value for param: %1", _paramName], "PARAM"] call KPLIB_fnc_log;}; _value = [_paramName, _defaultValue] call bis_fnc_getParamValue; }; }; diff --git a/Missionframework/functions/fn_getStoragePositions.sqf b/Missionframework/functions/fn_getStoragePositions.sqf index 967d8fb71..fcdfcb36b 100644 --- a/Missionframework/functions/fn_getStoragePositions.sqf +++ b/Missionframework/functions/fn_getStoragePositions.sqf @@ -2,7 +2,7 @@ File: fn_getStoragePositions.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-27 - Last Update: 2020-03-30 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -22,8 +22,8 @@ params [ if (isNull _storage) exitWith {["Null object given"] call BIS_fnc_error; [[], 0]}; private _data = [ - [KP_liberation_small_storage_building, [KP_liberation_small_storage_positions, 4]], - [KP_liberation_large_storage_building, [KP_liberation_large_storage_positions, 6.5]] + [KPLIB_small_storage_building, [KPLIB_small_storage_positions, 4]], + [KPLIB_large_storage_building, [KPLIB_large_storage_positions, 6.5]] ] select {(typeOf _storage) isEqualTo (_x select 0)}; if (_data isEqualTo []) exitWith {["No valid storage object given"] call BIS_fnc_error; [[], 0]}; diff --git a/Missionframework/functions/fn_handlePlacedZeusObject.sqf b/Missionframework/functions/fn_handlePlacedZeusObject.sqf index e3d3ad860..476e8e0d4 100644 --- a/Missionframework/functions/fn_handlePlacedZeusObject.sqf +++ b/Missionframework/functions/fn_handlePlacedZeusObject.sqf @@ -2,7 +2,7 @@ File: fn_handlePlacedZeusObject.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-11 - Last Update: 2020-04-25 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -43,9 +43,9 @@ if !(_crate) then { } else { // Otherwise apply all needed values/functionalities _obj setMass 500; - _obj setVariable ["KP_liberation_crate_value", 100, true]; + _obj setVariable ["KPLIB_crate_value", 100, true]; [_obj, true] call KPLIB_fnc_clearCargo; - if (KP_liberation_ace) then {[_obj, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; + if (KPLIB_ace) then {[_obj, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; }; // Add object init codes diff --git a/Missionframework/functions/fn_setVehicleSeized.sqf b/Missionframework/functions/fn_setVehicleSeized.sqf index ed2e553ca..bee722382 100644 --- a/Missionframework/functions/fn_setVehicleSeized.sqf +++ b/Missionframework/functions/fn_setVehicleSeized.sqf @@ -2,7 +2,7 @@ File: fn_setVehicleSeized.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-20 - Last Update: 2020-04-26 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -29,7 +29,7 @@ if !(_type in civilian_vehicles) exitWith {false}; if !(_veh getVariable ["KPLIB_seized", false]) then { _veh setVariable ["KPLIB_seized", true, true]; [0] remoteExec ["KPLIB_fnc_crGlobalMsg"]; - [KP_liberation_cr_vehicle_penalty, true] remoteExec ["F_cr_changeCR", 2]; + [KPLIB_cr_vehicle_penalty, true] remoteExec ["F_cr_changeCR", 2]; stats_civilian_vehicles_seized = stats_civilian_vehicles_seized + 1; publicVariable "stats_civilian_vehicles_seized"; diff --git a/Missionframework/functions/fn_sortStorage.sqf b/Missionframework/functions/fn_sortStorage.sqf index 0e786fbdf..52c061e24 100644 --- a/Missionframework/functions/fn_sortStorage.sqf +++ b/Missionframework/functions/fn_sortStorage.sqf @@ -2,7 +2,7 @@ File: fn_sortStorage.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-06-09 - Last Update: 2020-04-17 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -27,9 +27,9 @@ private _fuel = 0; { switch (typeOf _x) do { - case KP_liberation_supply_crate: {_supply = _supply + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_ammo_crate: {_ammo = _ammo + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_fuel_crate: {_fuel = _fuel + (_x getVariable ["KP_liberation_crate_value",0]);}; + case KPLIB_supply_crate: {_supply = _supply + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_ammo_crate: {_ammo = _ammo + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_fuel_crate: {_fuel = _fuel + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; detach _x; diff --git a/Missionframework/functions/fn_spawnGuerillaGroup.sqf b/Missionframework/functions/fn_spawnGuerillaGroup.sqf index 2a189a1b6..fef5d3766 100644 --- a/Missionframework/functions/fn_spawnGuerillaGroup.sqf +++ b/Missionframework/functions/fn_spawnGuerillaGroup.sqf @@ -25,10 +25,10 @@ params [ private _tier = [] call KPLIB_fnc_getResistanceTier; private _cr_multi = [] call KPLIB_fnc_crGetMulti; if (_amount == 0) then {_amount = (6 + (round (random _cr_multi)) + (round (random _tier)));}; -private _weapons = missionNamespace getVariable ("KP_liberation_guerilla_weapons_" + str _tier); -private _uniforms = missionNamespace getVariable ("KP_liberation_guerilla_uniforms_" + str _tier); -private _vests = missionNamespace getVariable ("KP_liberation_guerilla_vests_" + str _tier); -private _headgear = missionNamespace getVariable ("KP_liberation_guerilla_headgear_" + str _tier); +private _weapons = missionNamespace getVariable ("KPLIB_guerilla_weapons_" + str _tier); +private _uniforms = missionNamespace getVariable ("KPLIB_guerilla_uniforms_" + str _tier); +private _vests = missionNamespace getVariable ("KPLIB_guerilla_vests_" + str _tier); +private _headgear = missionNamespace getVariable ("KPLIB_guerilla_headgear_" + str _tier); // Spawn guerilla units private _grp = createGroup [KPLIB_side_resistance, true]; @@ -36,7 +36,7 @@ private _unit = objNull; private _weapon = []; for "_i" from 1 to _amount do { // Create unit - _unit = [selectRandom KP_liberation_guerilla_units, _pos, _grp, "PRIVATE", 5] call KPLIB_fnc_createManagedUnit; + _unit = [selectRandom KPLIB_guerilla_units, _pos, _grp, "PRIVATE", 5] call KPLIB_fnc_createManagedUnit; // Clear inventory removeAllWeapons _unit; @@ -54,7 +54,7 @@ for "_i" from 1 to _amount do { _unit addItemToUniform "MiniGrenade"; _unit addVest (selectRandom _vests); _unit addHeadgear (selectRandom _headgear); - if (_tier > 1) then {_unit addGoggles (selectRandom KP_liberation_guerilla_facegear);}; + if (_tier > 1) then {_unit addGoggles (selectRandom KPLIB_guerilla_facegear);}; // Add standard items _unit linkItem "ItemMap"; @@ -70,7 +70,7 @@ for "_i" from 1 to _amount do { _unit addPrimaryWeaponItem (_weapon select 4); // Add possible RPG launcher - if ((_tier > 1) && ((random 100) <= KP_liberation_resistance_at_chance)) then { + if ((_tier > 1) && ((random 100) <= KPLIB_resistance_at_chance)) then { _unit addBackpack "B_FieldPack_cbr"; for "_i" from 1 to 3 do {_unit addItemToBackpack "RPG7_F";}; _unit addWeapon "launch_RPG7_F"; diff --git a/Missionframework/functions/ui/fn_overlayUpdateResources.sqf b/Missionframework/functions/ui/fn_overlayUpdateResources.sqf index 3e2881053..2a2d27a3a 100644 --- a/Missionframework/functions/ui/fn_overlayUpdateResources.sqf +++ b/Missionframework/functions/ui/fn_overlayUpdateResources.sqf @@ -3,7 +3,7 @@ File: fn_overlayUpdateResources.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-01 - Last Update: 2020-05-09 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -40,14 +40,14 @@ if (!_show) exitWith { if (_updateValues) then { (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_FOB) ctrlSetText toUpper _resourceArea; - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_SUPPLIES) ctrlSetText str floor KP_liberation_supplies; - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_AMMO) ctrlSetText str floor KP_liberation_ammo; - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_FUEL) ctrlSetText str floor KP_liberation_fuel; + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_SUPPLIES) ctrlSetText str floor KPLIB_supplies; + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_AMMO) ctrlSetText str floor KPLIB_ammo; + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_FUEL) ctrlSetText str floor KPLIB_fuel; (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_UNITCAP) ctrlSetText ([unitcap, "/", [] call KPLIB_fnc_getLocalCap] joinString ""); - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_HELIPAD) ctrlSetText ([KP_liberation_heli_count, "/", KP_liberation_heli_slots] joinString ""); - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_PLANE) ctrlSetText ([KP_liberation_plane_count, "/", KP_liberation_plane_slots] joinString ""); + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_HELIPAD) ctrlSetText ([KPLIB_heli_count, "/", KPLIB_heli_slots] joinString ""); + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_PLANE) ctrlSetText ([KPLIB_plane_count, "/", KPLIB_plane_slots] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_ALERT) ctrlSetText ([round combat_readiness, "%"] joinString ""); - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_CIVREP) ctrlSetText ([KP_liberation_civ_rep,"%"] joinString ""); + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_CIVREP) ctrlSetText ([KPLIB_civ_rep,"%"] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_INTEL) ctrlSetText str round resources_intel; private _color_readiness = [0.8,0.8,0.8,1]; @@ -60,8 +60,8 @@ if (_updateValues) then { (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_ALERT) ctrlSetTextColor _color_readiness; private _color_reputation = [0.8,0.8,0.8,1]; - if (KP_liberation_civ_rep >= 25) then {_color_reputation = [0,0.7,0,1]}; - if (KP_liberation_civ_rep <= -25) then {_color_reputation = [0.7,0,0,1]}; + if (KPLIB_civ_rep >= 25) then {_color_reputation = [0,0.7,0,1]}; + if (KPLIB_civ_rep <= -25) then {_color_reputation = [0.7,0,0,1]}; (_overlay displayCtrl IDC_OVERLAY_RSC_PIC_CIVREP) ctrlSetTextColor _color_reputation; (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_CIVREP) ctrlSetTextColor _color_reputation; diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index 65e150cbe..a822f4cf3 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -2,7 +2,7 @@ KPLIB_init = false; // Version of the KP Liberation framework -KP_liberation_version = [0, 96, 7]; +KPLIB_version = [0, 96, 7]; enableSaving [ false, false ]; @@ -18,7 +18,7 @@ if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; [] call compileFinal preprocessFileLineNumbers "kp_objectInits.sqf"; // Activate selected player menu. If CBA isn't loaded -> fallback to GREUH -if (KPPLM_CBA && KP_liberation_playermenu) then { +if (KPPLM_CBA && KPLIB_playermenu) then { [] call KPPLM_fnc_postInit; } else { [] execVM "GREUH\scripts\GREUH_activate.sqf"; diff --git a/Missionframework/kp_objectInits.sqf b/Missionframework/kp_objectInits.sqf index e6365b5c0..b8a19da19 100644 --- a/Missionframework/kp_objectInits.sqf +++ b/Missionframework/kp_objectInits.sqf @@ -81,21 +81,21 @@ KPLIB_objectInits = [ // Add storage type variable to built storage areas (only for FOB built/loaded ones) [ - [KP_liberation_small_storage_building, KP_liberation_large_storage_building], - {_this setVariable ["KP_liberation_storage_type", 0, true];} + [KPLIB_small_storage_building, KPLIB_large_storage_building], + {_this setVariable ["KPLIB_storage_type", 0, true];} ], // Add ACE variables to corresponding building types [ - [KP_liberation_recycle_building], + [KPLIB_recycle_building], {_this setVariable ["ace_isRepairFacility", 1, true];} ], [ - KP_liberation_medical_facilities, + KPLIB_medical_facilities, {_this setVariable ["ace_medical_isMedicalFacility", true, true];} ], [ - KP_liberation_medical_vehicles, + KPLIB_medical_vehicles, {_this setVariable ["ace_medical_isMedicalVehicle", true, true];} ], @@ -114,8 +114,8 @@ KPLIB_objectInits = [ // Add valid vehicles to support module, if system is enabled [ - KP_liberation_suppMod_artyVeh, - {if (KP_liberation_suppMod > 0) then {KPLIB_suppMod_arty synchronizeObjectsAdd [_this];};} + KPLIB_suppMod_artyVeh, + {if (KPLIB_suppMod > 0) then {KPLIB_suppMod_arty synchronizeObjectsAdd [_this];};} ], // Disable autocombat (if set in parameters) and fleeing diff --git a/Missionframework/onPlayerRespawn.sqf b/Missionframework/onPlayerRespawn.sqf index 1bc1e7e01..ed268e227 100644 --- a/Missionframework/onPlayerRespawn.sqf +++ b/Missionframework/onPlayerRespawn.sqf @@ -22,9 +22,9 @@ if (isNil "KPLIB_respawn_loadout") then { // Support Module handling if ([ false, - player isEqualTo ([] call KPLIB_fnc_getCommander) || (getPlayerUID player) in KP_liberation_suppMod_whitelist, + player isEqualTo ([] call KPLIB_fnc_getCommander) || (getPlayerUID player) in KPLIB_suppMod_whitelist, true -] select KP_liberation_suppMod) then { +] select KPLIB_suppMod) then { waitUntil {!isNil "KPLIB_suppMod_req" && !isNil "KPLIB_suppMod_arty" && time > 5}; // Remove link to corpse, if respawned diff --git a/Missionframework/presets/blufor/3cbBAF_des.sqf b/Missionframework/presets/blufor/3cbBAF_des.sqf index cd382a98a..3e38a0f92 100644 --- a/Missionframework/presets/blufor/3cbBAF_des.sqf +++ b/Missionframework/presets/blufor/3cbBAF_des.sqf @@ -25,18 +25,18 @@ Respawn_truck_typename = "UK3CB_BAF_LandRover_Amb_FFR_Sand_A_DDPM"; // T huron_typename = "UK3CB_BAF_Merlin_HC3_18_DDPM"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "UK3CB_BAF_Crewman_DDPM"; // This defines the crew for vehicles. pilot_classname = "UK3CB_BAF_HeliPilot_Army_DDPM"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "UK3CB_BAF_Wildcat_AH1_TRN_8A_DDPM"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "UK3CB_BAF_Wildcat_AH1_TRN_8A_DDPM"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -245,12 +245,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,75], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/3cbBAF_mtp.sqf b/Missionframework/presets/blufor/3cbBAF_mtp.sqf index 9ae29e602..17a02d507 100644 --- a/Missionframework/presets/blufor/3cbBAF_mtp.sqf +++ b/Missionframework/presets/blufor/3cbBAF_mtp.sqf @@ -25,18 +25,18 @@ Respawn_truck_typename = "UK3CB_BAF_LandRover_Amb_FFR_Green_A_MTP"; // T huron_typename = "UK3CB_BAF_Merlin_HC3_18_MTP"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "UK3CB_BAF_Crewman_MTP"; // This defines the crew for vehicles. pilot_classname = "UK3CB_BAF_HeliPilot_Army_MTP"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "UK3CB_BAF_Wildcat_AH1_TRN_8A_MTP"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "UK3CB_BAF_Wildcat_AH1_TRN_8A_MTP"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -245,12 +245,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,75], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_ACR_Desert.sqf b/Missionframework/presets/blufor/CUP_ACR_Desert.sqf index 592a201ea..27d402559 100644 --- a/Missionframework/presets/blufor/CUP_ACR_Desert.sqf +++ b/Missionframework/presets/blufor/CUP_ACR_Desert.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_D"; // This huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_CZ_Crew_DES"; // This defines the crew for vehicles. pilot_classname = "CUP_B_CZ_Pilot_DES"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_T810_Unarmed_CZ_DES"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_DES"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -203,12 +203,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_ACR_Woodland.sqf b/Missionframework/presets/blufor/CUP_ACR_Woodland.sqf index 770f6eada..9ebab113b 100644 --- a/Missionframework/presets/blufor/CUP_ACR_Woodland.sqf +++ b/Missionframework/presets/blufor/CUP_ACR_Woodland.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_W"; // This huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_CZ_Crew_WDL"; // This defines the crew for vehicles. pilot_classname = "CUP_B_CZ_Pilot_WDL"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_T810_Unarmed_CZ_WDL"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_WDL"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -200,12 +200,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_BAF_Desert.sqf b/Missionframework/presets/blufor/CUP_BAF_Desert.sqf index 64932a70c..1364d77f6 100644 --- a/Missionframework/presets/blufor/CUP_BAF_Desert.sqf +++ b/Missionframework/presets/blufor/CUP_BAF_Desert.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_B_LR_Ambulance_GB_D"; // This huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_BAF_Soldier_Crew_DDPM"; // This defines the crew for vehicles. pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DDPM"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_MTVR_BAF_DES"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_BAF_DES"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -206,12 +206,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_BAF_Woodland.sqf b/Missionframework/presets/blufor/CUP_BAF_Woodland.sqf index 136e5ec56..10f9c11ca 100644 --- a/Missionframework/presets/blufor/CUP_BAF_Woodland.sqf +++ b/Missionframework/presets/blufor/CUP_BAF_Woodland.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_B_FV432_GB_Ambulance"; // This huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_BAF_Soldier_Crew_DPM"; // This defines the crew for vehicles. pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DPM"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_MTVR_BAF_WOOD"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_BAF_WOOD"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -208,12 +208,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_CDF.sqf b/Missionframework/presets/blufor/CUP_CDF.sqf index 71f85bad0..2f72bca81 100644 --- a/Missionframework/presets/blufor/CUP_CDF.sqf +++ b/Missionframework/presets/blufor/CUP_CDF.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_B_BMP2_AMB_CDF"; // This huron_typename = "CUP_B_MI6A_CDF"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_CDF_Crew_FST"; // This defines the crew for vehicles. pilot_classname = "CUP_B_CDF_Pilot_FST"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera bas -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_Ural_Open_CDF"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera bas +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_Ural_Open_CDF"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -201,12 +201,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_ChDKZ.sqf b/Missionframework/presets/blufor/CUP_ChDKZ.sqf index c9cf862b1..2fffdec72 100644 --- a/Missionframework/presets/blufor/CUP_ChDKZ.sqf +++ b/Missionframework/presets/blufor/CUP_ChDKZ.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_O_BMP2_AMB_CHDKZ"; // This huron_typename = "CUP_O_MI6A_CHDKZ"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_O_INS_Crew"; // This defines the crew for vehicles. pilot_classname = "CUP_O_INS_Pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_O_Mi8_medevac_CHDKZ"; // These are the little birds which spawn on the Freedom or at Chimera bas -KP_liberation_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_O_Ural_Open_CHDKZ"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_O_Mi8_medevac_CHDKZ"; // These are the little birds which spawn on the Freedom or at Chimera bas +KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_O_Ural_Open_CHDKZ"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -192,12 +192,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_SLA.sqf b/Missionframework/presets/blufor/CUP_SLA.sqf index 0ee153b22..0c352a5ec 100644 --- a/Missionframework/presets/blufor/CUP_SLA.sqf +++ b/Missionframework/presets/blufor/CUP_SLA.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_O_BMP2_AMB_sla"; // This huron_typename = "CUP_O_Mi8_SLA_1"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_O_sla_Crew"; // This defines the crew for vehicles. pilot_classname = "CUP_O_sla_Pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_O_UH1H_slick_SLA"; // These are the little birds which spawn on the Freedom or at Chimera bas -KP_liberation_boat_classname = "CUP_O_PBX_SLA"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_O_Ural_Open_SLA"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_O_UH1H_slick_SLA"; // These are the little birds which spawn on the Freedom or at Chimera bas +KPLIB_boat_classname = "CUP_O_PBX_SLA"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_O_Ural_Open_SLA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -198,12 +198,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_TakiArmy.sqf b/Missionframework/presets/blufor/CUP_TakiArmy.sqf index 318a2e79c..510c7e925 100644 --- a/Missionframework/presets/blufor/CUP_TakiArmy.sqf +++ b/Missionframework/presets/blufor/CUP_TakiArmy.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "CUP_O_M113_Med_TKA"; // This huron_typename = "CUP_O_MI6A_TKA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_O_TK_Crew"; // This defines the crew for vehicles. pilot_classname = "CUP_O_TK_Pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_O_UH1H_slick_TKA"; // These are the little birds which spawn on the Freedom or at Chimera bas -KP_liberation_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_O_Ural_Open_TKA"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_O_UH1H_slick_TKA"; // These are the little birds which spawn on the Freedom or at Chimera bas +KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_O_Ural_Open_TKA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -216,12 +216,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_USA_Desert.sqf b/Missionframework/presets/blufor/CUP_USA_Desert.sqf index f125f75a9..387181995 100644 --- a/Missionframework/presets/blufor/CUP_USA_Desert.sqf +++ b/Missionframework/presets/blufor/CUP_USA_Desert.sqf @@ -24,18 +24,18 @@ Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -222,12 +222,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_USA_Woodland.sqf b/Missionframework/presets/blufor/CUP_USA_Woodland.sqf index 3db0c2c7b..c052ce2b6 100644 --- a/Missionframework/presets/blufor/CUP_USA_Woodland.sqf +++ b/Missionframework/presets/blufor/CUP_USA_Woodland.sqf @@ -24,18 +24,18 @@ Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -224,12 +224,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_USMC_Desert.sqf b/Missionframework/presets/blufor/CUP_USMC_Desert.sqf index 4341999b2..758276c6a 100644 --- a/Missionframework/presets/blufor/CUP_USMC_Desert.sqf +++ b/Missionframework/presets/blufor/CUP_USMC_Desert.sqf @@ -24,18 +24,18 @@ Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_USMC_Crewman_FROG_DES"; // This defines the crew for vehicles. pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -219,12 +219,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/CUP_USMC_Woodland.sqf b/Missionframework/presets/blufor/CUP_USMC_Woodland.sqf index 072b4d9ee..b68a1343e 100644 --- a/Missionframework/presets/blufor/CUP_USMC_Woodland.sqf +++ b/Missionframework/presets/blufor/CUP_USMC_Woodland.sqf @@ -24,18 +24,18 @@ Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USMC"; // This huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "CUP_B_USMC_Crewman_FROG_WDL"; // This defines the crew for vehicles. pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "CUP_B_MTVR_USMC"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USMC"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -220,12 +220,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/apex.sqf b/Missionframework/presets/blufor/apex.sqf index 579cd21ba..662396bc1 100644 --- a/Missionframework/presets/blufor/apex.sqf +++ b/Missionframework/presets/blufor/apex.sqf @@ -28,18 +28,18 @@ Respawn_truck_typename = "B_T_Truck_01_medical_F"; // This huron_typename = "B_Heli_Transport_03_unarmed_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "B_T_crew_F"; // This defines the crew for vehicles. pilot_classname = "B_T_Helipilot_F"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "B_T_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "B_T_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -302,12 +302,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/bwmod.sqf b/Missionframework/presets/blufor/bwmod.sqf index 7c8afea83..6ab6a0223 100644 --- a/Missionframework/presets/blufor/bwmod.sqf +++ b/Missionframework/presets/blufor/bwmod.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy"; // This huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "BWA3_Crew_Fleck"; // This defines the crew for vehicles. pilot_classname = "BWA3_Helipilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -241,12 +241,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/bwmod_des.sqf b/Missionframework/presets/blufor/bwmod_des.sqf index e7bd35367..a21884341 100644 --- a/Missionframework/presets/blufor/bwmod_des.sqf +++ b/Missionframework/presets/blufor/bwmod_des.sqf @@ -22,18 +22,18 @@ Respawn_truck_typename = "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy"; // This huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "BWA3_Crew_Tropen"; // This defines the crew for vehicles. pilot_classname = "BWA3_Helipilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -242,12 +242,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/csat.sqf b/Missionframework/presets/blufor/csat.sqf index 001253915..d3f0db6b3 100644 --- a/Missionframework/presets/blufor/csat.sqf +++ b/Missionframework/presets/blufor/csat.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "O_Truck_03_medical_F"; // This huron_typename = "O_Heli_Transport_04_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "O_crew_F"; // This defines the crew for vehicles. pilot_classname = "O_helipilot_F"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "O_Heli_Light_02_unarmed_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "O_Truck_03_transport_F"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "O_Heli_Light_02_unarmed_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "O_Truck_03_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -199,12 +199,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,200,100,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,200,100,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], [Arsenal_typename,25,0,0], ["ACE_medicalSupplyCrate_advanced",10,0,0], ["Box_East_Support_F",10,0,0], diff --git a/Missionframework/presets/blufor/csat_apex.sqf b/Missionframework/presets/blufor/csat_apex.sqf index b242d615f..82f1d55d0 100644 --- a/Missionframework/presets/blufor/csat_apex.sqf +++ b/Missionframework/presets/blufor/csat_apex.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "O_T_Truck_03_medical_ghex_F"; // This huron_typename = "O_Heli_Transport_04_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "O_T_Crew_F"; // This defines the crew for vehicles. pilot_classname = "O_T_Helipilot_F"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "O_Heli_Light_02_unarmed_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "O_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "O_T_Truck_03_covered_ghex_F"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "O_Heli_Light_02_unarmed_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "O_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "O_T_Truck_03_covered_ghex_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -206,12 +206,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,200,100,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,200,100,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], [Arsenal_typename,25,0,0], ["ACE_medicalSupplyCrate_advanced",10,0,0], ["Box_East_Support_F",10,0,0], diff --git a/Missionframework/presets/blufor/custom.sqf b/Missionframework/presets/blufor/custom.sqf index d657461d1..f76517829 100644 --- a/Missionframework/presets/blufor/custom.sqf +++ b/Missionframework/presets/blufor/custom.sqf @@ -28,18 +28,18 @@ Respawn_truck_typename = "B_Truck_01_medical_F"; // This huron_typename = "B_Heli_Transport_03_unarmed_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "B_crew_F"; // This defines the crew for vehicles. pilot_classname = "B_Helipilot_F"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "B_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "B_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -308,12 +308,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/enoch.sqf b/Missionframework/presets/blufor/enoch.sqf index a2c8cb417..7e2bf76cc 100644 --- a/Missionframework/presets/blufor/enoch.sqf +++ b/Missionframework/presets/blufor/enoch.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "I_E_Truck_02_Medical_F"; // This huron_typename = "B_Heli_Transport_03_unarmed_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "I_E_Crew_F"; // This defines the crew for vehicles. pilot_classname = "I_E_Helipilot_F"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "I_E_Truck_02_transport_F"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "I_E_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "I_E_Truck_02_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "I_E_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -215,12 +215,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,200,100,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,200,100,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], [Arsenal_typename,25,0,0], ["ACE_medicalSupplyCrate_advanced",10,0,0], ["Box_East_Support_F",10,0,0], diff --git a/Missionframework/presets/blufor/gm_east.sqf b/Missionframework/presets/blufor/gm_east.sqf index 225115b5f..dfcff19a5 100644 --- a/Missionframework/presets/blufor/gm_east.sqf +++ b/Missionframework/presets/blufor/gm_east.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "gm_gc_army_ural375d_medic"; // This huron_typename = "gm_gc_army_btr60pa"; // This is Spartan 01, a multipurpose mobile respawn as a command BTR60. crewman_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the crew for vehicles. pilot_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -166,12 +166,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,200,500,0], [FOB_truck_typename,300,500,100], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/gm_east_win.sqf b/Missionframework/presets/blufor/gm_east_win.sqf index 69629e0f0..2c65eff58 100644 --- a/Missionframework/presets/blufor/gm_east_win.sqf +++ b/Missionframework/presets/blufor/gm_east_win.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "gm_gc_army_ural375d_medic_win"; // This huron_typename = "gm_gc_army_btr60pa_win"; // This is Spartan 01, a multipurpose mobile respawn as a command BTR60. crewman_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the crew for vehicles. pilot_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -166,12 +166,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,200,500,0], [FOB_truck_typename,300,500,100], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/gm_west.sqf b/Missionframework/presets/blufor/gm_west.sqf index 8cd5dccf2..afc3bb54e 100644 --- a/Missionframework/presets/blufor/gm_west.sqf +++ b/Missionframework/presets/blufor/gm_west.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "gm_ge_army_u1300l_medic"; // This huron_typename = "gm_ge_army_m113a1g_command"; // This is Spartan 01, a multipurpose mobile respawn as a command M113. crewman_classname = "gm_ge_army_crew_mp2a1_80_oli"; // This defines the crew for vehicles. pilot_classname = "gm_ge_army_crew_mp2a1_80_oli"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "gm_ge_army_u1300l_container"; // Little birds replaced with unimog for container transportation. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "gm_ge_army_kat1_454_cargo"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "gm_ge_army_u1300l_container"; // Little birds replaced with unimog for container transportation. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "gm_ge_army_kat1_454_cargo"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -170,12 +170,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,200,500,0], [FOB_truck_typename,300,500,100], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/gm_west_win.sqf b/Missionframework/presets/blufor/gm_west_win.sqf index 5e1f8feac..ed7861360 100644 --- a/Missionframework/presets/blufor/gm_west_win.sqf +++ b/Missionframework/presets/blufor/gm_west_win.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "gm_ge_army_u1300l_medic_win_rc"; // This huron_typename = "gm_ge_army_m113a1g_command_win"; // This is Spartan 01, a multipurpose mobile respawn as a command M113. crewman_classname = "gm_ge_army_crew_mp2a1_80_win"; // This defines the crew for vehicles. pilot_classname = "gm_ge_army_crew_mp2a1_80_win"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "gm_ge_army_u1300l_container_win";// Little birds replaced with unimog for container transportation. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "gm_ge_army_kat1_454_cargo_win"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "gm_ge_army_u1300l_container_win"; // Little birds replaced with unimog for container transportation. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "gm_ge_army_kat1_454_cargo_win"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -170,12 +170,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,200,500,0], [FOB_truck_typename,300,500,100], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/rhs_afrf.sqf b/Missionframework/presets/blufor/rhs_afrf.sqf index 1f030d7e8..6d40a08c1 100644 --- a/Missionframework/presets/blufor/rhs_afrf.sqf +++ b/Missionframework/presets/blufor/rhs_afrf.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "rhs_gaz66_ap2_msv"; // This huron_typename = "RHS_Mi8mt_vvs"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "rhs_msv_emr_armoredcrew"; // This defines the crew for vehicles. pilot_classname = "rhs_pilot_combat_heli"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "rhs_ka60_grey"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "rhs_kamaz5350_flatbed_vdv"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_forest_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_forest_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "rhs_prv13"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "rhs_ka60_grey"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "rhs_kamaz5350_flatbed_vdv"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_forest_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_forest_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "rhs_prv13"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -218,12 +218,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/rhs_usaf_des.sqf b/Missionframework/presets/blufor/rhs_usaf_des.sqf index e14f5b860..526d5dc89 100644 --- a/Missionframework/presets/blufor/rhs_usaf_des.sqf +++ b/Missionframework/presets/blufor/rhs_usaf_des.sqf @@ -24,18 +24,18 @@ Respawn_truck_typename = "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy"; // This huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "rhsusf_army_ocp_combatcrewman"; // This defines the crew for vehicles. pilot_classname = "rhsusf_army_ocp_helipilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -263,12 +263,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/rhs_usaf_wdl.sqf b/Missionframework/presets/blufor/rhs_usaf_wdl.sqf index 8d3d06e04..e528e8c10 100644 --- a/Missionframework/presets/blufor/rhs_usaf_wdl.sqf +++ b/Missionframework/presets/blufor/rhs_usaf_wdl.sqf @@ -24,18 +24,18 @@ Respawn_truck_typename = "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy"; // This huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "rhsusf_army_ocp_combatcrewman"; // This defines the crew for vehicles. pilot_classname = "rhsusf_army_ocp_helipilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -256,12 +256,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/sfp_des.sqf b/Missionframework/presets/blufor/sfp_des.sqf index 502b25666..d07338d38 100644 --- a/Missionframework/presets/blufor/sfp_des.sqf +++ b/Missionframework/presets/blufor/sfp_des.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "sfp_patgb203_ambulance"; // This huron_typename = "sfp_hkp4"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "sfp_m90d_crew"; // This defines the crew for vehicles. pilot_classname = "sfp_m90w_pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "sfp_hkp9"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "sfp_hkp9"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -200,12 +200,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/blufor/sfp_wdl.sqf b/Missionframework/presets/blufor/sfp_wdl.sqf index 11b120b1a..fdfe5f6b6 100644 --- a/Missionframework/presets/blufor/sfp_wdl.sqf +++ b/Missionframework/presets/blufor/sfp_wdl.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "sfp_patgb203_ambulance"; // This huron_typename = "sfp_hkp4"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "sfp_m90w_crew"; // This defines the crew for vehicles. pilot_classname = "sfp_m90w_pilot"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "sfp_hkp9"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "sfp_hkp9"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -128,7 +128,7 @@ static_vehicles = [ ["sfp_fh77",100,200,0] // FH 77 ]; - + buildings = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], @@ -140,7 +140,7 @@ buildings = [ ["Flag_White_F",0,0,0], ["Land_Medevac_house_V1_F",0,0,0], ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], ["CamoNet_BLUFOR_F",0,0,0], ["CamoNet_BLUFOR_open_F",0,0,0], ["CamoNet_BLUFOR_big_F",0,0,0], @@ -181,7 +181,7 @@ buildings = [ ["Land_BagFence_Short_F",0,0,0], ["Land_BagFence_Long_F",0,0,0], ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], ["Land_BagBunker_Small_F",0,0,0], ["Land_BagBunker_Large_F",0,0,0], ["Land_BagBunker_Tower_F",0,0,0], @@ -196,10 +196,10 @@ buildings = [ ["Land_HBarrierTower_F",0,0,0], ["Land_CncBarrierMedium_F",0,0,0], ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], ["Land_Concrete_SmallWall_8m_F",0,0,0], ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], + ["Land_CncWall1_F",0,0,0], ["Land_CncWall4_F",0,0,0], ["Land_Sign_WarningMilitaryArea_F",0,0,0], ["Land_Sign_WarningMilAreaSmall_F",0,0,0], @@ -213,12 +213,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -285,7 +285,7 @@ blufor_squad_recon = [ "sfp_m90w_sog_teamleader", "sfp_m90w_sog_ksp90", "sfp_m90w_sog_medic" -]; +]; // Paratroopers squad. blufor_squad_para = [ diff --git a/Missionframework/presets/blufor/unsung.sqf b/Missionframework/presets/blufor/unsung.sqf index 00d54fc58..122ff92c4 100644 --- a/Missionframework/presets/blufor/unsung.sqf +++ b/Missionframework/presets/blufor/unsung.sqf @@ -20,18 +20,18 @@ Respawn_truck_typename = "uns_M577_amb"; // This huron_typename = "uns_h21c"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. crewman_classname = "uns_US_25ID_STY3"; // This defines the crew for vehicles. pilot_classname = "uns_pilot1"; // This defines the pilot for helicopters. -KP_liberation_little_bird_classname = "uns_H13_transport_CAV"; // These are the little birds which spawn on the Freedom or at Chimera base. -KP_liberation_boat_classname = "UNS_Zodiac_W"; // These are the boats which spawn at the stern of the Freedom. -KP_liberation_truck_classname = "uns_M35A2_Open"; // These are the trucks which are used in the logistic convoy system. -KP_liberation_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KP_liberation_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KP_liberation_recycle_building = "uns_motorpool1_repair"; // The building defined to unlock FOB recycling functionality. -KP_liberation_air_vehicle_building = "LAND_uns_signaltower"; // The building defined to unlock FOB air vehicle functionality. -KP_liberation_heli_slot_building = "LAND_uns_Heli_pad"; // The helipad used to increase the GLOBAL rotary-wing cap. -KP_liberation_plane_slot_building = "UNS_Hanger_repair"; // The hangar used to increase the GLOBAL fixed-wing cap. -KP_liberation_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KP_liberation_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KP_liberation_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_little_bird_classname = "uns_H13_transport_CAV"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "UNS_Zodiac_W"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "uns_M35A2_Open"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "uns_motorpool1_repair"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "LAND_uns_signaltower"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "LAND_uns_Heli_pad"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "UNS_Hanger_repair"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -273,12 +273,12 @@ support_vehicles = [ [Respawn_truck_typename,200,0,100], [FOB_box_typename,300,500,0], [FOB_truck_typename,300,500,75], - [KP_liberation_small_storage_building,0,0,0], - [KP_liberation_large_storage_building,0,0,0], - [KP_liberation_recycle_building,250,0,0], - [KP_liberation_air_vehicle_building,1000,0,0], - [KP_liberation_heli_slot_building,250,0,0], - [KP_liberation_plane_slot_building,500,0,0], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], diff --git a/Missionframework/presets/init_presets.sqf b/Missionframework/presets/init_presets.sqf index e73f62ced..d2fbbcde3 100644 --- a/Missionframework/presets/init_presets.sqf +++ b/Missionframework/presets/init_presets.sqf @@ -8,7 +8,7 @@ if (isServer) then { ["Only if you e.g. use a CUP preset and you get messages about missing CUP classes, then check your loaded mods.", "PRESETS"] call KPLIB_fnc_log; }; -switch (KP_liberation_preset_blufor) do { +switch (KPLIB_preset_blufor) do { case 1: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\apex.sqf";}; case 2: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\3cbBAF_mtp.sqf";}; case 3: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\3cbBAF_des.sqf";}; @@ -42,7 +42,7 @@ switch (KP_liberation_preset_blufor) do { default {[] call compileFinal preprocessFileLineNumbers "presets\blufor\custom.sqf";}; }; -switch (KP_liberation_preset_opfor) do { +switch (KPLIB_preset_opfor) do { case 1: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\apex.sqf";}; case 2: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\rhs_afrf.sqf";}; case 3: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\takistan.sqf";}; @@ -66,7 +66,7 @@ switch (KP_liberation_preset_opfor) do { default {[] call compileFinal preprocessFileLineNumbers "presets\opfor\custom.sqf";}; }; -switch (KP_liberation_preset_resistance) do { +switch (KPLIB_preset_resistance) do { case 1: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\apex.sqf";}; case 2: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\rhs_gref.sqf";}; case 3: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\middle_eastern.sqf";}; @@ -78,7 +78,7 @@ switch (KP_liberation_preset_resistance) do { default {[] call compileFinal preprocessFileLineNumbers "presets\resistance\custom.sqf";}; }; -switch (KP_liberation_preset_civilians) do { +switch (KPLIB_preset_civilians) do { case 1: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\apex.sqf";}; case 2: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\middle_eastern.sqf";}; case 3: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\RDSCiv.sqf";}; @@ -193,8 +193,8 @@ opfor_choppers = opfor_choppers opfor_air = opfor_air select {[_x] call KPLIB_fnc_checkClass}; // Resistance -KP_liberation_guerilla_units = KP_liberation_guerilla_units select {[_x] call KPLIB_fnc_checkClass}; -KP_liberation_guerilla_vehicles = KP_liberation_guerilla_vehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_guerilla_units = KPLIB_guerilla_units select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_guerilla_vehicles = KPLIB_guerilla_vehicles select {[_x] call KPLIB_fnc_checkClass}; // Civilians civilians = civilians select {[_x] call KPLIB_fnc_checkClass}; @@ -233,10 +233,10 @@ KPLIB_o_squadAir = [opfor_squad_leader, opfor_medic, opfor_machinegunner, opf Liberation specific collections */ KPLIB_buildList = [[], infantry_units, light_vehicles, heavy_vehicles, air_vehicles, static_vehicles, buildings, support_vehicles, KPLIB_b_allSquads]; -KPLIB_crates = [KP_liberation_supply_crate, KP_liberation_ammo_crate, KP_liberation_fuel_crate]; -KPLIB_airSlots = [KP_liberation_heli_slot_building, KP_liberation_plane_slot_building]; -KPLIB_storageBuildings = [KP_liberation_small_storage_building, KP_liberation_large_storage_building]; -KPLIB_upgradeBuildings = [KP_liberation_recycle_building, KP_liberation_air_vehicle_building, KP_liberation_heli_slot_building, KP_liberation_plane_slot_building]; +KPLIB_crates = [KPLIB_supply_crate, KPLIB_ammo_crate, KPLIB_fuel_crate]; +KPLIB_airSlots = [KPLIB_heli_slot_building, KPLIB_plane_slot_building]; +KPLIB_storageBuildings = [KPLIB_small_storage_building, KPLIB_large_storage_building]; +KPLIB_upgradeBuildings = [KPLIB_recycle_building, KPLIB_air_vehicle_building, KPLIB_heli_slot_building, KPLIB_plane_slot_building]; KPLIB_aiResupplySources append [Respawn_truck_typename, huron_typename, Arsenal_typename]; KPLIB_crates = KPLIB_crates apply {toLower _x}; diff --git a/Missionframework/presets/resistance/CUP_NAPA.sqf b/Missionframework/presets/resistance/CUP_NAPA.sqf index cd8c1fe34..5fc884507 100644 --- a/Missionframework/presets/resistance/CUP_NAPA.sqf +++ b/Missionframework/presets/resistance/CUP_NAPA.sqf @@ -10,7 +10,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "CUP_I_GUE_Soldier_AR", "CUP_I_GUE_Engineer", "CUP_I_GUE_Commander", @@ -22,7 +22,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = [ +KPLIB_guerilla_vehicles = [ "CUP_I_Datsun_PK_Random", "CUP_I_Datsun_PK_Random", "CUP_I_Datsun_PK_Random", @@ -43,7 +43,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["CUP_srifle_CZ550","CUP_5x_22_LR_17_HMR_M",10,"",""], ["CUP_srifle_CZ550_rail","CUP_5x_22_LR_17_HMR_M",10,"optic_mrco",""], ["CUP_srifle_LeeEnfield","CUP_10x_303_M",10,"",""], @@ -52,7 +52,7 @@ KP_liberation_guerilla_weapons_1 = [ ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], ["CUP_arifle_AKM","CUP_30Rnd_762x39_AK47_M",4,"cup_optic_pso_1_ak_open",""], @@ -61,7 +61,7 @@ KP_liberation_guerilla_weapons_2 = [ ["CUP_smg_SA61","CUP_50Rnd_B_765x17_Ball_M",5,"",""] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], ["CUP_arifle_AK74M","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], ["CUP_arifle_AK74M_GL","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], @@ -73,7 +73,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "CUP_U_I_Villager_03", "CUP_U_I_Woodlander03", "CUP_U_I_Woodlander_02", @@ -86,7 +86,7 @@ KP_liberation_guerilla_uniforms_1 = [ ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "CUP_I_B_PMC_Unit_20", "CUP_I_B_PMC_Unit_19", "CUP_I_B_PMC_Unit_11", @@ -97,7 +97,7 @@ KP_liberation_guerilla_uniforms_2 = [ "CUP_I_B_PMC_Unit_22" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "CUP_U_I_GUE_Flecktarn2", "CUP_U_I_GUE_Flecktarn3", "CUP_U_I_GUE_Flecktarn", @@ -110,7 +110,7 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "CUP_V_I_Guerilla_Jacket", "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", @@ -126,7 +126,7 @@ KP_liberation_guerilla_vests_1 = [ "V_BandollierB_ghex_F" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "V_TacVestIR_blk", "V_Chestrig_rgr", "V_Chestrig_khk", @@ -140,7 +140,7 @@ KP_liberation_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "V_TacVest_oli", "CUP_V_RUS_Smersh_2", "CUP_V_I_Carrier_Belt", @@ -151,7 +151,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "", @@ -170,7 +170,7 @@ KP_liberation_guerilla_headgear_1 = [ "CUP_H_C_Beanie_04" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -188,7 +188,7 @@ KP_liberation_guerilla_headgear_2 = [ "H_MilCap_dgtl" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "H_Shemag_olive", "H_Shemag_olive_hs", "H_Shemag_olive", @@ -200,7 +200,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/CUP_TakiLocals.sqf b/Missionframework/presets/resistance/CUP_TakiLocals.sqf index a05463d67..f5f7a771d 100644 --- a/Missionframework/presets/resistance/CUP_TakiLocals.sqf +++ b/Missionframework/presets/resistance/CUP_TakiLocals.sqf @@ -10,7 +10,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "CUP_I_TK_GUE_Soldier_MG", "CUP_I_TK_GUE_Mechanic", "CUP_I_TK_GUE_Commander", @@ -22,7 +22,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = [ +KPLIB_guerilla_vehicles = [ "CUP_I_Datsun_PK_TK", "CUP_I_Hilux_AGS30_TK", "CUP_I_Hilux_DSHKM_TK", @@ -46,7 +46,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["bnae_mk1_virtual","10Rnd_303_Magazine",8,"",""], ["bnae_mk1_t_virtual","10Rnd_303_Magazine",8,"bnae_scope_v3_virtual",""], ["bnae_m97_virtual","6Rnd_Slug_Magazine",10,"",""], @@ -57,7 +57,7 @@ KP_liberation_guerilla_weapons_1 = [ ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["bnae_mk1_t_virtual","10Rnd_303_Magazine",8,"bnae_scope_v3_virtual",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"cup_optic_kobra",""], @@ -66,7 +66,7 @@ KP_liberation_guerilla_weapons_2 = [ ["CUP_arifle_RPK74","CUP_75Rnd_TE4_LRT4_Green_Tracer_545x39_RPK_M",3,"",""] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["CUP_arifle_FNFAL","CUP_20Rnd_762x51_FNFAL_M",5,"",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"cup_optic_kobra",""], @@ -78,7 +78,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "CUP_O_TKI_Khet_Jeans_04", "CUP_O_TKI_Khet_Jeans_03", "CUP_O_TKI_Khet_Jeans_02", @@ -96,7 +96,7 @@ KP_liberation_guerilla_uniforms_1 = [ ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "U_BG_Guerilla2_3", "U_BG_Guerilla2_1", "U_BG_Guerilla2_1", @@ -112,7 +112,7 @@ KP_liberation_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_Guerrilla_6_1", @@ -125,7 +125,7 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -156,7 +156,7 @@ KP_liberation_guerilla_vests_1 = [ "CUP_V_OI_TKI_Jacket5_04" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -171,7 +171,7 @@ KP_liberation_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -189,7 +189,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "CUP_H_TKI_Lungee_Open_01", "CUP_H_TK_Lungee", "CUP_H_TKI_Lungee_Open_02", @@ -223,7 +223,7 @@ KP_liberation_guerilla_headgear_1 = [ "CUP_H_TKI_SkullCap_06" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "CUP_H_TKI_Lungee_Open_01", "CUP_H_TK_Lungee", "CUP_H_TKI_Lungee_Open_02", @@ -257,7 +257,7 @@ KP_liberation_guerilla_headgear_2 = [ "CUP_H_TKI_SkullCap_06" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "CUP_H_TKI_Lungee_Open_01", "CUP_H_TK_Lungee", "CUP_H_TKI_Lungee_Open_02", @@ -292,7 +292,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/RACS.sqf b/Missionframework/presets/resistance/RACS.sqf index ce1bf9e1d..193825807 100644 --- a/Missionframework/presets/resistance/RACS.sqf +++ b/Missionframework/presets/resistance/RACS.sqf @@ -8,7 +8,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "LOP_RACS_Infantry_MG", "LOP_RACS_Infantry_Engineer", "LOP_RACS_Infantry_TL", @@ -20,7 +20,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = [ +KPLIB_guerilla_vehicles = [ "LOP_RACS_Landrover_M2", "LOP_RACS_Offroad_M2" ]; @@ -31,7 +31,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["rhs_weap_Izh","rhsgref_1Rnd_00Buck",20,"",""], ["rhs_weap_m38","rhsgref_5rnd_762x54_m38",6,"",""], ["rhs_weap_m38_rail","rhsgref_5rnd_762x54_m38",6,"",""], @@ -40,7 +40,7 @@ KP_liberation_guerilla_weapons_1 = [ ["rhs_weap_makarov_pm","rhs_mag_9x18_8_57N181S",5,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",3,"",""], ["rhs_weap_akm","rhs_30rnd_762x39mm",3,"",""], ["rhs_weap_akms","rhs_30rnd_762x39mm",3,"",""], @@ -49,7 +49,7 @@ KP_liberation_guerilla_weapons_2 = [ ["rhs_weap_svds","rhs_10rnd_762x54mmR_7N1",3,"rhs_acc_pso1m2",""] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"rhs_acc_pkas",""], ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"rhs_acc_ekp8_02",""], ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_pkas",""], @@ -61,23 +61,23 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "LOP_U_RACS_Fatigue_01", "LOP_U_RACS_Fatigue_01_slv" ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "LOP_U_RACS_Fatigue_01", "LOP_U_RACS_Fatigue_01_slv" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "LOP_U_RACS_Fatigue_01", "LOP_U_RACS_Fatigue_01_slv" ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -96,7 +96,7 @@ KP_liberation_guerilla_vests_1 = [ "rhs_6sh46" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -113,7 +113,7 @@ KP_liberation_guerilla_vests_2 = [ "V_TacChestrig_oli_F" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -130,7 +130,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "", @@ -141,7 +141,7 @@ KP_liberation_guerilla_headgear_1 = [ ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -161,7 +161,7 @@ KP_liberation_guerilla_headgear_2 = [ "LOP_H_6B27M_ess_RACS" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -184,7 +184,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/apex.sqf b/Missionframework/presets/resistance/apex.sqf index 95eb61c21..ef2d93054 100644 --- a/Missionframework/presets/resistance/apex.sqf +++ b/Missionframework/presets/resistance/apex.sqf @@ -8,7 +8,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "I_C_Soldier_Bandit_1_F", "I_C_Soldier_Bandit_2_F", "I_C_Soldier_Bandit_3_F", @@ -20,7 +20,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = [ +KPLIB_guerilla_vehicles = [ "I_C_Offroad_02_LMG_F", "I_C_Offroad_02_AT_F" ]; @@ -31,7 +31,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["arifle_AKM_F","30Rnd_762x39_Mag_F",4,"",""], ["arifle_AKS_F","30Rnd_545x39_Mag_F",4,"",""], ["hgun_PDW2000_F","30Rnd_9x21_Mag",4,"",""], @@ -40,7 +40,7 @@ KP_liberation_guerilla_weapons_1 = [ ["SMG_05_F","30Rnd_9x21_Mag_SMG_02",4,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["arifle_Katiba_F","30Rnd_65x39_caseless_green",4,"optic_ACO_grn",""], ["arifle_Mk20_plain_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], ["arifle_TRG21_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], @@ -49,7 +49,7 @@ KP_liberation_guerilla_weapons_2 = [ ["srifle_DMR_06_olive_F","20Rnd_762x51_Mag",5,"optic_Hamr","bipod_01_F_blk"] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["arifle_CTAR_blk_F","30Rnd_580x42_Mag_F",4,"optic_MRCO",""], ["arifle_SPAR_01_blk_F","30Rnd_556x45_Stanag",4,"optic_MRCO",""], ["arifle_SPAR_03_blk_F","20Rnd_762x51_Mag",5,"optic_MRCO",""], @@ -61,7 +61,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "U_C_Poloshirt_blue", "U_C_Poloshirt_burgundy", "U_C_Poloshirt_salmon", @@ -78,7 +78,7 @@ KP_liberation_guerilla_uniforms_1 = [ "U_Marshal" ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "U_I_C_Soldier_Bandit_1_F", "U_I_C_Soldier_Bandit_2_F", "U_I_C_Soldier_Bandit_3_F", @@ -94,7 +94,7 @@ KP_liberation_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_Guerrilla_6_1", @@ -107,7 +107,7 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -122,7 +122,7 @@ KP_liberation_guerilla_vests_1 = [ "V_BandollierB_ghex_F" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -135,7 +135,7 @@ KP_liberation_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -148,7 +148,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "", @@ -173,7 +173,7 @@ KP_liberation_guerilla_headgear_1 = [ "H_Cap_blk" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -191,7 +191,7 @@ KP_liberation_guerilla_headgear_2 = [ "H_MilCap_dgtl" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -205,7 +205,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/custom.sqf b/Missionframework/presets/resistance/custom.sqf index 5fa52f078..af4c51146 100644 --- a/Missionframework/presets/resistance/custom.sqf +++ b/Missionframework/presets/resistance/custom.sqf @@ -8,7 +8,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "I_G_Soldier_AR_F", "I_G_engineer_F", "I_G_officer_F", @@ -20,7 +20,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = [ +KPLIB_guerilla_vehicles = [ "I_G_Offroad_01_armed_F", "I_G_Offroad_01_AT_F" ]; @@ -31,7 +31,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["arifle_AKM_F","30Rnd_762x39_Mag_F",4,"",""], ["arifle_AKS_F","30Rnd_545x39_Mag_F",4,"",""], ["hgun_PDW2000_F","30Rnd_9x21_Mag",4,"",""], @@ -40,7 +40,7 @@ KP_liberation_guerilla_weapons_1 = [ ["SMG_05_F","30Rnd_9x21_Mag_SMG_02",4,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["arifle_Katiba_F","30Rnd_65x39_caseless_green",4,"optic_ACO_grn",""], ["arifle_Mk20_plain_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], ["arifle_TRG21_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], @@ -49,7 +49,7 @@ KP_liberation_guerilla_weapons_2 = [ ["srifle_DMR_06_olive_F","20Rnd_762x51_Mag",5,"optic_Hamr","bipod_01_F_blk"] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["arifle_CTAR_blk_F","30Rnd_580x42_Mag_F",4,"optic_MRCO",""], ["arifle_SPAR_01_blk_F","30Rnd_556x45_Stanag",4,"optic_MRCO",""], ["arifle_SPAR_03_blk_F","20Rnd_762x51_Mag",5,"optic_MRCO",""], @@ -61,7 +61,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "U_C_Poloshirt_blue", "U_C_Poloshirt_burgundy", "U_C_Poloshirt_salmon", @@ -78,7 +78,7 @@ KP_liberation_guerilla_uniforms_1 = [ "U_Marshal" ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "U_I_C_Soldier_Bandit_1_F", "U_I_C_Soldier_Bandit_2_F", "U_I_C_Soldier_Bandit_3_F", @@ -94,7 +94,7 @@ KP_liberation_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_Guerrilla_6_1", @@ -107,7 +107,7 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -122,7 +122,7 @@ KP_liberation_guerilla_vests_1 = [ "V_BandollierB_ghex_F" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -135,7 +135,7 @@ KP_liberation_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -148,7 +148,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "", @@ -173,7 +173,7 @@ KP_liberation_guerilla_headgear_1 = [ "H_Cap_blk" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -191,7 +191,7 @@ KP_liberation_guerilla_headgear_2 = [ "H_MilCap_dgtl" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -205,7 +205,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/germany.sqf b/Missionframework/presets/resistance/germany.sqf index 626e4bb5a..a6ae1789e 100644 --- a/Missionframework/presets/resistance/germany.sqf +++ b/Missionframework/presets/resistance/germany.sqf @@ -8,7 +8,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "I_G_Soldier_AR_F", "I_G_engineer_F", "I_G_officer_F", @@ -20,7 +20,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = []; +KPLIB_guerilla_vehicles = []; /* Guerilla Equipment There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ @@ -28,19 +28,19 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["gm_mp2a1_blk","gm_32Rnd_9x19mm_B_DM51_mp2_blk",4,"",""], ["gm_mp2a1_blk","gm_32Rnd_9x19mm_B_DM51_mp2_blk",4,"",""], ["gm_mpiaks74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["gm_mpiaks74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""], ["gm_mpiak74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""], ["gm_mpiak74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["gm_mpiak74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""], ["gm_g3a3_blk","gm_20Rnd_762x51mm_B_T_DM21_g3_blk",4,"",""], ["gm_g3a3_blk","gm_20Rnd_762x51mm_B_T_DM21_g3_blk",4,"",""], @@ -49,7 +49,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "gm_gc_civ_uniform_man_01_80_blu", "gm_gc_civ_uniform_man_02_80_brn", "gm_ge_civ_uniform_blouse_80_gry", @@ -57,7 +57,7 @@ KP_liberation_guerilla_uniforms_1 = [ "U_C_Mechanic_01_F" ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "gm_gc_civ_uniform_man_01_80_blu", "gm_gc_civ_uniform_man_02_80_brn", "gm_ge_civ_uniform_blouse_80_gry", @@ -67,7 +67,7 @@ KP_liberation_guerilla_uniforms_2 = [ "U_C_WorkerCoveralls" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "gm_gc_civ_uniform_man_01_80_blu", "gm_gc_civ_uniform_man_02_80_brn", "gm_ge_civ_uniform_blouse_80_gry", @@ -84,7 +84,7 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -94,7 +94,7 @@ KP_liberation_guerilla_vests_1 = [ "V_BandollierB_blk" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -104,7 +104,7 @@ KP_liberation_guerilla_vests_2 = [ "gm_ge_bgs_vest_80_rifleman" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -113,7 +113,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "", @@ -126,7 +126,7 @@ KP_liberation_guerilla_headgear_1 = [ "H_Hat_Safari_sand_F" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "", "", "", @@ -145,7 +145,7 @@ KP_liberation_guerilla_headgear_2 = [ "H_Bandanna_khk" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "", "", "", @@ -168,7 +168,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/middle_eastern.sqf b/Missionframework/presets/resistance/middle_eastern.sqf index 07a8694e9..f1de0f3f8 100644 --- a/Missionframework/presets/resistance/middle_eastern.sqf +++ b/Missionframework/presets/resistance/middle_eastern.sqf @@ -10,7 +10,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "LOP_AM_Infantry_SL", "LOP_AM_Infantry_Rifleman", "LOP_AM_Infantry_Rifleman_2", @@ -22,7 +22,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = [ +KPLIB_guerilla_vehicles = [ "LOP_AM_UAZ_DshKM" ]; @@ -32,13 +32,13 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",4,"",""], ["rhs_weap_aks74u","rhs_30rnd_545x39_AK",4,"",""], ["LOP_Weap_LeeEnfield","LOP_10rnd_77mm_mag",3,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",4,"",""], ["rhs_weap_akm","rhs_30rnd_762x39mm",4,"",""], ["rhs_weap_akms","rhs_30rnd_762x39mm",4,"",""], @@ -47,7 +47,7 @@ KP_liberation_guerilla_weapons_2 = [ ["LOP_Weap_LeeEnfield_railed","LOP_10rnd_77mm_mag",3,"optic_ACO_grn",""] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"",""], ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"",""], ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_ekp1",""], @@ -57,7 +57,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "LOP_U_TAK_Civ_Fatigue_01", "LOP_U_TAK_Civ_Fatigue_02", "LOP_U_TAK_Civ_Fatigue_04", @@ -75,7 +75,7 @@ KP_liberation_guerilla_uniforms_1 = [ "LOP_U_TAK_Civ_Fatigue_16" ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "LOP_U_TAK_Civ_Fatigue_01", "LOP_U_TAK_Civ_Fatigue_02", "LOP_U_TAK_Civ_Fatigue_04", @@ -93,7 +93,7 @@ KP_liberation_guerilla_uniforms_2 = [ "LOP_U_TAK_Civ_Fatigue_16" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "LOP_U_TAK_Civ_Fatigue_01", "LOP_U_TAK_Civ_Fatigue_02", "LOP_U_TAK_Civ_Fatigue_04", @@ -112,11 +112,11 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "", "V_LegStrapBag_black_F", "V_LegStrapBag_coyote_F", @@ -124,7 +124,7 @@ KP_liberation_guerilla_vests_2 = [ "LOP_6sh46" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "", "V_LegStrapBag_black_F", "V_LegStrapBag_coyote_F", @@ -136,7 +136,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "H_HeadBandage_clean_F", @@ -151,7 +151,7 @@ KP_liberation_guerilla_headgear_1 = [ "H_Bandanna_camo" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "", "H_HeadBandage_clean_F", "H_HeadBandage_stained_F", @@ -166,7 +166,7 @@ KP_liberation_guerilla_headgear_2 = [ "LOP_H_Turban_mask" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "LOP_H_Turban", "LOP_H_Turban_mask", "H_Shemag_olive", @@ -182,6 +182,6 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "" ]; diff --git a/Missionframework/presets/resistance/rhs_gref.sqf b/Missionframework/presets/resistance/rhs_gref.sqf index c46d80e64..5c7bbdf0b 100644 --- a/Missionframework/presets/resistance/rhs_gref.sqf +++ b/Missionframework/presets/resistance/rhs_gref.sqf @@ -9,7 +9,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "I_G_Soldier_AR_F", "I_G_engineer_F", "I_G_officer_F", @@ -21,7 +21,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = [ +KPLIB_guerilla_vehicles = [ "rhsgref_ins_g_uaz_dshkm_chdkz" ]; @@ -31,7 +31,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["rhs_weap_Izh","rhsgref_1Rnd_00Buck",20,"",""], ["rhs_weap_m38","rhsgref_5rnd_762x54_m38",6,"",""], ["rhs_weap_m38_rail","rhsgref_5rnd_762x54_m38",6,"",""], @@ -40,7 +40,7 @@ KP_liberation_guerilla_weapons_1 = [ ["rhs_weap_makarov_pm","rhs_mag_9x18_8_57N181S",5,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",3,"",""], ["rhs_weap_akm","rhs_30rnd_762x39mm",3,"",""], ["rhs_weap_akms","rhs_30rnd_762x39mm",3,"",""], @@ -49,7 +49,7 @@ KP_liberation_guerilla_weapons_2 = [ ["rhs_weap_svds","rhs_10rnd_762x54mmR_7N1",3,"rhs_acc_pso1m2",""] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"rhs_acc_pkas",""], ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"rhs_acc_ekp8_02",""], ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_pkas",""], @@ -61,7 +61,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "U_I_C_Soldier_Bandit_1_F", "U_I_C_Soldier_Bandit_2_F", "U_I_C_Soldier_Bandit_3_F", @@ -74,7 +74,7 @@ KP_liberation_guerilla_uniforms_1 = [ "U_BG_Guerilla2_3" ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "U_BG_Guerrilla_6_1", "U_BG_Guerilla1_1", "U_I_C_Soldier_Para_1_F", @@ -88,7 +88,7 @@ KP_liberation_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "rhsgref_uniform_reed", "rhsgref_uniform_woodland_olive", "rhsgref_uniform_flecktarn", @@ -97,7 +97,7 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -116,7 +116,7 @@ KP_liberation_guerilla_vests_1 = [ "rhs_6sh46" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -133,7 +133,7 @@ KP_liberation_guerilla_vests_2 = [ "V_TacChestrig_oli_F" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -150,7 +150,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "", @@ -171,7 +171,7 @@ KP_liberation_guerilla_headgear_1 = [ "H_Cap_blk" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -185,7 +185,7 @@ KP_liberation_guerilla_headgear_2 = [ "rhsgref_fieldcap_ttsko_urban" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -202,7 +202,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/unsung.sqf b/Missionframework/presets/resistance/unsung.sqf index b9bb65075..42c12d498 100644 --- a/Missionframework/presets/resistance/unsung.sqf +++ b/Missionframework/presets/resistance/unsung.sqf @@ -8,7 +8,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KP_liberation_guerilla_units = [ +KPLIB_guerilla_units = [ "uns_men_ARVNci_HMG", "uns_men_ARVNci_S2", "uns_men_ARVNci_SL", @@ -20,7 +20,7 @@ KP_liberation_guerilla_units = [ ]; // Armed vehicles -KP_liberation_guerilla_vehicles = []; +KPLIB_guerilla_vehicles = []; /* Guerilla Equipment There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ @@ -28,7 +28,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KP_liberation_guerilla_weapons_1 = [ +KPLIB_guerilla_weapons_1 = [ ["uns_ak47","uns_ak47mag",4,"",""], ["uns_PPS52","uns_k50mag",4,"",""], ["uns_owen","uns_owenmag",4,"",""], @@ -37,7 +37,7 @@ KP_liberation_guerilla_weapons_1 = [ ["uns_m1carbine","uns_m1carbinemag",4,"",""] ]; -KP_liberation_guerilla_weapons_2 = [ +KPLIB_guerilla_weapons_2 = [ ["uns_m2carbine","uns_m2carbinemag",4,"",""], ["uns_akm","uns_ak47mag",4,"",""], ["uns_DP28_base","uns_47Rnd_DP28",4,"",""], @@ -46,7 +46,7 @@ KP_liberation_guerilla_weapons_2 = [ ["uns_mas36","uns_mas36mag",4,"",""] ]; -KP_liberation_guerilla_weapons_3 = [ +KPLIB_guerilla_weapons_3 = [ ["uns_akm_drum","uns_75Rnd_akdr",4,"",""], ["uns_sa58p","uns_sa58mag",4,"",""], ["uns_PK","uns_100Rnd_762x54_PK",1,"",""], @@ -59,7 +59,7 @@ KP_liberation_guerilla_weapons_3 = [ ]; // Uniforms -KP_liberation_guerilla_uniforms_1 = [ +KPLIB_guerilla_uniforms_1 = [ "U_C_Man_casual_4_F", "U_C_Man_casual_5_F", "U_C_Man_casual_6_F", @@ -72,7 +72,7 @@ KP_liberation_guerilla_uniforms_1 = [ "UNS_VC_U" ]; -KP_liberation_guerilla_uniforms_2 = [ +KPLIB_guerilla_uniforms_2 = [ "U_BG_Guerilla2_1", "U_BG_Guerilla2_3", "U_BG_Guerilla3_1", @@ -85,7 +85,7 @@ KP_liberation_guerilla_uniforms_2 = [ "U_I_C_Soldier_Para_5_F" ]; -KP_liberation_guerilla_uniforms_3 = [ +KPLIB_guerilla_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_leader", @@ -99,7 +99,7 @@ KP_liberation_guerilla_uniforms_3 = [ ]; // Vests -KP_liberation_guerilla_vests_1 = [ +KPLIB_guerilla_vests_1 = [ "UNS_VC_B1", "UNS_VC_S2", "V_BandollierB_blk", @@ -116,7 +116,7 @@ KP_liberation_guerilla_vests_1 = [ "V_Pocketed_olive_F" ]; -KP_liberation_guerilla_vests_2 = [ +KPLIB_guerilla_vests_2 = [ "UNS_ANZAC_VEST_C", "UNS_ANZAC_VEST", "UNS_M1956_M14", @@ -136,7 +136,7 @@ KP_liberation_guerilla_vests_2 = [ "V_HarnessOGL_gry" ]; -KP_liberation_guerilla_vests_3 = [ +KPLIB_guerilla_vests_3 = [ "UNS_M1956_M1", "UNS_M1956_M2", "UNS_M1956_M3", @@ -154,7 +154,7 @@ KP_liberation_guerilla_vests_3 = [ ]; // Headgear -KP_liberation_guerilla_headgear_1 = [ +KPLIB_guerilla_headgear_1 = [ "", "", "", @@ -164,7 +164,7 @@ KP_liberation_guerilla_headgear_1 = [ "UNS_Conehat_VC" ]; -KP_liberation_guerilla_headgear_2 = [ +KPLIB_guerilla_headgear_2 = [ "H_Bandanna_khk", "UNS_Boonie_VC", "UNS_Headband_BK", @@ -179,7 +179,7 @@ KP_liberation_guerilla_headgear_2 = [ "uns_vc_headband_blue" ]; -KP_liberation_guerilla_headgear_3 = [ +KPLIB_guerilla_headgear_3 = [ "UNS_Boonie_6", "UNS_Boonie_ERDL", "UNS_Boonie_ERDL3", @@ -197,7 +197,7 @@ KP_liberation_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KP_liberation_guerilla_facegear = [ +KPLIB_guerilla_facegear = [ "", "", "", diff --git a/Missionframework/scripts/client/actions/do_recycle.sqf b/Missionframework/scripts/client/actions/do_recycle.sqf index 33c5d55cd..45e6c730a 100644 --- a/Missionframework/scripts/client/actions/do_recycle.sqf +++ b/Missionframework/scripts/client/actions/do_recycle.sqf @@ -1,7 +1,7 @@ // TODO Split this in an added action to the vehicles and add the dorecycle == 1 part in a button action params ["_vehToRecycle"]; -if (_vehToRecycle getVariable ["KP_liberation_preplaced", false]) exitWith {hint localize "STR_PREPLACED_ERROR";}; +if (_vehToRecycle getVariable ["KPLIB_preplaced", false]) exitWith {hint localize "STR_PREPLACED_ERROR";}; dorecycle = 0; @@ -15,7 +15,7 @@ if !( ((toLower _type) in KPLIB_b_buildings_classes) || ((toLower _type) in KPLIB_storageBuildings) || ((toLower _type) in KPLIB_upgradeBuildings) || - (_type in KP_liberation_ace_crates) || + (_type in KPLIB_ace_crates) || (_type == "B_Slingload_01_Repair_F") || (_type == "B_Slingload_01_Fuel_F") || (_type == "B_Slingload_01_Ammo_F") @@ -80,18 +80,18 @@ waitUntil {sleep 0.1; !dialog || !alive player || dorecycle != 0}; if (dialog) then {closeDialog 0}; if (dorecycle == 1 && !(isnull _vehToRecycle) && alive _vehToRecycle) then { - if (!(KP_liberation_recycle_building_near) && ((_price_s + _price_a + _price_f) > 0)) exitWith {hint localize "STR_NORECBUILDING_ERROR";}; + if (!(KPLIB_recycle_building_near) && ((_price_s + _price_a + _price_f) > 0)) exitWith {hint localize "STR_NORECBUILDING_ERROR";}; - private _storage_areas = (([] call KPLIB_fnc_getNearestFob) nearobjects (KPLIB_fob_range * 1.2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; + private _storage_areas = (([] call KPLIB_fnc_getNearestFob) nearobjects (KPLIB_fob_range * 1.2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; private _crateSum = (ceil (_price_s / 100)) + (ceil (_price_a / 100)) + (ceil (_price_f / 100)); private _spaceSum = 0; { - if (typeOf _x == KP_liberation_large_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; diff --git a/Missionframework/scripts/client/actions/do_repackage_fob.sqf b/Missionframework/scripts/client/actions/do_repackage_fob.sqf index ec009d87a..7e4084fb9 100644 --- a/Missionframework/scripts/client/actions/do_repackage_fob.sqf +++ b/Missionframework/scripts/client/actions/do_repackage_fob.sqf @@ -12,9 +12,9 @@ if (dorepackage > 0) then { if !(_fob isEqualTo []) then { KPLIB_all_fobs = KPLIB_all_fobs - [_fob]; - KP_liberation_clearances deleteAt (KP_liberation_clearances findIf {(_x select 0) isEqualTo _fob}); + KPLIB_clearances deleteAt (KPLIB_clearances findIf {(_x select 0) isEqualTo _fob}); publicVariable "KPLIB_all_fobs"; - publicVariable "KP_liberation_clearances"; + publicVariable "KPLIB_clearances"; }; {deleteVehicle _x} forEach (((getPos player) nearobjects [FOB_typename, 250]) select {getObjectType _x >= 8}); diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index df0aa28bd..2e9ef83e6 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/Missionframework/scripts/client/actions/open_arsenal.sqf @@ -9,7 +9,7 @@ private _backpack = backpack player; private ["_loadouts_data"]; // Get loadouts either from ACE or BI arsenals -if (KP_liberation_ace && KP_liberation_arsenal_type) then { +if (KPLIB_ace && KPLIB_arsenal_type) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -74,13 +74,13 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( load_loadout > 0 ) then { private _loaded_loadout = _loadouts_data select (lbCurSel 201); - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_arsenal_type) then { player setUnitLoadout (_loaded_loadout select 1); } else { [player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory; }; - if (KP_liberation_arsenalUsePreset) then { + if (KPLIB_arsenalUsePreset) then { if ([_backpack] call KPLIB_fnc_checkGear) then { hint format [ localize "STR_HINT_LOADOUT_LOADED", _loaded_loadout param [0]]; }; @@ -115,15 +115,15 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( edit_loadout > 0 ) then { closeDialog 0; waitUntil { !dialog }; - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_arsenal_type) then { [player, player, false] call ace_arsenal_fnc_openBox; } else { [ "Open", false ] spawn BIS_fnc_arsenal; }; - if (KP_liberation_arsenalUsePreset) then { + if (KPLIB_arsenalUsePreset) then { uiSleep 5; - private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KP_liberation_ace && KP_liberation_arsenal_type); + private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KPLIB_ace && KPLIB_arsenal_type); waitUntil {sleep 1; isNull (uinamespace getvariable [_arsenalDisplay, displayNull])}; [_backpack] call KPLIB_fnc_checkGear; }; diff --git a/Missionframework/scripts/client/actions/recycle_manager.sqf b/Missionframework/scripts/client/actions/recycle_manager.sqf index 526fe288d..9d9bf9761 100644 --- a/Missionframework/scripts/client/actions/recycle_manager.sqf +++ b/Missionframework/scripts/client/actions/recycle_manager.sqf @@ -21,9 +21,9 @@ while {true} do { private _detected_vehicles = (getPos player) nearObjects veh_action_detect_distance select { (((toLower (typeof _x)) in _recycleable_classnames && (({alive _x} count (crew _x)) == 0 || unitIsUAV _x) && (locked _x == 0 || locked _x == 1)) || (toLower (typeOf _x)) in KPLIB_b_buildings_classes || - (((toLower (typeOf _x)) in KPLIB_storageBuildings) && ((_x getVariable ["KP_liberation_storage_type",-1]) == 0)) || + (((toLower (typeOf _x)) in KPLIB_storageBuildings) && ((_x getVariable ["KPLIB_storage_type",-1]) == 0)) || (toLower (typeOf _x)) in KPLIB_upgradeBuildings || - (typeOf _x) in KP_liberation_ace_crates) && + (typeOf _x) in KPLIB_ace_crates) && alive _x && ( // ignore null objects left by Advanced Towing diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index 7069920ce..bc1a8fd02 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -85,11 +85,11 @@ while {true} do { _area_load = count (attachedObjects _x); if (!(_next_area in _managed_areas) && (_area_load > 0)) then { - _action_id = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_SUPPLY" + "",{[KP_liberation_supply_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-504,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; + _action_id = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_SUPPLY" + "",{[KPLIB_supply_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-504,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_supply_unstore_action", _action_id, false]; - _action_id2 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_AMMO" + "",{[KP_liberation_ammo_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-505,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; + _action_id2 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_AMMO" + "",{[KPLIB_ammo_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-505,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_ammo_unstore_action", _action_id2, false]; - _action_id3 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_FUEL" + "",{[KP_liberation_fuel_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-506,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; + _action_id3 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_FUEL" + "",{[KPLIB_fuel_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-506,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_fuel_unstore_action", _action_id3, false]; _action_id4 = _next_area addAction ["" + localize "STR_ACTION_SORT_STORAGE" + "",{[(_this select 0)] call KPLIB_fnc_sortStorage;},"",-507,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_storage_sort_action", _action_id4, false]; diff --git a/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf b/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf index 92cdc0cac..40911c3df 100644 --- a/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf +++ b/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf @@ -2,7 +2,7 @@ if (isDedicated) exitWith {}; params ["_notif_id", ["_pos", getpos player]]; -if (KP_liberation_asymmetric_debug > 0) then {[format ["asymm_notifications called on: %1 - Parameters: [%2, %3] ", debug_source, _notif_id, _pos], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["asymm_notifications called on: %1 - Parameters: [%2, %3] ", debug_source, _notif_id, _pos], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; switch (_notif_id) do { case 0: { diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 92443259d..10825b261 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -40,7 +40,7 @@ while { true } do { _price_f = ((KPLIB_buildList select buildtype) select buildindex) select 3; _nearfob = [] call KPLIB_fnc_getNearestFob; - _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; + _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; [_price_s, _price_a, _price_f, _classname, buildtype, _storage_areas] remoteExec ["build_remote_call",2]; }; @@ -89,7 +89,7 @@ while { true } do { if (buildtype == 6 ) then { _idactplacebis = player addAction ["" + localize "STR_PLACEMENT_BIS" + " ",{build_confirmed = 2; repeatbuild = true; hint localize "STR_CONFIRM_HINT";},"",-785,false,false,"","build_invalid == 0 && build_confirmed == 1"]; }; - if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KP_liberation_recycle_building || _classname isEqualTo KP_liberation_air_vehicle_building) then { + if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_recycle_building || _classname isEqualTo KPLIB_air_vehicle_building) then { _idactsnap = player addAction ["" + localize "STR_GRID" + "",{gridmode = gridmode + 1;},"",-735,false,false,"","build_confirmed == 1"]; _idactvector = player addAction ["" + localize "STR_VECACTION" + "",{KP_vector = !KP_vector;},"",-800,false,false,"","build_confirmed == 1"]; }; @@ -105,7 +105,7 @@ while { true } do { _vehicle allowdamage false; _vehicle setVehicleLock "LOCKED"; _vehicle enableSimulationGlobal false; - _vehicle setVariable ["KP_liberation_preplaced", true, true]; + _vehicle setVariable ["KPLIB_preplaced", true, true]; _dist = 0.6 * (sizeOf _classname); if (_dist < 3.5) then { _dist = 3.5 }; @@ -214,7 +214,7 @@ while { true } do { _vehicle setpos _truepos; }; }; - if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KP_liberation_recycle_building || _classname isEqualTo KP_liberation_air_vehicle_building) then { + if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_recycle_building || _classname isEqualTo KPLIB_air_vehicle_building) then { if (KP_vector) then { _vehicle setVectorUp [0,0,1]; } else { @@ -268,7 +268,7 @@ while { true } do { _price_f = ((KPLIB_buildList select buildtype) select buildindex) select 3; _nearfob = [] call KPLIB_fnc_getNearestFob; - _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; + _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; _supplyCrates = ceil (_price_s / 100); _ammoCrates = ceil (_price_a / 100); @@ -278,11 +278,11 @@ while { true } do { _spaceSum = 0; { - if (typeOf _x == KP_liberation_large_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -313,7 +313,7 @@ while { true } do { [_vehicle] call KPLIB_fnc_clearCargo; - if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KP_liberation_recycle_building || _classname isEqualTo KP_liberation_air_vehicle_building) then { + if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_recycle_building || _classname isEqualTo KPLIB_air_vehicle_building) then { if (KP_vector) then { _vehicle setVectorUp [0,0,1]; } else { diff --git a/Missionframework/scripts/client/build/do_sector_build.sqf b/Missionframework/scripts/client/build/do_sector_build.sqf index 8710886b1..3b350700f 100644 --- a/Missionframework/scripts/client/build/do_sector_build.sqf +++ b/Missionframework/scripts/client/build/do_sector_build.sqf @@ -1,6 +1,6 @@ private ["_vector", "_idactcancel", "_idactplace", "_idactvector", "_ghost_spot", "_truedir", "_dist", "_truepos", "_sectorpos", "_building"]; -if (((_this select 3) select 0) == KP_liberation_small_storage_building) then { +if (((_this select 3) select 0) == KPLIB_small_storage_building) then { _truepos = []; @@ -86,7 +86,7 @@ if (((_this select 3) select 0) == KP_liberation_small_storage_building) then { _building setVectorUp surfaceNormal position _building; }; - _building setVariable ["KP_liberation_storage_type", 1, true]; + _building setVariable ["KPLIB_storage_type", 1, true]; sleep 0.3; _building allowDamage true; diff --git a/Missionframework/scripts/client/build/open_build_menu.sqf b/Missionframework/scripts/client/build/open_build_menu.sqf index 2f5317257..80fda36c8 100644 --- a/Missionframework/scripts/client/build/open_build_menu.sqf +++ b/Missionframework/scripts/client/build/open_build_menu.sqf @@ -34,7 +34,7 @@ localize "STR_BUILD8" ]; _nearfob = [] call KPLIB_fnc_getNearestFob; -_actual_fob = KP_liberation_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; +_actual_fob = KPLIB_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { _build_list = KPLIB_buildList select buildtype; @@ -42,7 +42,7 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { if (_oldbuildtype != buildtype || synchro_done) then { synchro_done = false; _oldbuildtype = buildtype; - _actual_fob = KP_liberation_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; + _actual_fob = KPLIB_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; lbClear 110; { @@ -53,16 +53,16 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { switch (_classnamevar) do { case FOB_box_typename: {_entrytext = localize "STR_FOBBOX";}; - case Arsenal_typename: {if (KP_liberation_mobilearsenal) then {_entrytext = localize "STR_ARSENAL_BOX";};}; - case Respawn_truck_typename: {if (KP_liberation_mobilerespawn) then {_entrytext = localize "STR_RESPAWN_TRUCK";};}; + case Arsenal_typename: {if (KPLIB_mobilearsenal) then {_entrytext = localize "STR_ARSENAL_BOX";};}; + case Respawn_truck_typename: {if (KPLIB_mobilerespawn) then {_entrytext = localize "STR_RESPAWN_TRUCK";};}; case FOB_truck_typename: {_entrytext = localize "STR_FOBTRUCK";}; case "Flag_White_F": {_entrytext = localize "STR_INDIV_FLAG";}; - case KP_liberation_small_storage_building: {_entrytext = localize "STR_SMALL_STORAGE";}; - case KP_liberation_large_storage_building: {_entrytext = localize "STR_LARGE_STORAGE";}; - case KP_liberation_recycle_building: {_entrytext = localize "STR_RECYCLE_BUILDING";}; - case KP_liberation_air_vehicle_building: {_entrytext = localize "STR_HELI_BUILDING";}; - case KP_liberation_heli_slot_building: {_entrytext = localize "STR_HELI_SLOT";}; - case KP_liberation_plane_slot_building: {_entrytext = localize "STR_PLANE_SLOT";}; + case KPLIB_small_storage_building: {_entrytext = localize "STR_SMALL_STORAGE";}; + case KPLIB_large_storage_building: {_entrytext = localize "STR_LARGE_STORAGE";}; + case KPLIB_recycle_building: {_entrytext = localize "STR_RECYCLE_BUILDING";}; + case KPLIB_air_vehicle_building: {_entrytext = localize "STR_HELI_BUILDING";}; + case KPLIB_heli_slot_building: {_entrytext = localize "STR_HELI_SLOT";}; + case KPLIB_plane_slot_building: {_entrytext = localize "STR_PLANE_SLOT";}; default {}; }; @@ -128,14 +128,14 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { ((_build_item select 3 == 0 ) || ((_build_item select 3) <= ((_actual_fob select 0) select 3))) ) then { if ((toLower (_build_item select 0)) in KPLIB_b_air_classes && !([_build_item select 0] call KPLIB_fnc_isClassUAV)) then { - if (KP_liberation_air_vehicle_building_near && - ((((_build_item select 0) isKindOf "Helicopter") && (KP_liberation_heli_count < KP_liberation_heli_slots)) || - (((_build_item select 0) isKindOf "Plane") && (KP_liberation_plane_count < KP_liberation_plane_slots))) + if (KPLIB_air_vehicle_building_near && + ((((_build_item select 0) isKindOf "Helicopter") && (KPLIB_heli_count < KPLIB_heli_slots)) || + (((_build_item select 0) isKindOf "Plane") && (KPLIB_plane_count < KPLIB_plane_slots))) ) then { _affordable = true; }; } else { - if (!((toLower (_build_item select 0)) in KPLIB_airSlots) || (((toLower (_build_item select 0)) in KPLIB_airSlots) && KP_liberation_air_vehicle_building_near)) then { + if (!((toLower (_build_item select 0)) in KPLIB_airSlots) || (((toLower (_build_item select 0)) in KPLIB_airSlots) && KPLIB_air_vehicle_building_near)) then { _affordable = true; }; }; @@ -161,20 +161,20 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { ctrlEnable [ 120, _affordable && _linked_unlocked && !(_squad_full) ]; ctrlEnable [ 121, _affordable_crew && _linked_unlocked ]; - ctrlSetText [131, format [ "%1 : %2" , localize "STR_MANPOWER", (floor KP_liberation_supplies)]] ; - ctrlSetText [132, format [ "%1 : %2" , localize "STR_AMMO", (floor KP_liberation_ammo)]]; - ctrlSetText [133, format [ "%1 : %2" , localize "STR_FUEL", (floor KP_liberation_fuel)]]; + ctrlSetText [131, format [ "%1 : %2" , localize "STR_MANPOWER", (floor KPLIB_supplies)]] ; + ctrlSetText [132, format [ "%1 : %2" , localize "STR_AMMO", (floor KPLIB_ammo)]]; + ctrlSetText [133, format [ "%1 : %2" , localize "STR_FUEL", (floor KPLIB_fuel)]]; ((findDisplay 5501) displayCtrl (134)) ctrlSetStructuredText formatText [ "%1/%2 %3 - %4/%5 %6 - %7/%8 %9", unitcap, ([] call KPLIB_fnc_getLocalCap), image "\a3\Ui_F_Curator\Data\Displays\RscDisplayCurator\modeGroups_ca.paa", - KP_liberation_heli_count, - KP_liberation_heli_slots, + KPLIB_heli_count, + KPLIB_heli_slots, image "\A3\air_f_beta\Heli_Transport_01\Data\UI\Map_Heli_Transport_01_base_CA.paa", - KP_liberation_plane_count, - KP_liberation_plane_slots, + KPLIB_plane_count, + KPLIB_plane_slots, image "\A3\Air_F_EPC\Plane_CAS_01\Data\UI\Map_Plane_CAS_01_CA.paa" ]; diff --git a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf index bbaa5f0cc..f341c2333 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf @@ -2,11 +2,11 @@ params ["_informant"]; if (isDedicated) exitWith {}; -if (KP_liberation_civinfo_debug > 0) then {[format ["civinfo_escort called on: %1 - Parameters: [%2]", debug_source, _informant], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_escort called on: %1 - Parameters: [%2]", debug_source, _informant], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; waitUntil {sleep 0.5; local _informant || !alive _informant}; -if !(alive _informant) exitWith {if (KP_liberation_civinfo_debug > 0) then {[format ["civinfo_escort exited by: %1 - Informant isn't alive", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if !(alive _informant) exitWith {if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_escort exited by: %1 - Informant isn't alive", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _is_near_fob = false; @@ -39,9 +39,9 @@ if (alive _informant) then { sleep 5; [_informant, "AidlPsitMstpSnonWnonDnon_ground00"] remoteExecCall ["switchMove"]; [_informant] remoteExec ["civinfo_delivered",2]; - if (KP_liberation_civinfo_debug > 0) then {["civinfo_escort -> Informant at FOB", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["civinfo_escort -> Informant at FOB", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; sleep 600; deleteVehicle _informant; - if (KP_liberation_civinfo_debug > 0) then {[format ["civinfo_escort finished by: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_escort finished by: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; }; }; diff --git a/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf b/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf index 4080da32a..1f2ad6e25 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf @@ -2,7 +2,7 @@ if (isDedicated) exitWith {}; params ["_notif_id", ["_pos", getpos player]]; -if (KP_liberation_civinfo_debug > 0) then {[format ["civinfo_notifications called on: %1 - Parameters: [%2, %3]", debug_source, _notif_id, _pos], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_notifications called on: %1 - Parameters: [%2, %3]", debug_source, _notif_id, _pos], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; switch (_notif_id) do { case 0: { diff --git a/Missionframework/scripts/client/commander/open_logistic.sqf b/Missionframework/scripts/client/commander/open_logistic.sqf index eabe4df01..bc4345028 100644 --- a/Missionframework/scripts/client/commander/open_logistic.sqf +++ b/Missionframework/scripts/client/commander/open_logistic.sqf @@ -14,11 +14,11 @@ _logi_destinations = []; { _logi_destinations pushBack [(format ["FOB %1", military_alphabet select _forEachIndex]), (_x select 0), (_x select 1), (_x select 2), (_x select 3)]; -} forEach KP_liberation_fob_resources; +} forEach KPLIB_fob_resources; { _logi_destinations pushBack [(_x select 0), (markerPos (_x select 1)), (_x select 9), (_x select 10), (_x select 11)]; -} forEach KP_liberation_production; +} forEach KPLIB_production; _logi_destinations sort true; @@ -61,35 +61,35 @@ while {dialog && (alive player)} do { if (addLogiGroup == 1) then { addLogiGroup = 0; [_selectedGroup] remoteExec ["add_logiGroup_remote_call",2]; - waitUntil {sleep 0.5; _logi_count != (count KP_liberation_logistics)}; + waitUntil {sleep 0.5; _logi_count != (count KPLIB_logistics)}; }; if (deleteLogiGroup == 1) then { deleteLogiGroup = 0; [_selectedGroup] remoteExec ["del_logiGroup_remote_call",2]; lbSetCurSel [75802,-1]; - waitUntil {sleep 0.5; _logi_count != (count KP_liberation_logistics)}; + waitUntil {sleep 0.5; _logi_count != (count KPLIB_logistics)}; }; if (buyLogiTruck == 1) then { buyLogiTruck = 0; _tempvariable = _selectedGroup select 1; - [_listselect, _nearfob, clientOwner, KP_liberation_supplies, KP_liberation_ammo, KP_liberation_fuel] remoteExec ["add_logiTruck_remote_call",2]; - waitUntil {sleep 0.5; (_tempvariable != ((KP_liberation_logistics select _listselect) select 1)) || (logiError == 1)}; + [_listselect, _nearfob, clientOwner, KPLIB_supplies, KPLIB_ammo, KPLIB_fuel] remoteExec ["add_logiTruck_remote_call",2]; + waitUntil {sleep 0.5; (_tempvariable != ((KPLIB_logistics select _listselect) select 1)) || (logiError == 1)}; }; if (sellLogiTruck == 1) then { sellLogiTruck = 0; _tempvariable = _selectedGroup select 1; [_listselect, _nearfob, clientOwner] remoteExec ["del_logiTruck_remote_call",2]; - waitUntil {sleep 0.5; (_tempvariable != ((KP_liberation_logistics select _listselect) select 1)) || (logiError == 1)}; + waitUntil {sleep 0.5; (_tempvariable != ((KPLIB_logistics select _listselect) select 1)) || (logiError == 1)}; }; if (saveConvoySettings == 1) then { saveConvoySettings = 0; if (((lbCurSel 758024) != -1) && ((lbCurSel 758029) != -1)) then { [_listselect, ((_logi_destinations select lbCurSel 758024) select 1), [parseNumber ctrlText 758025,parseNumber ctrlText 758026,parseNumber ctrlText 758027], ((_logi_destinations select lbCurSel 758029) select 1), [parseNumber ctrlText 758030,parseNumber ctrlText 758031,parseNumber ctrlText 758032], clientOwner] remoteExec ["save_logi_remote_call",2]; - waitUntil {sleep 0.5; (!(_selectedGroup isEqualTo (KP_liberation_logistics select _listselect))) || (logiError == 1)}; + waitUntil {sleep 0.5; (!(_selectedGroup isEqualTo (KPLIB_logistics select _listselect))) || (logiError == 1)}; } else { hint localize "STR_LOGISTIC_SAVE_ERROR"; }; @@ -98,19 +98,19 @@ while {dialog && (alive player)} do { if (convoyStandby == 1) then { convoyStandby = 0; [_listselect, clientOwner] remoteExec ["abort_logi_remote_call",2]; - waitUntil {sleep 0.5; (!(_selectedGroup isEqualTo (KP_liberation_logistics select _listselect))) || (logiError == 1)}; + waitUntil {sleep 0.5; (!(_selectedGroup isEqualTo (KPLIB_logistics select _listselect))) || (logiError == 1)}; }; logiError = 0; _tempvariable = nil; ctrlEnable [75803, true]; - if (_logi_count != (count KP_liberation_logistics)) then { - _logi_count = (count KP_liberation_logistics); + if (_logi_count != (count KPLIB_logistics)) then { + _logi_count = (count KPLIB_logistics); lbClear 75802; { lbAdd [75802, (_x select 0)]; - } forEach KP_liberation_logistics; + } forEach KPLIB_logistics; }; if ((_logi_count > 0) && (lbCurSel 75802 == -1)) then { @@ -122,7 +122,7 @@ while {dialog && (alive player)} do { if ((_listselect != -1) && (_logi_count > 0)) then { {ctrlShow [_x, true]} forEach _detailControls; - _selectedGroup = +(KP_liberation_logistics select _listselect); + _selectedGroup = +(KPLIB_logistics select _listselect); if ((_selectedGroup select 7) == 0) then { ctrlEnable [758021, true]; diff --git a/Missionframework/scripts/client/commander/open_production.sqf b/Missionframework/scripts/client/commander/open_production.sqf index d7c7b3544..23a653892 100644 --- a/Missionframework/scripts/client/commander/open_production.sqf +++ b/Missionframework/scripts/client/commander/open_production.sqf @@ -20,7 +20,7 @@ _mapdisplay = ((findDisplay 75801) displayCtrl 758016); lbClear 75802; { lbAdd [75802, (markerText (_x select 1))]; -} forEach KP_liberation_production; +} forEach KPLIB_production; ctrlMapAnimClear _mapdisplay; @@ -32,7 +32,7 @@ while {dialog && (alive player)} do { if (saveSectorSetting == 1) then { saveSectorSetting = 0; [(_selectedSector select 1), new_production] remoteExec ["change_prod_remote_call",2]; - waitUntil {sleep 0.5; (!(_selectedSector isEqualTo (KP_liberation_production select _listselect)))}; + waitUntil {sleep 0.5; (!(_selectedSector isEqualTo (KPLIB_production select _listselect)))}; }; _listselect = -1; @@ -52,11 +52,11 @@ while {dialog && (alive player)} do { }; lbSetColor [75802, _listselect, _listcolor]; - } forEach KP_liberation_production; + } forEach KPLIB_production; _listselect = (lbCurSel 75802); waitUntil {_listselect == (lbCurSel 75802)}; - _selectedSector = +(KP_liberation_production select _listselect); + _selectedSector = +(KPLIB_production select _listselect); ctrlSetText [75803,(_selectedSector select 0)]; @@ -64,9 +64,9 @@ while {dialog && (alive player)} do { ctrlSetText [75804, _sectorType]; if ((count (_selectedSector select 3)) > 0) then { - _storage = ((nearestObjects [((_selectedSector select 3) select 0), [KP_liberation_small_storage_building], 25]) select 0); + _storage = ((nearestObjects [((_selectedSector select 3) select 0), [KPLIB_small_storage_building], 25]) select 0); _crateCount = count (attachedObjects _storage); - _crateMax = count (KP_liberation_small_storage_positions); + _crateMax = count (KPLIB_small_storage_positions); if (_crateCount >= _crateMax) then { _color_actual = _color_negative; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index 48266fb4c..229543828 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -1,5 +1,5 @@ [] call compileFinal preprocessFileLineNumbers "scripts\client\misc\init_markers.sqf"; -switch (KP_liberation_arsenal) do { +switch (KPLIB_arsenal) do { case 1: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\custom.sqf";}; case 2: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\rhsusaf.sqf";}; case 3: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\3cbBAF.sqf";}; @@ -39,17 +39,17 @@ execVM "scripts\client\ammoboxes\ammobox_action_manager.sqf"; execVM "scripts\client\build\build_overlay.sqf"; execVM "scripts\client\build\do_build.sqf"; execVM "scripts\client\commander\enforce_whitelist.sqf"; -if (KP_liberation_mapmarkers) then {execVM "scripts\client\markers\empty_vehicles_marker.sqf";}; +if (KPLIB_mapmarkers) then {execVM "scripts\client\markers\empty_vehicles_marker.sqf";}; execVM "scripts\client\markers\fob_markers.sqf"; -if (!KP_liberation_high_command && KP_liberation_mapmarkers) then {execVM "scripts\client\markers\group_icons.sqf";}; +if (!KPLIB_high_command && KPLIB_mapmarkers) then {execVM "scripts\client\markers\group_icons.sqf";}; execVM "scripts\client\markers\hostile_groups.sqf"; -if (KP_liberation_mapmarkers) then {execVM "scripts\client\markers\huron_marker.sqf";} else {deleteMarkerLocal "huronmarker"}; +if (KPLIB_mapmarkers) then {execVM "scripts\client\markers\huron_marker.sqf";} else {deleteMarkerLocal "huronmarker"}; execVM "scripts\client\markers\sector_manager.sqf"; execVM "scripts\client\markers\spot_timer.sqf"; execVM "scripts\client\misc\broadcast_squad_colors.sqf"; execVM "scripts\client\misc\init_arsenal.sqf"; execVM "scripts\client\misc\permissions_warning.sqf"; -if (!KP_liberation_ace) then {execVM "scripts\client\misc\resupply_manager.sqf";}; +if (!KPLIB_ace) then {execVM "scripts\client\misc\resupply_manager.sqf";}; execVM "scripts\client\misc\secondary_jip.sqf"; execVM "scripts\client\misc\synchronise_vars.sqf"; execVM "scripts\client\misc\synchronise_eco.sqf"; @@ -88,6 +88,6 @@ execVM "scripts\client\ui\intro.sqf"; [player] joinSilent (createGroup [KPLIB_side_friendly, true]); // Start Tutorial -if (KP_liberation_tutorial && {player isEqualTo ([] call KPLIB_fnc_getCommander)}) then { +if (KPLIB_tutorial && {player isEqualTo ([] call KPLIB_fnc_getCommander)}) then { [] call KPLIB_fnc_tutorial; }; diff --git a/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf b/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf index da3d2ac92..98723e5b2 100644 --- a/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf +++ b/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf @@ -6,8 +6,8 @@ _cfg = configFile >> "cfgVehicles"; _vehtomark = []; _support_to_skip = [ - KP_liberation_recycle_building, - KP_liberation_air_vehicle_building, + KPLIB_recycle_building, + KPLIB_air_vehicle_building, "B_Slingload_01_Repair_F", "B_Slingload_01_Fuel_F", "B_Slingload_01_Ammo_F" diff --git a/Missionframework/scripts/client/markers/fob_markers.sqf b/Missionframework/scripts/client/markers/fob_markers.sqf index 5eb8548d1..0a2314e68 100644 --- a/Missionframework/scripts/client/markers/fob_markers.sqf +++ b/Missionframework/scripts/client/markers/fob_markers.sqf @@ -23,7 +23,7 @@ while {true} do { }; }; - if (KP_liberation_mobilerespawn) then { + if (KPLIB_mobilerespawn) then { private _respawn_trucks = [] call KPLIB_fnc_getMobileRespawns; if (count _markers_mobilespawns != count _respawn_trucks) then { diff --git a/Missionframework/scripts/client/markers/update_production_sites.sqf b/Missionframework/scripts/client/markers/update_production_sites.sqf index 30ea9fc1b..16d5b6d83 100644 --- a/Missionframework/scripts/client/markers/update_production_sites.sqf +++ b/Missionframework/scripts/client/markers/update_production_sites.sqf @@ -1,12 +1,12 @@ waitUntil {!isNil "save_is_loaded"}; -waitUntil {!isNil "KP_liberation_production_markers"}; +waitUntil {!isNil "KPLIB_production_markers"}; waitUntil {save_is_loaded}; -private _KP_liberation_production_markers_old = [0]; +private _KPLIB_production_markers_old = [0]; while {KPLIB_endgame == 0} do { waitUntil {sleep 5; - !(_KP_liberation_production_markers_old isEqualTo KP_liberation_production_markers) + !(_KPLIB_production_markers_old isEqualTo KPLIB_production_markers) }; { @@ -16,7 +16,7 @@ while {KPLIB_endgame == 0} do { if (_x select 3) then {_marker_text = _marker_text + "F";}; _marker_text = _marker_text + "]"; (_x select 0) setMarkerTextLocal _marker_text; - } forEach KP_liberation_production_markers; + } forEach KPLIB_production_markers; - _KP_liberation_production_markers_old = +KP_liberation_production_markers; + _KPLIB_production_markers_old = +KPLIB_production_markers; }; diff --git a/Missionframework/scripts/client/misc/init_arsenal.sqf b/Missionframework/scripts/client/misc/init_arsenal.sqf index 5be5b5882..01027c212 100644 --- a/Missionframework/scripts/client/misc/init_arsenal.sqf +++ b/Missionframework/scripts/client/misc/init_arsenal.sqf @@ -1,10 +1,10 @@ -if (KP_liberation_arsenalUsePreset) then { +if (KPLIB_arsenalUsePreset) then { private _crawled = [] call KPLIB_fnc_crawlAllItems; private _weapons = []; private _magazines = []; private _items = []; private _backpacks = []; - KP_liberation_allowed_items = []; + KPLIB_allowed_items = []; if (isNil "KPLIB_arsenal_weapons") then {KPLIB_arsenal_weapons = []}; if (isNil "KPLIB_arsenal_magazines") then {KPLIB_arsenal_magazines = []}; @@ -19,10 +19,10 @@ if (KP_liberation_arsenalUsePreset) then { {if (!(_x in blacklisted_from_arsenal)) then {_weapons pushBack _x};} forEach (_crawled select 0); }; [missionNamespace, _weapons] call BIS_fnc_addVirtualWeaponCargo; - KP_liberation_allowed_items append _weapons; + KPLIB_allowed_items append _weapons; } else { [missionNamespace, KPLIB_arsenal_weapons] call BIS_fnc_addVirtualWeaponCargo; - KP_liberation_allowed_items append KPLIB_arsenal_weapons; + KPLIB_allowed_items append KPLIB_arsenal_weapons; }; // Support for CBA disposable launchers, https://github.com/CBATeam/CBA_A3/wiki/Disposable-Launchers @@ -39,8 +39,8 @@ if (KP_liberation_arsenalUsePreset) then { _normalLauncher params ["_loadedLauncher"]; _disposableLaunchers pushBack _loadedLauncher; }; - } forEach KP_liberation_allowed_items; - KP_liberation_allowed_items append _disposableLaunchers; + } forEach KPLIB_allowed_items; + KPLIB_allowed_items append _disposableLaunchers; }; if ((count KPLIB_arsenal_magazines) == 0) then { @@ -50,10 +50,10 @@ if (KP_liberation_arsenalUsePreset) then { {if (!(_x in blacklisted_from_arsenal)) then {_magazines pushBack _x};} forEach (_crawled select 1); }; [missionNamespace, _magazines] call BIS_fnc_addVirtualMagazineCargo; - KP_liberation_allowed_items append _magazines; + KPLIB_allowed_items append _magazines; } else { [missionNamespace, KPLIB_arsenal_magazines] call BIS_fnc_addVirtualMagazineCargo; - KP_liberation_allowed_items append KPLIB_arsenal_magazines; + KPLIB_allowed_items append KPLIB_arsenal_magazines; }; if ((count KPLIB_arsenal_items) == 0) then { @@ -63,10 +63,10 @@ if (KP_liberation_arsenalUsePreset) then { {if (!(_x in blacklisted_from_arsenal)) then {_items pushBack _x};} forEach (_crawled select 2); }; [missionNamespace, _items] call BIS_fnc_addVirtualItemCargo; - KP_liberation_allowed_items append _items; + KPLIB_allowed_items append _items; } else { [missionNamespace, KPLIB_arsenal_items] call BIS_fnc_addVirtualItemCargo; - KP_liberation_allowed_items append KPLIB_arsenal_items; + KPLIB_allowed_items append KPLIB_arsenal_items; }; if ((count KPLIB_arsenal_backpacks) == 0) then { @@ -76,38 +76,38 @@ if (KP_liberation_arsenalUsePreset) then { {if (!(_x in blacklisted_from_arsenal)) then {_backpacks pushBack _x};} forEach (_crawled select 3); }; [missionNamespace, _backpacks] call BIS_fnc_addVirtualBackpackCargo; - KP_liberation_allowed_items append _backpacks; + KPLIB_allowed_items append _backpacks; } else { [missionNamespace, KPLIB_arsenal_backpacks] call BIS_fnc_addVirtualBackpackCargo; - KP_liberation_allowed_items append KPLIB_arsenal_backpacks; + KPLIB_allowed_items append KPLIB_arsenal_backpacks; }; { if ((_x find "rhs_acc") == 0) then { - KP_liberation_allowed_items_extension append [_x + "_3d", _x + "_pip"]; + KPLIB_allowed_items_extension append [_x + "_3d", _x + "_pip"]; }; if ((_x find "rhsusf_acc") == 0) then { - KP_liberation_allowed_items_extension append [_x + "_3d", _x + "_pip"]; + KPLIB_allowed_items_extension append [_x + "_3d", _x + "_pip"]; }; - } forEach KP_liberation_allowed_items; + } forEach KPLIB_allowed_items; - if ((count KP_liberation_allowed_items_extension) > 0) then { - KP_liberation_allowed_items append KP_liberation_allowed_items_extension; + if ((count KPLIB_allowed_items_extension) > 0) then { + KPLIB_allowed_items append KPLIB_allowed_items_extension; }; - if (KP_liberation_ace && KP_liberation_arsenal_type) then { - [player, KP_liberation_allowed_items, false] call ace_arsenal_fnc_addVirtualItems; + if (KPLIB_ace && KPLIB_arsenal_type) then { + [player, KPLIB_allowed_items, false] call ace_arsenal_fnc_addVirtualItems; }; // Lowercase all classnames - KP_liberation_allowed_items = KP_liberation_allowed_items apply {toLower _x}; + KPLIB_allowed_items = KPLIB_allowed_items apply {toLower _x}; } else { [missionNamespace, true] call BIS_fnc_addVirtualWeaponCargo; [missionNamespace, true] call BIS_fnc_addVirtualMagazineCargo; [missionNamespace, true] call BIS_fnc_addVirtualItemCargo; [missionNamespace, true] call BIS_fnc_addVirtualBackpackCargo; - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_arsenal_type) then { [player, true, false] call ace_arsenal_fnc_addVirtualItems; }; }; diff --git a/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf b/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf index 12ce8aeff..37416cc1d 100644 --- a/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf +++ b/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf @@ -19,11 +19,11 @@ player addEventHandler ["GetInMan", {[ _this select 2] execVM "scripts\kp_fuel_c //CONFIG // Time in Minutes till a full tank depletes when the vehicle is standing with running engine -private _kp_neutral_consumption = KP_liberation_fuel_neutral; +private _kp_neutral_consumption = KPLIB_fuel_neutral; // Time in Minutes till a full tank depletes when the vehicle is driving -private _kp_normal_consumption = KP_liberation_fuel_normal; +private _kp_normal_consumption = KPLIB_fuel_normal; // Time in Minutes till a full tank depletes when the vehicle is driving at max speed -private _kp_max_consumption = KP_liberation_fuel_max; +private _kp_max_consumption = KPLIB_fuel_max; /* DO NOT EDIT BELOW diff --git a/Missionframework/scripts/client/misc/playerNamespace.sqf b/Missionframework/scripts/client/misc/playerNamespace.sqf index 0cef108f0..518aeace9 100644 --- a/Missionframework/scripts/client/misc/playerNamespace.sqf +++ b/Missionframework/scripts/client/misc/playerNamespace.sqf @@ -37,18 +37,18 @@ while {true} do { player setVariable ["KPLIB_fobPos", _fobPos]; // Direct acces due to config, commander or admin - player setVariable ["KPLIB_hasDirectAccess", (getPlayerUID player) in KP_liberation_commander_actions || {player == ([] call KPLIB_fnc_getCommander)} || {serverCommandAvailable "#kick"}]; + player setVariable ["KPLIB_hasDirectAccess", (getPlayerUID player) in KPLIB_commander_actions || {player == ([] call KPLIB_fnc_getCommander)} || {serverCommandAvailable "#kick"}]; // Outside of startbase "safezone" player setVariable ["KPLIB_isAwayFromStart", (player distance2d startbase) > 1000]; // Is near an arsenal object - if (KP_liberation_mobilearsenal) then { + if (KPLIB_mobilearsenal) then { player setVariable ["KPLIB_isNearArsenal", !(((player nearObjects [Arsenal_typename, 5]) select {getObjectType _x >= 8}) isEqualTo [])]; }; // Is near a mobile respawn - if (KP_liberation_mobilerespawn) then { + if (KPLIB_mobilerespawn) then { player setVariable ["KPLIB_isNearMobRespawn", !((player nearEntities [[Respawn_truck_typename, huron_typename], 10]) isEqualTo [])]; }; @@ -56,7 +56,7 @@ while {true} do { player setVariable ["KPLIB_isNearStart", (player distance2d startbase) < 200]; // Nearest activated sector and possible production data - player setVariable ["KPLIB_nearProd", KP_liberation_production param [KP_liberation_production findIf {(_x select 1) isEqualTo ([100] call KPLIB_fnc_getNearestSector)}, []]]; + player setVariable ["KPLIB_nearProd", KPLIB_production param [KPLIB_production findIf {(_x select 1) isEqualTo ([100] call KPLIB_fnc_getNearestSector)}, []]]; player setVariable ["KPLIB_nearSector", [KPLIB_sector_size] call KPLIB_fnc_getNearestSector]; // Zeus module synced to player diff --git a/Missionframework/scripts/client/misc/synchronise_eco.sqf b/Missionframework/scripts/client/misc/synchronise_eco.sqf index 091391797..868a52f72 100644 --- a/Missionframework/scripts/client/misc/synchronise_eco.sqf +++ b/Missionframework/scripts/client/misc/synchronise_eco.sqf @@ -6,9 +6,9 @@ while {true} do { sleep 0.2; count sync_eco > 0; }; - KP_liberation_production = sync_eco select 0; - KP_liberation_logistics = sync_eco select 1; - KP_liberation_production_markers = sync_eco select 2; + KPLIB_production = sync_eco select 0; + KPLIB_logistics = sync_eco select 1; + KPLIB_production_markers = sync_eco select 2; sync_eco = []; one_eco_done = true; }; diff --git a/Missionframework/scripts/client/misc/synchronise_vars.sqf b/Missionframework/scripts/client/misc/synchronise_vars.sqf index 6f05a220c..ea8d17cec 100644 --- a/Missionframework/scripts/client/misc/synchronise_vars.sqf +++ b/Missionframework/scripts/client/misc/synchronise_vars.sqf @@ -6,20 +6,20 @@ waitUntil {!isNil "sync_vars"}; while {true} do { waitUntil {sleep 0.2; (count sync_vars) > 0}; - KP_liberation_fob_resources = sync_vars select 0; - KP_liberation_supplies_global = sync_vars select 1; - KP_liberation_ammo_global = sync_vars select 2; - KP_liberation_fuel_global = sync_vars select 3; + KPLIB_fob_resources = sync_vars select 0; + KPLIB_supplies_global = sync_vars select 1; + KPLIB_ammo_global = sync_vars select 2; + KPLIB_fuel_global = sync_vars select 3; unitcap = sync_vars select 4; - KP_liberation_heli_count = sync_vars select 5; - KP_liberation_plane_count = sync_vars select 6; - KP_liberation_heli_slots = sync_vars select 7; - KP_liberation_plane_slots = sync_vars select 8; + KPLIB_heli_count = sync_vars select 5; + KPLIB_plane_count = sync_vars select 6; + KPLIB_heli_slots = sync_vars select 7; + KPLIB_plane_slots = sync_vars select 8; combat_readiness = sync_vars select 9; resources_intel = sync_vars select 10; infantry_cap = sync_vars select 11; - KP_liberation_civ_rep = sync_vars select 12; - KP_liberation_guerilla_strength = sync_vars select 13; + KPLIB_civ_rep = sync_vars select 12; + KPLIB_guerilla_strength = sync_vars select 13; infantry_weight = sync_vars select 14; armor_weight = sync_vars select 15; air_weight = sync_vars select 16; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 3caf3ea8c..5f3ccb1f1 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -21,8 +21,8 @@ waitUntil {cinematic_camera_stop}; private _basenamestr = "Operation Base"; -KP_liberation_respawn_time = time; -KP_liberation_respawn_mobile_done = false; +KPLIB_respawn_time = time; +KPLIB_respawn_mobile_done = false; while {true} do { waitUntil { @@ -59,7 +59,7 @@ while {true} do { // Get loadouts either from ACE or BI arsenals private ["_loadouts_data"]; - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_arsenal_type) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -86,8 +86,8 @@ while {true} do { choiceslist = choiceslist + [[format ["FOB %1 - %2", (military_alphabet select _idx),mapGridPosition (KPLIB_all_fobs select _idx)],KPLIB_all_fobs select _idx]]; }; - if (KP_liberation_mobilerespawn) then { - if (KP_liberation_respawn_time <= time) then { + if (KPLIB_mobilerespawn) then { + if (KPLIB_respawn_time <= time) then { private _respawn_trucks = [] call KPLIB_fnc_getMobileRespawns; for [ {_idx=0},{_idx < count _respawn_trucks},{_idx=_idx+1} ] do { @@ -159,7 +159,7 @@ while {true} do { if (count (choiceslist select _idxchoice) == 3) then { private _truck = (choiceslist select _idxchoice) select 2; player setposATL (_truck getPos [5 + (random 3), random 360]); - KP_liberation_respawn_mobile_done = true; + KPLIB_respawn_mobile_done = true; } else { private _destpos = ((choiceslist select _idxchoice) select 1); player setposATL [((_destpos select 0) + 5) - (random 10),((_destpos select 1) + 5) - (random 10),(_destpos select 2)]; @@ -167,7 +167,7 @@ while {true} do { if ((lbCurSel 203) > 0) then { private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1); - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_arsenal_type) then { player setUnitLoadout (_selectedLoadout select 1); } else { [player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory; @@ -187,18 +187,18 @@ while {true} do { if (alive player && deploy == 1) then { [_spawn_str] spawn spawn_camera; - if (KP_liberation_respawn_mobile_done) then { - KP_liberation_respawn_time = time + KP_liberation_respawn_cooldown; - KP_liberation_respawn_mobile_done = false; + if (KPLIB_respawn_mobile_done) then { + KPLIB_respawn_time = time + KPLIB_respawn_cooldown; + KPLIB_respawn_mobile_done = false; }; }; - if (KP_liberation_arsenalUsePreset) then { + if (KPLIB_arsenalUsePreset) then { [_backpack] call KPLIB_fnc_checkGear; }; - if (KP_liberation_mobilerespawn && (KP_liberation_respawn_time > time)) then { - hint format [localize "STR_RESPAWN_COOLDOWN_HINT", ceil ((KP_liberation_respawn_time - time) / 60)]; + if (KPLIB_mobilerespawn && (KPLIB_respawn_time > time)) then { + hint format [localize "STR_RESPAWN_COOLDOWN_HINT", ceil ((KPLIB_respawn_time - time) / 60)]; uiSleep 12; hint ""; }; diff --git a/Missionframework/scripts/client/ui/ui_manager.sqf b/Missionframework/scripts/client/ui/ui_manager.sqf index 372072112..fd75f773d 100644 --- a/Missionframework/scripts/client/ui/ui_manager.sqf +++ b/Missionframework/scripts/client/ui/ui_manager.sqf @@ -11,11 +11,11 @@ private _sectorcontrols = [ ]; KPLIB_ui_notif = ""; -KP_liberation_supplies = 0; -KP_liberation_ammo = 0; -KP_liberation_fuel = 0; -KP_liberation_air_vehicle_building_near = false; -KP_liberation_recycle_building_near = false; +KPLIB_supplies = 0; +KPLIB_ammo = 0; +KPLIB_fuel = 0; +KPLIB_air_vehicle_building_near = false; +KPLIB_recycle_building_near = false; waitUntil { !isNil "synchro_done" }; waitUntil { synchro_done }; @@ -61,28 +61,28 @@ while {true} do { private _nearestFob = player getVariable "KPLIB_fobPos"; ([_nearestFob] call KPLIB_fnc_getFobResources) params ["", "_supplies", "_ammo", "_fuel", "_hasAir", "_hasRecycling"]; - if (KP_liberation_resources_global || {_visibleMap}) then { + if (KPLIB_resources_global || {_visibleMap}) then { // Overwrite FOB name in global mode _currentFob = localize "STR_RESOURCE_GLOBAL"; - KP_liberation_supplies = KP_liberation_supplies_global; - KP_liberation_ammo = KP_liberation_ammo_global; - KP_liberation_fuel = KP_liberation_fuel_global; + KPLIB_supplies = KPLIB_supplies_global; + KPLIB_ammo = KPLIB_ammo_global; + KPLIB_fuel = KPLIB_fuel_global; } else { - KP_liberation_supplies = _supplies; - KP_liberation_ammo = _ammo; - KP_liberation_fuel = _fuel; + KPLIB_supplies = _supplies; + KPLIB_ammo = _ammo; + KPLIB_fuel = _fuel; }; // TODO this is used by build scripts, move to relevant places - KP_liberation_air_vehicle_building_near = _hasAir; - KP_liberation_recycle_building_near = _hasRecycling; + KPLIB_air_vehicle_building_near = _hasAir; + KPLIB_recycle_building_near = _hasRecycling; } else { _showResources = false; - KP_liberation_supplies = 0; - KP_liberation_ammo = 0; - KP_liberation_fuel = 0; - KP_liberation_air_vehicle_building_near = false; - KP_liberation_recycle_building_near = false; + KPLIB_supplies = 0; + KPLIB_ammo = 0; + KPLIB_fuel = 0; + KPLIB_air_vehicle_building_near = false; + KPLIB_recycle_building_near = false; }; if (_overlayVisible) then { diff --git a/Missionframework/scripts/server/ai/prisonner_ai.sqf b/Missionframework/scripts/server/ai/prisonner_ai.sqf index 65603008d..0dfa5857e 100644 --- a/Missionframework/scripts/server/ai/prisonner_ai.sqf +++ b/Missionframework/scripts/server/ai/prisonner_ai.sqf @@ -24,7 +24,7 @@ if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == KPLIB_side_e sleep 1; private _grp = createGroup [KPLIB_side_civilian, true]; [_unit] joinSilent _grp; - if (KP_liberation_ace) then { + if (KPLIB_ace) then { [_unit, true] call ACE_captives_fnc_setSurrendered; } else { _unit disableAI "ANIM"; @@ -38,7 +38,7 @@ if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == KPLIB_side_e }; if (alive _unit) then { - if (KP_liberation_ace) then { + if (KPLIB_ace) then { [_unit, false] call ACE_captives_fnc_setSurrendered; } else { _unit enableAI "ANIM"; diff --git a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf index af255421b..7fe1255aa 100644 --- a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf +++ b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf @@ -1,23 +1,23 @@ waitUntil {!isNil "save_is_loaded"}; -waitUntil {!isNil "KP_liberation_civ_rep"}; +waitUntil {!isNil "KPLIB_civ_rep"}; waitUntil {save_is_loaded}; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Loop spawned on: %1", debug_source], "ASYMMETRIC"] call KPLIB_fnc_log;}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Loop spawned on: %1", debug_source], "ASYMMETRIC"] call KPLIB_fnc_log;}; -KP_liberation_asymmetric_sectors = []; +KPLIB_asymmetric_sectors = []; while {KPLIB_endgame == 0} do { private _sectors_to_remove = []; { - if (!(_x in blufor_sectors) || (KP_liberation_civ_rep > -25)) then { + if (!(_x in blufor_sectors) || (KPLIB_civ_rep > -25)) then { _sectors_to_remove pushBack _x; }; - } forEach KP_liberation_asymmetric_sectors; + } forEach KPLIB_asymmetric_sectors; - KP_liberation_asymmetric_sectors = KP_liberation_asymmetric_sectors - _sectors_to_remove; + KPLIB_asymmetric_sectors = KPLIB_asymmetric_sectors - _sectors_to_remove; - if (KP_liberation_civ_rep <= -25) then { + if (KPLIB_civ_rep <= -25) then { { private _sector = _x; private _blocked = false; @@ -27,18 +27,18 @@ while {KPLIB_endgame == 0} do { if ((_x select 0) == _sector) exitWith { if ((((_x select 1) + 1800) < time) && (_units_at_sector == 0)) then { asymm_blocked_sectors = asymm_blocked_sectors - [_x]; - if (KP_liberation_asymmetric_debug > 0) then {[format ["Sector %1 removed from blocked sectors", markerText (_x select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; + if (KPLIB_asymmetric_debug > 0) then {[format ["Sector %1 removed from blocked sectors", markerText (_x select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; } else { _blocked = true; - if (KP_liberation_asymmetric_debug > 0) then {[format ["Sector %1 still blocked for ambush", markerText (_x select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; + if (KPLIB_asymmetric_debug > 0) then {[format ["Sector %1 still blocked for ambush", markerText (_x select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; }; }; } forEach asymm_blocked_sectors; - if ((_units_at_sector > 0) && !(_sector in KP_liberation_asymmetric_sectors) && !_blocked) then { - KP_liberation_asymmetric_sectors pushBack _sector; + if ((_units_at_sector > 0) && !(_sector in KPLIB_asymmetric_sectors) && !_blocked) then { + KPLIB_asymmetric_sectors pushBack _sector; - if ((random 100) <= KP_liberation_resistance_ambush_chance) then { + if ((random 100) <= KPLIB_resistance_ambush_chance) then { private _hc = [] call KPLIB_fnc_getLessLoadedHC; private _ieds = round (([] call KPLIB_fnc_crGetMulti) * KPLIB_difficulty_modifier); @@ -52,12 +52,12 @@ while {KPLIB_endgame == 0} do { }; }; - if (!(_units_at_sector > 0) && (_sector in KP_liberation_asymmetric_sectors)) then { - KP_liberation_asymmetric_sectors = KP_liberation_asymmetric_sectors - [_sector]; + if (!(_units_at_sector > 0) && (_sector in KPLIB_asymmetric_sectors)) then { + KPLIB_asymmetric_sectors = KPLIB_asymmetric_sectors - [_sector]; }; } forEach ((sectors_capture + sectors_bigtown) select {_x in blufor_sectors}); }; - publicVariable "KP_liberation_asymmetric_sectors"; + publicVariable "KPLIB_asymmetric_sectors"; publicVariable "asymm_blocked_sectors"; sleep 10; }; diff --git a/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf b/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf index 7c896e308..7390bcf25 100644 --- a/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf +++ b/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf @@ -1,6 +1,6 @@ params ["_convoy"]; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1: spawning ambush", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1: spawning ambush", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; private _pos = [0,0,0]; @@ -14,17 +14,17 @@ if (_pos isEqualTo [0,0,0]) exitWith {[format ["Logistic convoy %1 ambush: no po private _roadObj = [_pos, 400, []] call BIS_fnc_nearestRoad; if (isNull _roadObj) exitWith { - if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: no road near current convoy position", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; - KP_liberation_convoy_ambush_check = 1; + if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: no road near current convoy position", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; + KPLIB_convoy_ambush_check = 1; }; -KP_liberation_convoy_ambush_check = 2; -KP_liberation_convoy_ambush_inProgress = true; +KPLIB_convoy_ambush_check = 2; +KPLIB_convoy_ambush_inProgress = true; [0, getPos _roadObj] remoteExec ["asymm_notifications"]; private _vehicleArray = []; for "_i" from 1 to (_convoy select 1) do { - private _veh = createVehicle [KP_liberation_truck_classname, getPos _roadObj, [], 50, "NONE"]; + private _veh = createVehicle [KPLIB_truck_classname, getPos _roadObj, [], 50, "NONE"]; _veh setDir (getDir _roadObj); { private _damage = random 0.6; @@ -41,7 +41,7 @@ for "_i" from 1 to (_convoy select 1) do { private _driver = createVehicle [crewman_classname, getPos _veh, [], 12, "NONE"]; _driver setDamage 1; }; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: truck spawning done", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: truck spawning done", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; private _supplies = (_convoy select 6) select 0; private _ammo = (_convoy select 6) select 1; @@ -54,7 +54,7 @@ while {_supplies > 0} do { _amount = _supplies; }; _supplies = _supplies - _amount; - private _crate = [KP_liberation_supply_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_supply_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; _crate setPos (_crate getPos [random 60, random 360]); _crateArray pushBack [_crate]; }; @@ -65,7 +65,7 @@ while {_ammo > 0} do { _amount = _ammo; }; _ammo = _ammo - _amount; - private _crate = [KP_liberation_ammo_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_ammo_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; _crate setPos (_crate getPos [random 60, random 360]); _crateArray pushBack [_crate]; }; @@ -76,11 +76,11 @@ while {_fuel > 0} do { _amount = _fuel; }; _fuel = _fuel - _amount; - private _crate = [KP_liberation_fuel_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_fuel_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; _crate setPos (_crate getPos [random 60, random 360]); _crateArray pushBack [_crate]; }; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: resource spawning done", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: resource spawning done", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; private _grp = [getPos _roadObj] call KPLIB_fnc_spawnGuerillaGroup; @@ -96,9 +96,9 @@ _waypoint setWaypointCompletionRadius 10; _waypoint = _grp addWaypoint [getPos _roadObj, 150]; _waypoint setWaypointType "CYCLE"; _waypoint setWaypointCompletionRadius 10; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: guerillas spawning done", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: guerillas spawning done", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; -private _waitingTime = KP_liberation_convoy_ambush_duration; +private _waitingTime = KPLIB_convoy_ambush_duration; while {(({alive _x} count (units _grp)) > 0) && (_waitingTime > 0)} do { uiSleep 1; @@ -111,9 +111,9 @@ while {(({alive _x} count (units _grp)) > 0) && (_waitingTime > 0)} do { _waitingTime = _waitingTime - 1; }; }; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: ambush finished", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: ambush finished", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; -KP_liberation_convoy_ambush_inProgress = false; +KPLIB_convoy_ambush_inProgress = false; if ((_waitingTime <= 0) && (({alive _x} count (units _grp)) > 0)) then { [2] remoteExec ["asymm_notifications"]; @@ -125,16 +125,16 @@ if ((_waitingTime <= 0) && (({alive _x} count (units _grp)) > 0)) then { }; } forEach (units _grp); { - if ((typeOf (_x select 0)) == KP_liberation_ammo_crate) then { + if ((typeOf (_x select 0)) == KPLIB_ammo_crate) then { _gain = _gain + 3; } else { _gain = _gain + 2; }; deleteVehicle (_x select 0); } forEach _crateArray; - KP_liberation_guerilla_strength = KP_liberation_guerilla_strength + _gain; - if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: guerillas escaped", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; + KPLIB_guerilla_strength = KPLIB_guerilla_strength + _gain; + if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: guerillas escaped", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; } else { [1] remoteExec ["asymm_notifications"]; - if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: guerillas defeated", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; + if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: guerillas defeated", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; }; diff --git a/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf b/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf index 8f030fcd9..7ddc2ebcc 100644 --- a/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf +++ b/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf @@ -2,11 +2,11 @@ params ["_sector", "_count"]; if (_count <= 0) exitWith {}; -if (KP_liberation_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf for %1 spawned on: %2", markerText _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf for %1 spawned on: %2", markerText _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; -waitUntil {sleep 1; _sector in KP_liberation_asymmetric_sectors}; +waitUntil {sleep 1; _sector in KPLIB_asymmetric_sectors}; -if (KP_liberation_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> spawning IED %1 at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> spawning IED %1 at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _activation_radius_infantry = 6.66; private _activation_radius_vehicles = 10; @@ -28,9 +28,9 @@ if (!(isnull _roadobj)) then { _ied_obj = createMine [_ied_type, _roadpos getPos [_spread, random (360)], [], 0]; _ied_obj setdir (random 360); - if (KP_liberation_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> IED %1 spawned at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> IED %1 spawned at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; - while {(_sector in KP_liberation_asymmetric_sectors) && (mineActive _ied_obj) && !_goes_boom} do { + while {(_sector in KPLIB_asymmetric_sectors) && (mineActive _ied_obj) && !_goes_boom} do { _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_friendly}; _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_friendly}; if (count _nearinfantry >= _infantry_trigger || count _nearvehicles >= _vehicle_trigger) then { @@ -41,10 +41,10 @@ if (!(isnull _roadobj)) then { sleep 1; }; } else { - if (KP_liberation_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> _roadobj is Null for IED %1 at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> _roadobj is Null for IED %1 at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; }; -if ((KP_liberation_asymmetric_debug > 0) && !(isNull _roadobj)) then {[format ["manage_asymIED.sqf -> exit IED %1 loop at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if ((KPLIB_asymmetric_debug > 0) && !(isNull _roadobj)) then {[format ["manage_asymIED.sqf -> exit IED %1 loop at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; sleep 60; diff --git a/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf b/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf index 796b767d0..a98764aec 100644 --- a/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf +++ b/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf @@ -1,16 +1,16 @@ params ["_sector"]; -if (KP_liberation_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf for %1 spawned on: %2 - Time: %3", markerText _sector, debug_source, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf for %1 spawned on: %2 - Time: %3", markerText _sector, debug_source, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; -waitUntil {sleep 1; _sector in KP_liberation_asymmetric_sectors}; +waitUntil {sleep 1; _sector in KPLIB_asymmetric_sectors}; -private _buildings = (nearestObjects [(markerPos _sector), ["House"], 75]) select {(alive _x) && !((typeOf _x) in KP_liberation_cr_ign_buildings)}; +private _buildings = (nearestObjects [(markerPos _sector), ["House"], 75]) select {(alive _x) && !((typeOf _x) in KPLIB_cr_ign_buildings)}; private _positions = []; { _positions = _positions + ([_x] call BIS_fnc_buildingPositions); } forEach _buildings; -if (KP_liberation_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Found %1 suitable buildings in %2 - Time: %3", count _buildings, markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Found %1 suitable buildings in %2 - Time: %3", count _buildings, markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _position_indexes = []; private _position_count = count _positions; @@ -32,11 +32,11 @@ private _idxposit = 0; _idxposit = _idxposit + 1; } forEach (units _grp); -if (KP_liberation_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Units spawned in %1 - Time: %2", markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Units spawned in %1 - Time: %2", markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _attack = false; -while {(_sector in KP_liberation_asymmetric_sectors) && (!isNull _grp)} do { +while {(_sector in KPLIB_asymmetric_sectors) && (!isNull _grp)} do { private _blufor_near = {alive _x && side _x == KPLIB_side_friendly} count ((getpos (leader _grp)) nearEntities [["LAND"], 140]); if ((_blufor_near > 0) && !_attack) then { _attack = true; @@ -59,7 +59,7 @@ while {(_sector in KP_liberation_asymmetric_sectors) && (!isNull _grp)} do { sleep 1; }; -if (KP_liberation_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Exit Loop in %1 - Time: %2", markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Exit Loop in %1 - Time: %2", markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; sleep 60; @@ -71,4 +71,4 @@ if (!isNull _grp) then { } forEach (units _grp); }; -if (KP_liberation_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Ambush dropped in %1 - Time: %2", markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Ambush dropped in %1 - Time: %2", markerText _sector, diag_tickTime], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; diff --git a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf index 9fb37e59a..3edef7597 100644 --- a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf +++ b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf @@ -1,6 +1,6 @@ params ["_sector"]; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - sector_guerilla spawned on: %3", (markerText _sector), _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - sector_guerilla spawned on: %3", (markerText _sector), _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _startpos = (markerPos _sector) getPos [(1200 + (round (random 400))), (random 360)]; @@ -76,8 +76,8 @@ _spawnedGroups pushBack _grp; sleep 30; -if (((random 100) <= 25) && !(KP_liberation_guerilla_vehicles isEqualTo [])) then { - private _vehicle = (selectRandom KP_liberation_guerilla_vehicles) createVehicle _startpos; +if (((random 100) <= 25) && !(KPLIB_guerilla_vehicles isEqualTo [])) then { + private _vehicle = (selectRandom KPLIB_guerilla_vehicles) createVehicle _startpos; [_vehicle] call KPLIB_fnc_allowCrewInImmobile; private _grp = [_startpos, 2] call KPLIB_fnc_spawnGuerillaGroup; @@ -117,7 +117,7 @@ private _strengthChanged = false; { if (alive _x) then { deleteVehicle _x; - KP_liberation_guerilla_strength = KP_liberation_guerilla_strength + 2; + KPLIB_guerilla_strength = KPLIB_guerilla_strength + 2; _strengthChanged = true; }; } forEach (units _x); @@ -125,7 +125,7 @@ private _strengthChanged = false; } forEach _spawnedGroups; if (!isServer && _strengthChanged) then { - publicVariableServer "KP_liberation_guerilla_strength"; + publicVariableServer "KPLIB_guerilla_strength"; }; -if (KP_liberation_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - sector_guerilla dropped on: %3", (markerText _sector), _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - sector_guerilla dropped on: %3", (markerText _sector), _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; diff --git a/Missionframework/scripts/server/base/startgame.sqf b/Missionframework/scripts/server/base/startgame.sqf index d600ad93e..a5bf42762 100644 --- a/Missionframework/scripts/server/base/startgame.sqf +++ b/Missionframework/scripts/server/base/startgame.sqf @@ -19,7 +19,7 @@ if (KPLIB_all_fobs isEqualTo []) then { // Spawn FOB box and wait until the first FOB was built private _fobbox = objNull; while {KPLIB_all_fobs isEqualTo []} do { - _fobbox = ([FOB_box_typename, FOB_truck_typename] select KP_liberation_fob_vehicle) createVehicle (getposATL base_boxspawn); + _fobbox = ([FOB_box_typename, FOB_truck_typename] select KPLIB_fob_vehicle) createVehicle (getposATL base_boxspawn); _fobbox setdir getDir base_boxspawn; _fobbox setposATL (getposATL base_boxspawn); [_fobbox, true] call KPLIB_fnc_clearCargo; @@ -37,7 +37,7 @@ if (KPLIB_all_fobs isEqualTo []) then { // Wait a short time before paradropping the start resource crates waitUntil {sleep 1; !(KPLIB_all_fobs isEqualTo [])}; - if (KP_liberation_tutorial && {["KPLIB_Tasks_Tutorial_Fob"] call BIS_fnc_taskExists}) then { + if (KPLIB_tutorial && {["KPLIB_Tasks_Tutorial_Fob"] call BIS_fnc_taskExists}) then { waitUntil {sleep 1; ["KPLIB_Tasks_Tutorial_Fob_02"] call BIS_fnc_taskCompleted}; sleep 3; } else { @@ -56,10 +56,10 @@ if (KPLIB_all_fobs isEqualTo []) then { "FLY" ]; [_crate, true] call KPLIB_fnc_clearCargo; - _crate setVariable ["KP_liberation_crate_value", 100, true]; + _crate setVariable ["KPLIB_crate_value", 100, true]; [_crate, 500] remoteExec ["setMass", _crate]; [objNull, _crate] call BIS_fnc_curatorObjectEdited; - if (KP_liberation_ace) then {[_crate, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; + if (KPLIB_ace) then {[_crate, true, [0, 1.5, 0], 0] remoteExec ["ace_dragging_fnc_setCarryable"];}; KPLIB_startCrates pushBack _crate; }; diff --git a/Missionframework/scripts/server/base/startvehicle_spawn.sqf b/Missionframework/scripts/server/base/startvehicle_spawn.sqf index 88ac95d0a..2407678a8 100644 --- a/Missionframework/scripts/server/base/startvehicle_spawn.sqf +++ b/Missionframework/scripts/server/base/startvehicle_spawn.sqf @@ -12,7 +12,7 @@ E.g. the variables of the grasscutter placeholder objects for the little birds are named "littlebird_0", "littlebird_1", etc. - while the variable from the preset is KP_liberation_little_bird_classname. + while the variable from the preset is KPLIB_little_bird_classname. This leads to the entry below. You can also remove unwanted start vehicles by deleting the corresponding line @@ -42,10 +42,10 @@ private _veh = objNull; _veh enableSimulationGlobal true; _veh setDamage 0; _veh allowDamage true; - _veh setVariable ["KP_liberation_preplaced", true, true]; + _veh setVariable ["KPLIB_preplaced", true, true]; [_veh] call KPLIB_fnc_addObjectInit; }; } forEach [ - ["littlebird_", KP_liberation_little_bird_classname], - ["boat_", KP_liberation_boat_classname] + ["littlebird_", KPLIB_little_bird_classname], + ["boat_", KPLIB_boat_classname] ]; diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index ac203de2f..842db97e7 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -18,7 +18,7 @@ if !(_spawn_marker isEqualTo "") then { [_spawn_marker] remoteExec ["remote_call_battlegroup"]; - if (worldName in KP_liberation_battlegroup_clearance) then { + if (worldName in KPLIB_battlegroup_clearance) then { [markerPos _spawn_marker, 15] call KPLIB_fnc_createClearance; }; diff --git a/Missionframework/scripts/server/civinformant/civinfo_delivered.sqf b/Missionframework/scripts/server/civinformant/civinfo_delivered.sqf index 3c35f19a6..5b74f29d0 100644 --- a/Missionframework/scripts/server/civinformant/civinfo_delivered.sqf +++ b/Missionframework/scripts/server/civinformant/civinfo_delivered.sqf @@ -1,13 +1,13 @@ params ["_informant"]; if (isServer && alive _informant) then { - resources_intel = resources_intel + KP_liberation_civinfo_intel; + resources_intel = resources_intel + KPLIB_civinfo_intel; [2] spawn F_cr_changeCR; [1] remoteExec ["civinfo_notifications"]; sleep 6; - if ((random 100) <= KP_liberation_civinfo_task_chance) then { + if ((random 100) <= KPLIB_civinfo_task_chance) then { private _hc = [] call KPLIB_fnc_getLessLoadedHC; if (isNull _hc) then { diff --git a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf index e968e79fd..d09d5a4f1 100644 --- a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf +++ b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf @@ -1,32 +1,32 @@ waitUntil {sleep 10; ({_x in sectors_capture || _x in sectors_bigtown} count blufor_sectors) > 0}; -if (KP_liberation_civinfo_debug > 0) then {[format ["Loop spawned on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civinfo_debug > 0) then {[format ["Loop spawned on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; while {true} do { - uiSleep (KP_liberation_civinfo_min + round (random (KP_liberation_civinfo_max - KP_liberation_civinfo_min))); + uiSleep (KPLIB_civinfo_min + round (random (KPLIB_civinfo_max - KPLIB_civinfo_min))); - if (KP_liberation_civinfo_debug > 0) then {["Informant sleep passed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["Informant sleep passed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; waitUntil { sleep 10; ({_x in sectors_capture || _x in sectors_bigtown} count blufor_sectors) > 0 && - KP_liberation_civ_rep >= 25 + KPLIB_civ_rep >= 25 }; - if (KP_liberation_civinfo_debug > 0) then {["Informant waitUntil passed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["Informant waitUntil passed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; - if ((KP_liberation_civinfo_chance >= (random 100)) && KPLIB_endgame == 0) then { + if ((KPLIB_civinfo_chance >= (random 100)) && KPLIB_endgame == 0) then { private _sector = selectRandom (blufor_sectors select {_x in sectors_capture || _x in sectors_bigtown}); private _house = (nearestObjects [[((markerPos _sector select 0) - 100 + (random 200)), ((markerPos _sector select 1) - 100 + (random 200))],["House", "Building"], 100]) select 0; private _grp = createGroup [KPLIB_side_civilian, true]; private _informant = [selectRandom civilians, markerPos _sector, _grp] call KPLIB_fnc_createManagedUnit; - private _waiting_time = KP_liberation_civinfo_duration; + private _waiting_time = KPLIB_civinfo_duration; _informant setPos (selectRandom (_house buildingPos -1)); _informant setUnitPos "UP"; sleep 1; - if (KP_liberation_ace) then { + if (KPLIB_ace) then { [_informant, true] call ACE_captives_fnc_setSurrendered; } else { _informant disableAI "ANIM"; @@ -36,7 +36,7 @@ while {true} do { _informant setCaptive true; }; - if (KP_liberation_civinfo_debug > 0) then {[format ["Informant %1 spawned on: %2 - Position: %3", name _informant, debug_source, getPos _informant], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {[format ["Informant %1 spawned on: %2 - Position: %3", name _informant, debug_source, getPos _informant], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; [0, [((((getPos _informant) select 0) + 200) - random 400),((((getPos _informant) select 1) + 200) - random 400),0]] remoteExec ["civinfo_notifications"]; @@ -51,12 +51,12 @@ while {true} do { _waiting_time = _waiting_time - 1; }; - if ((KP_liberation_civinfo_debug > 0) && ((_waiting_time % 60) == 0)) then {[format ["Informant will despawn in %1 minutes", round (_waiting_time / 60)], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if ((KPLIB_civinfo_debug > 0) && ((_waiting_time % 60) == 0)) then {[format ["Informant will despawn in %1 minutes", round (_waiting_time / 60)], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; }; if (_waiting_time > 0) then { if (alive _informant) then { - if (KP_liberation_ace) then { + if (KPLIB_ace) then { [_informant, false] call ACE_captives_fnc_setSurrendered; } else { _informant enableAI "ANIM"; @@ -65,15 +65,15 @@ while {true} do { sleep 1; [_informant] remoteExec ["civinfo_escort"]; } else { - if (KP_liberation_civinfo_debug > 0) then {["Informant is dead", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["Informant is dead", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; [3] remoteExec ["civinfo_notifications"]; }; } else { deleteVehicle _informant; - if (KP_liberation_civinfo_debug > 0) then {["Informant despawned", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["Informant despawned", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; [2] remoteExec ["civinfo_notifications"]; }; } else { - if (KP_liberation_civinfo_debug > 0) then {["Informant spawn chance missed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["Informant spawn chance missed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; }; }; diff --git a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf index c18d56644..f6379ced9 100644 --- a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf +++ b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf @@ -1,9 +1,9 @@ -if (KP_liberation_civinfo_debug > 0) then {[format ["civinfo_task.sqf spawned on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_task.sqf spawned on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _spawn_marker = [2000,999999,false] call KPLIB_fnc_getOpforSpawnPoint; private _roadObj = [markerPos _spawn_marker, 400, []] call BIS_fnc_nearestRoad; -if (isNull _roadObj) exitWith {if (KP_liberation_civinfo_debug > 0) then {["civinfo_task.sqf -> no road found", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (isNull _roadObj) exitWith {if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> no road found", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _veh = createVehicle [opfor_mrap, getPos _roadObj, [], 0, "NONE"]; _veh setDir (getDir _roadObj); @@ -38,13 +38,13 @@ _waypoint setWaypointType "MOVE"; _waypoint = _grp addWaypoint [getPos _roadObj, 100]; _waypoint setWaypointType "CYCLE"; -if (KP_liberation_civinfo_debug > 0) then {[format ["civinfo_task.sqf -> vehicle and group created on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_task.sqf -> vehicle and group created on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _marker_pos = [((((getPos _roadObj) select 0) + 200) - random 400),((((getPos _roadObj) select 1) + 200) - random 400),0]; [4, _marker_pos] remoteExec ["civinfo_notifications"]; -private _time_remaining = KP_liberation_civinfo_task_duration; +private _time_remaining = KPLIB_civinfo_task_duration; while {(alive _hvt) && _time_remaining > 0} do { uiSleep 1; @@ -56,21 +56,21 @@ while {(alive _hvt) && _time_remaining > 0} do { if !(_player_near) then { _time_remaining = _time_remaining - 1; }; - if ((KP_liberation_civinfo_debug > 0) && ((_time_remaining % 60) == 0)) then {[format ["civinfo_task.sqf -> Task will despawn in %1 minutes", round (_time_remaining / 60)], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if ((KPLIB_civinfo_debug > 0) && ((_time_remaining % 60) == 0)) then {[format ["civinfo_task.sqf -> Task will despawn in %1 minutes", round (_time_remaining / 60)], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; }; -if (KP_liberation_civinfo_debug > 0) then {[format ["civinfo_task.sqf -> loop exited on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_task.sqf -> loop exited on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; if (alive _hvt) then { deleteVehicle _veh; {deleteVehicle _x} forEach (units _grp); [6] remoteExec ["civinfo_notifications"]; - if (KP_liberation_civinfo_debug > 0) then {["civinfo_task.sqf -> Task despawned", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> Task despawned", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; } else { combat_readiness = round (combat_readiness * 0.6); if (!isServer) then { publicVariableServer "combat_readiness"; }; [5] remoteExec ["civinfo_notifications"]; - if (KP_liberation_civinfo_debug > 0) then {["civinfo_task.sqf -> Task ended with success", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> Task ended with success", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; }; diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf index f43f0ccfe..02c526f5f 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf @@ -2,24 +2,24 @@ params ["_amount", ["_negative", false]]; if (!isServer) exitWith {}; -if (KP_liberation_civrep_debug > 0) then {[format ["changeCR called - Parameters [%1, %2]", _amount, _negative], "CIVREP"] call KPLIB_fnc_log;}; +if (KPLIB_civrep_debug > 0) then {[format ["changeCR called - Parameters [%1, %2]", _amount, _negative], "CIVREP"] call KPLIB_fnc_log;}; if (_negative) then { - KP_liberation_civ_rep = KP_liberation_civ_rep - _amount; + KPLIB_civ_rep = KPLIB_civ_rep - _amount; } else { - KP_liberation_civ_rep = KP_liberation_civ_rep + _amount; + KPLIB_civ_rep = KPLIB_civ_rep + _amount; }; -KP_liberation_civ_rep = -100 max (KP_liberation_civ_rep min 100); +KPLIB_civ_rep = -100 max (KPLIB_civ_rep min 100); // Set correct resistance standing -private _resistanceEnemy = [0, 1] select (KP_liberation_civ_rep < 25); -private _resistanceFriendly = [0, 1] select (KP_liberation_civ_rep >= -25); +private _resistanceEnemy = [0, 1] select (KPLIB_civ_rep < 25); +private _resistanceFriendly = [0, 1] select (KPLIB_civ_rep >= -25); KPLIB_side_resistance setFriend [KPLIB_side_enemy, _resistanceEnemy]; KPLIB_side_enemy setFriend [KPLIB_side_resistance, _resistanceEnemy]; KPLIB_side_resistance setFriend [KPLIB_side_friendly, _resistanceFriendly]; KPLIB_side_friendly setFriend [KPLIB_side_resistance, _resistanceFriendly]; -if (KP_liberation_civrep_debug > 0) then {[format ["changeCR finished - New value: %1", KP_liberation_civ_rep], "CIVREP"] call KPLIB_fnc_log;}; -if (KP_liberation_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; +if (KPLIB_civrep_debug > 0) then {[format ["changeCR finished - New value: %1", KPLIB_civ_rep], "CIVREP"] call KPLIB_fnc_log;}; +if (KPLIB_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf index d4feea5a7..e92ff18f8 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf @@ -2,10 +2,10 @@ params ["_sector"]; private _return = 0; -if (KP_liberation_cr_param_buildings) then { - _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(damage _x == 0) && !((typeOf _x) in KP_liberation_cr_ign_buildings)}); +if (KPLIB_cr_param_buildings) then { + _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(damage _x == 0) && !((typeOf _x) in KPLIB_cr_ign_buildings)}); } else { - _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(alive _x) && !((typeOf _x) in KP_liberation_cr_ign_buildings)}); + _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(alive _x) && !((typeOf _x) in KPLIB_cr_ign_buildings)}); }; _return diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf index 1fd0de0f9..227844e23 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf @@ -5,20 +5,20 @@ if (_sector in sectors_bigtown || _sector in sectors_capture) then { { if (_sector == (_x select 0)) exitWith {_penalty = (_x select 1) - ([_sector] call F_cr_getBuildings)}; - } forEach KP_liberation_cr_sectorbuildings; + } forEach KPLIB_cr_sectorbuildings; stats_civilian_buildings_destroyed = stats_civilian_buildings_destroyed + _penalty; - _penalty = _penalty * KP_liberation_cr_building_penalty; + _penalty = _penalty * KPLIB_cr_building_penalty; if (_penalty > 0) then { - [1, [(_penalty / KP_liberation_cr_building_penalty)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; + [1, [(_penalty / KPLIB_cr_building_penalty)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; }; if (_sector in sectors_bigtown) then { - [(2 * KP_liberation_cr_sector_gain - _penalty), false] spawn F_cr_changeCR; + [(2 * KPLIB_cr_sector_gain - _penalty), false] spawn F_cr_changeCR; } else { - [(KP_liberation_cr_sector_gain - _penalty), false] spawn F_cr_changeCR; + [(KPLIB_cr_sector_gain - _penalty), false] spawn F_cr_changeCR; }; [format ["Civilian sector %1 (%2) captured. Penalty: %3", markerText _sector, _sector, _penalty], "CIVREP"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/civrep/ignored/altis.sqf b/Missionframework/scripts/server/civrep/ignored/altis.sqf index 97e6c5fa4..11e810246 100644 --- a/Missionframework/scripts/server/civrep/ignored/altis.sqf +++ b/Missionframework/scripts/server/civrep/ignored/altis.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_Cargo_House_V1_F", "Land_Cargo_House_V2_F", "Land_Cargo_House_V3_F", @@ -58,4 +58,4 @@ KP_liberation_cr_ign_buildings = [ "Land_spp_Mirror_F", "Land_TTowerSmall_1_F", "Land_TTowerSmall_2_F" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/chernarus.sqf b/Missionframework/scripts/server/civrep/ignored/chernarus.sqf index 8244efba0..8dd4baff0 100644 --- a/Missionframework/scripts/server/civrep/ignored/chernarus.sqf +++ b/Missionframework/scripts/server/civrep/ignored/chernarus.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_A_Crane_02a", "Land_A_Crane_02b", "Land_A_FuelStation_Shed", @@ -154,4 +154,4 @@ KP_liberation_cr_ign_buildings = [ "Land_Wall_Gate_Kolchoz", "Land_Wall_Gate_Village", "Land_Wall_Gate_Wood1" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/chernarus2020.sqf b/Missionframework/scripts/server/civrep/ignored/chernarus2020.sqf index f050ee301..ecd16b188 100644 --- a/Missionframework/scripts/server/civrep/ignored/chernarus2020.sqf +++ b/Missionframework/scripts/server/civrep/ignored/chernarus2020.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_A_Crane_02a", "Land_popelnice", "Land_fuel_tank_small", diff --git a/Missionframework/scripts/server/civrep/ignored/enoch.sqf b/Missionframework/scripts/server/civrep/ignored/enoch.sqf index c5d8691f5..7fa61601b 100644 --- a/Missionframework/scripts/server/civrep/ignored/enoch.sqf +++ b/Missionframework/scripts/server/civrep/ignored/enoch.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_Bunker_02_double_F", "Land_Bunker_02_left_F", "Land_Bunker_02_light_double_F", diff --git a/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_summer.sqf b/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_summer.sqf index 948a312e6..2bff49b09 100644 --- a/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_summer.sqf +++ b/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_summer.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "land_gm_euro_beersign_01", "land_gm_euro_beersign_02", "land_gm_euro_beersign_03", diff --git a/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_winter.sqf b/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_winter.sqf index d6b269aeb..2b2cb743f 100644 --- a/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_winter.sqf +++ b/Missionframework/scripts/server/civrep/ignored/gm_weferlingen_winter.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "land_gm_euro_beersign_01", "land_gm_euro_beersign_02", "land_gm_euro_beersign_03", diff --git a/Missionframework/scripts/server/civrep/ignored/lythium.sqf b/Missionframework/scripts/server/civrep/ignored/lythium.sqf index d19ab52ea..85f6ae7e6 100644 --- a/Missionframework/scripts/server/civrep/ignored/lythium.sqf +++ b/Missionframework/scripts/server/civrep/ignored/lythium.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_Cargo_House_V1_F", "Land_Cargo_House_V2_F", "Land_Cargo_House_V3_F", @@ -97,4 +97,4 @@ KP_liberation_cr_ign_buildings = [ "Land_TTowerSmall_1_F", "Land_TTowerSmall_2_F", "Land_u_Addon_01_V1_dam_F" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/malden.sqf b/Missionframework/scripts/server/civrep/ignored/malden.sqf index faf77a3e1..4bd4c4d94 100644 --- a/Missionframework/scripts/server/civrep/ignored/malden.sqf +++ b/Missionframework/scripts/server/civrep/ignored/malden.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_Bunker_01_big_F", "Land_Bunker_01_small_F", "Land_cargo_addon02_V1_F", @@ -58,4 +58,4 @@ KP_liberation_cr_ign_buildings = [ "Land_TTowerSmall_1_F", "Land_TTowerSmall_2_F", "MetalBarrel_burning_F" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/panthera3.sqf b/Missionframework/scripts/server/civrep/ignored/panthera3.sqf index a97edd807..3ca6d4386 100644 --- a/Missionframework/scripts/server/civrep/ignored/panthera3.sqf +++ b/Missionframework/scripts/server/civrep/ignored/panthera3.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_AfDum_mesto2", "Land_AfDum_mesto2L", "Land_AfDum_mesto3", diff --git a/Missionframework/scripts/server/civrep/ignored/pja310.sqf b/Missionframework/scripts/server/civrep/ignored/pja310.sqf index af490c6cb..206e2a529 100644 --- a/Missionframework/scripts/server/civrep/ignored/pja310.sqf +++ b/Missionframework/scripts/server/civrep/ignored/pja310.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_A_Castle_Bastion", "Land_A_Crane_02a", "Land_A_Crane_02b", @@ -78,4 +78,4 @@ KP_liberation_cr_ign_buildings = [ "Land_Wall_L3_gate_EP1", "Land_Wall_L3_pillar_EP1", "Land_water_tank" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/sara.sqf b/Missionframework/scripts/server/civrep/ignored/sara.sqf index 57994745d..ef7de6701 100644 --- a/Missionframework/scripts/server/civrep/ignored/sara.sqf +++ b/Missionframework/scripts/server/civrep/ignored/sara.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_AfDum_mesto2", "Land_AfDum_mesto2L", "Land_AfDum_mesto3", @@ -82,4 +82,4 @@ KP_liberation_cr_ign_buildings = [ "Land_Zavora", "Land_Zavora_2_a1", "Land_Zed_dira_civil" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/song_bin_tanh.sqf b/Missionframework/scripts/server/civrep/ignored/song_bin_tanh.sqf index da59eee88..aa3014146 100644 --- a/Missionframework/scripts/server/civrep/ignored/song_bin_tanh.sqf +++ b/Missionframework/scripts/server/civrep/ignored/song_bin_tanh.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_Communication_F", "LAND_fort2", "Land_fortified_nest_big_ep1", diff --git a/Missionframework/scripts/server/civrep/ignored/takistan.sqf b/Missionframework/scripts/server/civrep/ignored/takistan.sqf index fcb8824b6..cc95765d6 100644 --- a/Missionframework/scripts/server/civrep/ignored/takistan.sqf +++ b/Missionframework/scripts/server/civrep/ignored/takistan.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_BoatSmall_1", "Land_BoatSmall_2a", "Land_BoatSmall_2b", @@ -33,4 +33,4 @@ KP_liberation_cr_ign_buildings = [ "Land_Wall_L3_5m_EP1", "Land_Wall_L3_gate_EP1", "Land_Wall_L3_pillar_EP1" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/tanoa.sqf b/Missionframework/scripts/server/civrep/ignored/tanoa.sqf index f86788b42..adb5687ab 100644 --- a/Missionframework/scripts/server/civrep/ignored/tanoa.sqf +++ b/Missionframework/scripts/server/civrep/ignored/tanoa.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_Cargo_House_V4_F", "Land_Cargo_Patrol_V4_F", "Land_Cargo_Tower_V4_F", @@ -71,4 +71,4 @@ KP_liberation_cr_ign_buildings = [ "Land_Warehouse_02_ladder_F", "Land_WarehouseShelter_01_F", "Land_WoodenShelter_01_F" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/ignored/wl_rosche.sqf b/Missionframework/scripts/server/civrep/ignored/wl_rosche.sqf index c7c2a5671..db1d331f2 100644 --- a/Missionframework/scripts/server/civrep/ignored/wl_rosche.sqf +++ b/Missionframework/scripts/server/civrep/ignored/wl_rosche.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_Barn_W_01_dam", "Land_Barracks_01_grey_F", "Land_BellTower_01_V1_F", @@ -134,7 +134,7 @@ KP_liberation_cr_ign_buildings = [ "Land_TTowerBig_2_F", "Land_u_Addon_01_V1_dam_F", "Land_u_Addon_01_V1_F", - "Land_u_Shed_Ind_F", + "Land_u_Shed_Ind_F", "Land_Walkover_01_F", "Land_Wall_CBrk_5_D", "Land_Wall_CGry_5_D", diff --git a/Missionframework/scripts/server/civrep/ignored/xcam_taunus.sqf b/Missionframework/scripts/server/civrep/ignored/xcam_taunus.sqf index cb138f85b..37d1b594d 100644 --- a/Missionframework/scripts/server/civrep/ignored/xcam_taunus.sqf +++ b/Missionframework/scripts/server/civrep/ignored/xcam_taunus.sqf @@ -1,4 +1,4 @@ -KP_liberation_cr_ign_buildings = [ +KPLIB_cr_ign_buildings = [ "Land_A_Castle_Bastion", "Land_A_Castle_Gate", "Land_A_Castle_Stairs_A", @@ -275,4 +275,4 @@ KP_liberation_cr_ign_buildings = [ "Land_Zastavka_jih", "Land_Zastavka_sever", "Land_zavora_2" -]; \ No newline at end of file +]; diff --git a/Missionframework/scripts/server/civrep/init_buildings.sqf b/Missionframework/scripts/server/civrep/init_buildings.sqf index f47292459..7f2fca61d 100644 --- a/Missionframework/scripts/server/civrep/init_buildings.sqf +++ b/Missionframework/scripts/server/civrep/init_buildings.sqf @@ -20,19 +20,19 @@ switch (worldName) do { default {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\altis.sqf"}; }; -KP_liberation_cr_sectorbuildings = []; +KPLIB_cr_sectorbuildings = []; { - KP_liberation_cr_sectorbuildings pushBack [_x, [_x] call F_cr_getBuildings]; + KPLIB_cr_sectorbuildings pushBack [_x, [_x] call F_cr_getBuildings]; } forEach sectors_capture; { - KP_liberation_cr_sectorbuildings pushBack [_x, [_x] call F_cr_getBuildings]; + KPLIB_cr_sectorbuildings pushBack [_x, [_x] call F_cr_getBuildings]; } forEach sectors_bigtown; if (isServer) then {[format ["init_buildings.sqf finished. Time needed: %1 seconds", diag_ticktime - _start], "CIVREP"] call KPLIB_fnc_log;}; -if (KP_liberation_civrep_debug > 0) then { +if (KPLIB_civrep_debug > 0) then { { [format ["%1: %2", markerText (_x select 0), (_x select 1)], "CIVREP"] call KPLIB_fnc_log; - } forEach KP_liberation_cr_sectorbuildings; + } forEach KPLIB_cr_sectorbuildings; }; diff --git a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf index 93ad33a0a..7c0bb17c8 100644 --- a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf +++ b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf @@ -2,7 +2,7 @@ params ["_sector"]; if (!(_sector in sectors_bigtown) && !(_sector in sectors_capture) && !(_sector in sectors_factory)) exitWith {}; -if (KP_liberation_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned for %1 on: %2", markerText _sector, debug_source], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned for %1 on: %2", markerText _sector, debug_source], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _count = 2 + (ceil (random 2)); private _grp = creategroup [KPLIB_side_civilian, true]; @@ -20,7 +20,7 @@ for "_i" from 1 to _count do { removeAllItems _civ; _civ setDamage 0.5; _civ call F_cr_woundedAnim; - if (KP_liberation_ace) then {[_civ] remoteExec ["KPLIB_fnc_crAddAceAction"];}; + if (KPLIB_ace) then {[_civ] remoteExec ["KPLIB_fnc_crAddAceAction"];}; _civs pushBack _civ; private _marker = createMarker ["wounded_marker_" + str _i, [((_pos select 0) - 20 + (random 40)),((_pos select 1) - 20 + (random 40))]]; _marker setMarkerShape "ELLIPSE"; @@ -30,7 +30,7 @@ for "_i" from 1 to _count do { _markers pushBack _marker; }; -if (KP_liberation_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned %1 wounded civilians at %2", _count, markerText _sector], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned %1 wounded civilians at %2", _count, markerText _sector], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _units_near = [markerPos _sector, 300, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; private _healed_civs = []; @@ -45,7 +45,7 @@ while {_units_near > 0} do { sleep 2; {_civ enableAI _x} forEach ["ANIM", "TARGET", "AUTOTARGET", "MOVE"]; [4, [(name _civ)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; - [KP_liberation_cr_wounded_gain] call F_cr_changeCR; + [KPLIB_cr_wounded_gain] call F_cr_changeCR; _healed_civs pushBack _civ; stats_civilians_healed = stats_civilians_healed +1; } @@ -63,4 +63,4 @@ sleep 60; deleteMarker _x; } forEach _markers; -if (KP_liberation_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> dropped at %1", markerText _sector], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2]}; +if (KPLIB_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> dropped at %1", markerText _sector], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2]}; diff --git a/Missionframework/scripts/server/game/check_victory_conditions.sqf b/Missionframework/scripts/server/game/check_victory_conditions.sqf index b8949f563..a84644e53 100644 --- a/Missionframework/scripts/server/game/check_victory_conditions.sqf +++ b/Missionframework/scripts/server/game/check_victory_conditions.sqf @@ -1,6 +1,6 @@ sleep 5; -if ([] call KP_liberation_victoryCheck && KPLIB_endgame != 1) then { +if ([] call KPLIB_victoryCheck && KPLIB_endgame != 1) then { KPLIB_endgame = 1; publicVariable "KPLIB_endgame"; {_x allowDamage false; (vehicle _x) allowDamage false;} forEach allPlayers; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index cc5c6ffa2..13733dfa1 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -80,17 +80,17 @@ KPLIB_vehicle_to_military_base_links = []; // Enemy weight for anti infantry infantry_weight = 33; // Civilian reputation value (-100 - +100) -KP_liberation_civ_rep = 0; +KPLIB_civ_rep = 0; // Clearances -KP_liberation_clearances = []; +KPLIB_clearances = []; // Strength value of the resistance forces -KP_liberation_guerilla_strength = 0; +KPLIB_guerilla_strength = 0; // Logistic handling data -KP_liberation_logistics = []; +KPLIB_logistics = []; // Production handling data -KP_liberation_production = []; +KPLIB_production = []; // Factory markers to display the current available facilities -KP_liberation_production_markers = []; +KPLIB_production_markers = []; // Global Intel resource resources_intel = 0; // State if the save is fully loaded @@ -154,7 +154,7 @@ stats_vehicles_recycled = 0; // Prevent saving/duplication of objects placed in Eden { - _x setVariable ["KP_liberation_edenObject", true]; + _x setVariable ["KPLIB_edenObject", true]; } forEach (allMissionObjects ""); // Get possible save data @@ -182,12 +182,12 @@ if (!isNil "_saveData") then { KPLIB_all_fobs = _saveData select 9; KPLIB_permissions = _saveData select 10; KPLIB_vehicle_to_military_base_links = _saveData select 11; - KP_liberation_civ_rep = _saveData select 12; - KP_liberation_clearances = _saveData select 13; - KP_liberation_guerilla_strength = _saveData select 14; - KP_liberation_logistics = _saveData select 15; - KP_liberation_production = _saveData select 16; - KP_liberation_production_markers = _saveData select 17; + KPLIB_civ_rep = _saveData select 12; + KPLIB_clearances = _saveData select 13; + KPLIB_guerilla_strength = _saveData select 14; + KPLIB_logistics = _saveData select 15; + KPLIB_production = _saveData select 16; + KPLIB_production_markers = _saveData select 17; resources_intel = _saveData select 18; _allMines = _saveData param [19, []]; _allCrates = _saveData param [20, []]; @@ -241,17 +241,17 @@ if (!isNil "_saveData") then { _dateTime = _saveData select 3; combat_readiness = _saveData select 4; _resourceStorages = _saveData select 5; - KP_liberation_production = _saveData select 6; - KP_liberation_logistics = _saveData select 7; + KPLIB_production = _saveData select 6; + KPLIB_logistics = _saveData select 7; _stats = _saveData select 8; _weights = _saveData select 9; KPLIB_vehicle_to_military_base_links = _saveData select 10; KPLIB_permissions = _saveData select 11; _aiGroups = _saveData select 12; resources_intel = _saveData select 13; - KP_liberation_civ_rep = _saveData select 15; - KP_liberation_production_markers = _saveData select 16; - KP_liberation_guerilla_strength = _saveData select 17; + KPLIB_civ_rep = _saveData select 15; + KPLIB_production_markers = _saveData select 16; + KPLIB_guerilla_strength = _saveData select 17; stats_opfor_soldiers_killed = _stats select 0; stats_opfor_killed_by_players = _stats select 1; @@ -287,15 +287,15 @@ if (!isNil "_saveData") then { air_weight = _weights select 2; // Set correct resistance standing - private _resistanceEnemy = [0, 1] select (KP_liberation_civ_rep < 25); - private _resistanceFriendly = [0, 1] select (KP_liberation_civ_rep >= -25); + private _resistanceEnemy = [0, 1] select (KPLIB_civ_rep < 25); + private _resistanceFriendly = [0, 1] select (KPLIB_civ_rep >= -25); KPLIB_side_resistance setFriend [KPLIB_side_enemy, _resistanceEnemy]; KPLIB_side_enemy setFriend [KPLIB_side_resistance, _resistanceEnemy]; KPLIB_side_resistance setFriend [KPLIB_side_friendly, _resistanceFriendly]; KPLIB_side_friendly setFriend [KPLIB_side_resistance, _resistanceFriendly]; - if (KP_liberation_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; + if (KPLIB_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; // Apply current date and time if (_dateTime isEqualType []) then { @@ -307,7 +307,7 @@ if (!isNil "_saveData") then { // Create clearances { [_x select 0, _x select 1] call KPLIB_fnc_createClearance; - } forEach KP_liberation_clearances; + } forEach KPLIB_clearances; // Collection array for all objects which are loaded private _spawnedObjects = []; @@ -321,13 +321,13 @@ if (!isNil "_saveData") then { // This will be removed if we reach a 0.96.7 due to more released Arma 3 DLCs until we finish 0.97.0 if !(((_saveData select 0) select 0) isEqualType 0) then { // Pre 0.96.5 compatibility with repair building, as it was replaced by default with a different classname - if ((KP_liberation_recycle_building != "Land_CarService_F") && (_class == "Land_CarService_F")) then { - _class = KP_liberation_recycle_building; + if ((KPLIB_recycle_building != "Land_CarService_F") && (_class == "Land_CarService_F")) then { + _class = KPLIB_recycle_building; }; // Pre 0.96.5 compatibility with air building, as it was replaced by default with a different classname - if ((KP_liberation_air_vehicle_building != "Land_Radar_Small_F") && (_class == "Land_Radar_Small_F")) then { - _class = KP_liberation_air_vehicle_building; + if ((KPLIB_air_vehicle_building != "Land_Radar_Small_F") && (_class == "Land_Radar_Small_F")) then { + _class = KPLIB_air_vehicle_building; }; }; @@ -421,7 +421,7 @@ if (!isNil "_saveData") then { _object allowdamage true; // Mark it as FOB storage - _object setVariable ["KP_liberation_storage_type", 0, true]; + _object setVariable ["KPLIB_storage_type", 0, true]; // Fill storage with saved resources [floor _supply, floor _ammo, floor _fuel, _object] call KPLIB_fnc_fillStorage; @@ -439,7 +439,7 @@ if (!isNil "_saveData") then { _storage params ["_pos", "_dir", "_vecUp"]; // Create object without damage handling and simulation - _object = createVehicle [KP_liberation_small_storage_building, _pos, [], 0, "CAN_COLLIDE"]; + _object = createVehicle [KPLIB_small_storage_building, _pos, [], 0, "CAN_COLLIDE"]; _object enableSimulationGlobal false; _object allowdamage false; @@ -454,12 +454,12 @@ if (!isNil "_saveData") then { _object allowdamage true; // Mark it as sector storage - _object setVariable ["KP_liberation_storage_type", 1, true]; + _object setVariable ["KPLIB_storage_type", 1, true]; // Fill storage [floor (_x select 9), floor (_x select 10), floor (_x select 11), _object] call KPLIB_fnc_fillStorage; }; - } forEach KP_liberation_production; + } forEach KPLIB_production; ["Saved sector storages placed and filled", "SAVE"] call KPLIB_fnc_log; // Spawn BLUFOR AI groups @@ -504,7 +504,7 @@ publicVariable "stats_civilian_vehicles_seized"; publicVariable "stats_ieds_detonated"; publicVariable "blufor_sectors"; publicVariable "KPLIB_all_fobs"; -publicVariable "KP_liberation_clearances"; +publicVariable "KPLIB_clearances"; // Check for deleted military sectors or deleted classnames in the locked vehicles array KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {((_x select 0) in elite_vehicles) && ((_x select 1) in sectors_military)}; @@ -543,7 +543,7 @@ save_is_loaded = true; publicVariable "save_is_loaded"; [format ["----- Saved data loaded - Time needed: %1 seconds", diag_tickTime - _start], "SAVE"] call KPLIB_fnc_log; // Start the save loop -private _saveTime = time + KP_liberation_save_interval; +private _saveTime = time + KPLIB_save_interval; while {true} do { waitUntil { sleep 0.5; @@ -559,9 +559,9 @@ while {true} do { [] call KPLIB_fnc_doSave; - if (KP_liberation_savegame_debug > 0) then {[format ["Campaign saved - Time needed: %1 seconds", diag_tickTime - _start], "SAVE"] call KPLIB_fnc_log;}; + if (KPLIB_savegame_debug > 0) then {[format ["Campaign saved - Time needed: %1 seconds", diag_tickTime - _start], "SAVE"] call KPLIB_fnc_log;}; - _saveTime = time + KP_liberation_save_interval; + _saveTime = time + KPLIB_save_interval; }; ["Left saving loop", "SAVE"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/server_restart.sqf b/Missionframework/scripts/server/game/server_restart.sqf index 2c259a6bb..a57e33e95 100644 --- a/Missionframework/scripts/server/game/server_restart.sqf +++ b/Missionframework/scripts/server/game/server_restart.sqf @@ -1,6 +1,6 @@ if (!isDedicated) exitWith {}; -_serverDuration = (KP_liberation_restart * 60 * 60); +_serverDuration = (KPLIB_restart * 60 * 60); [format ["Restart Timer Set To %1", _serverDuration], "RESTART"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/synchronise_eco.sqf b/Missionframework/scripts/server/game/synchronise_eco.sqf index b887f9be6..7a185f117 100644 --- a/Missionframework/scripts/server/game/synchronise_eco.sqf +++ b/Missionframework/scripts/server/game/synchronise_eco.sqf @@ -1,26 +1,26 @@ sync_eco = []; publicVariable "sync_eco"; waitUntil{!isNil "save_is_loaded"}; -waitUntil{!isNil "KP_liberation_production"}; -waitUntil{!isNil "KP_liberation_logistics"}; -waitUntil{!isNil "KP_liberation_production_markers"}; +waitUntil{!isNil "KPLIB_production"}; +waitUntil{!isNil "KPLIB_logistics"}; +waitUntil{!isNil "KPLIB_production_markers"}; waitUntil {save_is_loaded}; -if (KP_liberation_production_markers isEqualTo []) then { +if (KPLIB_production_markers isEqualTo []) then { { private _facility = selectRandom [[true,false,false], [false,true,false], [false,false,true]]; - KP_liberation_production_markers pushBack [_x, _facility select 0, _facility select 1, _facility select 2, markerText _x]; + KPLIB_production_markers pushBack [_x, _facility select 0, _facility select 1, _facility select 2, markerText _x]; } forEach sectors_factory; }; -private _KP_liberation_production_old = [0]; -private _KP_liberation_logistics_old = [0]; +private _KPLIB_production_old = [0]; +private _KPLIB_logistics_old = [0]; while {true} do { waitUntil {sleep 0.25; - !(_KP_liberation_production_old isEqualTo KP_liberation_production) - || !(_KP_liberation_logistics_old isEqualTo KP_liberation_logistics) + !(_KPLIB_production_old isEqualTo KPLIB_production) + || !(_KPLIB_logistics_old isEqualTo KPLIB_logistics) }; { private _sector = _x; @@ -30,12 +30,12 @@ while {true} do { _x set [2, (_sector select 5)]; _x set [3, (_sector select 6)]; }; - } forEach KP_liberation_production_markers; - } forEach KP_liberation_production; + } forEach KPLIB_production_markers; + } forEach KPLIB_production; sleep 0.25; - sync_eco = [KP_liberation_production,KP_liberation_logistics,KP_liberation_production_markers]; + sync_eco = [KPLIB_production,KPLIB_logistics,KPLIB_production_markers]; publicVariable "sync_eco"; - _KP_liberation_production_old = +KP_liberation_production; - _KP_liberation_logistics_old = +KP_liberation_logistics; + _KPLIB_production_old = +KPLIB_production; + _KPLIB_logistics_old = +KPLIB_logistics; }; diff --git a/Missionframework/scripts/server/game/synchronise_vars.sqf b/Missionframework/scripts/server/game/synchronise_vars.sqf index 623305c60..b5eb0b08a 100644 --- a/Missionframework/scripts/server/game/synchronise_vars.sqf +++ b/Missionframework/scripts/server/game/synchronise_vars.sqf @@ -1,102 +1,102 @@ sync_vars = []; publicVariable "sync_vars"; waitUntil{!isNil "save_is_loaded"}; -waitUntil{!isNil "KP_liberation_fob_resources"}; -waitUntil{!isNil "KP_liberation_supplies_global"}; -waitUntil{!isNil "KP_liberation_ammo_global"}; -waitUntil{!isNil "KP_liberation_fuel_global"}; +waitUntil{!isNil "KPLIB_fob_resources"}; +waitUntil{!isNil "KPLIB_supplies_global"}; +waitUntil{!isNil "KPLIB_ammo_global"}; +waitUntil{!isNil "KPLIB_fuel_global"}; waitUntil{!isNil "combat_readiness"}; waitUntil{!isNil "unitcap"}; -waitUntil{!isNil "KP_liberation_heli_count"}; -waitUntil{!isNil "KP_liberation_plane_count"}; -waitUntil{!isNil "KP_liberation_heli_slots"}; -waitUntil{!isNil "KP_liberation_plane_slots"}; +waitUntil{!isNil "KPLIB_heli_count"}; +waitUntil{!isNil "KPLIB_plane_count"}; +waitUntil{!isNil "KPLIB_heli_slots"}; +waitUntil{!isNil "KPLIB_plane_slots"}; waitUntil{!isNil "resources_intel"}; waitUntil{!isNil "infantry_cap"}; -waitUntil{!isNil "KP_liberation_civ_rep"}; -waitUntil{!isNil "KP_liberation_guerilla_strength"}; +waitUntil{!isNil "KPLIB_civ_rep"}; +waitUntil{!isNil "KPLIB_guerilla_strength"}; waitUntil{!isNil "infantry_weight"}; waitUntil{!isNil "armor_weight"}; waitUntil{!isNil "air_weight"}; waitUntil {save_is_loaded}; -private _KP_liberation_fob_resources_old = []; -private _KP_liberation_supplies_global_old = -1; -private _KP_liberation_ammo_global_old = -1; -private _KP_liberation_fuel_global_old = -1; +private _KPLIB_fob_resources_old = []; +private _KPLIB_supplies_global_old = -1; +private _KPLIB_ammo_global_old = -1; +private _KPLIB_fuel_global_old = -1; private _unitcap_old = -1; -private _KP_liberation_heli_count_old = -1; -private _KP_liberation_plane_count_old = -1; -private _KP_liberation_heli_slots_old = -1; -private _KP_liberation_plane_slots_old = -1; +private _KPLIB_heli_count_old = -1; +private _KPLIB_plane_count_old = -1; +private _KPLIB_heli_slots_old = -1; +private _KPLIB_plane_slots_old = -1; private _combat_readiness_old = -1; private _resources_intel_old = -999; private _infantry_cap_old = -999; -private _KP_liberation_civ_rep_old = -999; -private _KP_liberation_guerilla_strength_old = -999; +private _KPLIB_civ_rep_old = -999; +private _KPLIB_guerilla_strength_old = -999; private _infantry_weight_old = -1; private _armor_weight_old = -1; private _air_weight_old = -1; while {true} do { waitUntil {sleep 0.25; - !(_KP_liberation_fob_resources_old isEqualTo KP_liberation_fob_resources) - || _KP_liberation_supplies_global_old != KP_liberation_supplies_global - || _KP_liberation_ammo_global_old != KP_liberation_ammo_global - || _KP_liberation_fuel_global_old != KP_liberation_fuel_global + !(_KPLIB_fob_resources_old isEqualTo KPLIB_fob_resources) + || _KPLIB_supplies_global_old != KPLIB_supplies_global + || _KPLIB_ammo_global_old != KPLIB_ammo_global + || _KPLIB_fuel_global_old != KPLIB_fuel_global || _unitcap_old != unitcap - || _KP_liberation_heli_count_old != KP_liberation_heli_count - || _KP_liberation_plane_count_old != KP_liberation_plane_count - || _KP_liberation_heli_slots_old != KP_liberation_heli_slots - || _KP_liberation_plane_slots_old != KP_liberation_plane_slots + || _KPLIB_heli_count_old != KPLIB_heli_count + || _KPLIB_plane_count_old != KPLIB_plane_count + || _KPLIB_heli_slots_old != KPLIB_heli_slots + || _KPLIB_plane_slots_old != KPLIB_plane_slots || _combat_readiness_old != combat_readiness || _resources_intel_old != resources_intel || _infantry_cap_old != infantry_cap - || _KP_liberation_civ_rep_old != KP_liberation_civ_rep - || _KP_liberation_guerilla_strength_old != KP_liberation_guerilla_strength + || _KPLIB_civ_rep_old != KPLIB_civ_rep + || _KPLIB_guerilla_strength_old != KPLIB_guerilla_strength || _infantry_weight_old != infantry_weight || _armor_weight_old != armor_weight || _air_weight_old != air_weight }; - if (KP_liberation_guerilla_strength < 0) then {KP_liberation_guerilla_strength = 0;}; + if (KPLIB_guerilla_strength < 0) then {KPLIB_guerilla_strength = 0;}; sleep 0.25; sync_vars = [ - KP_liberation_fob_resources, - KP_liberation_supplies_global, - KP_liberation_ammo_global, - KP_liberation_fuel_global, + KPLIB_fob_resources, + KPLIB_supplies_global, + KPLIB_ammo_global, + KPLIB_fuel_global, unitcap, - KP_liberation_heli_count, - KP_liberation_plane_count, - KP_liberation_heli_slots, - KP_liberation_plane_slots, + KPLIB_heli_count, + KPLIB_plane_count, + KPLIB_heli_slots, + KPLIB_plane_slots, combat_readiness, resources_intel, infantry_cap, - KP_liberation_civ_rep, - KP_liberation_guerilla_strength, + KPLIB_civ_rep, + KPLIB_guerilla_strength, infantry_weight, armor_weight, air_weight ]; publicVariable "sync_vars"; - _KP_liberation_fob_resources_old = +KP_liberation_fob_resources; - _KP_liberation_supplies_global_old = KP_liberation_supplies_global; - _KP_liberation_ammo_global_old = KP_liberation_ammo_global; - _KP_liberation_fuel_global_old = KP_liberation_fuel_global; + _KPLIB_fob_resources_old = +KPLIB_fob_resources; + _KPLIB_supplies_global_old = KPLIB_supplies_global; + _KPLIB_ammo_global_old = KPLIB_ammo_global; + _KPLIB_fuel_global_old = KPLIB_fuel_global; _unitcap_old = unitcap; - _KP_liberation_heli_count_old = KP_liberation_heli_count; - _KP_liberation_plane_count_old = KP_liberation_plane_count; - _KP_liberation_heli_slots_old = KP_liberation_heli_slots; - _KP_liberation_plane_slots_old = KP_liberation_plane_slots; + _KPLIB_heli_count_old = KPLIB_heli_count; + _KPLIB_plane_count_old = KPLIB_plane_count; + _KPLIB_heli_slots_old = KPLIB_heli_slots; + _KPLIB_plane_slots_old = KPLIB_plane_slots; _combat_readiness_old = combat_readiness; _resources_intel_old = resources_intel; _infantry_cap_old = infantry_cap; - _KP_liberation_civ_rep_old = KP_liberation_civ_rep; - _KP_liberation_guerilla_strength_old = KP_liberation_guerilla_strength; + _KPLIB_civ_rep_old = KPLIB_civ_rep; + _KPLIB_guerilla_strength_old = KPLIB_guerilla_strength; _infantry_weight_old = infantry_weight; _armor_weight_old = armor_weight; _air_weight_old = air_weight; diff --git a/Missionframework/scripts/server/game/zeus_synchro.sqf b/Missionframework/scripts/server/game/zeus_synchro.sqf index 48ab5bd5d..14b0dd1a8 100644 --- a/Missionframework/scripts/server/game/zeus_synchro.sqf +++ b/Missionframework/scripts/server/game/zeus_synchro.sqf @@ -12,7 +12,7 @@ private _vehicleClassnames = [toLower huron_typename]; KPLIB_b_static_classes, KPLIB_b_support_classes ]; -if (KP_liberation_enemies_zeus) then {_vehicleClassnames append KPLIB_o_allVeh_classes;}; +if (KPLIB_enemies_zeus) then {_vehicleClassnames append KPLIB_o_allVeh_classes;}; private _valids = []; private _toRemove = []; @@ -25,7 +25,7 @@ while {true} do { _valids = allUnits select { (alive _x) // Alive && { - (KP_liberation_enemies_zeus && {!(side (group _x) isEqualTo KPLIB_side_civilian)}) // Not civilian side, if enemy adding is enabled + (KPLIB_enemies_zeus && {!(side (group _x) isEqualTo KPLIB_side_civilian)}) // Not civilian side, if enemy adding is enabled || {side (group _x) isEqualTo KPLIB_side_friendly} // Player side if enemy adding is disabled } && {((str _x) find "BIS_SUPP_HQ_") isEqualTo -1} // Not a HQ entity from support module diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index 477b05553..bbddc3696 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -44,7 +44,7 @@ execVM "scripts\server\battlegroup\random_battlegroups.sqf"; execVM "scripts\server\battlegroup\readiness_increase.sqf"; execVM "scripts\server\game\apply_default_permissions.sqf"; execVM "scripts\server\game\cleanup_vehicles.sqf"; -if (!KP_liberation_fog_param) then {execVM "scripts\server\game\fucking_set_fog.sqf";}; +if (!KPLIB_fog_param) then {execVM "scripts\server\game\fucking_set_fog.sqf";}; execVM "scripts\server\game\manage_time.sqf"; execVM "scripts\server\game\manage_weather.sqf"; execVM "scripts\server\game\playtime.sqf"; @@ -57,7 +57,7 @@ execVM "scripts\server\offloading\show_fps.sqf"; execVM "scripts\server\patrols\civilian_patrols.sqf"; execVM "scripts\server\patrols\manage_patrols.sqf"; execVM "scripts\server\patrols\reinforcements_resetter.sqf"; -if (KP_liberation_ailogistics) then {execVM "scripts\server\resources\manage_logistics.sqf";}; +if (KPLIB_ailogistics) then {execVM "scripts\server\resources\manage_logistics.sqf";}; execVM "scripts\server\resources\manage_resources.sqf"; execVM "scripts\server\resources\recalculate_resources.sqf"; execVM "scripts\server\resources\recalculate_timer.sqf"; @@ -66,10 +66,10 @@ execVM "scripts\server\resources\unit_cap.sqf"; execVM "scripts\server\sector\lose_sectors.sqf"; KPLIB_fsm_sectorMonitor = [] call KPLIB_fnc_sectorMonitor; -if (KP_liberation_high_command) then {KPLIB_fsm_highcommand = [] call KPLIB_fnc_highcommand;}; +if (KPLIB_high_command) then {KPLIB_fsm_highcommand = [] call KPLIB_fnc_highcommand;}; // Select FOB templates -switch (KP_liberation_preset_opfor) do { +switch (KPLIB_preset_opfor) do { case 1: { KPLIB_fob_templates = [ "scripts\fob_templates\apex\template1.sqf", @@ -123,11 +123,11 @@ execVM "scripts\server\offloading\group_diag.sqf"; } forEach allUnits; // Server Restart Script from K4s0 -if (KP_liberation_restart > 0) then { +if (KPLIB_restart > 0) then { execVM "scripts\server\game\server_restart.sqf"; }; -if (KP_liberation_limited_zeus) then { +if (KPLIB_limited_zeus) then { zm1 setVariable ["Addons", 0, true]; removeAllCuratorAddons zm1; diff --git a/Missionframework/scripts/server/remotecall/abort_logi_remote_call.sqf b/Missionframework/scripts/server/remotecall/abort_logi_remote_call.sqf index 2039cc7bc..03dd9e991 100644 --- a/Missionframework/scripts/server/remotecall/abort_logi_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/abort_logi_remote_call.sqf @@ -6,34 +6,34 @@ private ["_time","_nextState"]; logiError = 0; -if ((((KP_liberation_logistics select _index) select 7) == 0) || (((KP_liberation_logistics select _index) select 7) == 5) || (((KP_liberation_logistics select _index) select 7) == 6)) exitWith {logiError = 1;(localize "STR_LOGISTIC_STANDBY_ERROR") remoteExec ["hint",_clientID]; _clientID publicVariableClient "logiError";}; +if ((((KPLIB_logistics select _index) select 7) == 0) || (((KPLIB_logistics select _index) select 7) == 5) || (((KPLIB_logistics select _index) select 7) == 6)) exitWith {logiError = 1;(localize "STR_LOGISTIC_STANDBY_ERROR") remoteExec ["hint",_clientID]; _clientID publicVariableClient "logiError";}; -switch ((KP_liberation_logistics select _index) select 7) do { +switch ((KPLIB_logistics select _index) select 7) do { case 1; case 3: { - _time = ceil (((ceil ((((KP_liberation_logistics select _index) select 6) select 0) / 100)) + (ceil ((((KP_liberation_logistics select _index) select 6) select 1) / 100)) + (ceil ((((KP_liberation_logistics select _index) select 6) select 2) / 100))) / 3); + _time = ceil (((ceil ((((KPLIB_logistics select _index) select 6) select 0) / 100)) + (ceil ((((KPLIB_logistics select _index) select 6) select 1) / 100)) + (ceil ((((KPLIB_logistics select _index) select 6) select 2) / 100))) / 3); _time = _time + 1; }; case 2; case 4: { - _time = ceil ((((KP_liberation_logistics select _index) select 2) distance2D ((KP_liberation_logistics select _index) select 3)) / 400); - _time = _time - ((KP_liberation_logistics select _index) select 8); + _time = ceil ((((KPLIB_logistics select _index) select 2) distance2D ((KPLIB_logistics select _index) select 3)) / 400); + _time = _time - ((KPLIB_logistics select _index) select 8); - _time = _time + (ceil (((ceil ((((KP_liberation_logistics select _index) select 6) select 0) / 100)) + (ceil ((((KP_liberation_logistics select _index) select 6) select 1) / 100)) + (ceil ((((KP_liberation_logistics select _index) select 6) select 2) / 100))) / 3)); + _time = _time + (ceil (((ceil ((((KPLIB_logistics select _index) select 6) select 0) / 100)) + (ceil ((((KPLIB_logistics select _index) select 6) select 1) / 100)) + (ceil ((((KPLIB_logistics select _index) select 6) select 2) / 100))) / 3)); _time = _time + 1; }; }; -_nextState = switch ((KP_liberation_logistics select _index) select 7) do {case 1; case 2: {5}; case 3; case 4: {6};}; +_nextState = switch ((KPLIB_logistics select _index) select 7) do {case 1; case 2: {5}; case 3; case 4: {6};}; -KP_liberation_logistics set [_index,[ - (KP_liberation_logistics select _index) select 0, - (KP_liberation_logistics select _index) select 1, - (KP_liberation_logistics select _index) select 2, - (KP_liberation_logistics select _index) select 3, - (KP_liberation_logistics select _index) select 4, - (KP_liberation_logistics select _index) select 5, - (KP_liberation_logistics select _index) select 6, +KPLIB_logistics set [_index,[ + (KPLIB_logistics select _index) select 0, + (KPLIB_logistics select _index) select 1, + (KPLIB_logistics select _index) select 2, + (KPLIB_logistics select _index) select 3, + (KPLIB_logistics select _index) select 4, + (KPLIB_logistics select _index) select 5, + (KPLIB_logistics select _index) select 6, _nextState, _time, 0 diff --git a/Missionframework/scripts/server/remotecall/add_logiGroup_remote_call.sqf b/Missionframework/scripts/server/remotecall/add_logiGroup_remote_call.sqf index 04734477c..aaf6988a7 100644 --- a/Missionframework/scripts/server/remotecall/add_logiGroup_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/add_logiGroup_remote_call.sqf @@ -1,8 +1,8 @@ if (!isServer) exitWith {}; -private _newID = [count KP_liberation_logistics] call KPLIB_fnc_getMilitaryId; +private _newID = [count KPLIB_logistics] call KPLIB_fnc_getMilitaryId; -KP_liberation_logistics append [[ +KPLIB_logistics append [[ _newID, // ID 0, // Truck Count [0,0,0], // Position Point A diff --git a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf index 86ca82a13..756281f89 100644 --- a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf @@ -4,7 +4,7 @@ params ["_index", "_nearfob", "_clientID", "_supplies", "_ammo", "_fuel"]; logiError = 0; -private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; +private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; if ((count _storage_areas) == 0) exitWith {(localize "STR_LOGISTIC_CANTAFFORD") remoteExec ["hint",_clientID]; logiError = 1; _clientID publicVariableClient "logiError";}; @@ -22,14 +22,14 @@ if ((_price_s > _supplies) || (_price_a > _ammo) || (_price_f > _fuel)) exitWith reverse _storedCrates; { - private _crateValue = _x getVariable ["KP_liberation_crate_value",0]; + private _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KP_liberation_supply_crate: { + case KPLIB_supply_crate: { if (_price_s > 0) then { if (_crateValue > _price_s) then { _crateValue = _crateValue - _price_s; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_s = 0; } else { detach _x; @@ -38,11 +38,11 @@ if ((_price_s > _supplies) || (_price_a > _ammo) || (_price_f > _fuel)) exitWith }; }; }; - case KP_liberation_ammo_crate: { + case KPLIB_ammo_crate: { if (_price_a > 0) then { if (_crateValue > _price_a) then { _crateValue = _crateValue - _price_a; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_a = 0; } else { detach _x; @@ -51,11 +51,11 @@ if ((_price_s > _supplies) || (_price_a > _ammo) || (_price_f > _fuel)) exitWith }; }; }; - case KP_liberation_fuel_crate: { + case KPLIB_fuel_crate: { if (_price_f > 0) then { if (_crateValue > _price_f) then { _crateValue = _crateValue - _price_f; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_f = 0; } else { detach _x; @@ -85,4 +85,4 @@ if ((_price_s > _supplies) || (_price_a > _ammo) || (_price_f > _fuel)) exitWith please_recalculate = true; -(KP_liberation_logistics select _index) set [1, ((KP_liberation_logistics select _index) select 1) + 1]; +(KPLIB_logistics select _index) set [1, ((KPLIB_logistics select _index) select 1) + 1]; diff --git a/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf b/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf index feb4ea28c..ad5427b4f 100644 --- a/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf @@ -2,7 +2,7 @@ if (!isServer) exitWith {}; params ["_sector", "_fac","_clientID"]; -private _tempProduction = +KP_liberation_production; +private _tempProduction = +KPLIB_production; private _checkFor = 0; private _price_s = 100; private _price_a = 100; @@ -22,22 +22,22 @@ switch (_fac) do { stats_ammo_spent = stats_ammo_spent + _price_a; stats_fuel_spent = stats_fuel_spent + _price_f; - private _storage = nearestObjects [(markerPos (_x select 1)), [KP_liberation_small_storage_building], 100]; - _storage = _storage select {(_x getVariable ["KP_liberation_storage_type",-1]) == 1}; + private _storage = nearestObjects [(markerPos (_x select 1)), [KPLIB_small_storage_building], 100]; + _storage = _storage select {(_x getVariable ["KPLIB_storage_type",-1]) == 1}; if ((count _storage) == 0) exitWith {}; _storage = (_storage select 0); private _storedCrates = (attachedObjects _storage); reverse _storedCrates; { - private _crateValue = _x getVariable ["KP_liberation_crate_value",0]; + private _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KP_liberation_supply_crate: { + case KPLIB_supply_crate: { if (_price_s > 0) then { if (_crateValue > _price_s) then { _crateValue = _crateValue - _price_s; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_s = 0; } else { detach _x; @@ -46,11 +46,11 @@ switch (_fac) do { }; }; }; - case KP_liberation_ammo_crate: { + case KPLIB_ammo_crate: { if (_price_a > 0) then { if (_crateValue > _price_a) then { _crateValue = _crateValue - _price_a; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_a = 0; } else { detach _x; @@ -59,11 +59,11 @@ switch (_fac) do { }; }; }; - case KP_liberation_fuel_crate: { + case KPLIB_fuel_crate: { if (_price_f > 0) then { if (_crateValue > _price_f) then { _crateValue = _crateValue - _price_f; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_f = 0; } else { detach _x; @@ -80,7 +80,7 @@ switch (_fac) do { { private _height = [typeOf _x] call KPLIB_fnc_getCrateHeight; detach _x; - _x attachTo [_storage, [(KP_liberation_small_storage_positions select _i) select 0, (KP_liberation_small_storage_positions select _i) select 1, _height]]; + _x attachTo [_storage, [(KPLIB_small_storage_positions select _i) select 0, (KPLIB_small_storage_positions select _i) select 1, _height]]; _i = _i + 1; } forEach (attachedObjects _storage); @@ -96,6 +96,6 @@ switch (_fac) do { } forEach _tempProduction; if (_success) then { - KP_liberation_production = +_tempProduction; + KPLIB_production = +_tempProduction; recalculate_sectors = true; }; diff --git a/Missionframework/scripts/server/remotecall/build_remote_call.sqf b/Missionframework/scripts/server/remotecall/build_remote_call.sqf index 51b65510a..5448971ac 100644 --- a/Missionframework/scripts/server/remotecall/build_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/build_remote_call.sqf @@ -14,14 +14,14 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { reverse _storedCrates; { - _crateValue = _x getVariable ["KP_liberation_crate_value",0]; + _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KP_liberation_supply_crate: { + case KPLIB_supply_crate: { if (_price_s > 0) then { if (_crateValue > _price_s) then { _crateValue = _crateValue - _price_s; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_s = 0; } else { detach _x; @@ -30,11 +30,11 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { }; }; }; - case KP_liberation_ammo_crate: { + case KPLIB_ammo_crate: { if (_price_a > 0) then { if (_crateValue > _price_a) then { _crateValue = _crateValue - _price_a; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_a = 0; } else { detach _x; @@ -43,11 +43,11 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { }; }; }; - case KP_liberation_fuel_crate: { + case KPLIB_fuel_crate: { if (_price_f > 0) then { if (_crateValue > _price_f) then { _crateValue = _crateValue - _price_f; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _price_f = 0; } else { detach _x; diff --git a/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf b/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf index b99527ae9..9b02395d9 100644 --- a/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf @@ -5,11 +5,11 @@ params ["_price_s", "_price_a", "_price_f", "_storage_areas"]; if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { { private _space = 0; - if (typeOf _x == KP_liberation_large_storage_building) then { - _space = (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _space = (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; while {(_space > 0) && (_price_s > 0)} do { @@ -18,7 +18,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_s; }; _price_s = _price_s - _amount; - private _crate = [KP_liberation_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -29,7 +29,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_a; }; _price_a = _price_a - _amount; - private _crate = [KP_liberation_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -40,7 +40,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_f; }; _price_f = _price_f - _amount; - private _crate = [KP_liberation_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; diff --git a/Missionframework/scripts/server/remotecall/change_prod_remote_call.sqf b/Missionframework/scripts/server/remotecall/change_prod_remote_call.sqf index ec0550670..a06701e9a 100644 --- a/Missionframework/scripts/server/remotecall/change_prod_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/change_prod_remote_call.sqf @@ -25,7 +25,7 @@ _tempProduction = []; (_x select 5), (_x select 6), _new_production, - KP_liberation_production_interval, + KPLIB_production_interval, (_x select 9), (_x select 10), (_x select 11) @@ -37,6 +37,6 @@ _tempProduction = []; } else { _tempProduction pushBack _x; }; -} forEach KP_liberation_production; +} forEach KPLIB_production; -KP_liberation_production = _tempProduction; +KPLIB_production = _tempProduction; diff --git a/Missionframework/scripts/server/remotecall/del_logiGroup_remote_call.sqf b/Missionframework/scripts/server/remotecall/del_logiGroup_remote_call.sqf index 8c4111575..5d923eba8 100644 --- a/Missionframework/scripts/server/remotecall/del_logiGroup_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/del_logiGroup_remote_call.sqf @@ -2,7 +2,7 @@ if (!isServer) exitWith {}; params ["_groupToDelete"]; -private _temp = +KP_liberation_logistics; +private _temp = +KPLIB_logistics; _temp = _temp - [_groupToDelete]; @@ -10,4 +10,4 @@ _temp = _temp - [_groupToDelete]; _x set [0, [_forEachIndex] call KPLIB_fnc_getMilitaryId]; } forEach _temp; -KP_liberation_logistics = +_temp; +KPLIB_logistics = +_temp; diff --git a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf index cec35912f..23cb9f8ec 100644 --- a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf @@ -4,9 +4,9 @@ params ["_index", "_nearfob", "_clientID"]; logiError = 0; -if (((KP_liberation_logistics select _index) select 1) <= 0) exitWith {logiError = 1; _clientID publicVariableClient "logiError";}; +if (((KPLIB_logistics select _index) select 1) <= 0) exitWith {logiError = 1; _clientID publicVariableClient "logiError";}; -private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; +private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; if ((count _storage_areas) == 0) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExec ["hint",_clientID]; logiError = 1; _clientID publicVariableClient "logiError";}; @@ -19,11 +19,11 @@ private _crateSum = (ceil(_price_s / 100)) + (ceil(_price_a / 100)) + (ceil(_pri private _spaceSum = 0; { - if (typeOf _x == KP_liberation_large_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -31,11 +31,11 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe { private _space = 0; - if (typeOf _x == KP_liberation_large_storage_building) then { - _space = (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _space = (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; while {(_space > 0) && (_price_s > 0)} do { @@ -44,7 +44,7 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe _amount = _price_s; }; _price_s = _price_s - _amount; - private _crate = [KP_liberation_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -55,7 +55,7 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe _amount = _price_a; }; _price_a = _price_a - _amount; - private _crate = [KP_liberation_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -66,7 +66,7 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe _amount = _price_f; }; _price_f = _price_f - _amount; - private _crate = [KP_liberation_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -76,4 +76,4 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe please_recalculate = true; -(KP_liberation_logistics select _index) set [1, ((KP_liberation_logistics select _index) select 1) - 1]; +(KPLIB_logistics select _index) set [1, ((KPLIB_logistics select _index) select 1) - 1]; diff --git a/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf b/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf index c30d317b1..acf5ba6e1 100644 --- a/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf @@ -9,11 +9,11 @@ deleteVehicle _object_recycled; if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { { private _space = 0; - if (typeOf _x == KP_liberation_large_storage_building) then { - _space = (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _space = (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; while {(_space > 0) && (_price_s > 0)} do { @@ -22,7 +22,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_s; }; _price_s = _price_s - _amount; - private _crate = [KP_liberation_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -33,7 +33,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_a; }; _price_a = _price_a - _amount; - private _crate = [KP_liberation_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -44,7 +44,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_f; }; _price_f = _price_f - _amount; - private _crate = [KP_liberation_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; diff --git a/Missionframework/scripts/server/remotecall/save_logi_remote_call.sqf b/Missionframework/scripts/server/remotecall/save_logi_remote_call.sqf index 9fd62febc..4f4f1be42 100644 --- a/Missionframework/scripts/server/remotecall/save_logi_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/save_logi_remote_call.sqf @@ -25,26 +25,26 @@ if (_dest_a isEqualTo _dest_b) then { ((((_x select 2) isEqualTo _dest_a)) || (((_x select 2) isEqualTo _dest_b))) && ((((_x select 3) isEqualTo _dest_a)) || (((_x select 3) isEqualTo _dest_b))) ) exitWith {logiError = 1;} -} forEach KP_liberation_logistics; +} forEach KPLIB_logistics; if (logiError == 1) exitWith {(localize "STR_LOGISTIC_SAVE_ERROR") remoteExec ["hint",_clientID]; _clientID publicVariableClient "logiError";}; private _time = ceil (((ceil ((_ress_a select 0) / 100)) + (ceil ((_ress_a select 1) / 100)) + (ceil ((_ress_a select 2) / 100))) / 3); -if (_time > ((KP_liberation_logistics select _index) select 1)) then { - _time = ((KP_liberation_logistics select _index) select 1); +if (_time > ((KPLIB_logistics select _index) select 1)) then { + _time = ((KPLIB_logistics select _index) select 1); }; _time = _time + 1; -KP_liberation_logistics set [_index,[ - (KP_liberation_logistics select _index) select 0, - (KP_liberation_logistics select _index) select 1, +KPLIB_logistics set [_index,[ + (KPLIB_logistics select _index) select 0, + (KPLIB_logistics select _index) select 1, _dest_a, _dest_b, _ress_a, _ress_b, - (KP_liberation_logistics select _index) select 6, + (KPLIB_logistics select _index) select 6, 1, _time, 0 diff --git a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf index 1e077b5d4..50395a6e4 100644 --- a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf @@ -21,11 +21,11 @@ reset_battlegroups_ai = true; publicVariable "reset_battlegroups_ai"; if (_liberated_sector in sectors_factory) then { { - if (_liberated_sector in _x) exitWith {KP_liberation_production = KP_liberation_production - [_x];}; - } forEach KP_liberation_production; + if (_liberated_sector in _x) exitWith {KPLIB_production = KPLIB_production - [_x];}; + } forEach KPLIB_production; - private _sectorFacilities = (KP_liberation_production_markers select {_liberated_sector == (_x select 0)}) select 0; - KP_liberation_production pushBack [ + private _sectorFacilities = (KPLIB_production_markers select {_liberated_sector == (_x select 0)}) select 0; + KPLIB_production pushBack [ markerText _liberated_sector, _liberated_sector, 1, @@ -34,7 +34,7 @@ if (_liberated_sector in sectors_factory) then { _sectorFacilities select 2, _sectorFacilities select 3, 3, - KP_liberation_production_interval, + KPLIB_production_interval, 0, 0, 0 @@ -43,7 +43,7 @@ if (_liberated_sector in sectors_factory) then { [_liberated_sector] spawn F_cr_liberatedSector; -if ((random 100) <= KP_liberation_cr_wounded_chance || (count blufor_sectors) == 1) then { +if ((random 100) <= KPLIB_cr_wounded_chance || (count blufor_sectors) == 1) then { [_liberated_sector] spawn civrep_wounded_civs; }; diff --git a/Missionframework/scripts/server/resources/manage_logistics.sqf b/Missionframework/scripts/server/resources/manage_logistics.sqf index 9fb4dd022..9bfc2e33e 100644 --- a/Missionframework/scripts/server/resources/manage_logistics.sqf +++ b/Missionframework/scripts/server/resources/manage_logistics.sqf @@ -1,19 +1,19 @@ waitUntil {!isNil "save_is_loaded"}; -waitUntil {!isNil "KP_liberation_logistics"}; +waitUntil {!isNil "KPLIB_logistics"}; waitUntil {save_is_loaded}; ["Logistic management started", "LOGISTIC"] call KPLIB_fnc_log; -KP_liberation_convoy_ambush_inProgress = false; -KP_liberation_convoy_ambush_check = 0; +KPLIB_convoy_ambush_inProgress = false; +KPLIB_convoy_ambush_check = 0; private _start = 0; while {KPLIB_endgame == 0} do { - if (((count (allPlayers - entities "HeadlessClient_F")) > 0) && ((count KP_liberation_logistics) > 0)) then { + if (((count (allPlayers - entities "HeadlessClient_F")) > 0) && ((count KPLIB_logistics) > 0)) then { _start = diag_tickTime; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic interval started: %1", diag_tickTime], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic interval started: %1", diag_tickTime], "LOGISTIC"] call KPLIB_fnc_log;}; - private _tempLogistics = +KP_liberation_logistics; + private _tempLogistics = +KPLIB_logistics; { private _locPos = -1; @@ -25,7 +25,7 @@ while {KPLIB_endgame == 0} do { if ((_x select 8) > 1) then { switch (_x select 7) do {case 1: {_locPos = 2; _locRes = 4;}; case 3: {_locPos = 3; _locRes = 5;};}; switch (_x select 9) do {case 2: {_x set [9,0];}; case 3: {_x set [9,1];};}; - private _storage_areas = nearestObjects [(_x select _locPos), [KP_liberation_small_storage_building, KP_liberation_large_storage_building], 150]; + private _storage_areas = nearestObjects [(_x select _locPos), [KPLIB_small_storage_building, KPLIB_large_storage_building], 150]; if (((_x select 9) == 0) && !((_x select 6) isEqualTo [0,0,0])) then { @@ -35,11 +35,11 @@ while {KPLIB_endgame == 0} do { if (_toProcess > 3) then {_toProcess = 3;}; private _spaceSum = 0; { - if (typeOf _x == KP_liberation_large_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -51,11 +51,11 @@ while {KPLIB_endgame == 0} do { while {_processed < _toProcess} do { { private _space = 0; - if (typeOf _x == KP_liberation_large_storage_building) then { - _space = (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _space = (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; if ((_space > 0) && ((((_tempLogistics select _currentIndex) select 6) select 0) > 0)) then { @@ -68,7 +68,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KP_liberation_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -85,7 +85,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1) - _amount, (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KP_liberation_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -102,7 +102,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2) - _amount] ]; - private _crate = [KP_liberation_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -111,7 +111,7 @@ while {KPLIB_endgame == 0} do { } forEach _storage_areas; }; please_recalculate = true; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; } else { _x set [9,1]; }; @@ -127,9 +127,9 @@ while {KPLIB_endgame == 0} do { { { switch ((typeOf _x)) do { - case KP_liberation_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KP_liberation_crate_value",0]);}; + case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _x); @@ -206,14 +206,14 @@ while {KPLIB_endgame == 0} do { reverse _storedCrates; { - private _crateValue = _x getVariable ["KP_liberation_crate_value",0]; + private _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KP_liberation_supply_crate: { + case KPLIB_supply_crate: { if (_getSupply > 0) then { if (_crateValue > _getSupply) then { _crateValue = _crateValue - _getSupply; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _getSupply = 0; } else { detach _x; @@ -222,11 +222,11 @@ while {KPLIB_endgame == 0} do { }; }; }; - case KP_liberation_ammo_crate: { + case KPLIB_ammo_crate: { if (_getAmmo > 0) then { if (_crateValue > _getAmmo) then { _crateValue = _crateValue - _getAmmo; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _getAmmo = 0; } else { detach _x; @@ -235,11 +235,11 @@ while {KPLIB_endgame == 0} do { }; }; }; - case KP_liberation_fuel_crate: { + case KPLIB_fuel_crate: { if (_getFuel > 0) then { if (_crateValue > _getFuel) then { _crateValue = _crateValue - _getFuel; - _x setVariable ["KP_liberation_crate_value", _crateValue, true]; + _x setVariable ["KPLIB_crate_value", _crateValue, true]; _getFuel = 0; } else { detach _x; @@ -267,7 +267,7 @@ while {KPLIB_endgame == 0} do { } forEach _storage_areas; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; }; } else { private _nextState = 0; @@ -284,23 +284,23 @@ while {KPLIB_endgame == 0} do { _x set [8,_time]; _x set [9,0]; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; }; }; case 2; case 4: { if ((_x select 8) > 1) then { - if (((_x select 8) <= ((ceil (((_x select 2) distance2D (_x select 3)) / 400)) - 3)) && ((_x select 8) >= 3) && !((_x select 6) isEqualTo [0,0,0]) && !KP_liberation_convoy_ambush_inProgress && (KP_liberation_civ_rep <= -25) && (((_x select 8) % 2) == 0)) then { + if (((_x select 8) <= ((ceil (((_x select 2) distance2D (_x select 3)) / 400)) - 3)) && ((_x select 8) >= 3) && !((_x select 6) isEqualTo [0,0,0]) && !KPLIB_convoy_ambush_inProgress && (KPLIB_civ_rep <= -25) && (((_x select 8) % 2) == 0)) then { private _dice = round (random 100); - private _chance = KP_liberation_convoy_ambush_chance + ([] call KPLIB_fnc_crGetMulti); - if (KP_liberation_asymmetric_debug > 0) then {[format ["Logistic convoy %1: ambush possible - current ETA: %2 - Dice: %3 - Chance: %4", (_x select 0), (_x select 8), _dice, _chance], "ASYMMETRIC"] call KPLIB_fnc_log;}; + private _chance = KPLIB_convoy_ambush_chance + ([] call KPLIB_fnc_crGetMulti); + if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1: ambush possible - current ETA: %2 - Dice: %3 - Chance: %4", (_x select 0), (_x select 8), _dice, _chance], "ASYMMETRIC"] call KPLIB_fnc_log;}; if (_dice <= _chance) then { private _convoy = +_x; sleep 0.1; [_convoy] spawn logistic_convoy_ambush; - waitUntil {sleep 0.1; KP_liberation_convoy_ambush_check != 0}; - if (KP_liberation_convoy_ambush_check == 2) then { + waitUntil {sleep 0.1; KPLIB_convoy_ambush_check != 0}; + if (KPLIB_convoy_ambush_check == 2) then { _x set [1,0]; _x set [2,[0,0,0]]; _x set [3,[0,0,0]]; @@ -311,7 +311,7 @@ while {KPLIB_endgame == 0} do { _x set [8,-1]; } else { _x set [8,((_x select 8) - 1)]; - KP_liberation_convoy_ambush_check = 0; + KPLIB_convoy_ambush_check = 0; }; } else { _x set [8,((_x select 8) - 1)]; @@ -320,7 +320,7 @@ while {KPLIB_endgame == 0} do { _x set [8,((_x select 8) - 1)]; }; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; } else { private _nextState = -1; @@ -343,7 +343,7 @@ while {KPLIB_endgame == 0} do { _x set [7,_nextState]; _x set [8,_time]; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; }; }; case 5; @@ -351,7 +351,7 @@ while {KPLIB_endgame == 0} do { if ((_x select 8) > 1) then { _locPos = switch (_x select 7) do {case 5: {2}; case 6: {3};}; _x set [9,0]; - private _storage_areas = nearestObjects [(_x select _locPos), [KP_liberation_small_storage_building, KP_liberation_large_storage_building], 150]; + private _storage_areas = nearestObjects [(_x select _locPos), [KPLIB_small_storage_building, KPLIB_large_storage_building], 150]; if ((count (_storage_areas)) == 0) exitWith {_x set [9,2];}; @@ -359,11 +359,11 @@ while {KPLIB_endgame == 0} do { if (_toProcess > 3) then {_toProcess = 3;}; private _spaceSum = 0; { - if (typeOf _x == KP_liberation_large_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _spaceSum = _spaceSum + (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -375,11 +375,11 @@ while {KPLIB_endgame == 0} do { while {_processed < _toProcess} do { { private _space = 0; - if (typeOf _x == KP_liberation_large_storage_building) then { - _space = (count KP_liberation_large_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_large_storage_building) then { + _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KP_liberation_small_storage_building) then { - _space = (count KP_liberation_small_storage_positions) - (count (attachedObjects _x)); + if (typeOf _x == KPLIB_small_storage_building) then { + _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; if ((_space > 0) && ((((_tempLogistics select _currentIndex) select 6) select 0) > 0)) then { @@ -392,7 +392,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KP_liberation_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -409,7 +409,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1) - _amount, (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KP_liberation_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -426,7 +426,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2) - _amount] ]; - private _crate = [KP_liberation_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -436,7 +436,7 @@ while {KPLIB_endgame == 0} do { }; please_recalculate = true; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; } else { _x set [2,[0,0,0]]; _x set [3,[0,0,0]]; @@ -446,16 +446,16 @@ while {KPLIB_endgame == 0} do { _x set [7,0]; _x set [8,-1]; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic Group Update: %1", _x], "LOGISTIC"] call KPLIB_fnc_log;}; }; }; default {}; }; } forEach _tempLogistics; - KP_liberation_logistics = +_tempLogistics; + KPLIB_logistics = +_tempLogistics; - if (KP_liberation_logistic_debug > 0) then {[format ["Logistic interval finished - Time needed: %1 seconds", diag_tickTime - _start], "LOGISTIC"] call KPLIB_fnc_log;}; + if (KPLIB_logistic_debug > 0) then {[format ["Logistic interval finished - Time needed: %1 seconds", diag_tickTime - _start], "LOGISTIC"] call KPLIB_fnc_log;}; }; uiSleep 60; }; diff --git a/Missionframework/scripts/server/resources/manage_resources.sqf b/Missionframework/scripts/server/resources/manage_resources.sqf index bda47bd41..8f91429bd 100644 --- a/Missionframework/scripts/server/resources/manage_resources.sqf +++ b/Missionframework/scripts/server/resources/manage_resources.sqf @@ -1,5 +1,5 @@ waitUntil {!isNil "save_is_loaded"}; -waitUntil {!isNil "KP_liberation_production"}; +waitUntil {!isNil "KPLIB_production"}; waitUntil {save_is_loaded}; sectors_recalculating = false; @@ -11,7 +11,7 @@ while {KPLIB_endgame == 0} do { recalculate_sectors = false; - if (((count (allPlayers - entities "HeadlessClient_F")) > 0) && ((count KP_liberation_production) > 0)) then { + if (((count (allPlayers - entities "HeadlessClient_F")) > 0) && ((count KPLIB_production) > 0)) then { waitUntil {sleep 0.5; !sectors_recalculating}; sectors_recalculating = true; @@ -19,7 +19,7 @@ while {KPLIB_endgame == 0} do { if (sectors_timer) then {_time_update = true; sectors_timer = false;}; _start = diag_tickTime; - if (KP_liberation_production_debug > 0) then {[format ["Production interval started: %1 - _time_update: %2", diag_tickTime, _time_update], "PRODUCTION"] call KPLIB_fnc_log;}; + if (KPLIB_production_debug > 0) then {[format ["Production interval started: %1 - _time_update: %2", diag_tickTime, _time_update], "PRODUCTION"] call KPLIB_fnc_log;}; private _tempProduction = []; { @@ -29,8 +29,8 @@ while {KPLIB_endgame == 0} do { private _fuelValue = 0; private _time = _x select 8; - private _storage = nearestObjects [(markerPos (_x select 1)), [KP_liberation_small_storage_building], 100]; - _storage = _storage select {(_x getVariable ["KP_liberation_storage_type",-1]) == 1}; + private _storage = nearestObjects [(markerPos (_x select 1)), [KPLIB_small_storage_building], 100]; + _storage = _storage select {(_x getVariable ["KPLIB_storage_type",-1]) == 1}; if ((count _storage) > 0) then { _storage = (_storage select 0); _storageArray = [(getPosATL _storage),(getDir _storage),(vectorUpVisual _storage)]; @@ -38,14 +38,14 @@ while {KPLIB_endgame == 0} do { if (_time_update) then { if ((_time - 1) < 1) then { - _time = KP_liberation_production_interval; + _time = KPLIB_production_interval; if (((count (attachedObjects _storage)) < 12) && !((_x select 7) == 3)) then { - private _crateType = KP_liberation_supply_crate; + private _crateType = KPLIB_supply_crate; switch (_x select 7) do { - case 1: {_crateType = KP_liberation_ammo_crate; stats_ammo_produced = stats_ammo_produced + 100;}; - case 2: {_crateType = KP_liberation_fuel_crate; stats_fuel_produced = stats_fuel_produced + 100;}; - default {_crateType = KP_liberation_supply_crate; stats_supplies_produced = stats_supplies_produced + 100;}; + case 1: {_crateType = KPLIB_ammo_crate; stats_ammo_produced = stats_ammo_produced + 100;}; + case 2: {_crateType = KPLIB_fuel_crate; stats_fuel_produced = stats_fuel_produced + 100;}; + default {_crateType = KPLIB_supply_crate; stats_supplies_produced = stats_supplies_produced + 100;}; }; private _crate = [_crateType, 100, getPosATL _storage] call KPLIB_fnc_createCrate; @@ -58,9 +58,9 @@ while {KPLIB_endgame == 0} do { { switch ((typeOf _x)) do { - case KP_liberation_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KP_liberation_crate_value",0]);}; + case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _storage); @@ -80,14 +80,14 @@ while {KPLIB_endgame == 0} do { _ammoValue, _fuelValue ]; - if (KP_liberation_production_debug > 0) then {[format ["Production Update: %1", _tempProduction select _forEachIndex], "PRODUCTION"] call KPLIB_fnc_log;}; - } forEach KP_liberation_production; + if (KPLIB_production_debug > 0) then {[format ["Production Update: %1", _tempProduction select _forEachIndex], "PRODUCTION"] call KPLIB_fnc_log;}; + } forEach KPLIB_production; _tempProduction sort true; - KP_liberation_production = +_tempProduction; + KPLIB_production = +_tempProduction; sectors_recalculating = false; }; - if (KP_liberation_production_debug > 0) then {[format ["Production interval finished - Time needed: %1 seconds", diag_tickTime - _start], "PRODUCTION"] call KPLIB_fnc_log;}; + if (KPLIB_production_debug > 0) then {[format ["Production interval finished - Time needed: %1 seconds", diag_tickTime - _start], "PRODUCTION"] call KPLIB_fnc_log;}; waitUntil {sleep 1; recalculate_sectors}; }; diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index dbda57459..72f660816 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -1,12 +1,12 @@ waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; -KP_liberation_fob_resources = []; -KP_liberation_supplies_global = 0; -KP_liberation_ammo_global = 0; -KP_liberation_fuel_global = 0; -KP_liberation_heli_slots = 0; -KP_liberation_plane_slots = 0; +KPLIB_fob_resources = []; +KPLIB_supplies_global = 0; +KPLIB_ammo_global = 0; +KPLIB_fuel_global = 0; +KPLIB_heli_slots = 0; +KPLIB_plane_slots = 0; infantry_cap = 50 * KPLIB_resources_multiplier; please_recalculate = true; @@ -27,12 +27,12 @@ while {true} do { { private _fob_buildings = _x nearobjects KPLIB_fob_range; - private _storage_areas = _fob_buildings select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0}; - private _heliSlots = {(typeOf _x) == KP_liberation_heli_slot_building;} count _fob_buildings; - private _planeSlots = {(typeOf _x) == KP_liberation_plane_slot_building;} count _fob_buildings; - private _hasAirBuilding = {(typeOf _x) == KP_liberation_air_vehicle_building;} count _fob_buildings; + private _storage_areas = _fob_buildings select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; + private _heliSlots = {(typeOf _x) == KPLIB_heli_slot_building;} count _fob_buildings; + private _planeSlots = {(typeOf _x) == KPLIB_plane_slot_building;} count _fob_buildings; + private _hasAirBuilding = {(typeOf _x) == KPLIB_air_vehicle_building;} count _fob_buildings; if (_hasAirBuilding > 0) then {_hasAirBuilding = true;} else {_hasAirBuilding = false;}; - private _hasRecBuilding = {(typeOf _x) == KP_liberation_recycle_building;} count _fob_buildings; + private _hasRecBuilding = {(typeOf _x) == KPLIB_recycle_building;} count _fob_buildings; if (_hasRecBuilding > 0) then {_hasRecBuilding = true;} else {_hasRecBuilding = false;}; private _supplyValue = 0; @@ -42,9 +42,9 @@ while {true} do { { { switch ((typeOf _x)) do { - case KP_liberation_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KP_liberation_crate_value",0]);}; - case KP_liberation_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KP_liberation_crate_value",0]);}; + case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _x); @@ -64,12 +64,12 @@ while {true} do { }; } foreach blufor_sectors; - KP_liberation_fob_resources = _local_fob_resources; - KP_liberation_supplies_global = _local_supplies_global; - KP_liberation_ammo_global = _local_ammo_global; - KP_liberation_fuel_global = _local_fuel_global; - KP_liberation_heli_slots = _local_heli_slots; - KP_liberation_plane_slots = _local_plane_slots; + KPLIB_fob_resources = _local_fob_resources; + KPLIB_supplies_global = _local_supplies_global; + KPLIB_ammo_global = _local_ammo_global; + KPLIB_fuel_global = _local_fuel_global; + KPLIB_heli_slots = _local_heli_slots; + KPLIB_plane_slots = _local_plane_slots; infantry_cap = _local_infantry_cap; }; diff --git a/Missionframework/scripts/server/resources/unit_cap.sqf b/Missionframework/scripts/server/resources/unit_cap.sqf index f331da8b6..761ac86c7 100644 --- a/Missionframework/scripts/server/resources/unit_cap.sqf +++ b/Missionframework/scripts/server/resources/unit_cap.sqf @@ -1,6 +1,6 @@ unitcap = 0; -KP_liberation_heli_count = 0; -KP_liberation_plane_count = 0; +KPLIB_heli_count = 0; +KPLIB_plane_count = 0; while {true} do { private _local_unitcap = 0; @@ -12,7 +12,7 @@ while {true} do { }; } forEach allUnits; { - if ((toLower (typeOf _x)) in KPLIB_b_air_classes && !([typeOf _x] call KPLIB_fnc_isClassUAV) && alive _x && !(_x getVariable ["KP_liberation_preplaced", false])) then { + if ((toLower (typeOf _x)) in KPLIB_b_air_classes && !([typeOf _x] call KPLIB_fnc_isClassUAV) && alive _x && !(_x getVariable ["KPLIB_preplaced", false])) then { if (_x isKindOf "Helicopter") then { _local_heli_count = _local_heli_count + 1; }; @@ -22,7 +22,7 @@ while {true} do { }; } forEach vehicles; unitcap = _local_unitcap; - KP_liberation_heli_count = _local_heli_count; - KP_liberation_plane_count = _local_plane_count; + KPLIB_heli_count = _local_heli_count; + KPLIB_plane_count = _local_plane_count; sleep 1; }; diff --git a/Missionframework/scripts/server/secondary/convoy_hijack.sqf b/Missionframework/scripts/server/secondary/convoy_hijack.sqf index 35ee963c7..89ee06709 100644 --- a/Missionframework/scripts/server/secondary/convoy_hijack.sqf +++ b/Missionframework/scripts/server/secondary/convoy_hijack.sqf @@ -31,7 +31,7 @@ private _boxes_loaded = 0; while { _boxes_loaded < _boxes_amount } do { _boxes_loaded = _boxes_loaded + 1; sleep 0.5; - private _next_box = [KP_liberation_ammo_crate, 100, _spawnpos getPos [15, 135]] call KPLIB_fnc_createCrate; + private _next_box = [KPLIB_ammo_crate, 100, _spawnpos getPos [15, 135]] call KPLIB_fnc_createCrate; sleep 0.5; [_next_box, 50] call _load_box_fnc; }; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf index 7fcb70976..94e3040d5 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf @@ -59,13 +59,13 @@ if ( KPLIB_endgame == 0 ) then { { detach _x; deleteVehicle _x; - } forEach (attachedObjects ((nearestObjects [((_x select 3) select 0), [KP_liberation_small_storage_building], 10]) select 0)); + } forEach (attachedObjects ((nearestObjects [((_x select 3) select 0), [KPLIB_small_storage_building], 10]) select 0)); - deleteVehicle ((nearestObjects [((_x select 3) select 0), [KP_liberation_small_storage_building], 10]) select 0); + deleteVehicle ((nearestObjects [((_x select 3) select 0), [KPLIB_small_storage_building], 10]) select 0); }; - KP_liberation_production = KP_liberation_production - [_x]; + KPLIB_production = KPLIB_production - [_x]; }; - } forEach KP_liberation_production; + } forEach KPLIB_production; } else { [_sector, 3] remoteExec ["remote_call_sector"]; {[_x] spawn prisonner_ai;} foreach (((markerpos _sector) nearEntities ["Man", KPLIB_capture_size * 0.8]) select {side group _x == KPLIB_side_enemy}); diff --git a/Missionframework/scripts/server/sector/fn_destroyFob.sqf b/Missionframework/scripts/server/sector/fn_destroyFob.sqf index 672934a0c..3435f0d83 100644 --- a/Missionframework/scripts/server/sector/fn_destroyFob.sqf +++ b/Missionframework/scripts/server/sector/fn_destroyFob.sqf @@ -32,7 +32,7 @@ _buildings append KPLIB_b_buildings_classes; }; } forEach ((_fobPos nearObjects (KPLIB_fob_range * 1.2)) select {getObjectType _x >= 8}); -KP_liberation_clearances deleteAt (KP_liberation_clearances findIf {(_x select 0) isEqualTo _fobPos}); -publicVariable "KP_liberation_clearances"; +KPLIB_clearances deleteAt (KPLIB_clearances findIf {(_x select 0) isEqualTo _fobPos}); +publicVariable "KPLIB_clearances"; true diff --git a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf index 87761c931..eb05d95ed 100644 --- a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf +++ b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf @@ -34,7 +34,7 @@ if !(_sector in KPLIB_sectorCratesSpawned) then { for "_i" from 1 to _amount do { while {_spawnPos isEqualTo []} do { _j = _j + 1; - _spawnPos = ((markerPos _sector) getPos [random 50, random 360]) findEmptyPosition [10, 40, KP_liberation_ammo_crate]; + _spawnPos = ((markerPos _sector) getPos [random 50, random 360]) findEmptyPosition [10, 40, KPLIB_ammo_crate]; if (_j isEqualTo 10) exitWith {}; }; if !(_spawnPos isEqualTo []) then { diff --git a/Missionframework/scripts/server/sector/ied_manager.sqf b/Missionframework/scripts/server/sector/ied_manager.sqf index 752ad7cbc..557464fe8 100644 --- a/Missionframework/scripts/server/sector/ied_manager.sqf +++ b/Missionframework/scripts/server/sector/ied_manager.sqf @@ -2,7 +2,7 @@ params ["_sector", "_radius", "_number"]; if (_number <= 0) exitWith {}; -if (KP_liberation_asymmetric_debug > 0) then {[format ["ied_manager.sqf for %1 spawned on: %2", markerText _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["ied_manager.sqf for %1 spawned on: %2", markerText _sector, debug_source], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; _number = round _number; @@ -22,7 +22,7 @@ private _roadobj = [(markerPos _sector) getPos [random _radius, random 360], _ra private _goes_boom = false; private _ied_marker = ""; -if (KP_liberation_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> spawning IED %1 at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (KPLIB_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> spawning IED %1 at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; if (_number > 0) then { [_sector, _radius, _number - 1] spawn ied_manager; @@ -34,7 +34,7 @@ if (!(isnull _roadobj)) then { _ied_obj = createMine [_ied_type, _roadpos getPos [_spread, random 360], [], 0]; _ied_obj setdir (random 360); - if (KP_liberation_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> IED %1 spawned at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> IED %1 spawned at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; while {_sector in active_sectors && mineActive _ied_obj && !_goes_boom} do { _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_friendly}; @@ -52,10 +52,10 @@ if (!(isnull _roadobj)) then { sleep 1; }; } else { - if (KP_liberation_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> _roadobj is Null for IED %1 at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> _roadobj is Null for IED %1 at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; }; -if ((KP_liberation_asymmetric_debug > 0) && !(isNull _roadobj)) then {[format ["ied_manager.sqf -> exited IED %1 loop at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if ((KPLIB_asymmetric_debug > 0) && !(isNull _roadobj)) then {[format ["ied_manager.sqf -> exited IED %1 loop at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; sleep 1800; diff --git a/Missionframework/scripts/server/sector/manage_one_sector.sqf b/Missionframework/scripts/server/sector/manage_one_sector.sqf index e634fb9b2..66afbcc55 100644 --- a/Missionframework/scripts/server/sector/manage_one_sector.sqf +++ b/Missionframework/scripts/server/sector/manage_one_sector.sqf @@ -28,7 +28,7 @@ private _squad3 = []; private _squad4 = []; private _minimum_building_positions = 5; private _sector_despawn_tickets = BASE_TICKETS; -private _maximum_additional_tickets = (KP_liberation_delayDespawnMax * 60 / SECTOR_TICK_TIME); +private _maximum_additional_tickets = (KPLIB_delayDespawnMax * 60 / SECTOR_TICK_TIME); private _popfactor = 1; private _guerilla = false; @@ -61,7 +61,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _spawncivs = true; - if (((random 100) <= KP_liberation_resistance_sector_chance) && (([] call KPLIB_fnc_crGetMulti) > 0)) then { + if (((random 100) <= KPLIB_resistance_sector_chance) && (([] call KPLIB_fnc_crGetMulti) > 0)) then { _guerilla = true; }; @@ -69,8 +69,8 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _building_range = 200; _local_capture_size = _local_capture_size * 1.4; - if (KP_liberation_civ_rep < 0) then { - _iedcount = round (2 + (ceil (random 4)) * (round ((KP_liberation_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); + if (KPLIB_civ_rep < 0) then { + _iedcount = round (2 + (ceil (random 4)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); } else { _iedcount = 0; }; @@ -95,15 +95,15 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _spawncivs = true; - if (((random 100) <= KP_liberation_resistance_sector_chance) && (([] call KPLIB_fnc_crGetMulti) > 0)) then { + if (((random 100) <= KPLIB_resistance_sector_chance) && (([] call KPLIB_fnc_crGetMulti) > 0)) then { _guerilla = true; }; _building_ai_max = round ((floor (18 + (round (combat_readiness / 10 )))) * _popfactor); _building_range = 120; - if (KP_liberation_civ_rep < 0) then { - _iedcount = round ((ceil (random 4)) * (round ((KP_liberation_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); + if (KPLIB_civ_rep < 0) then { + _iedcount = round ((ceil (random 4)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); } else { _iedcount = 0; }; @@ -139,15 +139,15 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _spawncivs = false; - if (((random 100) <= KP_liberation_resistance_sector_chance) && (([] call KPLIB_fnc_crGetMulti) > 0)) then { + if (((random 100) <= KPLIB_resistance_sector_chance) && (([] call KPLIB_fnc_crGetMulti) > 0)) then { _guerilla = true; }; _building_ai_max = round ((floor (18 + (round (combat_readiness / 10 )))) * _popfactor); _building_range = 120; - if (KP_liberation_civ_rep < 0) then { - _iedcount = round ((ceil (random 3)) * (round ((KP_liberation_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); + if (KPLIB_civ_rep < 0) then { + _iedcount = round ((ceil (random 3)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); } else { _iedcount = 0; }; @@ -168,7 +168,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _vehtospawn = _vehtospawn select {!(isNil "_x")}; - if (KP_liberation_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - manage_one_sector calculated -> _infsquad: %3 - _squad1: %4 - _squad2: %5 - _squad3: %6 - _squad4: %7 - _vehtospawn: %8 - _building_ai_max: %9", (markerText _sector), _sector, _infsquad, (count _squad1), (count _squad2), (count _squad3), (count _squad4), (count _vehtospawn), _building_ai_max], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - manage_one_sector calculated -> _infsquad: %3 - _squad1: %4 - _squad2: %5 - _squad3: %6 - _squad4: %7 - _vehtospawn: %8 - _building_ai_max: %9", (markerText _sector), _sector, _infsquad, (count _squad1), (count _squad2), (count _squad3), (count _squad4), (count _vehtospawn), _building_ai_max], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; if (_building_ai_max > 0 && KPLIB_adaptive_opfor) then { _building_ai_max = round (_building_ai_max * ([] call KPLIB_fnc_getOpforFactor)); @@ -188,7 +188,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K { _buildingpositions = _buildingpositions + ([_x] call BIS_fnc_buildingPositions); } forEach _allbuildings; - if (KP_liberation_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - manage_one_sector found %3 building positions", (markerText _sector), _sector, (count _buildingpositions)], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - manage_one_sector found %3 building positions", (markerText _sector), _sector, (count _buildingpositions)], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; if (count _buildingpositions > _minimum_building_positions) then { _managed_units = _managed_units + ([_infsquad, _building_ai_max, _buildingpositions, _sector] call KPLIB_fnc_spawnBuildingSquad); }; @@ -224,7 +224,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _managed_units = _managed_units + ([_sector] call KPLIB_fnc_spawnCivilians); }; - if (KP_liberation_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - Range: %3 - Count: %4", (markerText _sector), _sector, _building_range, _iedcount], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - Range: %3 - Count: %4", (markerText _sector), _sector, _building_range, _iedcount], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; [_sector, _building_range, _iedcount] spawn ied_manager; if (_guerilla) then { @@ -237,7 +237,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K [_sector] remoteExec ["reinforcements_remote_call",2]; }; - if (KP_liberation_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - populating done", (markerText _sector), _sector], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; + if (KPLIB_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - populating done", (markerText _sector), _sector], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; private _activationTime = time; // sector lifetime loop diff --git a/Missionframework/scripts/server/support/fn_createSuppModules.sqf b/Missionframework/scripts/server/support/fn_createSuppModules.sqf index 24c0566ae..c8c08b219 100644 --- a/Missionframework/scripts/server/support/fn_createSuppModules.sqf +++ b/Missionframework/scripts/server/support/fn_createSuppModules.sqf @@ -2,7 +2,7 @@ File: fn_createSuppModules.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-21 - Last Update: 2020-04-22 + Last Update: 2020-05-10 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,7 +15,7 @@ Function reached the end [BOOL] */ -if (!isServer || KP_liberation_suppMod isEqualTo 0) exitWith {false}; +if (!isServer || KPLIB_suppMod isEqualTo 0) exitWith {false}; ["Creating modules", "SUPPORTMODULES"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/shared/diagnostics.sqf b/Missionframework/scripts/shared/diagnostics.sqf index ca58dd1fa..af4b948a1 100644 --- a/Missionframework/scripts/shared/diagnostics.sqf +++ b/Missionframework/scripts/shared/diagnostics.sqf @@ -5,13 +5,13 @@ private _source = ""; [format ["World: %1", worldName], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Version: %1", (localize "STR_MISSION_VERSION")], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Author: %1", [missionConfigFile] call BIS_fnc_overviewAuthor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Blufor: %1", KP_liberation_preset_blufor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Opfor: %1", KP_liberation_preset_opfor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Resistance: %1", KP_liberation_preset_resistance], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Civilians: %1", KP_liberation_preset_civilians], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Arsenal: %1", KP_liberation_arsenal], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Blufor: %1", KPLIB_preset_blufor], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Opfor: %1", KPLIB_preset_opfor], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Resistance: %1", KPLIB_preset_resistance], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Civilians: %1", KPLIB_preset_civilians], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Arsenal: %1", KPLIB_arsenal], "MISSIONSTART"] call KPLIB_fnc_log; [format ["CBA: %1", KPPLM_CBA], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["ACE: %1", KP_liberation_ace], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["ACE: %1", KPLIB_ace], "MISSIONSTART"] call KPLIB_fnc_log; [format ["KP Ranks: %1", KPPLM_KPR], "MISSIONSTART"] call KPLIB_fnc_log; ["------------------------------------", "MISSIONSTART"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/shared/fetch_params.sqf b/Missionframework/scripts/shared/fetch_params.sqf index ead472c7a..34b9c97f1 100644 --- a/Missionframework/scripts/shared/fetch_params.sqf +++ b/Missionframework/scripts/shared/fetch_params.sqf @@ -1,20 +1,20 @@ #include "defines.hpp" // Check if ACE is running -if (isClass (configfile >> "CfgPatches" >> "ace_common")) then {KP_liberation_ace = true; ["ACE detected. Deactivating resupply script from Liberation.", "MOD"] call KPLIB_fnc_log;} else {KP_liberation_ace = false}; +if (isClass (configfile >> "CfgPatches" >> "ace_common")) then {KPLIB_ace = true; ["ACE detected. Deactivating resupply script from Liberation.", "MOD"] call KPLIB_fnc_log;} else {KPLIB_ace = false}; /* Not saveable params */ KPLIB_param_wipe_savegame_1 = ["WipeSave1", 0] call bis_fnc_getParamValue; KPLIB_param_wipe_savegame_2 = ["WipeSave2", 0] call bis_fnc_getParamValue; -KP_liberation_civinfo_debug = ["DebugCivInfo", 0] call bis_fnc_getParamValue; -KP_liberation_civrep_debug = ["DebugCivRep", 0] call bis_fnc_getParamValue; -KP_liberation_savegame_debug = ["DebugSave", 0] call bis_fnc_getParamValue; -KP_liberation_asymmetric_debug = ["DebugAsymmetric", 0] call bis_fnc_getParamValue; -KP_liberation_logistic_debug = ["DebugLogistic", 0] call bis_fnc_getParamValue; -KP_liberation_sectorspawn_debug = ["DebugSectorSpawn", 0] call bis_fnc_getParamValue; -KP_liberation_kill_debug = ["DebugKill", 0] call bis_fnc_getParamValue; -KP_liberation_production_debug = ["DebugProduction", 0] call bis_fnc_getParamValue; -KP_liberation_highcommand_debug = ["DebugHighCommand", 0] call bis_fnc_getParamValue; +KPLIB_civinfo_debug = ["DebugCivInfo", 0] call bis_fnc_getParamValue; +KPLIB_civrep_debug = ["DebugCivRep", 0] call bis_fnc_getParamValue; +KPLIB_savegame_debug = ["DebugSave", 0] call bis_fnc_getParamValue; +KPLIB_asymmetric_debug = ["DebugAsymmetric", 0] call bis_fnc_getParamValue; +KPLIB_logistic_debug = ["DebugLogistic", 0] call bis_fnc_getParamValue; +KPLIB_sectorspawn_debug = ["DebugSectorSpawn", 0] call bis_fnc_getParamValue; +KPLIB_kill_debug = ["DebugKill", 0] call bis_fnc_getParamValue; +KPLIB_production_debug = ["DebugProduction", 0] call bis_fnc_getParamValue; +KPLIB_highcommand_debug = ["DebugHighCommand", 0] call bis_fnc_getParamValue; KP_load_params = ["LoadSaveParams", 1] call BIS_fnc_getParamValue; @@ -45,7 +45,7 @@ if(isServer) then { GET_PARAM_BOOL(KPLIB_adaptive_opfor, "AdaptToPlayercount", 1); GET_PARAM(KPLIB_civilian_activity, "Civilians", 1); GET_PARAM_BOOL(KPLIB_build_first_fob, "FirstFob", 0); - GET_PARAM_BOOL(KP_liberation_fob_vehicle, "FirstFobVehicle", 0); + GET_PARAM_BOOL(KPLIB_fob_vehicle, "FirstFobVehicle", 0); GET_PARAM(KPLIB_maximum_fobs, "MaximumFobs", 26); GET_PARAM(KPLIB_max_squad_size, "MaxSquadSize", 10); GET_PARAM_BOOL(KPLIB_blufor_defenders, "BluforDefenders", 1); @@ -53,11 +53,11 @@ if(isServer) then { GET_PARAM(KPLIB_time_factor, "DayDuration", 12); GET_PARAM_BOOL(KPLIB_shorter_nights, "ShorterNights", 0); GET_PARAM(KPLIB_weather_param, "Weather", 3); - GET_PARAM_BOOL(KP_liberation_fog_param, "VanillaFog", 1); + GET_PARAM_BOOL(KPLIB_fog_param, "VanillaFog", 1); GET_PARAM(KPLIB_resources_multiplier, "ResourcesMultiplier", 3); - GET_PARAM_BOOL(KP_liberation_arsenal_type, "ArsenalType", 0); - GET_PARAM_BOOL(KP_liberation_playermenu, "PlayerMenu", 1); - GET_PARAM(KP_liberation_victoryCondition, "VictoryCondition", 0); + GET_PARAM_BOOL(KPLIB_arsenal_type, "ArsenalType", 0); + GET_PARAM_BOOL(KPLIB_playermenu, "PlayerMenu", 1); + GET_PARAM(KPLIB_victoryCondition, "VictoryCondition", 0); // Deactivate BI Revive when ACE Medical is running if (isClass (configfile >> "CfgPatches" >> "ace_medical")) then { @@ -80,22 +80,22 @@ if(isServer) then { ["--- Gameplay Options ---", "PARAM"] call KPLIB_fnc_log; GET_PARAM_BOOL(KPLIB_fatigue, "Fatigue", 1); GET_PARAM_BOOL(KPLIB_sway, "WeaponSway", 1); - GET_PARAM_BOOL(KP_liberation_arsenalUsePreset, "ArsenalUsePreset", 1); - GET_PARAM_BOOL(KP_liberation_mapmarkers, "MapMarkers", 1); - GET_PARAM_BOOL(KP_liberation_mobilerespawn, "MobileRespawn", 1); - GET_PARAM(KP_liberation_respawn_cooldown, "RespawnCooldown", 900); - GET_PARAM_BOOL(KP_liberation_mobilearsenal, "MobileArsenal", 1); - GET_PARAM_BOOL(KP_liberation_ailogistics, "AiLogistics", 1); - GET_PARAM_BOOL(KP_liberation_cr_param_buildings, "CR_Building", 0); + GET_PARAM_BOOL(KPLIB_arsenalUsePreset, "ArsenalUsePreset", 1); + GET_PARAM_BOOL(KPLIB_mapmarkers, "MapMarkers", 1); + GET_PARAM_BOOL(KPLIB_mobilerespawn, "MobileRespawn", 1); + GET_PARAM(KPLIB_respawn_cooldown, "RespawnCooldown", 900); + GET_PARAM_BOOL(KPLIB_mobilearsenal, "MobileArsenal", 1); + GET_PARAM_BOOL(KPLIB_ailogistics, "AiLogistics", 1); + GET_PARAM_BOOL(KPLIB_cr_param_buildings, "CR_Building", 0); GET_PARAM(KPLIB_halo_param, "HaloJump", 1); - GET_PARAM_BOOL(KP_liberation_clear_cargo, "ClearCargo", 1); - GET_PARAM(KP_liberation_allowEnemiesInImmobile, "AllowEnemiesInImmobile", 50); - GET_PARAM(KP_liberation_delayDespawnMax, "DelayDespawnMax", 5); - GET_PARAM_BOOL(KP_liberation_limited_zeus, "LimitedZeus", 1); - GET_PARAM_BOOL(KP_liberation_enemies_zeus, "ZeusAddEnemies", 1); - GET_PARAM_BOOL(KP_liberation_high_command, "HighCommand", 1); - GET_PARAM(KP_liberation_suppMod, "SuppMod", 1); - GET_PARAM_BOOL(KP_liberation_tutorial, "Tutorial", 1); + GET_PARAM_BOOL(KPLIB_clear_cargo, "ClearCargo", 1); + GET_PARAM(KPLIB_allowEnemiesInImmobile, "AllowEnemiesInImmobile", 50); + GET_PARAM(KPLIB_delayDespawnMax, "DelayDespawnMax", 5); + GET_PARAM_BOOL(KPLIB_limited_zeus, "LimitedZeus", 1); + GET_PARAM_BOOL(KPLIB_enemies_zeus, "ZeusAddEnemies", 1); + GET_PARAM_BOOL(KPLIB_high_command, "HighCommand", 1); + GET_PARAM(KPLIB_suppMod, "SuppMod", 1); + GET_PARAM_BOOL(KPLIB_tutorial, "Tutorial", 1); // Technical Options ["--- Technical Options ---", "PARAM"] call KPLIB_fnc_log; @@ -104,10 +104,10 @@ if(isServer) then { GET_PARAM_BOOL(KPLIB_introduction, "Introduction", 1); GET_PARAM_BOOL(KPLIB_deployment_cinematic, "DeploymentCinematic", 1); GET_PARAM_BOOL(KPLIB_use_whitelist, "Whitelist", 0); - GET_PARAM(KP_liberation_restart, "ServerRestart", 0); + GET_PARAM(KPLIB_restart, "ServerRestart", 0); - GREUH_allow_mapmarkers = KP_liberation_mapmarkers; publicVariable "GREUH_allow_mapmarkers"; - GREUH_allow_platoonview = KP_liberation_mapmarkers; publicVariable "GREUH_allow_platoonview"; + GREUH_allow_mapmarkers = KPLIB_mapmarkers; publicVariable "GREUH_allow_mapmarkers"; + GREUH_allow_platoonview = KPLIB_mapmarkers; publicVariable "GREUH_allow_platoonview"; KP_serverParamsFetched = true; publicVariable "KP_serverParamsFetched"; @@ -167,9 +167,9 @@ switch (KPLIB_resources_multiplier) do { default {KPLIB_resources_multiplier = 1;}; }; -switch (KP_liberation_victoryCondition) do { +switch (KPLIB_victoryCondition) do { case 1: { - KP_liberation_victoryCheck = { + KPLIB_victoryCheck = { (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) && { @@ -178,7 +178,7 @@ switch (KP_liberation_victoryCondition) do { }; }; case 2: { - KP_liberation_victoryCheck = { + KPLIB_victoryCheck = { (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) && { @@ -187,7 +187,7 @@ switch (KP_liberation_victoryCondition) do { }; }; case 3: { - KP_liberation_victoryCheck = { + KPLIB_victoryCheck = { (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) && { @@ -196,12 +196,12 @@ switch (KP_liberation_victoryCondition) do { }; }; case 4: { - KP_liberation_victoryCheck = { + KPLIB_victoryCheck = { (count blufor_sectors) == (count sectors_allSectors) }; }; default { - KP_liberation_victoryCheck = { + KPLIB_victoryCheck = { (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) }; }; @@ -256,7 +256,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_FIRSTFOBVEHICLE"; - _value = if (KP_liberation_fob_vehicle) then {localize "STR_PARAMS_FIRSTFOBVEHICLE_TRUCK";} else {localize "STR_PARAMS_FIRSTFOBVEHICLE_CONTAINTER";}; + _value = if (KPLIB_fob_vehicle) then {localize "STR_PARAMS_FIRSTFOBVEHICLE_TRUCK";} else {localize "STR_PARAMS_FIRSTFOBVEHICLE_CONTAINTER";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_FOBS_COUNT"; @@ -292,7 +292,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_FOG_PARAM"; - _value = if (KP_liberation_fog_param) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_fog_param) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_RESOURCESMULTIPLIER"; @@ -300,15 +300,15 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_ARSENAL"; - _value = if (KP_liberation_arsenal_type) then {localize "STR_PARAMS_ARSENAL_ACE";} else {localize "STR_PARAMS_ARSENAL_BI";}; + _value = if (KPLIB_arsenal_type) then {localize "STR_PARAMS_ARSENAL_ACE";} else {localize "STR_PARAMS_ARSENAL_BI";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_PLAYERMENU"; - _value = if (KP_liberation_playermenu) then {localize "STR_PARAMS_PLAYERMENU_KP";} else {localize "STR_PARAMS_PLAYERMENU_GREUH";}; + _value = if (KPLIB_playermenu) then {localize "STR_PARAMS_PLAYERMENU_KP";} else {localize "STR_PARAMS_PLAYERMENU_GREUH";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_VICTORYCONDITION"; - switch (KP_liberation_victoryCondition) do { + switch (KPLIB_victoryCondition) do { case 1: {_value = localize "STR_PARAMS_VICTORYCONDITION_1";}; case 2: {_value = localize "STR_PARAMS_VICTORYCONDITION_2";}; case 3: {_value = localize "STR_PARAMS_VICTORYCONDITION_3";}; @@ -368,31 +368,31 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_ARSENALUSEPRESET"; - _value = if (KP_liberation_arsenalUsePreset) then {localize "STR_PARAMS_USEPRESET";} else {localize "STR_PARAMS_NORESTRICTIONS";}; + _value = if (KPLIB_arsenalUsePreset) then {localize "STR_PARAMS_USEPRESET";} else {localize "STR_PARAMS_NORESTRICTIONS";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_MAPMARKERS"; - _value = if (KP_liberation_mapmarkers) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_mapmarkers) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_MOBILERESPAWN"; - _value = if (KP_liberation_mobilerespawn) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_mobilerespawn) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_RESPAWN_COOLDOWN"; - _value = if (KP_liberation_respawn_cooldown == 0) then {localize "STR_PARAMS_DISABLED";} else {str (KP_liberation_respawn_cooldown / 60);}; + _value = if (KPLIB_respawn_cooldown == 0) then {localize "STR_PARAMS_DISABLED";} else {str (KPLIB_respawn_cooldown / 60);}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_MOBILEARSENAL"; - _value = if (KP_liberation_mobilearsenal) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_mobilearsenal) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_AILOGISTICS"; - _value = if (KP_liberation_ailogistics) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_ailogistics) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_CR_BUILDING"; - _value = if (KP_liberation_cr_param_buildings) then {localize "STR_PARAM_CR_DAMAGED";} else {localize "STR_PARAM_CR_DESTROYED";}; + _value = if (KPLIB_cr_param_buildings) then {localize "STR_PARAM_CR_DAMAGED";} else {localize "STR_PARAM_CR_DESTROYED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_HALO_PARAM"; @@ -408,31 +408,31 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_CLEAR_CARGO"; - _value = if (KP_liberation_clear_cargo) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_clear_cargo) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_ALLOW_ENEMIES_IN_IMMOBILE"; - _value = if (KP_liberation_allowEnemiesInImmobile == 0) then {localize "STR_PARAMS_DISABLED";} else {KP_liberation_allowEnemiesInImmobile;}; + _value = if (KPLIB_allowEnemiesInImmobile == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_allowEnemiesInImmobile;}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_DELAY_DESPAWN_MAX"; - _value = if (KP_liberation_delayDespawnMax == 0) then {localize "STR_PARAMS_DISABLED";} else {KP_liberation_delayDespawnMax;}; + _value = if (KPLIB_delayDespawnMax == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_delayDespawnMax;}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_LIMITEDZEUS"; - _value = if (KP_liberation_limited_zeus) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_limited_zeus) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_ZEUSADDENEMIES"; - _value = if (KP_liberation_enemies_zeus) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_enemies_zeus) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_HIGHCOMMAND"; - _value = if (KP_liberation_high_command) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_high_command) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_SUPPMOD"; - switch (KP_liberation_suppMod) do { + switch (KPLIB_suppMod) do { case 1: {_value = localize "STR_PARAM_SUPPMOD_CMDRANDWHITELIST";}; case 2: {_value = localize "STR_PARAM_SUPPMOD_EVERYONE";}; default {_value = localize "STR_PARAMS_DISABLED";}; @@ -440,7 +440,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_TUTORIAL"; - _value = if (KP_liberation_tutorial) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_tutorial) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PERMISSIONS_PARAM"; @@ -469,7 +469,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_RESTART_PARAM"; - _value = if (KP_liberation_restart == 0) then {localize "STR_PARAMS_DISABLED";} else {KP_liberation_restart;}; + _value = if (KPLIB_restart == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_restart;}; _text = _text + format ["%1
%2

", _param, _value]; player createDiaryRecord ["parameters", ["Active", _text]]; diff --git a/Missionframework/scripts/shared/init_shared.sqf b/Missionframework/scripts/shared/init_shared.sqf index 1380016a4..118a0e4b6 100644 --- a/Missionframework/scripts/shared/init_shared.sqf +++ b/Missionframework/scripts/shared/init_shared.sqf @@ -12,7 +12,7 @@ start_secondary_remote_call = compileFinal preprocessFileLineNumbers "scripts\se zeus_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\zeus_remote_call.sqf"; change_prod_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\change_prod_remote_call.sqf"; build_fac_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\build_fac_remote_call.sqf"; -if (KP_liberation_ailogistics) then { +if (KPLIB_ailogistics) then { add_logiGroup_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\add_logiGroup_remote_call.sqf"; del_logiGroup_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\del_logiGroup_remote_call.sqf"; add_logiTruck_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\add_logiTruck_remote_call.sqf"; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index e0a0bea82..1d625f4af 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -2,21 +2,21 @@ params ["_unit", "_killer"]; if (isServer) then { - if (KP_liberation_kill_debug > 0) then {[format ["Kill Manager executed - _unit: %1 (%2) - _killer: %3 (%4)", typeOf _unit, _unit, typeOf _killer, _killer], "KILL"] call KPLIB_fnc_log;}; + if (KPLIB_kill_debug > 0) then {[format ["Kill Manager executed - _unit: %1 (%2) - _killer: %3 (%4)", typeOf _unit, _unit, typeOf _killer, _killer], "KILL"] call KPLIB_fnc_log;}; // Get Killer, when ACE enabled, via lastDamageSource - if (KP_liberation_ace) then { + if (KPLIB_ace) then { if (local _unit) then { _killer = _unit getVariable ["ace_medical_lastDamageSource", _killer]; - if (KP_liberation_kill_debug > 0) then {["_unit is local to server", "KILL"] call KPLIB_fnc_log;}; + if (KPLIB_kill_debug > 0) then {["_unit is local to server", "KILL"] call KPLIB_fnc_log;}; } else { - if (KP_liberation_kill_debug > 0) then {["_unit is not local to server", "KILL"] call KPLIB_fnc_log;}; - if (isNil "KP_liberation_ace_killer") then {KP_liberation_ace_killer = objNull;}; - waitUntil {sleep 0.5; !(isNull KP_liberation_ace_killer)}; - if (KP_liberation_kill_debug > 0) then {["KP_liberation_ace_killer received on server", "KILL"] call KPLIB_fnc_log;}; - _killer = KP_liberation_ace_killer; - KP_liberation_ace_killer = objNull; - publicVariable "KP_liberation_ace_killer"; + if (KPLIB_kill_debug > 0) then {["_unit is not local to server", "KILL"] call KPLIB_fnc_log;}; + if (isNil "KPLIB_ace_killer") then {KPLIB_ace_killer = objNull;}; + waitUntil {sleep 0.5; !(isNull KPLIB_ace_killer)}; + if (KPLIB_kill_debug > 0) then {["KPLIB_ace_killer received on server", "KILL"] call KPLIB_fnc_log;}; + _killer = KPLIB_ace_killer; + KPLIB_ace_killer = objNull; + publicVariable "KPLIB_ace_killer"; }; }; @@ -97,7 +97,7 @@ if (isServer) then { // Resistance casualty if (side (group _unit) == KPLIB_side_resistance) then { - KP_liberation_guerilla_strength = KP_liberation_guerilla_strength - 1; + KPLIB_guerilla_strength = KPLIB_guerilla_strength - 1; stats_resistance_killed = stats_resistance_killed + 1; // Resistance is friendly to BLUFOR @@ -105,10 +105,10 @@ if (isServer) then { // Killed by BLUFOR if (side _killer == KPLIB_side_friendly) then { - if (KP_liberation_asymmetric_debug > 0) then {[format ["Guerilla unit killed by: %1", name _killer], "ASYMMETRIC"] call KPLIB_fnc_log;}; + if (KPLIB_asymmetric_debug > 0) then {[format ["Guerilla unit killed by: %1", name _killer], "ASYMMETRIC"] call KPLIB_fnc_log;}; [3, [(name _unit)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; stats_resistance_teamkills = stats_resistance_teamkills + 1; - [KP_liberation_cr_resistance_penalty, true] spawn F_cr_changeCR; + [KPLIB_cr_resistance_penalty, true] spawn F_cr_changeCR; }; // Killed by a player @@ -124,9 +124,9 @@ if (isServer) then { // Killed by BLUFOR if (side _killer == KPLIB_side_friendly) then { - if (KP_liberation_civrep_debug > 0) then {[format ["Civilian killed by: %1", name _killer], "CIVREP"] call KPLIB_fnc_log;}; + if (KPLIB_civrep_debug > 0) then {[format ["Civilian killed by: %1", name _killer], "CIVREP"] call KPLIB_fnc_log;}; [2, [(name _unit)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; - [KP_liberation_cr_kill_penalty, true] spawn F_cr_changeCR; + [KPLIB_cr_kill_penalty, true] spawn F_cr_changeCR; }; // Killed by a player @@ -160,9 +160,9 @@ if (isServer) then { }; } else { // Get Killer and send it to server, when ACE enabled, via lastDamageSource - if (KP_liberation_ace && local _unit) then { - if (KP_liberation_kill_debug > 0) then {[format ["_unit is local to: %1", debug_source], "KILL"] remoteExecCall ["KPLIB_fnc_log", 2];}; - KP_liberation_ace_killer = _unit getVariable ["ace_medical_lastDamageSource", _killer]; - publicVariable "KP_liberation_ace_killer"; + if (KPLIB_ace && local _unit) then { + if (KPLIB_kill_debug > 0) then {[format ["_unit is local to: %1", debug_source], "KILL"] remoteExecCall ["KPLIB_fnc_log", 2];}; + KPLIB_ace_killer = _unit getVariable ["ace_medical_lastDamageSource", _killer]; + publicVariable "KPLIB_ace_killer"; }; }; diff --git a/_tools/README.md b/_tools/README.md index 686832241..f7930d00e 100644 --- a/_tools/README.md +++ b/_tools/README.md @@ -56,13 +56,13 @@ Every `Preset` entry should have following structure: // Keys of object represent variables in . // These variables values will be set to corresponding value in - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 0, - "KP_liberation_preset_opfor": 0, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 0, + "KPLIB_preset_opfor": 0, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 } } ``` diff --git a/_tools/_presets.json b/_tools/_presets.json index 84e459dcb..d56441f12 100644 --- a/_tools/_presets.json +++ b/_tools/_presets.json @@ -3,13 +3,13 @@ "sourceFolder": "kp_liberation.Altis", "missionName": "kp_liberation", "map": "Altis", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 0, - "KP_liberation_preset_opfor": 0, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 0, + "KPLIB_preset_opfor": 0, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 }, "workshopId": "1578862234" }, @@ -17,13 +17,13 @@ "sourceFolder": "kp_liberation.Chernarus", "missionName": "kp_liberation", "map": "Chernarus", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 6, - "KP_liberation_preset_opfor": 2, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 6, + "KPLIB_preset_opfor": 2, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 }, "workshopId": "880462893" }, @@ -32,13 +32,13 @@ "missionName": "kp_liberation", "map": "Chernarus_Winter", "mapDisplay": "Chernarus Winter", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 6, - "KP_liberation_preset_opfor": 2, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 6, + "KPLIB_preset_opfor": 2, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 }, "workshopId": "1598002157" }, @@ -47,13 +47,13 @@ "missionName": "kp_liberation", "map": "Enoch", "mapDisplay": "Livonia", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 30, - "KP_liberation_preset_opfor": 1, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 30, + "KPLIB_preset_opfor": 1, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 }, "workshopId": "1816049282" }, @@ -62,13 +62,13 @@ "missionName": "kp_liberation", "map": "gm_weferlingen_summer", "mapDisplay": "Weferlingen", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 9, - "KP_liberation_preset_opfor": 10, - "KP_liberation_preset_resistance": 5, - "KP_liberation_preset_civilians": 4, - "KP_liberation_arsenal": 4 + "KPLIB_preset_blufor": 9, + "KPLIB_preset_opfor": 10, + "KPLIB_preset_resistance": 5, + "KPLIB_preset_civilians": 4, + "KPLIB_arsenal": 4 }, "workshopId": "1737367431" }, @@ -77,13 +77,13 @@ "missionName": "kp_liberation", "map": "gm_weferlingen_winter", "mapDisplay": "Weferlingen Winter", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 10, - "KP_liberation_preset_opfor": 11, - "KP_liberation_preset_resistance": 5, - "KP_liberation_preset_civilians": 4, - "KP_liberation_arsenal": 4 + "KPLIB_preset_blufor": 10, + "KPLIB_preset_opfor": 11, + "KPLIB_preset_resistance": 5, + "KPLIB_preset_civilians": 4, + "KPLIB_arsenal": 4 }, "workshopId": "1737368152" }, @@ -92,13 +92,13 @@ "missionName": "kp_liberation", "map": "lythium", "mapDisplay": "Lythium", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 7, - "KP_liberation_preset_opfor": 4, - "KP_liberation_preset_resistance": 3, - "KP_liberation_preset_civilians": 2, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 7, + "KPLIB_preset_opfor": 4, + "KPLIB_preset_resistance": 3, + "KPLIB_preset_civilians": 2, + "KPLIB_arsenal": 0 }, "workshopId": "1226882826" }, @@ -106,13 +106,13 @@ "sourceFolder": "kp_liberation.Malden", "missionName": "kp_liberation", "map": "Malden", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 0, - "KP_liberation_preset_opfor": 0, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 0, + "KPLIB_preset_opfor": 0, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 }, "workshopId": "1737370963" }, @@ -121,13 +121,13 @@ "missionName": "kp_liberation", "map": "panthera3", "mapDisplay": "Panthera", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 17, - "KP_liberation_preset_opfor": 17, - "KP_liberation_preset_resistance": 8, - "KP_liberation_preset_civilians": 7, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 17, + "KPLIB_preset_opfor": 17, + "KPLIB_preset_resistance": 8, + "KPLIB_preset_civilians": 7, + "KPLIB_arsenal": 0 }, "workshopId": "1816045062" }, @@ -136,13 +136,13 @@ "missionName": "kp_liberation", "map": "pja310", "mapDisplay": "Al Rayak", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 6, - "KP_liberation_preset_opfor": 2, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 6, + "KPLIB_preset_opfor": 2, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 }, "workshopId": "934734065" }, @@ -151,13 +151,13 @@ "missionName": "kp_liberation", "map": "Sara", "mapDisplay": "Sahrani", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 6, - "KP_liberation_preset_opfor": 2, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 6, + "KPLIB_preset_opfor": 2, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 0 }, "workshopId": "930514473" }, @@ -166,13 +166,13 @@ "missionName": "kp_liberation", "map": "song_bin_tanh", "mapDisplay": "Song Bin Tanh", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 15, - "KP_liberation_preset_opfor": 12, - "KP_liberation_preset_resistance": 6, - "KP_liberation_preset_civilians": 5, - "KP_liberation_arsenal": 7 + "KPLIB_preset_blufor": 15, + "KPLIB_preset_opfor": 12, + "KPLIB_preset_resistance": 6, + "KPLIB_preset_civilians": 5, + "KPLIB_arsenal": 7 }, "workshopId": "1816042577" }, @@ -180,13 +180,13 @@ "sourceFolder": "kp_liberation.Takistan", "missionName": "kp_liberation", "map": "Takistan", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 7, - "KP_liberation_preset_opfor": 3, - "KP_liberation_preset_resistance": 3, - "KP_liberation_preset_civilians": 2, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 7, + "KPLIB_preset_opfor": 3, + "KPLIB_preset_resistance": 3, + "KPLIB_preset_civilians": 2, + "KPLIB_arsenal": 0 }, "workshopId": "878715681" }, @@ -194,13 +194,13 @@ "sourceFolder": "kp_liberation.Tanoa", "missionName": "kp_liberation", "map": "Tanoa", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 1, - "KP_liberation_preset_opfor": 1, - "KP_liberation_preset_resistance": 1, - "KP_liberation_preset_civilians": 1, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 1, + "KPLIB_preset_opfor": 1, + "KPLIB_preset_resistance": 1, + "KPLIB_preset_civilians": 1, + "KPLIB_arsenal": 0 }, "workshopId": "884703460" }, @@ -209,57 +209,57 @@ "missionName": "kp_liberation", "map": "xcam_taunus", "mapDisplay": "Taunus", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 4, - "KP_liberation_preset_opfor": 2, - "KP_liberation_preset_resistance": 0, - "KP_liberation_preset_civilians": 0, - "KP_liberation_arsenal": 9 + "KPLIB_preset_blufor": 4, + "KPLIB_preset_opfor": 2, + "KPLIB_preset_resistance": 0, + "KPLIB_preset_civilians": 0, + "KPLIB_arsenal": 9 }, "workshopId": "884705418" }, { "sourceFolder": "kp_liberation.gm_weferlingen_summer", - "missionName": "kp_liberation_east", + "missionName": "KPLIB_east", "map": "gm_weferlingen_summer", "mapDisplay": "Weferlingen", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 11, - "KP_liberation_preset_opfor": 8, - "KP_liberation_preset_resistance": 5, - "KP_liberation_preset_civilians": 4, - "KP_liberation_arsenal": 5 + "KPLIB_preset_blufor": 11, + "KPLIB_preset_opfor": 8, + "KPLIB_preset_resistance": 5, + "KPLIB_preset_civilians": 4, + "KPLIB_arsenal": 5 }, "workshopId": "" }, { "sourceFolder": "kp_liberation.gm_weferlingen_winter", - "missionName": "kp_liberation_east", + "missionName": "KPLIB_east", "map": "gm_weferlingen_winter", "mapDisplay": "Weferlingen Winter", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 12, - "KP_liberation_preset_opfor": 9, - "KP_liberation_preset_resistance": 5, - "KP_liberation_preset_civilians": 4, - "KP_liberation_arsenal": 5 + "KPLIB_preset_blufor": 12, + "KPLIB_preset_opfor": 9, + "KPLIB_preset_resistance": 5, + "KPLIB_preset_civilians": 4, + "KPLIB_arsenal": 5 }, "workshopId": "" }, { "sourceFolder": "kp_liberation.Takistan", - "missionName": "kp_liberation_afrf", + "missionName": "KPLIB_afrf", "map": "Takistan", - "configFile": "kp_liberation_config.sqf", + "configFile": "KPLIB_config.sqf", "variables": { - "KP_liberation_preset_blufor": 8, - "KP_liberation_preset_opfor": 3, - "KP_liberation_preset_resistance": 3, - "KP_liberation_preset_civilians": 2, - "KP_liberation_arsenal": 0 + "KPLIB_preset_blufor": 8, + "KPLIB_preset_opfor": 3, + "KPLIB_preset_resistance": 3, + "KPLIB_preset_civilians": 2, + "KPLIB_arsenal": 0 }, "workshopId": "" } From 5666f79a7c6af1d2425b73ed11a5f720635496a6 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 10 May 2020 17:06:38 +0200 Subject: [PATCH 005/115] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dc68c3a1..a1eacf5b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.96.8 (TBD) +* Tweaked: Splitted the config file in seperate files, as it was getting quite big. +* Tweaked: Unified the prefix of all variables to `KPLIB_`. + ## 0.96.7 (2020-05-10) * Added: CfgFunctions library created from `shared/functions` and all of these functions optimized. * Added: Mines and explosives will be saved around FOBs. From e6a8641e9d91a0c209bce7489c2de5c9cebe6a5e Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 10 May 2020 23:55:30 +0200 Subject: [PATCH 006/115] Adjust description.ext maxPlayers to count HCs closes #784 --- CHANGELOG.md | 1 + Missionframework/description.ext | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1eacf5b8..2291c393b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 0.96.8 (TBD) * Tweaked: Splitted the config file in seperate files, as it was getting quite big. * Tweaked: Unified the prefix of all variables to `KPLIB_`. +* Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. ## 0.96.7 (2020-05-10) * Added: CfgFunctions library created from `shared/functions` and all of these functions optimized. diff --git a/Missionframework/description.ext b/Missionframework/description.ext index 16937bf86..a5521cb97 100644 --- a/Missionframework/description.ext +++ b/Missionframework/description.ext @@ -21,7 +21,7 @@ class Header { gameType = "CTI"; minPlayers = 1; - maxPlayers = 34; + maxPlayers = 37; }; // Name of Mission author(s) and contributors. Obviously you can only add and not (!) remove someone. From 040921e6b6d77363d40aaeb164f81cc3b228d8cd Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 11 May 2020 09:59:05 +0200 Subject: [PATCH 007/115] Reorganized arsenal presets and preset variables --- CHANGELOG.md | 3 + Missionframework/KPLIB_classnameLists.sqf | 258 +----------------- Missionframework/KPLIB_config.sqf | 16 +- Missionframework/arsenal_presets/custom.sqf | 16 -- Missionframework/description.ext | 6 +- Missionframework/functions/fn_checkGear.sqf | 24 +- .../functions/fn_checkWeaponCargo.sqf | 18 +- Missionframework/init.sqf | 18 +- .../arsenal}/3cbBAF.sqf | 18 +- .../presets/arsenal/allowedExtension.sqf | 25 ++ .../presets/arsenal/blacklist.sqf | 138 ++++++++++ .../arsenal}/bwmod.sqf | 18 +- .../arsenal}/csat.sqf | 18 +- Missionframework/presets/arsenal/custom.sqf | 26 ++ .../arsenal}/gm_east.sqf | 21 +- .../arsenal}/gm_west.sqf | 21 +- .../arsenal}/rhsusaf.sqf | 18 +- .../arsenal}/sfp.sqf | 18 +- .../arsenal}/unsung.sqf | 18 +- .../{opfor => enemies}/CUP_AFRF_MSV.sqf | 0 .../{opfor => enemies}/CUP_AFRF_ModernMSV.sqf | 0 .../{opfor => enemies}/CUP_BAF_Desert.sqf | 0 .../{opfor => enemies}/CUP_BAF_Woodland.sqf | 0 .../presets/{opfor => enemies}/CUP_CDF.sqf | 0 .../presets/{opfor => enemies}/CUP_ChDKZ.sqf | 0 .../presets/{opfor => enemies}/CUP_SLA.sqf | 0 .../{opfor => enemies}/CUP_TakiArmy.sqf | 0 .../presets/{opfor => enemies}/SLA.sqf | 0 .../presets/{opfor => enemies}/aaf.sqf | 0 .../presets/{opfor => enemies}/apex.sqf | 0 .../presets/{opfor => enemies}/custom.sqf | 0 .../presets/{opfor => enemies}/gm_east.sqf | 0 .../{opfor => enemies}/gm_east_win.sqf | 0 .../presets/{opfor => enemies}/gm_west.sqf | 0 .../{opfor => enemies}/gm_west_win.sqf | 0 .../{opfor => enemies}/islamic_state.sqf | 0 .../presets/{opfor => enemies}/nato.sqf | 0 .../presets/{opfor => enemies}/rhs_afrf.sqf | 0 .../presets/{opfor => enemies}/takistan.sqf | 0 .../presets/{opfor => enemies}/unsung.sqf | 0 Missionframework/presets/init_presets.sqf | 150 +++++----- .../{blufor => players}/3cbBAF_des.sqf | 0 .../{blufor => players}/3cbBAF_mtp.sqf | 0 .../{blufor => players}/CUP_ACR_Desert.sqf | 0 .../{blufor => players}/CUP_ACR_Woodland.sqf | 0 .../{blufor => players}/CUP_BAF_Desert.sqf | 0 .../{blufor => players}/CUP_BAF_Woodland.sqf | 0 .../presets/{blufor => players}/CUP_CDF.sqf | 0 .../presets/{blufor => players}/CUP_ChDKZ.sqf | 0 .../presets/{blufor => players}/CUP_SLA.sqf | 0 .../{blufor => players}/CUP_TakiArmy.sqf | 0 .../{blufor => players}/CUP_USA_Desert.sqf | 0 .../{blufor => players}/CUP_USA_Woodland.sqf | 0 .../{blufor => players}/CUP_USMC_Desert.sqf | 0 .../{blufor => players}/CUP_USMC_Woodland.sqf | 0 .../presets/{blufor => players}/apex.sqf | 0 .../presets/{blufor => players}/bwmod.sqf | 0 .../presets/{blufor => players}/bwmod_des.sqf | 0 .../presets/{blufor => players}/csat.sqf | 0 .../presets/{blufor => players}/csat_apex.sqf | 0 .../presets/{blufor => players}/custom.sqf | 0 .../presets/{blufor => players}/enoch.sqf | 0 .../presets/{blufor => players}/gm_east.sqf | 0 .../{blufor => players}/gm_east_win.sqf | 0 .../presets/{blufor => players}/gm_west.sqf | 0 .../{blufor => players}/gm_west_win.sqf | 0 .../presets/{blufor => players}/rhs_afrf.sqf | 0 .../{blufor => players}/rhs_usaf_des.sqf | 0 .../{blufor => players}/rhs_usaf_wdl.sqf | 0 .../presets/{blufor => players}/sfp_des.sqf | 0 .../presets/{blufor => players}/sfp_wdl.sqf | 0 .../presets/{blufor => players}/unsung.sqf | 0 .../scripts/client/CfgFunctions.hpp | 5 + .../client/commander/enforce_whitelist.sqf | 2 +- .../client/commander/open_permissions.sqf | 2 +- .../scripts/client/init_client.sqf | 40 +-- .../scripts/client/misc/fn_initArsenal.sqf | 90 ++++++ .../scripts/client/misc/init_arsenal.sqf | 113 -------- .../client/remotecall/remote_call_endgame.sqf | 2 +- .../scripts/server/asymmetric/init_module.sqf | 8 +- .../server/civinformant/init_module.sqf | 2 +- .../scripts/server/civrep/init_module.sqf | 10 +- .../scripts/server/init_server.sqf | 46 ++-- .../scripts/server/offloading/hc_manager.sqf | 28 +- .../server/secondary/convoy_hijack.sqf | 2 +- .../scripts/shared/diagnostics.sqf | 10 +- .../scripts/shared/init_shared.sqf | 60 ++-- Missionframework/stringtable.xml | 4 +- 88 files changed, 601 insertions(+), 671 deletions(-) delete mode 100644 Missionframework/arsenal_presets/custom.sqf rename Missionframework/{arsenal_presets => presets/arsenal}/3cbBAF.sqf (99%) create mode 100644 Missionframework/presets/arsenal/allowedExtension.sqf create mode 100644 Missionframework/presets/arsenal/blacklist.sqf rename Missionframework/{arsenal_presets => presets/arsenal}/bwmod.sqf (99%) rename Missionframework/{arsenal_presets => presets/arsenal}/csat.sqf (98%) create mode 100644 Missionframework/presets/arsenal/custom.sqf rename Missionframework/{arsenal_presets => presets/arsenal}/gm_east.sqf (86%) rename Missionframework/{arsenal_presets => presets/arsenal}/gm_west.sqf (92%) rename Missionframework/{arsenal_presets => presets/arsenal}/rhsusaf.sqf (99%) rename Missionframework/{arsenal_presets => presets/arsenal}/sfp.sqf (99%) rename Missionframework/{arsenal_presets => presets/arsenal}/unsung.sqf (99%) rename Missionframework/presets/{opfor => enemies}/CUP_AFRF_MSV.sqf (100%) rename Missionframework/presets/{opfor => enemies}/CUP_AFRF_ModernMSV.sqf (100%) rename Missionframework/presets/{opfor => enemies}/CUP_BAF_Desert.sqf (100%) rename Missionframework/presets/{opfor => enemies}/CUP_BAF_Woodland.sqf (100%) rename Missionframework/presets/{opfor => enemies}/CUP_CDF.sqf (100%) rename Missionframework/presets/{opfor => enemies}/CUP_ChDKZ.sqf (100%) rename Missionframework/presets/{opfor => enemies}/CUP_SLA.sqf (100%) rename Missionframework/presets/{opfor => enemies}/CUP_TakiArmy.sqf (100%) rename Missionframework/presets/{opfor => enemies}/SLA.sqf (100%) rename Missionframework/presets/{opfor => enemies}/aaf.sqf (100%) rename Missionframework/presets/{opfor => enemies}/apex.sqf (100%) rename Missionframework/presets/{opfor => enemies}/custom.sqf (100%) rename Missionframework/presets/{opfor => enemies}/gm_east.sqf (100%) rename Missionframework/presets/{opfor => enemies}/gm_east_win.sqf (100%) rename Missionframework/presets/{opfor => enemies}/gm_west.sqf (100%) rename Missionframework/presets/{opfor => enemies}/gm_west_win.sqf (100%) rename Missionframework/presets/{opfor => enemies}/islamic_state.sqf (100%) rename Missionframework/presets/{opfor => enemies}/nato.sqf (100%) rename Missionframework/presets/{opfor => enemies}/rhs_afrf.sqf (100%) rename Missionframework/presets/{opfor => enemies}/takistan.sqf (100%) rename Missionframework/presets/{opfor => enemies}/unsung.sqf (100%) rename Missionframework/presets/{blufor => players}/3cbBAF_des.sqf (100%) rename Missionframework/presets/{blufor => players}/3cbBAF_mtp.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_ACR_Desert.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_ACR_Woodland.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_BAF_Desert.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_BAF_Woodland.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_CDF.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_ChDKZ.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_SLA.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_TakiArmy.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_USA_Desert.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_USA_Woodland.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_USMC_Desert.sqf (100%) rename Missionframework/presets/{blufor => players}/CUP_USMC_Woodland.sqf (100%) rename Missionframework/presets/{blufor => players}/apex.sqf (100%) rename Missionframework/presets/{blufor => players}/bwmod.sqf (100%) rename Missionframework/presets/{blufor => players}/bwmod_des.sqf (100%) rename Missionframework/presets/{blufor => players}/csat.sqf (100%) rename Missionframework/presets/{blufor => players}/csat_apex.sqf (100%) rename Missionframework/presets/{blufor => players}/custom.sqf (100%) rename Missionframework/presets/{blufor => players}/enoch.sqf (100%) rename Missionframework/presets/{blufor => players}/gm_east.sqf (100%) rename Missionframework/presets/{blufor => players}/gm_east_win.sqf (100%) rename Missionframework/presets/{blufor => players}/gm_west.sqf (100%) rename Missionframework/presets/{blufor => players}/gm_west_win.sqf (100%) rename Missionframework/presets/{blufor => players}/rhs_afrf.sqf (100%) rename Missionframework/presets/{blufor => players}/rhs_usaf_des.sqf (100%) rename Missionframework/presets/{blufor => players}/rhs_usaf_wdl.sqf (100%) rename Missionframework/presets/{blufor => players}/sfp_des.sqf (100%) rename Missionframework/presets/{blufor => players}/sfp_wdl.sqf (100%) rename Missionframework/presets/{blufor => players}/unsung.sqf (100%) create mode 100644 Missionframework/scripts/client/misc/fn_initArsenal.sqf delete mode 100644 Missionframework/scripts/client/misc/init_arsenal.sqf diff --git a/CHANGELOG.md b/CHANGELOG.md index 2291c393b..447ffb7a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ ## 0.96.8 (TBD) * Tweaked: Splitted the config file in seperate files, as it was getting quite big. * Tweaked: Unified the prefix of all variables to `KPLIB_`. +* Tweaked: Arsenal presets are now in the presets folder. +* Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal. +* Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset. * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. ## 0.96.7 (2020-05-10) diff --git a/Missionframework/KPLIB_classnameLists.sqf b/Missionframework/KPLIB_classnameLists.sqf index 9c0297192..9465feb5f 100644 --- a/Missionframework/KPLIB_classnameLists.sqf +++ b/Missionframework/KPLIB_classnameLists.sqf @@ -2,266 +2,14 @@ File: KPLIB_lists.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-10 - Last Update: 2020-05-10 + Last Update: 2020-05-11 License: MIT License - http://www.opensource.org/licenses/MIT Description: - No description added yet. + Arrays of classnames for various purposes. + Check the comments above each variable for details. */ - -/* ------------------------------------------------------------- - --- Default arsenal blacklist --- - Useless if you're using anything other than - "KPLIB_arsenal = 0;" in KPLIB_config.sqf. - A whitelisted arsenal is always more performance - friendly then a blacklisted arsenal. - - All static turret and UAV bags should be defined - here, to stop players from exploiting free resources - via the virtual arsenal. ------------------------------------------------------------- -*/ - -// Blacklisted item classnames -blacklisted_from_arsenal = [ - "B_AA_01_weapon_F", - "B_AT_01_weapon_F", - "B_GMG_01_A_weapon_F", - "B_GMG_01_high_weapon_F", - "B_GMG_01_weapon_F", - "B_HMG_01_A_weapon_F", - "B_HMG_01_high_weapon_F", - "B_HMG_01_support_F", - "B_HMG_01_support_high_F", - "B_HMG_01_weapon_F", - "B_Mortar_01_support_F", - "B_Mortar_01_weapon_F", - "B_Respawn_Sleeping_bag_blue_F", - "B_Respawn_Sleeping_bag_brown_F", - "B_Respawn_Sleeping_bag_F", - "B_Respawn_TentA_F", - "B_Respawn_TentDome_F", - "B_UAV_01_backpack_F", - "B_UAV_06_backpack_F", - "B_UAV_06_medical_backpack_F", - "B_UGV_02_Demining_backpack_F", - "B_UGV_02_Science_backpack_F", - "C_IDAP_UAV_01_backpack_F", - "C_IDAP_UAV_06_antimine_backpack_F", - "C_IDAP_UAV_06_backpack_F", - "C_IDAP_UAV_06_medical_backpack_F", - "C_IDAP_UGV_02_Demining_backpack_F", - "C_UAV_06_backpack_F", - "C_UAV_06_medical_backpack_F", - "I_AA_01_weapon_F", - "I_AT_01_weapon_F", - "I_E_AA_01_weapon_F", - "I_E_AT_01_weapon_F", - "I_E_GMG_01_A_Weapon_F", - "I_E_GMG_01_high_Weapon_F", - "I_E_GMG_01_Weapon_F", - "I_E_HMG_01_A_Weapon_F", - "I_E_HMG_01_high_Weapon_F", - "I_E_HMG_01_support_F", - "I_E_HMG_01_support_high_F", - "I_E_HMG_01_Weapon_F", - "I_E_Mortar_01_support_F", - "I_E_Mortar_01_Weapon_F", - "I_E_UAV_01_backpack_F", - "I_E_UAV_06_backpack_F", - "I_E_UAV_06_medical_backpack_F", - "I_E_UGV_02_Demining_backpack_F", - "I_E_UGV_02_Science_backpack_F", - "I_GMG_01_A_weapon_F", - "I_GMG_01_high_weapon_F", - "I_GMG_01_weapon_F", - "I_HMG_01_A_weapon_F", - "I_HMG_01_high_weapon_F", - "I_HMG_01_support_F", - "I_HMG_01_support_high_F", - "I_HMG_01_weapon_F", - "I_Mortar_01_support_F", - "I_Mortar_01_weapon_F", - "I_UAV_01_backpack_F", - "I_UAV_06_backpack_F", - "I_UAV_06_medical_backpack_F", - "I_UGV_02_Demining_backpack_F", - "I_UGV_02_Science_backpack_F", - "O_AA_01_weapon_F", - "O_AT_01_weapon_F", - "O_GMG_01_A_weapon_F", - "O_GMG_01_high_weapon_F", - "O_GMG_01_weapon_F", - "O_HMG_01_A_weapon_F", - "O_HMG_01_high_weapon_F", - "O_HMG_01_support_F", - "O_HMG_01_support_high_F", - "O_HMG_01_weapon_F", - "O_Mortar_01_support_F", - "O_Mortar_01_weapon_F", - "O_UAV_01_backpack_F", - "O_UAV_06_backpack_F", - "O_UAV_06_medical_backpack_F", - "O_UGV_02_Demining_backpack_F", - "O_UGV_02_Science_backpack_F", - "RHS_AGS30_Gun_Bag", - "RHS_AGS30_Tripod_Bag", - "RHS_DShkM_Gun_Bag", - "RHS_DShkM_TripodHigh_Bag", - "RHS_DShkM_TripodLow_Bag", - "RHS_Kord_Gun_Bag", - "RHS_Kord_Tripod_Bag", - "RHS_Kornet_Gun_Bag", - "RHS_Kornet_Tripod_Bag", - "RHS_M2_Gun_Bag", - "RHS_M2_MiniTripod_Bag", - "RHS_M2_Tripod_Bag", - "rhs_M252_Bipod_Bag", - "rhs_M252_Gun_Bag", - "RHS_Metis_Gun_Bag", - "RHS_Metis_Tripod_Bag", - "RHS_Mk19_Gun_Bag", - "RHS_Mk19_Tripod_Bag", - "RHS_NSV_Gun_Bag", - "RHS_NSV_Tripod_Bag", - "RHS_Podnos_Bipod_Bag", - "RHS_Podnos_Gun_Bag", - "RHS_SPG9_Gun_Bag", - "RHS_SPG9_Tripod_Bag", - "rhs_Tow_Gun_Bag", - "rhs_TOW_Tripod_Bag", - "UK3CB_BAF_L111A1", - "UK3CB_BAF_L134A1", - "UK3CB_BAF_L16_Tripod", - "UK3CB_BAF_L16", - "UK3CB_BAF_M6", - "UK3CB_BAF_Tripod", - "uns_M1_81mm_mortar_US_Bag", - "uns_M1919_low_US_Bag", - "uns_M2_60mm_mortar_US_Bag", - "uns_m2_high_US_Bag", - "uns_M2_low_US_Bag", - "uns_M30_107mm_mortar_US_Bag", - "uns_M60_high_US_Bag", - "uns_M60_low_US_Bag", - "uns_MK18_low_US_Bag", - "uns_STABO_US_Bag", - "uns_Tripod_Bag", - "Uns_US_searchlight_Bag" -]; - -// Classnames of items which are always added to each arsenal list (handy for generic classnames) -KPLIB_allowed_items_extension = [ - "ACE_Chemlight_Shield_Blue", - "ACE_Chemlight_Shield_Green", - "ACE_Chemlight_Shield_Orange", - "ACE_Chemlight_Shield_Red", - "ACE_Chemlight_Shield_White", - "ACE_Chemlight_Shield_Yellow", - "ACE_launch_NLAW_Used_F", - "ACE_PreloadedMissileDummy_CUP", - "ACE_PreloadedMissileDummy_Igla_CUP", - "ACE_PreloadedMissileDummy_M72A6_CUP", - "ACE_PreloadedMissileDummy_NLAW_CUP", - "ACE_PreloadedMissileDummy_RPG18_CUP", - "ACE_PreloadedMissileDummy_Stinger_CUP", - "ACE_PreloadedMissileDummy_Strela_2_CUP", - "ACE_ReserveParachute", - "BWA3_acc_LLM01_flash_tan", - "BWA3_acc_LLM01_flash_underbarrel", - "BWA3_acc_LLM01_flash", - "BWA3_acc_LLM01_laser_tan", - "BWA3_acc_LLM01_laser_underbarrel", - "BWA3_acc_LLM01_laser", - "BWA3_acc_VarioRay_flash", - "BWA3_acc_VarioRay_laser", - "BWA3_Bunkerfaust", - "BWA3_G36A2_pip", - "BWA3_G36A2_tan_pip", - "BWA3_optic_CompM2_G36A2", - "BWA3_optic_CompM2_tan_G36A2", - "BWA3_optic_EOTech_G36A2", - "BWA3_optic_EOTech_Mag_Off", - "BWA3_optic_EOTech_Mag_On", - "BWA3_optic_EOTech_sand_G36A2", - "BWA3_optic_EOTech_tan_Mag_Off", - "BWA3_optic_EOTech_tan_Mag_On", - "BWA3_optic_EOTech552_G36A2", - "BWA3_optic_EOTech552_tan_G36A2", - "BWA3_optic_Hensoldt_NSV", - "BWA3_optic_M5Xi_MSR_MicroT2_pip", - "BWA3_optic_M5Xi_MSR_pip", - "BWA3_optic_M5Xi_Tremor3_MicroT2_pip", - "BWA3_optic_M5Xi_Tremor3_pip", - "BWA3_optic_MicroT1_G36A2", - "BWA3_optic_MicroT2_G36A2", - "BWA3_optic_NSA80_G36", - "BWA3_optic_PMII_DMR_MicroT1_front_NSV_pip", - "BWA3_optic_PMII_DMR_MicroT1_front_NSV", - "BWA3_optic_PMII_DMR_MicroT1_front_pip", - "BWA3_optic_PMII_DMR_MicroT1_rear_NSV_pip", - "BWA3_optic_PMII_DMR_MicroT1_rear_NSV", - "BWA3_optic_PMII_DMR_MicroT1_rear_pip", - "BWA3_optic_PMII_DMR_NSV_pip", - "BWA3_optic_PMII_DMR_NSV", - "BWA3_optic_PMII_DMR_pip", - "BWA3_optic_PMII_ShortdotCC_pip", - "BWA3_optic_RSAS_brown_G36A2", - "BWA3_optic_RSAS_G36A2", - "BWA3_optic_RSAS_sand_G36A2", - "BWA3_optic_RSAS_tan_G36A2", - "BWA3_optic_ZO4x30_brown_IRV", - "BWA3_optic_ZO4x30_brown_NSV", - "BWA3_optic_ZO4x30_brown_pip", - "BWA3_optic_ZO4x30_brown_RSAS_IRV_pip", - "BWA3_optic_ZO4x30_brown_RSAS_IRV", - "BWA3_optic_ZO4x30_brown_RSAS_NSV_pip", - "BWA3_optic_ZO4x30_brown_RSAS_NSV", - "BWA3_optic_ZO4x30_brown_RSAS_pip", - "BWA3_optic_ZO4x30_IRV", - "BWA3_optic_ZO4x30_MicroT2_brown_IRV", - "BWA3_optic_ZO4x30_MicroT2_brown_NSV", - "BWA3_optic_ZO4x30_MicroT2_IRV", - "BWA3_optic_ZO4x30_MicroT2_NSV", - "BWA3_optic_ZO4x30_NSV", - "BWA3_optic_ZO4x30_pip", - "BWA3_optic_ZO4x30_RSAS_IRV_pip", - "BWA3_optic_ZO4x30_RSAS_IRV", - "BWA3_optic_ZO4x30_RSAS_NSV_pip", - "BWA3_optic_ZO4x30_RSAS_NSV", - "BWA3_optic_ZO4x30_RSAS_pip", - "BWA3_optic_ZO4x30i_MicroT2_pip", - "BWA3_optic_ZO4x30i_MicroT2_sand_pip", - "BWA3_optic_ZO4x30i_pip", - "BWA3_optic_ZO4x30i_RSAS_pip", - "BWA3_optic_ZO4x30i_RSAS_sand_pip", - "BWA3_optic_ZO4x30i_sand_pip", - "BWA3_PzF3_Used", - "BWA3_PzF3", - "BWA3_RGW90_Used", - "BWA3_RGW90", - "ItemRadioAcreFlagged", - "rhs_acc_ekp8_18b", - "rhs_acc_ekp8_18c", - "rhs_acc_ekp8_18d", - "rhs_m136_hedp_mag", - "rhs_m136_hp_mag", - "rhs_m136_mag", - "rhs_m72a7_mag", - "rhs_rpg26_mag", - "rhs_rshg2_mag", - "rhs_weap_M136_used", - "rhsusf_acc_anpeq15_bk_light_h", - "rhsusf_acc_g33_T1_flip", - "rhsusf_acc_g33_xps3_flip", - "rhsusf_acc_g33_xps3_tan_flip", - "sma_spitfire_03_rds_low_ard_red", - "UK3CB_BAF_AT4_CS_AP_Mag", - "UK3CB_BAF_Javelin_Launcher" -]; - // Vehicle classnames which also function as ACE medical vehicles. KPLIB_medical_vehicles = [ "B_T_Truck_01_medical_F", diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 85ff7a7d1..7d5c97078 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -2,7 +2,7 @@ File: KPLIB_config.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-16 - Last Update: 2020-05-10 + Last Update: 2020-05-11 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -53,7 +53,7 @@ 29 = SFP (Desert) 30 = LDF (Contact DLC) */ -KPLIB_preset_blufor = 0; +KPLIB_presetPlayers = 0; /* ----- Enemy preset ----- @@ -79,7 +79,7 @@ KPLIB_preset_blufor = 0; 19 = CUP British Armed Forces (Desert) 20 = CUP British Armed Forces (Woodland) */ -KPLIB_preset_opfor = 0; +KPLIB_presetEnemies = 0; /* ----- Resistance preset ----- @@ -93,7 +93,7 @@ KPLIB_preset_opfor = 0; 7 = CUP Takistani Locals 8 = CUP National Party of Chernarus */ -KPLIB_preset_resistance = 0; +KPLIB_presetResistance = 0; /* ----- Civilians preset ----- @@ -106,12 +106,12 @@ KPLIB_preset_resistance = 0; 6 = CUP Takistani Civilians 7 = CUP Chernarussian Civilians */ -KPLIB_preset_civilians = 0; +KPLIB_presetCivilians = 0; /* ----- Arsenal preset ----- 0 = Use the default blacklist method (defined below) - 1 = Custom arsenal preset (custom.sqf in the arsenal_presets\ folder) + 1 = Custom arsenal preset (custom.sqf in the presets\arsenal\ folder) 2 = RHS USAF arsenal preset 3 = 3cbBAF and RHS USAF arsenal preset 4 = GM West arsenal preset @@ -121,7 +121,7 @@ KPLIB_preset_civilians = 0; 8 = SFP arsenal preset 9 = BWMod arsenal preset */ -KPLIB_arsenal = 0; +KPLIB_presetArsenal = 0; /* @@ -383,7 +383,7 @@ KPLIB_suppMod_whitelist = [ // Adjustments calculation depending on selected mission parameters (shouldn't be edited) KPLIB_endgame = 0; KPLIB_respawn_marker = "respawn"; -KPLIB_production_interval = ceil (KPLIB_production_interval / KPLIB_resources_multiplier); +KPLIB_production_interval = ceil (KPLIB_production_interval / KPLIB_resources_multiplier); KPLIB_battlegroup_size = KPLIB_battlegroup_size * (sqrt KPLIB_unitcap) * (sqrt KPLIB_csat_aggressivity); KPLIB_civilians_amount = KPLIB_civilians_amount * KPLIB_civilian_activity; KPLIB_blufor_cap = (KPLIB_blufor_cap * KPLIB_unitcap) min 100; diff --git a/Missionframework/arsenal_presets/custom.sqf b/Missionframework/arsenal_presets/custom.sqf deleted file mode 100644 index 2f15ea225..000000000 --- a/Missionframework/arsenal_presets/custom.sqf +++ /dev/null @@ -1,16 +0,0 @@ -// Custom Arsenal Preset -KPLIB_arsenal_weapons = [ - -]; - -KPLIB_arsenal_magazines = [ - -]; - -KPLIB_arsenal_items = [ - -]; - -KPLIB_arsenal_backpacks = [ - -]; diff --git a/Missionframework/description.ext b/Missionframework/description.ext index a5521cb97..39429266b 100644 --- a/Missionframework/description.ext +++ b/Missionframework/description.ext @@ -2,7 +2,7 @@ File: description.ext Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-16 - Last Update: 2020-05-10 + Last Update: 2020-05-11 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -40,7 +40,7 @@ briefingName = $STR_MISSION_TITLE; overviewPicture = "res\lib.paa"; // Text to be displayed below the overviewPicture on the mission selection screen -overviewText = "www.killahpotatoes.de"; +overviewText = "github.com/KillahPotatoes"; /* @@ -56,7 +56,7 @@ onLoadName = $STR_MISSION_TITLE; loadScreen = "res\lib.paa"; // Displays a message while the mission is loading below the loadScreen picture. -onLoadMission = "www.killahpotatoes.de"; +onLoadMission = "github.com/KillahPotatoes"; /* diff --git a/Missionframework/functions/fn_checkGear.sqf b/Missionframework/functions/fn_checkGear.sqf index d20796d59..67419f786 100644 --- a/Missionframework/functions/fn_checkGear.sqf +++ b/Missionframework/functions/fn_checkGear.sqf @@ -2,7 +2,7 @@ File: fn_checkGear.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-11-22 - Last Update: 2020-05-10 + Last Update: 2020-05-11 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,23 +25,23 @@ params [ private _removedItems = []; // Check single item slots -if !(toLower (headgear player) in KPLIB_allowed_items) then { +if !(toLower (headgear player) in KPLIB_arsenalAllowed) then { _removedItems pushBack (headgear player); removeHeadgear player; }; -if !(toLower (goggles player) in KPLIB_allowed_items) then { +if !(toLower (goggles player) in KPLIB_arsenalAllowed) then { _removedItems pushBack (goggles player); removeGoggles player; }; -if !(toLower (uniform player) in KPLIB_allowed_items) then { +if !(toLower (uniform player) in KPLIB_arsenalAllowed) then { _removedItems pushBack (uniform player); removeUniform player; }; -if !(toLower (vest player) in KPLIB_allowed_items) then { +if !(toLower (vest player) in KPLIB_arsenalAllowed) then { _removedItems pushBack (vest player); removeVest player; }; -if (!(toLower (backpack player) in KPLIB_allowed_items) && ((backpack player) != _backpack)) then { +if (!(toLower (backpack player) in KPLIB_arsenalAllowed) && ((backpack player) != _backpack)) then { _removedItems pushBack (backpack player); removeBackpack player; }; @@ -56,7 +56,7 @@ _items = _items apply {toLower _x}; _removedItems pushBack _x; player unassignItem _x; player removeItems _x; -} forEach (((_items arrayIntersect _items) - KPLIB_allowed_items) select {!([_x] call KPLIB_fnc_isRadio)}); +} forEach (((_items arrayIntersect _items) - KPLIB_arsenalAllowed) select {!([_x] call KPLIB_fnc_isRadio)}); // Check magazines _items = ((getMagazineCargo (uniformContainer player)) select 0); @@ -66,7 +66,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removeMagazines _x; -} forEach ((_items arrayIntersect _items) - KPLIB_allowed_items); +} forEach ((_items arrayIntersect _items) - KPLIB_arsenalAllowed); // Check weapons stored in inventory containers { @@ -78,7 +78,7 @@ _items = (weapons player) apply {toLower ([_x] call BIS_fnc_baseWeapon)}; { _removedItems pushBack _x; player removeWeapon _x; -} forEach (_items - KPLIB_allowed_items); +} forEach (_items - KPLIB_arsenalAllowed); // Check weapon items of primary weapon _items = primaryWeaponItems player; @@ -87,7 +87,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removePrimaryWeaponItem _x; -} forEach (_items - KPLIB_allowed_items); +} forEach (_items - KPLIB_arsenalAllowed); // Check weapon items of secondary weapon _items = secondaryWeaponItems player; @@ -96,7 +96,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removeSecondaryWeaponItem _x; -} forEach (_items - KPLIB_allowed_items); +} forEach (_items - KPLIB_arsenalAllowed); // Check weapon items of handgun _items = handgunItems player; @@ -105,7 +105,7 @@ _items = _items apply {toLower _x}; { _removedItems pushBack _x; player removeHandgunItem _x; -} forEach (_items - KPLIB_allowed_items); +} forEach (_items - KPLIB_arsenalAllowed); // Remove duplicates and empty strings _removedItems = (_removedItems arrayIntersect _removedItems) - [""]; diff --git a/Missionframework/functions/fn_checkWeaponCargo.sqf b/Missionframework/functions/fn_checkWeaponCargo.sqf index 551d7cf96..319967a73 100644 --- a/Missionframework/functions/fn_checkWeaponCargo.sqf +++ b/Missionframework/functions/fn_checkWeaponCargo.sqf @@ -2,11 +2,11 @@ File: fn_removeWeaponCargo.sqf Author: Zharf - https://github.com/zharf Date: 2019-06-21 - Last Update: 2020-05-10 + Last Update: 2020-05-11 License: MIT License - http://www.opensource.org/licenses/MIT Description: - Removes weapons not found in KPLIB_allowed_items from a cargo space. + Removes weapons not found in KPLIB_arsenalAllowed from a cargo space. Warning: All weapon attachments/magazines in container will become detached. Warning: Preset weapons without non-preset parents will get their attachments readded (engine limitation). @@ -39,7 +39,7 @@ clearWeaponCargoGlobal _container; _weaponNonPreset = _weapon; }; - if ((toLower ([_x] call BIS_fnc_baseWeapon)) in KPLIB_allowed_items) then { + if ((toLower ([_x] call BIS_fnc_baseWeapon)) in KPLIB_arsenalAllowed) then { _container addWeaponCargoGlobal [_weaponNonPreset, 1]; // If weapon does not have a non-preset parent, only add attachments that were custom added @@ -51,7 +51,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _muzzle in _presetAttachments) then { - if (toLower _muzzle in KPLIB_allowed_items) then { + if (toLower _muzzle in KPLIB_arsenalAllowed) then { _container addItemCargoGlobal [_muzzle, 1]; } else { _removed pushBack _muzzle; @@ -59,7 +59,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _pointer in _presetAttachments) then { - if (toLower _pointer in KPLIB_allowed_items) then { + if (toLower _pointer in KPLIB_arsenalAllowed) then { _container addItemCargoGlobal [_pointer, 1]; } else { _removed pushBack _pointer; @@ -67,7 +67,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _optic in _presetAttachments) then { - if (toLower _optic in KPLIB_allowed_items) then { + if (toLower _optic in KPLIB_arsenalAllowed) then { _container addItemCargoGlobal [_optic, 1]; } else { _removed pushBack _optic; @@ -75,7 +75,7 @@ clearWeaponCargoGlobal _container; }; if !(toLower _bipod in _presetAttachments) then { - if (toLower _bipod in KPLIB_allowed_items) then { + if (toLower _bipod in KPLIB_arsenalAllowed) then { _container addItemCargoGlobal [_bipod, 1]; } else { _removed pushBack _bipod; @@ -84,7 +84,7 @@ clearWeaponCargoGlobal _container; _magazine params [["_magazineClass", ""], ["_magazineAmmoCount", 0]]; if (_magazineClass != "") then { - if (toLower _magazineClass in KPLIB_allowed_items) then { + if (toLower _magazineClass in KPLIB_arsenalAllowed) then { _container addMagazineAmmoCargo [_magazineClass, 1, _magazineAmmoCount]; } else { _removed pushBack _magazineClass; @@ -93,7 +93,7 @@ clearWeaponCargoGlobal _container; _magazineGL params [["_magazineGLClass", ""], ["_magazineGLAmmoCount", 0]]; if (_magazineGLClass != "") then { - if (toLower _magazineGLClass in KPLIB_allowed_items) then { + if (toLower _magazineGLClass in KPLIB_arsenalAllowed) then { _container addMagazineAmmoCargo [_magazineGLClass, 1, _magazineGLAmmoCount]; } else { _removed pushBack _magazineGLClass; diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index a822f4cf3..2dc19ece0 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -10,12 +10,12 @@ if (isDedicated) then {debug_source = "Server";} else {debug_source = name playe [] call KPLIB_fnc_initSectors; if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; -[] call compileFinal preprocessFileLineNumbers "scripts\shared\fetch_params.sqf"; -[] call compileFinal preprocessFileLineNumbers "KPLIB_config.sqf"; -[] call compileFinal preprocessFileLineNumbers "KPLIB_transportConfigs.sqf"; -[] call compileFinal preprocessFileLineNumbers "KPLIB_classnameLists.sqf"; -[] call compileFinal preprocessFileLineNumbers "presets\init_presets.sqf"; -[] call compileFinal preprocessFileLineNumbers "kp_objectInits.sqf"; +[] call compile preprocessFileLineNumbers "scripts\shared\fetch_params.sqf"; +[] call compile preprocessFileLineNumbers "KPLIB_config.sqf"; +[] call compile preprocessFileLineNumbers "KPLIB_transportConfigs.sqf"; +[] call compile preprocessFileLineNumbers "KPLIB_classnameLists.sqf"; +[] call compile preprocessFileLineNumbers "presets\init_presets.sqf"; +[] call compile preprocessFileLineNumbers "kp_objectInits.sqf"; // Activate selected player menu. If CBA isn't loaded -> fallback to GREUH if (KPPLM_CBA && KPLIB_playermenu) then { @@ -24,10 +24,10 @@ if (KPPLM_CBA && KPLIB_playermenu) then { [] execVM "GREUH\scripts\GREUH_activate.sqf"; }; -[] call compileFinal preprocessFileLineNumbers "scripts\shared\init_shared.sqf"; +[] call compile preprocessFileLineNumbers "scripts\shared\init_shared.sqf"; if (isServer) then { - [] call compileFinal preprocessFileLineNumbers "scripts\server\init_server.sqf"; + [] call compile preprocessFileLineNumbers "scripts\server\init_server.sqf"; }; if (!isDedicated && !hasInterface && isMultiplayer) then { @@ -47,7 +47,7 @@ if (!isDedicated && hasInterface) then { waitUntil {alive player}; if (debug_source != name player) then {debug_source = name player}; - [] call compileFinal preprocessFileLineNumbers "scripts\client\init_client.sqf"; + [] call compile preprocessFileLineNumbers "scripts\client\init_client.sqf"; } else { setViewDistance 1600; }; diff --git a/Missionframework/arsenal_presets/3cbBAF.sqf b/Missionframework/presets/arsenal/3cbBAF.sqf similarity index 99% rename from Missionframework/arsenal_presets/3cbBAF.sqf rename to Missionframework/presets/arsenal/3cbBAF.sqf index 962259ebe..9981a6506 100644 --- a/Missionframework/arsenal_presets/3cbBAF.sqf +++ b/Missionframework/presets/arsenal/3cbBAF.sqf @@ -1,6 +1,12 @@ /* - 3CB BAF Arsenal Preset - Last Update: 2020-05-10 + File: 3cbBAF.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-05-22 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + 3cbBAF arsenal preset. Needed: - 3CB BAF Weapons - https://steamcommunity.com/sharedfiles/filedetails/?id=893339590 @@ -12,7 +18,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ "UK3CB_BAF_AT4_CS_AP_Launcher", // ILAW HEDP Launcher "UK3CB_BAF_AT4_CS_AT_Launcher", // ILAW HP Launcher "UK3CB_BAF_L103A2", // L130A2 DP @@ -66,7 +72,7 @@ KPLIB_arsenal_weapons = [ "UK3CB_BAF_NLAW_Launcher" // NLAW Launcher ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ "UK3CB_BAF_12G_Pellets", // 12G 8rnd Buckshot "UK3CB_BAF_12G_Slugs", // 12G 8rnd Slug "UK3CB_BAF_1Rnd_Blank_Grenade_Shell", // 40mm Practice Round (L123) @@ -154,7 +160,7 @@ KPLIB_arsenal_magazines = [ "TrainingMine_Mag" // Training Mine ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Uniforms "UK3CB_BAF_U_CombatUniform_Arctic_Ghillie_RM", // Combat Uniform Arctic Ghillie RM [BAF] "UK3CB_BAF_U_CombatUniform_DDPM_Ghillie_RM", // Combat Uniform DDPPM Ghillie RM [BAF] @@ -658,7 +664,7 @@ KPLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "UK3CB_BAF_B_Bergen_Arctic_JTAC_A", // Bergen Arctic JTAC/FAC [BAF] "UK3CB_BAF_B_Bergen_Arctic_JTAC_H_A", // Bergen Arctic JTAC/FAC H [BAF] "UK3CB_BAF_B_Bergen_Arctic_Rifleman_A", // Bergen Arctic Rifleman A [BAF] diff --git a/Missionframework/presets/arsenal/allowedExtension.sqf b/Missionframework/presets/arsenal/allowedExtension.sqf new file mode 100644 index 000000000..21a0fadc6 --- /dev/null +++ b/Missionframework/presets/arsenal/allowedExtension.sqf @@ -0,0 +1,25 @@ +/* + File: allowedExtension.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-05-11 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + List of classnames which will be always added to the allowed gear list. + This is used to add let's name it "generic classnames". + + E.g. if you've an available weapon "myMod_weap_M16" and an available grip "myMod_acc_coolGrip" + some mods transform this combination to a weapon "myMod_weap_M16_coolGrip". + That classname is used internally and wouldn't be listed in the arsenal and can cause issues to be + detected as not allowed weapon, even if the weapon and the grip is whitelisted. + So add this "generic classname" here afterwards to avoid this. + + The classnames of blacklisted items on a player are logged in the server rpt for a later lookup. +*/ + +// Extension list of allowed arsenal gear +KPLIB_arsenalAllowedExtension = [ + "ACE_ReserveParachute", + "ItemRadioAcreFlagged" +]; diff --git a/Missionframework/presets/arsenal/blacklist.sqf b/Missionframework/presets/arsenal/blacklist.sqf new file mode 100644 index 000000000..08e97d6bc --- /dev/null +++ b/Missionframework/presets/arsenal/blacklist.sqf @@ -0,0 +1,138 @@ +/* + File: blacklist.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-05-11 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + List of blacklisted items for the arsenal, if KPLIB_presetArsenal is set to 0 in the config. +*/ + +// Blacklisted item classnames +KPLIB_arsenalBlacklist = [ + "B_AA_01_weapon_F", + "B_AT_01_weapon_F", + "B_GMG_01_A_weapon_F", + "B_GMG_01_high_weapon_F", + "B_GMG_01_weapon_F", + "B_HMG_01_A_weapon_F", + "B_HMG_01_high_weapon_F", + "B_HMG_01_support_F", + "B_HMG_01_support_high_F", + "B_HMG_01_weapon_F", + "B_Mortar_01_support_F", + "B_Mortar_01_weapon_F", + "B_Respawn_Sleeping_bag_blue_F", + "B_Respawn_Sleeping_bag_brown_F", + "B_Respawn_Sleeping_bag_F", + "B_Respawn_TentA_F", + "B_Respawn_TentDome_F", + "B_UAV_01_backpack_F", + "B_UAV_06_backpack_F", + "B_UAV_06_medical_backpack_F", + "B_UGV_02_Demining_backpack_F", + "B_UGV_02_Science_backpack_F", + "C_IDAP_UAV_01_backpack_F", + "C_IDAP_UAV_06_antimine_backpack_F", + "C_IDAP_UAV_06_backpack_F", + "C_IDAP_UAV_06_medical_backpack_F", + "C_IDAP_UGV_02_Demining_backpack_F", + "C_UAV_06_backpack_F", + "C_UAV_06_medical_backpack_F", + "I_AA_01_weapon_F", + "I_AT_01_weapon_F", + "I_E_AA_01_weapon_F", + "I_E_AT_01_weapon_F", + "I_E_GMG_01_A_Weapon_F", + "I_E_GMG_01_high_Weapon_F", + "I_E_GMG_01_Weapon_F", + "I_E_HMG_01_A_Weapon_F", + "I_E_HMG_01_high_Weapon_F", + "I_E_HMG_01_support_F", + "I_E_HMG_01_support_high_F", + "I_E_HMG_01_Weapon_F", + "I_E_Mortar_01_support_F", + "I_E_Mortar_01_Weapon_F", + "I_E_UAV_01_backpack_F", + "I_E_UAV_06_backpack_F", + "I_E_UAV_06_medical_backpack_F", + "I_E_UGV_02_Demining_backpack_F", + "I_E_UGV_02_Science_backpack_F", + "I_GMG_01_A_weapon_F", + "I_GMG_01_high_weapon_F", + "I_GMG_01_weapon_F", + "I_HMG_01_A_weapon_F", + "I_HMG_01_high_weapon_F", + "I_HMG_01_support_F", + "I_HMG_01_support_high_F", + "I_HMG_01_weapon_F", + "I_Mortar_01_support_F", + "I_Mortar_01_weapon_F", + "I_UAV_01_backpack_F", + "I_UAV_06_backpack_F", + "I_UAV_06_medical_backpack_F", + "I_UGV_02_Demining_backpack_F", + "I_UGV_02_Science_backpack_F", + "O_AA_01_weapon_F", + "O_AT_01_weapon_F", + "O_GMG_01_A_weapon_F", + "O_GMG_01_high_weapon_F", + "O_GMG_01_weapon_F", + "O_HMG_01_A_weapon_F", + "O_HMG_01_high_weapon_F", + "O_HMG_01_support_F", + "O_HMG_01_support_high_F", + "O_HMG_01_weapon_F", + "O_Mortar_01_support_F", + "O_Mortar_01_weapon_F", + "O_UAV_01_backpack_F", + "O_UAV_06_backpack_F", + "O_UAV_06_medical_backpack_F", + "O_UGV_02_Demining_backpack_F", + "O_UGV_02_Science_backpack_F", + "RHS_AGS30_Gun_Bag", + "RHS_AGS30_Tripod_Bag", + "RHS_DShkM_Gun_Bag", + "RHS_DShkM_TripodHigh_Bag", + "RHS_DShkM_TripodLow_Bag", + "RHS_Kord_Gun_Bag", + "RHS_Kord_Tripod_Bag", + "RHS_Kornet_Gun_Bag", + "RHS_Kornet_Tripod_Bag", + "RHS_M2_Gun_Bag", + "RHS_M2_MiniTripod_Bag", + "RHS_M2_Tripod_Bag", + "rhs_M252_Bipod_Bag", + "rhs_M252_Gun_Bag", + "RHS_Metis_Gun_Bag", + "RHS_Metis_Tripod_Bag", + "RHS_Mk19_Gun_Bag", + "RHS_Mk19_Tripod_Bag", + "RHS_NSV_Gun_Bag", + "RHS_NSV_Tripod_Bag", + "RHS_Podnos_Bipod_Bag", + "RHS_Podnos_Gun_Bag", + "RHS_SPG9_Gun_Bag", + "RHS_SPG9_Tripod_Bag", + "rhs_Tow_Gun_Bag", + "rhs_TOW_Tripod_Bag", + "UK3CB_BAF_L111A1", + "UK3CB_BAF_L134A1", + "UK3CB_BAF_L16_Tripod", + "UK3CB_BAF_L16", + "UK3CB_BAF_M6", + "UK3CB_BAF_Tripod", + "uns_M1_81mm_mortar_US_Bag", + "uns_M1919_low_US_Bag", + "uns_M2_60mm_mortar_US_Bag", + "uns_m2_high_US_Bag", + "uns_M2_low_US_Bag", + "uns_M30_107mm_mortar_US_Bag", + "uns_M60_high_US_Bag", + "uns_M60_low_US_Bag", + "uns_MK18_low_US_Bag", + "uns_STABO_US_Bag", + "uns_Tripod_Bag", + "Uns_US_searchlight_Bag" +]; diff --git a/Missionframework/arsenal_presets/bwmod.sqf b/Missionframework/presets/arsenal/bwmod.sqf similarity index 99% rename from Missionframework/arsenal_presets/bwmod.sqf rename to Missionframework/presets/arsenal/bwmod.sqf index 3c123ef42..d95511895 100644 --- a/Missionframework/arsenal_presets/bwmod.sqf +++ b/Missionframework/presets/arsenal/bwmod.sqf @@ -1,6 +1,12 @@ /* - BWMod Arsenal Preset - Last Update: 2020-05-10 + File: bwmod.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-05-03 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + BWMod arsenal preset. Needed: - BWMod - https://steamcommunity.com/sharedfiles/filedetails/?id=1200127537 @@ -11,7 +17,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ "BWA3_Bunkerfaust", // Bunkerfaust "BWA3_CarlGustav", // Leuchtbüchse 84 mm "BWA3_Fliegerfaust", // Fliegerfaust 2 Stinger @@ -77,7 +83,7 @@ KPLIB_arsenal_weapons = [ "BWA3_RGW90" // RGW 90 ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ "BWA3_10Rnd_127x99_G82_AP_Tracer", // G82 12.7x99mm 10Rnd Mag (AP Tracer) "BWA3_10Rnd_127x99_G82_AP", // G82 12.7x99mm 10Rnd Mag (AP) "BWA3_10Rnd_127x99_G82_Raufoss_Tracer_Dim", // G82 12.7x99mm Mk211 10Rnd Mag (Raufoss IR-DIM) @@ -170,7 +176,7 @@ KPLIB_arsenal_magazines = [ "UGL_FlareYellow_F" // Flare Round (Yellow) ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Uniforms "BWA3_Uniform_Crew_Fleck", // Boilersuit (Flecktart) "BWA3_Uniform_Crew_Multi", // Boilersuit (Multitarn) @@ -470,7 +476,7 @@ KPLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "BWA3_AssaultPack_Fleck_Medic", // Assault Pack (Flecktarn, Medic) "BWA3_AssaultPack_Fleck", // Assault Pack (Flecktarn) "BWA3_AssaultPack_Multi_Medic", // Assault Pack (Multitarn, Medic) diff --git a/Missionframework/arsenal_presets/csat.sqf b/Missionframework/presets/arsenal/csat.sqf similarity index 98% rename from Missionframework/arsenal_presets/csat.sqf rename to Missionframework/presets/arsenal/csat.sqf index e4e057ecd..8e37e37d2 100644 --- a/Missionframework/arsenal_presets/csat.sqf +++ b/Missionframework/presets/arsenal/csat.sqf @@ -1,6 +1,12 @@ /* - CSAT Arsenal Preset - Last Update: 2020-05-10 + File: csat.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-03 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CSAT arsenal preset. Needed: - None @@ -11,7 +17,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ "arifle_AK12_arid_F", // AK-12 7.62 mm (Arid) "arifle_AK12_F", // AK-12 7.62 mm "arifle_AK12_GL_arid_F", // AK-12 7.62 mm (Arid) @@ -100,11 +106,11 @@ KPLIB_arsenal_weapons = [ "srifle_GM6_ghex_F" // GM6 Lynx 12.7 mm (Green Hex) ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -374,7 +380,7 @@ KPLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_AssaultPack_blk", // Assault Pack (Black) "B_AssaultPack_ocamo", // Assault Pack (Hex) "B_AssaultPack_rgr", // Assault Pack (Green) diff --git a/Missionframework/presets/arsenal/custom.sqf b/Missionframework/presets/arsenal/custom.sqf new file mode 100644 index 000000000..d5e0de40b --- /dev/null +++ b/Missionframework/presets/arsenal/custom.sqf @@ -0,0 +1,26 @@ +/* + File: custom.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-05-11 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Custom arsenal preset template. +*/ + +KPLIB_arsenalWeapons = [ + +]; + +KPLIB_arsenalMagazines = [ + +]; + +KPLIB_arsenalItems = [ + +]; + +KPLIB_arsenalBackpacks = [ + +]; diff --git a/Missionframework/arsenal_presets/gm_east.sqf b/Missionframework/presets/arsenal/gm_east.sqf similarity index 86% rename from Missionframework/arsenal_presets/gm_east.sqf rename to Missionframework/presets/arsenal/gm_east.sqf index fcc1c7d9a..e7d5fcd77 100644 --- a/Missionframework/arsenal_presets/gm_east.sqf +++ b/Missionframework/presets/arsenal/gm_east.sqf @@ -1,14 +1,21 @@ /* - Global Mobilization East Germany Arsenal Preset + File: gm_east.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-07 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Global Mobilization East Germany arsenal preset. Mods needed: - - Global Mobilization + - Global Mobilization Mods optional: - - None + - None */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // AK-74 "gm_mpiak74n_brn", "gm_mpiaks74nk_brn", @@ -32,7 +39,7 @@ KPLIB_arsenal_weapons = [ "gm_rpg7_prp_pgo7v" ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ // LP1 26.5mm "gm_1Rnd_265mm_flare_single_grn_gc", @@ -82,7 +89,7 @@ KPLIB_arsenal_magazines = [ "gm_mine_at_tm46" ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Uniforms "gm_gc_army_uniform_dress_80_gry", @@ -121,7 +128,7 @@ KPLIB_arsenal_items = [ "ItemRadio" ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "gm_gc_army_backpack_80_at_str", "gm_gc_army_backpack_80_lmg_str", "gm_gc_army_backpack_80_mgk_str", diff --git a/Missionframework/arsenal_presets/gm_west.sqf b/Missionframework/presets/arsenal/gm_west.sqf similarity index 92% rename from Missionframework/arsenal_presets/gm_west.sqf rename to Missionframework/presets/arsenal/gm_west.sqf index aef8705c0..2c64a74b3 100644 --- a/Missionframework/arsenal_presets/gm_west.sqf +++ b/Missionframework/presets/arsenal/gm_west.sqf @@ -1,16 +1,21 @@ /* - Global Mobilization West Germany Arsenal Preset - + File: gm_west.sqf Author: Dahlgren - https://github.com/Dahlgren + Date: 2019-04-30 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Global Mobilization West Germany arsenal preset. Mods needed: - - Global Mobilization + - Global Mobilization Mods optional: - - None + - None */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // G3A3 + G3A4 "gm_g3a3_oli", "gm_g3a4_oli", @@ -34,7 +39,7 @@ KPLIB_arsenal_weapons = [ "gm_pzf84_oli" ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ // G3A3 + G3A4 "gm_20rnd_762x51mm_b_t_dm21_g3_blk", "gm_20rnd_762x51mm_b_t_dm21a1_g3_blk", @@ -110,7 +115,7 @@ KPLIB_arsenal_magazines = [ "gm_mine_at_dm21" ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Uniforms "gm_ge_army_uniform_crew_80_oli", "gm_ge_army_uniform_soldier_80_oli", @@ -170,7 +175,7 @@ KPLIB_arsenal_items = [ "ItemRadio" ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "gm_ge_army_backpack_80_oli", "gm_ge_backpack_satchel_80_blk", "gm_ge_backpack_satchel_80_san" diff --git a/Missionframework/arsenal_presets/rhsusaf.sqf b/Missionframework/presets/arsenal/rhsusaf.sqf similarity index 99% rename from Missionframework/arsenal_presets/rhsusaf.sqf rename to Missionframework/presets/arsenal/rhsusaf.sqf index 45048caf3..8fa23da9f 100644 --- a/Missionframework/arsenal_presets/rhsusaf.sqf +++ b/Missionframework/presets/arsenal/rhsusaf.sqf @@ -1,6 +1,12 @@ /* - RHS United States Armed Forces Arsenal Preset - Last Update: 2020-05-10 + File: rhsusaf.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-03-16 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + RHSUSAF arsenal preset. Needed: - RHSUSAF - https://steamcommunity.com/sharedfiles/filedetails/?id=843577117 @@ -11,7 +17,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ "rhs_weap_fgm148", // FGM-148 Javelin "rhs_weap_fim92", // FIM-92F "rhs_weap_hk416d10_LMT_d", // HK416 D10 (SOPMOD Stock/Desert) @@ -134,7 +140,7 @@ KPLIB_arsenal_weapons = [ "rhsusf_weap_MP7A2" // MP7A2 ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ "rhs_fgm148_magazine_AT", // Javelin AT "rhs_fgm172a_magazine_AT", // FGM172A SRAW "rhs_fgm172b_magazine_MPV", // FGM172B SRAW-MPV @@ -356,7 +362,7 @@ KPLIB_arsenal_magazines = [ "TrainingMine_Mag" // Training Mine ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Uniforms "rhs_uniform_abu", // Airman Battle Uniform "rhs_uniform_acu_ocp", // Army Combat Uniform (OCP) @@ -947,7 +953,7 @@ KPLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_rhsusf_B_BACKPACK", // Eagle A-III OCP (Raven) "rhsusf_assault_eagleaiii_coy", // Eagle A-III Coyote "rhsusf_assault_eagleaiii_ocp", // Eagle A-III OEF-CP diff --git a/Missionframework/arsenal_presets/sfp.sqf b/Missionframework/presets/arsenal/sfp.sqf similarity index 99% rename from Missionframework/arsenal_presets/sfp.sqf rename to Missionframework/presets/arsenal/sfp.sqf index a58511817..3b2be3462 100644 --- a/Missionframework/arsenal_presets/sfp.sqf +++ b/Missionframework/presets/arsenal/sfp.sqf @@ -1,6 +1,12 @@ /* - Swedish Forces Pack Arsenal Preset - Last Update: 2020-05-10 + File: sfp.sqf + Author: Dahlgren - https://github.com/Dahlgren + Date: 2017-07-17 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + SFP arsenal preset. Needed: - SFP: Swedish Forces Pack - https://steamcommunity.com/sharedfiles/filedetails/?id=826911897 @@ -11,7 +17,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ "sfp_20Rnd_762x51_ak4", // Ak 4C "sfp_ag90_base", // Ag 90B "sfp_ak4_m203", // Ak 4 M203 @@ -60,7 +66,7 @@ KPLIB_arsenal_weapons = [ "sfp_signpist50" // Signalpistol 80 (Flare) ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ "sfp_100Rnd_762x51_ksp58", // 7.62mm 100Rnd "sfp_10Rnd_127x99_ag90", // 12.7mm 10Rnd Ag90 Mag "sfp_12Gauge_8rd_Pellets", // 12 Gauge 8 Rnd Buckshopt @@ -165,7 +171,7 @@ KPLIB_arsenal_magazines = [ "UGL_FlareYellow_F" // Flare Round (Yellow) ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Uniforms "sfp_drysuit", // Dry Suit "sfp_ghillie_desert_uniform", // Ghillie suit (Desert) @@ -476,7 +482,7 @@ KPLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "sfp_backpack_grg_loader", // GRG Loader (Backpack) "sfp_backpack_lk35", // LK 35 "sfp_backpack_sjvv9", // Medic Bag diff --git a/Missionframework/arsenal_presets/unsung.sqf b/Missionframework/presets/arsenal/unsung.sqf similarity index 99% rename from Missionframework/arsenal_presets/unsung.sqf rename to Missionframework/presets/arsenal/unsung.sqf index 82fc5d1f9..232a3f110 100644 --- a/Missionframework/arsenal_presets/unsung.sqf +++ b/Missionframework/presets/arsenal/unsung.sqf @@ -1,6 +1,12 @@ /* - The Unsung Vietnam War Mod US Arsenal Preset - Last Update: 2020-05-10 + File: unsung.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-07-24 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Unsung arsenal preset. Needed: - Unsung - https://steamcommunity.com/sharedfiles/filedetails/?id=943001311 @@ -11,7 +17,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -KPLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ "uns_357m", // Colt Lawman Mk.III (.357) "uns_38spec", // S/W Model 10 (.38 Spec) "uns_ak47_49", // AK-47/49 @@ -186,7 +192,7 @@ KPLIB_arsenal_weapons = [ "uns_xm177e2" // XM-177E2 ]; -KPLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ "Mine", // Mine Type 59 (Anti Tank) "MineE", // Mine TM57 (Anti Vehicle) "PipeBomb", // Explosive Charge @@ -479,7 +485,7 @@ KPLIB_arsenal_magazines = [ "TrainingMine_Mag" // Training Mine ]; -KPLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Uniforms "UNS_ARMY_BDU_101stAB1stlt", // ARMY BDU_101stAB 1stLT "UNS_ARMY_BDU_101stAB1stsgt", // ARMY BDU_101stAB 1stSGT @@ -1820,7 +1826,7 @@ KPLIB_arsenal_items = [ "tf_microdagr" // MicroDAGR Radio Programmer ]; -KPLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "UNS_Alice_1", // Alice Pack 1 "UNS_Alice_2", // Alice Pack 2 "UNS_Alice_3", // Alice Pack 3 diff --git a/Missionframework/presets/opfor/CUP_AFRF_MSV.sqf b/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_AFRF_MSV.sqf rename to Missionframework/presets/enemies/CUP_AFRF_MSV.sqf diff --git a/Missionframework/presets/opfor/CUP_AFRF_ModernMSV.sqf b/Missionframework/presets/enemies/CUP_AFRF_ModernMSV.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_AFRF_ModernMSV.sqf rename to Missionframework/presets/enemies/CUP_AFRF_ModernMSV.sqf diff --git a/Missionframework/presets/opfor/CUP_BAF_Desert.sqf b/Missionframework/presets/enemies/CUP_BAF_Desert.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_BAF_Desert.sqf rename to Missionframework/presets/enemies/CUP_BAF_Desert.sqf diff --git a/Missionframework/presets/opfor/CUP_BAF_Woodland.sqf b/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_BAF_Woodland.sqf rename to Missionframework/presets/enemies/CUP_BAF_Woodland.sqf diff --git a/Missionframework/presets/opfor/CUP_CDF.sqf b/Missionframework/presets/enemies/CUP_CDF.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_CDF.sqf rename to Missionframework/presets/enemies/CUP_CDF.sqf diff --git a/Missionframework/presets/opfor/CUP_ChDKZ.sqf b/Missionframework/presets/enemies/CUP_ChDKZ.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_ChDKZ.sqf rename to Missionframework/presets/enemies/CUP_ChDKZ.sqf diff --git a/Missionframework/presets/opfor/CUP_SLA.sqf b/Missionframework/presets/enemies/CUP_SLA.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_SLA.sqf rename to Missionframework/presets/enemies/CUP_SLA.sqf diff --git a/Missionframework/presets/opfor/CUP_TakiArmy.sqf b/Missionframework/presets/enemies/CUP_TakiArmy.sqf similarity index 100% rename from Missionframework/presets/opfor/CUP_TakiArmy.sqf rename to Missionframework/presets/enemies/CUP_TakiArmy.sqf diff --git a/Missionframework/presets/opfor/SLA.sqf b/Missionframework/presets/enemies/SLA.sqf similarity index 100% rename from Missionframework/presets/opfor/SLA.sqf rename to Missionframework/presets/enemies/SLA.sqf diff --git a/Missionframework/presets/opfor/aaf.sqf b/Missionframework/presets/enemies/aaf.sqf similarity index 100% rename from Missionframework/presets/opfor/aaf.sqf rename to Missionframework/presets/enemies/aaf.sqf diff --git a/Missionframework/presets/opfor/apex.sqf b/Missionframework/presets/enemies/apex.sqf similarity index 100% rename from Missionframework/presets/opfor/apex.sqf rename to Missionframework/presets/enemies/apex.sqf diff --git a/Missionframework/presets/opfor/custom.sqf b/Missionframework/presets/enemies/custom.sqf similarity index 100% rename from Missionframework/presets/opfor/custom.sqf rename to Missionframework/presets/enemies/custom.sqf diff --git a/Missionframework/presets/opfor/gm_east.sqf b/Missionframework/presets/enemies/gm_east.sqf similarity index 100% rename from Missionframework/presets/opfor/gm_east.sqf rename to Missionframework/presets/enemies/gm_east.sqf diff --git a/Missionframework/presets/opfor/gm_east_win.sqf b/Missionframework/presets/enemies/gm_east_win.sqf similarity index 100% rename from Missionframework/presets/opfor/gm_east_win.sqf rename to Missionframework/presets/enemies/gm_east_win.sqf diff --git a/Missionframework/presets/opfor/gm_west.sqf b/Missionframework/presets/enemies/gm_west.sqf similarity index 100% rename from Missionframework/presets/opfor/gm_west.sqf rename to Missionframework/presets/enemies/gm_west.sqf diff --git a/Missionframework/presets/opfor/gm_west_win.sqf b/Missionframework/presets/enemies/gm_west_win.sqf similarity index 100% rename from Missionframework/presets/opfor/gm_west_win.sqf rename to Missionframework/presets/enemies/gm_west_win.sqf diff --git a/Missionframework/presets/opfor/islamic_state.sqf b/Missionframework/presets/enemies/islamic_state.sqf similarity index 100% rename from Missionframework/presets/opfor/islamic_state.sqf rename to Missionframework/presets/enemies/islamic_state.sqf diff --git a/Missionframework/presets/opfor/nato.sqf b/Missionframework/presets/enemies/nato.sqf similarity index 100% rename from Missionframework/presets/opfor/nato.sqf rename to Missionframework/presets/enemies/nato.sqf diff --git a/Missionframework/presets/opfor/rhs_afrf.sqf b/Missionframework/presets/enemies/rhs_afrf.sqf similarity index 100% rename from Missionframework/presets/opfor/rhs_afrf.sqf rename to Missionframework/presets/enemies/rhs_afrf.sqf diff --git a/Missionframework/presets/opfor/takistan.sqf b/Missionframework/presets/enemies/takistan.sqf similarity index 100% rename from Missionframework/presets/opfor/takistan.sqf rename to Missionframework/presets/enemies/takistan.sqf diff --git a/Missionframework/presets/opfor/unsung.sqf b/Missionframework/presets/enemies/unsung.sqf similarity index 100% rename from Missionframework/presets/opfor/unsung.sqf rename to Missionframework/presets/enemies/unsung.sqf diff --git a/Missionframework/presets/init_presets.sqf b/Missionframework/presets/init_presets.sqf index d2fbbcde3..45e3507e5 100644 --- a/Missionframework/presets/init_presets.sqf +++ b/Missionframework/presets/init_presets.sqf @@ -8,85 +8,85 @@ if (isServer) then { ["Only if you e.g. use a CUP preset and you get messages about missing CUP classes, then check your loaded mods.", "PRESETS"] call KPLIB_fnc_log; }; -switch (KPLIB_preset_blufor) do { - case 1: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\apex.sqf";}; - case 2: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\3cbBAF_mtp.sqf";}; - case 3: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\3cbBAF_des.sqf";}; - case 4: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\bwmod.sqf";}; - case 5: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\bwmod_des.sqf";}; - case 6: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\rhs_usaf_wdl.sqf";}; - case 7: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\rhs_usaf_des.sqf";}; - case 8: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\rhs_afrf.sqf";}; - case 9: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\gm_west.sqf";}; - case 10: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\gm_west_win.sqf";}; - case 11: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\gm_east.sqf";}; - case 12: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\gm_east_win.sqf";}; - case 13: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\csat.sqf";}; - case 14: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\csat_apex.sqf";}; - case 15: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\unsung.sqf";}; - case 16: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_BAF_Desert.sqf";}; - case 17: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_BAF_Woodland.sqf";}; - case 18: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_USMC_Desert.sqf";}; - case 19: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_USMC_Woodland.sqf";}; - case 20: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_USA_Desert.sqf";}; - case 21: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_USA_Woodland.sqf";}; - case 22: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_CDF.sqf";}; - case 23: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_ACR_Desert.sqf";}; - case 24: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_ACR_Woodland.sqf";}; - case 25: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_ChDKZ.sqf";}; - case 26: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_SLA.sqf";}; - case 27: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\CUP_TakiArmy.sqf";}; - case 28: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\sfp_wdl.sqf";}; - case 29: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\sfp_des.sqf";}; - case 30: {[] call compileFinal preprocessFileLineNumbers "presets\blufor\enoch.sqf";}; - default {[] call compileFinal preprocessFileLineNumbers "presets\blufor\custom.sqf";}; +switch (KPLIB_presetPlayers) do { + case 1: {[] call compile preprocessFileLineNumbers "presets\players\apex.sqf";}; + case 2: {[] call compile preprocessFileLineNumbers "presets\players\3cbBAF_mtp.sqf";}; + case 3: {[] call compile preprocessFileLineNumbers "presets\players\3cbBAF_des.sqf";}; + case 4: {[] call compile preprocessFileLineNumbers "presets\players\bwmod.sqf";}; + case 5: {[] call compile preprocessFileLineNumbers "presets\players\bwmod_des.sqf";}; + case 6: {[] call compile preprocessFileLineNumbers "presets\players\rhs_usaf_wdl.sqf";}; + case 7: {[] call compile preprocessFileLineNumbers "presets\players\rhs_usaf_des.sqf";}; + case 8: {[] call compile preprocessFileLineNumbers "presets\players\rhs_afrf.sqf";}; + case 9: {[] call compile preprocessFileLineNumbers "presets\players\gm_west.sqf";}; + case 10: {[] call compile preprocessFileLineNumbers "presets\players\gm_west_win.sqf";}; + case 11: {[] call compile preprocessFileLineNumbers "presets\players\gm_east.sqf";}; + case 12: {[] call compile preprocessFileLineNumbers "presets\players\gm_east_win.sqf";}; + case 13: {[] call compile preprocessFileLineNumbers "presets\players\csat.sqf";}; + case 14: {[] call compile preprocessFileLineNumbers "presets\players\csat_apex.sqf";}; + case 15: {[] call compile preprocessFileLineNumbers "presets\players\unsung.sqf";}; + case 16: {[] call compile preprocessFileLineNumbers "presets\players\CUP_BAF_Desert.sqf";}; + case 17: {[] call compile preprocessFileLineNumbers "presets\players\CUP_BAF_Woodland.sqf";}; + case 18: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USMC_Desert.sqf";}; + case 19: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USMC_Woodland.sqf";}; + case 20: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USA_Desert.sqf";}; + case 21: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USA_Woodland.sqf";}; + case 22: {[] call compile preprocessFileLineNumbers "presets\players\CUP_CDF.sqf";}; + case 23: {[] call compile preprocessFileLineNumbers "presets\players\CUP_ACR_Desert.sqf";}; + case 24: {[] call compile preprocessFileLineNumbers "presets\players\CUP_ACR_Woodland.sqf";}; + case 25: {[] call compile preprocessFileLineNumbers "presets\players\CUP_ChDKZ.sqf";}; + case 26: {[] call compile preprocessFileLineNumbers "presets\players\CUP_SLA.sqf";}; + case 27: {[] call compile preprocessFileLineNumbers "presets\players\CUP_TakiArmy.sqf";}; + case 28: {[] call compile preprocessFileLineNumbers "presets\players\sfp_wdl.sqf";}; + case 29: {[] call compile preprocessFileLineNumbers "presets\players\sfp_des.sqf";}; + case 30: {[] call compile preprocessFileLineNumbers "presets\players\enoch.sqf";}; + default {[] call compile preprocessFileLineNumbers "presets\players\custom.sqf";}; }; -switch (KPLIB_preset_opfor) do { - case 1: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\apex.sqf";}; - case 2: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\rhs_afrf.sqf";}; - case 3: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\takistan.sqf";}; - case 4: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\islamic_state.sqf";}; - case 5: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\SLA.sqf";}; - case 6: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\aaf.sqf";}; - case 7: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\nato.sqf";}; - case 8: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\gm_west.sqf";}; - case 9: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\gm_west_win.sqf";}; - case 10: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\gm_east.sqf";}; - case 11: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\gm_east_win.sqf";}; - case 12: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\unsung.sqf";}; - case 13: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_SLA.sqf";}; - case 14: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_TakiArmy.sqf";}; - case 15: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_ChDKZ.sqf";}; - case 16: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_AFRF_MSV.sqf";}; - case 17: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_AFRF_ModernMSV.sqf";}; - case 18: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_CDF.sqf";}; - case 19: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_BAF_Desert.sqf";}; - case 20: {[] call compileFinal preprocessFileLineNumbers "presets\opfor\CUP_BAF_Woodland.sqf";}; - default {[] call compileFinal preprocessFileLineNumbers "presets\opfor\custom.sqf";}; +switch (KPLIB_presetEnemies) do { + case 1: {[] call compile preprocessFileLineNumbers "presets\enemies\apex.sqf";}; + case 2: {[] call compile preprocessFileLineNumbers "presets\enemies\rhs_afrf.sqf";}; + case 3: {[] call compile preprocessFileLineNumbers "presets\enemies\takistan.sqf";}; + case 4: {[] call compile preprocessFileLineNumbers "presets\enemies\islamic_state.sqf";}; + case 5: {[] call compile preprocessFileLineNumbers "presets\enemies\SLA.sqf";}; + case 6: {[] call compile preprocessFileLineNumbers "presets\enemies\aaf.sqf";}; + case 7: {[] call compile preprocessFileLineNumbers "presets\enemies\nato.sqf";}; + case 8: {[] call compile preprocessFileLineNumbers "presets\enemies\gm_west.sqf";}; + case 9: {[] call compile preprocessFileLineNumbers "presets\enemies\gm_west_win.sqf";}; + case 10: {[] call compile preprocessFileLineNumbers "presets\enemies\gm_east.sqf";}; + case 11: {[] call compile preprocessFileLineNumbers "presets\enemies\gm_east_win.sqf";}; + case 12: {[] call compile preprocessFileLineNumbers "presets\enemies\unsung.sqf";}; + case 13: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_SLA.sqf";}; + case 14: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_TakiArmy.sqf";}; + case 15: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_ChDKZ.sqf";}; + case 16: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_AFRF_MSV.sqf";}; + case 17: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_AFRF_ModernMSV.sqf";}; + case 18: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_CDF.sqf";}; + case 19: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_BAF_Desert.sqf";}; + case 20: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_BAF_Woodland.sqf";}; + default {[] call compile preprocessFileLineNumbers "presets\enemies\custom.sqf";}; }; -switch (KPLIB_preset_resistance) do { - case 1: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\apex.sqf";}; - case 2: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\rhs_gref.sqf";}; - case 3: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\middle_eastern.sqf";}; - case 4: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\RACS.sqf";}; - case 5: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\germany.sqf";}; - case 6: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\unsung.sqf";}; - case 7: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\CUP_TakiLocals.sqf";}; - case 8: {[] call compileFinal preprocessFileLineNumbers "presets\resistance\CUP_NAPA.sqf";}; - default {[] call compileFinal preprocessFileLineNumbers "presets\resistance\custom.sqf";}; +switch (KPLIB_presetResistance) do { + case 1: {[] call compile preprocessFileLineNumbers "presets\resistance\apex.sqf";}; + case 2: {[] call compile preprocessFileLineNumbers "presets\resistance\rhs_gref.sqf";}; + case 3: {[] call compile preprocessFileLineNumbers "presets\resistance\middle_eastern.sqf";}; + case 4: {[] call compile preprocessFileLineNumbers "presets\resistance\RACS.sqf";}; + case 5: {[] call compile preprocessFileLineNumbers "presets\resistance\germany.sqf";}; + case 6: {[] call compile preprocessFileLineNumbers "presets\resistance\unsung.sqf";}; + case 7: {[] call compile preprocessFileLineNumbers "presets\resistance\CUP_TakiLocals.sqf";}; + case 8: {[] call compile preprocessFileLineNumbers "presets\resistance\CUP_NAPA.sqf";}; + default {[] call compile preprocessFileLineNumbers "presets\resistance\custom.sqf";}; }; -switch (KPLIB_preset_civilians) do { - case 1: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\apex.sqf";}; - case 2: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\middle_eastern.sqf";}; - case 3: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\RDSCiv.sqf";}; - case 4: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\germany.sqf";}; - case 5: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\unsung.sqf";}; - case 6: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\CUP_TakiCivs.sqf";}; - case 7: {[] call compileFinal preprocessFileLineNumbers "presets\civilians\CUP_ChernoCivs.sqf";}; - default {[] call compileFinal preprocessFileLineNumbers "presets\civilians\custom.sqf";}; +switch (KPLIB_presetCivilians) do { + case 1: {[] call compile preprocessFileLineNumbers "presets\civilians\apex.sqf";}; + case 2: {[] call compile preprocessFileLineNumbers "presets\civilians\middle_eastern.sqf";}; + case 3: {[] call compile preprocessFileLineNumbers "presets\civilians\RDSCiv.sqf";}; + case 4: {[] call compile preprocessFileLineNumbers "presets\civilians\germany.sqf";}; + case 5: {[] call compile preprocessFileLineNumbers "presets\civilians\unsung.sqf";}; + case 6: {[] call compile preprocessFileLineNumbers "presets\civilians\CUP_TakiCivs.sqf";}; + case 7: {[] call compile preprocessFileLineNumbers "presets\civilians\CUP_ChernoCivs.sqf";}; + default {[] call compile preprocessFileLineNumbers "presets\civilians\custom.sqf";}; }; // Prices for the blufor infantry squads (supplies, ammo, fuel) @@ -193,8 +193,8 @@ opfor_choppers = opfor_choppers opfor_air = opfor_air select {[_x] call KPLIB_fnc_checkClass}; // Resistance -KPLIB_guerilla_units = KPLIB_guerilla_units select {[_x] call KPLIB_fnc_checkClass}; -KPLIB_guerilla_vehicles = KPLIB_guerilla_vehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_guerilla_units = KPLIB_guerilla_units select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_guerilla_vehicles = KPLIB_guerilla_vehicles select {[_x] call KPLIB_fnc_checkClass}; // Civilians civilians = civilians select {[_x] call KPLIB_fnc_checkClass}; diff --git a/Missionframework/presets/blufor/3cbBAF_des.sqf b/Missionframework/presets/players/3cbBAF_des.sqf similarity index 100% rename from Missionframework/presets/blufor/3cbBAF_des.sqf rename to Missionframework/presets/players/3cbBAF_des.sqf diff --git a/Missionframework/presets/blufor/3cbBAF_mtp.sqf b/Missionframework/presets/players/3cbBAF_mtp.sqf similarity index 100% rename from Missionframework/presets/blufor/3cbBAF_mtp.sqf rename to Missionframework/presets/players/3cbBAF_mtp.sqf diff --git a/Missionframework/presets/blufor/CUP_ACR_Desert.sqf b/Missionframework/presets/players/CUP_ACR_Desert.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_ACR_Desert.sqf rename to Missionframework/presets/players/CUP_ACR_Desert.sqf diff --git a/Missionframework/presets/blufor/CUP_ACR_Woodland.sqf b/Missionframework/presets/players/CUP_ACR_Woodland.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_ACR_Woodland.sqf rename to Missionframework/presets/players/CUP_ACR_Woodland.sqf diff --git a/Missionframework/presets/blufor/CUP_BAF_Desert.sqf b/Missionframework/presets/players/CUP_BAF_Desert.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_BAF_Desert.sqf rename to Missionframework/presets/players/CUP_BAF_Desert.sqf diff --git a/Missionframework/presets/blufor/CUP_BAF_Woodland.sqf b/Missionframework/presets/players/CUP_BAF_Woodland.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_BAF_Woodland.sqf rename to Missionframework/presets/players/CUP_BAF_Woodland.sqf diff --git a/Missionframework/presets/blufor/CUP_CDF.sqf b/Missionframework/presets/players/CUP_CDF.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_CDF.sqf rename to Missionframework/presets/players/CUP_CDF.sqf diff --git a/Missionframework/presets/blufor/CUP_ChDKZ.sqf b/Missionframework/presets/players/CUP_ChDKZ.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_ChDKZ.sqf rename to Missionframework/presets/players/CUP_ChDKZ.sqf diff --git a/Missionframework/presets/blufor/CUP_SLA.sqf b/Missionframework/presets/players/CUP_SLA.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_SLA.sqf rename to Missionframework/presets/players/CUP_SLA.sqf diff --git a/Missionframework/presets/blufor/CUP_TakiArmy.sqf b/Missionframework/presets/players/CUP_TakiArmy.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_TakiArmy.sqf rename to Missionframework/presets/players/CUP_TakiArmy.sqf diff --git a/Missionframework/presets/blufor/CUP_USA_Desert.sqf b/Missionframework/presets/players/CUP_USA_Desert.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_USA_Desert.sqf rename to Missionframework/presets/players/CUP_USA_Desert.sqf diff --git a/Missionframework/presets/blufor/CUP_USA_Woodland.sqf b/Missionframework/presets/players/CUP_USA_Woodland.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_USA_Woodland.sqf rename to Missionframework/presets/players/CUP_USA_Woodland.sqf diff --git a/Missionframework/presets/blufor/CUP_USMC_Desert.sqf b/Missionframework/presets/players/CUP_USMC_Desert.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_USMC_Desert.sqf rename to Missionframework/presets/players/CUP_USMC_Desert.sqf diff --git a/Missionframework/presets/blufor/CUP_USMC_Woodland.sqf b/Missionframework/presets/players/CUP_USMC_Woodland.sqf similarity index 100% rename from Missionframework/presets/blufor/CUP_USMC_Woodland.sqf rename to Missionframework/presets/players/CUP_USMC_Woodland.sqf diff --git a/Missionframework/presets/blufor/apex.sqf b/Missionframework/presets/players/apex.sqf similarity index 100% rename from Missionframework/presets/blufor/apex.sqf rename to Missionframework/presets/players/apex.sqf diff --git a/Missionframework/presets/blufor/bwmod.sqf b/Missionframework/presets/players/bwmod.sqf similarity index 100% rename from Missionframework/presets/blufor/bwmod.sqf rename to Missionframework/presets/players/bwmod.sqf diff --git a/Missionframework/presets/blufor/bwmod_des.sqf b/Missionframework/presets/players/bwmod_des.sqf similarity index 100% rename from Missionframework/presets/blufor/bwmod_des.sqf rename to Missionframework/presets/players/bwmod_des.sqf diff --git a/Missionframework/presets/blufor/csat.sqf b/Missionframework/presets/players/csat.sqf similarity index 100% rename from Missionframework/presets/blufor/csat.sqf rename to Missionframework/presets/players/csat.sqf diff --git a/Missionframework/presets/blufor/csat_apex.sqf b/Missionframework/presets/players/csat_apex.sqf similarity index 100% rename from Missionframework/presets/blufor/csat_apex.sqf rename to Missionframework/presets/players/csat_apex.sqf diff --git a/Missionframework/presets/blufor/custom.sqf b/Missionframework/presets/players/custom.sqf similarity index 100% rename from Missionframework/presets/blufor/custom.sqf rename to Missionframework/presets/players/custom.sqf diff --git a/Missionframework/presets/blufor/enoch.sqf b/Missionframework/presets/players/enoch.sqf similarity index 100% rename from Missionframework/presets/blufor/enoch.sqf rename to Missionframework/presets/players/enoch.sqf diff --git a/Missionframework/presets/blufor/gm_east.sqf b/Missionframework/presets/players/gm_east.sqf similarity index 100% rename from Missionframework/presets/blufor/gm_east.sqf rename to Missionframework/presets/players/gm_east.sqf diff --git a/Missionframework/presets/blufor/gm_east_win.sqf b/Missionframework/presets/players/gm_east_win.sqf similarity index 100% rename from Missionframework/presets/blufor/gm_east_win.sqf rename to Missionframework/presets/players/gm_east_win.sqf diff --git a/Missionframework/presets/blufor/gm_west.sqf b/Missionframework/presets/players/gm_west.sqf similarity index 100% rename from Missionframework/presets/blufor/gm_west.sqf rename to Missionframework/presets/players/gm_west.sqf diff --git a/Missionframework/presets/blufor/gm_west_win.sqf b/Missionframework/presets/players/gm_west_win.sqf similarity index 100% rename from Missionframework/presets/blufor/gm_west_win.sqf rename to Missionframework/presets/players/gm_west_win.sqf diff --git a/Missionframework/presets/blufor/rhs_afrf.sqf b/Missionframework/presets/players/rhs_afrf.sqf similarity index 100% rename from Missionframework/presets/blufor/rhs_afrf.sqf rename to Missionframework/presets/players/rhs_afrf.sqf diff --git a/Missionframework/presets/blufor/rhs_usaf_des.sqf b/Missionframework/presets/players/rhs_usaf_des.sqf similarity index 100% rename from Missionframework/presets/blufor/rhs_usaf_des.sqf rename to Missionframework/presets/players/rhs_usaf_des.sqf diff --git a/Missionframework/presets/blufor/rhs_usaf_wdl.sqf b/Missionframework/presets/players/rhs_usaf_wdl.sqf similarity index 100% rename from Missionframework/presets/blufor/rhs_usaf_wdl.sqf rename to Missionframework/presets/players/rhs_usaf_wdl.sqf diff --git a/Missionframework/presets/blufor/sfp_des.sqf b/Missionframework/presets/players/sfp_des.sqf similarity index 100% rename from Missionframework/presets/blufor/sfp_des.sqf rename to Missionframework/presets/players/sfp_des.sqf diff --git a/Missionframework/presets/blufor/sfp_wdl.sqf b/Missionframework/presets/players/sfp_wdl.sqf similarity index 100% rename from Missionframework/presets/blufor/sfp_wdl.sqf rename to Missionframework/presets/players/sfp_wdl.sqf diff --git a/Missionframework/presets/blufor/unsung.sqf b/Missionframework/presets/players/unsung.sqf similarity index 100% rename from Missionframework/presets/blufor/unsung.sqf rename to Missionframework/presets/players/unsung.sqf diff --git a/Missionframework/scripts/client/CfgFunctions.hpp b/Missionframework/scripts/client/CfgFunctions.hpp index 9cd3bec72..5caa394ef 100644 --- a/Missionframework/scripts/client/CfgFunctions.hpp +++ b/Missionframework/scripts/client/CfgFunctions.hpp @@ -1,3 +1,8 @@ +class client_misc { + file = "scripts\client\misc"; + + class initArsenal {}; +}; class client_tutorial { file = "scripts\client\tutorial"; diff --git a/Missionframework/scripts/client/commander/enforce_whitelist.sqf b/Missionframework/scripts/client/commander/enforce_whitelist.sqf index 7d05a68e2..de2940119 100644 --- a/Missionframework/scripts/client/commander/enforce_whitelist.sqf +++ b/Missionframework/scripts/client/commander/enforce_whitelist.sqf @@ -1,6 +1,6 @@ scriptName "[KPLIB] Enforce Whitelist"; -[] call compileFinal preprocessFileLineNumbers "whitelist.sqf"; +[] call compile preprocessFileLineNumbers "whitelist.sqf"; if (!KPLIB_use_whitelist) exitWith {}; diff --git a/Missionframework/scripts/client/commander/open_permissions.sqf b/Missionframework/scripts/client/commander/open_permissions.sqf index b5de292d8..fb97eb9bc 100644 --- a/Missionframework/scripts/client/commander/open_permissions.sqf +++ b/Missionframework/scripts/client/commander/open_permissions.sqf @@ -18,7 +18,7 @@ disableSerialization; waitUntil { dialog }; -permission_create_activetext = compileFinal ' +permission_create_activetext = compile ' params ["_idx", "_column", "_permission", "_text", "_tooltip"]; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index 229543828..b41dad705 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -1,36 +1,12 @@ -[] call compileFinal preprocessFileLineNumbers "scripts\client\misc\init_markers.sqf"; -switch (KPLIB_arsenal) do { - case 1: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\custom.sqf";}; - case 2: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\rhsusaf.sqf";}; - case 3: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\3cbBAF.sqf";}; - case 4: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\gm_west.sqf";}; - case 5: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\gm_east.sqf";}; - case 6: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\csat.sqf";}; - case 7: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\unsung.sqf";}; - case 8: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\sfp.sqf";}; - case 9: {[] call compileFinal preprocessFileLineNumbers "arsenal_presets\bwmod.sqf";}; - default {KPLIB_arsenal_weapons = [];KPLIB_arsenal_magazines = [];KPLIB_arsenal_items = [];KPLIB_arsenal_backpacks = [];}; -}; - -if (typeOf player == "VirtualSpectator_F") exitWith { - execVM "scripts\client\markers\empty_vehicles_marker.sqf"; - execVM "scripts\client\markers\fob_markers.sqf"; - execVM "scripts\client\markers\group_icons.sqf"; - execVM "scripts\client\markers\hostile_groups.sqf"; - execVM "scripts\client\markers\sector_manager.sqf"; - execVM "scripts\client\markers\spot_timer.sqf"; - execVM "scripts\client\misc\synchronise_vars.sqf"; - execVM "scripts\client\ui\ui_manager.sqf"; -}; +[] call compile preprocessFileLineNumbers "scripts\client\misc\init_markers.sqf"; +[] call KPLIB_fnc_initArsenal; -// This causes the script error with not defined variable _display in File A3\functions_f_bootcamp\Inventory\fn_arsenal.sqf [BIS_fnc_arsenal], line 2122 -// ["Preload"] call BIS_fnc_arsenal; -spawn_camera = compileFinal preprocessFileLineNumbers "scripts\client\spawn\spawn_camera.sqf"; -cinematic_camera = compileFinal preprocessFileLineNumbers "scripts\client\ui\cinematic_camera.sqf"; -write_credit_line = compileFinal preprocessFileLineNumbers "scripts\client\ui\write_credit_line.sqf"; -do_load_box = compileFinal preprocessFileLineNumbers "scripts\client\ammoboxes\do_load_box.sqf"; -kp_fuel_consumption = compileFinal preprocessFileLineNumbers "scripts\client\misc\kp_fuel_consumption.sqf"; -kp_vehicle_permissions = compileFinal preprocessFileLineNumbers "scripts\client\misc\vehicle_permissions.sqf"; +spawn_camera = compile preprocessFileLineNumbers "scripts\client\spawn\spawn_camera.sqf"; +cinematic_camera = compile preprocessFileLineNumbers "scripts\client\ui\cinematic_camera.sqf"; +write_credit_line = compile preprocessFileLineNumbers "scripts\client\ui\write_credit_line.sqf"; +do_load_box = compile preprocessFileLineNumbers "scripts\client\ammoboxes\do_load_box.sqf"; +kp_fuel_consumption = compile preprocessFileLineNumbers "scripts\client\misc\kp_fuel_consumption.sqf"; +kp_vehicle_permissions = compile preprocessFileLineNumbers "scripts\client\misc\vehicle_permissions.sqf"; execVM "scripts\client\actions\intel_manager.sqf"; execVM "scripts\client\actions\recycle_manager.sqf"; diff --git a/Missionframework/scripts/client/misc/fn_initArsenal.sqf b/Missionframework/scripts/client/misc/fn_initArsenal.sqf new file mode 100644 index 000000000..426ff31ce --- /dev/null +++ b/Missionframework/scripts/client/misc/fn_initArsenal.sqf @@ -0,0 +1,90 @@ +/* + File: fn_initArsenal.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-05-11 + Last Update: 2020-05-11 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Loads the arsenal preset and adjusts the available arsenal gear accordingly. + + Parameter(s): + NONE + + Returns: + Function reached the end [BOOL] +*/ + +if (KPLIB_arsenalUsePreset) then { + KPLIB_arsenalWeapons = []; + KPLIB_arsenalMagazines = []; + KPLIB_arsenalItems = []; + KPLIB_arsenalBackpacks = []; + KPLIB_arsenalBlacklist = []; + KPLIB_arsenalAllowed = []; + KPLIB_arsenalAllowedExtension = []; + + switch (KPLIB_presetArsenal) do { + case 1: {[] call compile preprocessFileLineNumbers "presets\arsenal\custom.sqf";}; + case 2: {[] call compile preprocessFileLineNumbers "presets\arsenal\rhsusaf.sqf";}; + case 3: {[] call compile preprocessFileLineNumbers "presets\arsenal\3cbBAF.sqf";}; + case 4: {[] call compile preprocessFileLineNumbers "presets\arsenal\gm_west.sqf";}; + case 5: {[] call compile preprocessFileLineNumbers "presets\arsenal\gm_east.sqf";}; + case 6: {[] call compile preprocessFileLineNumbers "presets\arsenal\csat.sqf";}; + case 7: {[] call compile preprocessFileLineNumbers "presets\arsenal\unsung.sqf";}; + case 8: {[] call compile preprocessFileLineNumbers "presets\arsenal\sfp.sqf";}; + case 9: {[] call compile preprocessFileLineNumbers "presets\arsenal\bwmod.sqf";}; + default {[] call compile preprocessFileLineNumbers "presets\arsenal\blacklist.sqf";}; + }; + [] call compile preprocessFileLineNumbers "presets\arsenal\allowedExtension.sqf"; + + private _crawled = [] call KPLIB_fnc_crawlAllItems; + + if (KPLIB_arsenalWeapons isEqualTo []) then {KPLIB_arsenalWeapons = (_crawled select 0) select {!(_x in KPLIB_arsenalBlacklist)};}; + [missionNamespace, KPLIB_arsenalWeapons] call BIS_fnc_addVirtualWeaponCargo; + KPLIB_arsenalAllowed append KPLIB_arsenalWeapons; + + if (KPLIB_arsenalMagazines isEqualTo []) then {KPLIB_arsenalMagazines = (_crawled select 1) select {!(_x in KPLIB_arsenalBlacklist)};}; + [missionNamespace, KPLIB_arsenalMagazines] call BIS_fnc_addVirtualMagazineCargo; + KPLIB_arsenalAllowed append KPLIB_arsenalMagazines; + + if (KPLIB_arsenalItems isEqualTo []) then {KPLIB_arsenalItems = (_crawled select 2) select {!(_x in KPLIB_arsenalBlacklist)};}; + [missionNamespace, KPLIB_arsenalItems] call BIS_fnc_addVirtualItemCargo; + KPLIB_arsenalAllowed append KPLIB_arsenalItems; + + if (KPLIB_arsenalBackpacks isEqualTo []) then {KPLIB_arsenalBackpacks = (_crawled select 3) select {!(_x in KPLIB_arsenalBlacklist)};}; + [missionNamespace, KPLIB_arsenalBackpacks] call BIS_fnc_addVirtualBackpackCargo; + KPLIB_arsenalAllowed append KPLIB_arsenalBackpacks; + + // Support for CBA disposable launchers, https://github.com/CBATeam/CBA_A3/wiki/Disposable-Launchers + if !(configProperties [configFile >> "CBA_DisposableLaunchers"] isEqualTo []) then { + private _disposableLaunchers = ["CBA_FakeLauncherMagazine"]; + { + private _loadedLauncher = cba_disposable_LoadedLaunchers getVariable _x; + if (!isNil "_loadedLauncher") then { + _disposableLaunchers pushBack _loadedLauncher; + }; + + private _normalLauncher = cba_disposable_NormalLaunchers getVariable _x; + if (!isNil "_normalLauncher") then { + _normalLauncher params ["_loadedLauncher"]; + _disposableLaunchers pushBack _loadedLauncher; + }; + } forEach KPLIB_arsenalAllowed; + KPLIB_arsenalAllowed append _disposableLaunchers; + }; + + KPLIB_arsenalAllowed append KPLIB_arsenalAllowedExtension; + if (KPLIB_ace && KPLIB_arsenal_type) then {[player, KPLIB_arsenalAllowed, false] call ace_arsenal_fnc_addVirtualItems;}; + + // Lowering to avoid issues with incorrect capitalized classnames in KPLIB_fnc_checkGear + KPLIB_arsenalAllowed = KPLIB_arsenalAllowed apply {toLower _x}; +} else { + [missionNamespace, true] call BIS_fnc_addVirtualWeaponCargo; + [missionNamespace, true] call BIS_fnc_addVirtualMagazineCargo; + [missionNamespace, true] call BIS_fnc_addVirtualItemCargo; + [missionNamespace, true] call BIS_fnc_addVirtualBackpackCargo; + if (KPLIB_ace && KPLIB_arsenal_type) then {[player, true, false] call ace_arsenal_fnc_addVirtualItems;}; +}; + +true diff --git a/Missionframework/scripts/client/misc/init_arsenal.sqf b/Missionframework/scripts/client/misc/init_arsenal.sqf deleted file mode 100644 index 01027c212..000000000 --- a/Missionframework/scripts/client/misc/init_arsenal.sqf +++ /dev/null @@ -1,113 +0,0 @@ -if (KPLIB_arsenalUsePreset) then { - private _crawled = [] call KPLIB_fnc_crawlAllItems; - private _weapons = []; - private _magazines = []; - private _items = []; - private _backpacks = []; - KPLIB_allowed_items = []; - - if (isNil "KPLIB_arsenal_weapons") then {KPLIB_arsenal_weapons = []}; - if (isNil "KPLIB_arsenal_magazines") then {KPLIB_arsenal_magazines = []}; - if (isNil "KPLIB_arsenal_items") then {KPLIB_arsenal_items = []}; - if (isNil "KPLIB_arsenal_backpacks") then {KPLIB_arsenal_backpacks = []}; - if (isNil "blacklisted_from_arsenal") then {blacklisted_from_arsenal = []}; - - if ((count KPLIB_arsenal_weapons) == 0) then { - if ((count blacklisted_from_arsenal) == 0) then { - _weapons = _crawled select 0; - } else { - {if (!(_x in blacklisted_from_arsenal)) then {_weapons pushBack _x};} forEach (_crawled select 0); - }; - [missionNamespace, _weapons] call BIS_fnc_addVirtualWeaponCargo; - KPLIB_allowed_items append _weapons; - } else { - [missionNamespace, KPLIB_arsenal_weapons] call BIS_fnc_addVirtualWeaponCargo; - KPLIB_allowed_items append KPLIB_arsenal_weapons; - }; - - // Support for CBA disposable launchers, https://github.com/CBATeam/CBA_A3/wiki/Disposable-Launchers - if !(configProperties [configFile >> "CBA_DisposableLaunchers"] isEqualTo []) then { - private _disposableLaunchers = ["CBA_FakeLauncherMagazine"]; - { - private _loadedLauncher = cba_disposable_LoadedLaunchers getVariable _x; - if (!isNil "_loadedLauncher") then { - _disposableLaunchers pushBack _loadedLauncher; - }; - - private _normalLauncher = cba_disposable_NormalLaunchers getVariable _x; - if (!isNil "_normalLauncher") then { - _normalLauncher params ["_loadedLauncher"]; - _disposableLaunchers pushBack _loadedLauncher; - }; - } forEach KPLIB_allowed_items; - KPLIB_allowed_items append _disposableLaunchers; - }; - - if ((count KPLIB_arsenal_magazines) == 0) then { - if ((count blacklisted_from_arsenal) == 0) then { - _magazines = _crawled select 1; - } else { - {if (!(_x in blacklisted_from_arsenal)) then {_magazines pushBack _x};} forEach (_crawled select 1); - }; - [missionNamespace, _magazines] call BIS_fnc_addVirtualMagazineCargo; - KPLIB_allowed_items append _magazines; - } else { - [missionNamespace, KPLIB_arsenal_magazines] call BIS_fnc_addVirtualMagazineCargo; - KPLIB_allowed_items append KPLIB_arsenal_magazines; - }; - - if ((count KPLIB_arsenal_items) == 0) then { - if ((count blacklisted_from_arsenal) == 0) then { - _items = _crawled select 2; - } else { - {if (!(_x in blacklisted_from_arsenal)) then {_items pushBack _x};} forEach (_crawled select 2); - }; - [missionNamespace, _items] call BIS_fnc_addVirtualItemCargo; - KPLIB_allowed_items append _items; - } else { - [missionNamespace, KPLIB_arsenal_items] call BIS_fnc_addVirtualItemCargo; - KPLIB_allowed_items append KPLIB_arsenal_items; - }; - - if ((count KPLIB_arsenal_backpacks) == 0) then { - if ((count blacklisted_from_arsenal) == 0) then { - _backpacks = _crawled select 3; - } else { - {if (!(_x in blacklisted_from_arsenal)) then {_backpacks pushBack _x};} forEach (_crawled select 3); - }; - [missionNamespace, _backpacks] call BIS_fnc_addVirtualBackpackCargo; - KPLIB_allowed_items append _backpacks; - } else { - [missionNamespace, KPLIB_arsenal_backpacks] call BIS_fnc_addVirtualBackpackCargo; - KPLIB_allowed_items append KPLIB_arsenal_backpacks; - }; - - { - if ((_x find "rhs_acc") == 0) then { - KPLIB_allowed_items_extension append [_x + "_3d", _x + "_pip"]; - }; - if ((_x find "rhsusf_acc") == 0) then { - KPLIB_allowed_items_extension append [_x + "_3d", _x + "_pip"]; - }; - } forEach KPLIB_allowed_items; - - if ((count KPLIB_allowed_items_extension) > 0) then { - KPLIB_allowed_items append KPLIB_allowed_items_extension; - }; - - if (KPLIB_ace && KPLIB_arsenal_type) then { - [player, KPLIB_allowed_items, false] call ace_arsenal_fnc_addVirtualItems; - }; - - // Lowercase all classnames - KPLIB_allowed_items = KPLIB_allowed_items apply {toLower _x}; -} else { - [missionNamespace, true] call BIS_fnc_addVirtualWeaponCargo; - [missionNamespace, true] call BIS_fnc_addVirtualMagazineCargo; - [missionNamespace, true] call BIS_fnc_addVirtualItemCargo; - [missionNamespace, true] call BIS_fnc_addVirtualBackpackCargo; - - if (KPLIB_ace && KPLIB_arsenal_type) then { - [player, true, false] call ace_arsenal_fnc_addVirtualItems; - }; -}; diff --git a/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf b/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf index 408aeebb7..1998381c6 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf @@ -3,4 +3,4 @@ player allowDamage false; KPLIB_endgame = 1; sleep 20; -_this call compileFinal preprocessFileLineNumbers "scripts\client\ui\end_screen.sqf"; +_this call compile preprocessFileLineNumbers "scripts\client\ui\end_screen.sqf"; diff --git a/Missionframework/scripts/server/asymmetric/init_module.sqf b/Missionframework/scripts/server/asymmetric/init_module.sqf index 626067ee9..0879c1739 100644 --- a/Missionframework/scripts/server/asymmetric/init_module.sqf +++ b/Missionframework/scripts/server/asymmetric/init_module.sqf @@ -1,12 +1,12 @@ // Scripts // Logistic convoy ambush -logistic_convoy_ambush = compileFinal preprocessFileLineNumbers "scripts\server\asymmetric\convoy\logistic_convoy_ambush.sqf"; +logistic_convoy_ambush = compile preprocessFileLineNumbers "scripts\server\asymmetric\convoy\logistic_convoy_ambush.sqf"; // IED spawner for blufor sectors -manage_asymIED = compileFinal preprocessFileLineNumbers "scripts\server\asymmetric\ied\manage_asymIED.sqf"; +manage_asymIED = compile preprocessFileLineNumbers "scripts\server\asymmetric\ied\manage_asymIED.sqf"; // Spawner for guerilla ambushes in blufor sectors -asym_sector_ambush = compileFinal preprocessFileLineNumbers "scripts\server\asymmetric\random\asym_sector_ambush.sqf"; +asym_sector_ambush = compile preprocessFileLineNumbers "scripts\server\asymmetric\random\asym_sector_ambush.sqf"; // Spawner for guerilla forces who join a fight at an opfor sector -sector_guerilla = compileFinal preprocessFileLineNumbers "scripts\server\asymmetric\random\sector_guerilla.sqf"; +sector_guerilla = compile preprocessFileLineNumbers "scripts\server\asymmetric\random\sector_guerilla.sqf"; // Globals // List sectors which are just liberated. Preventing direct ambush spawn. diff --git a/Missionframework/scripts/server/civinformant/init_module.sqf b/Missionframework/scripts/server/civinformant/init_module.sqf index 30d789a33..092bef575 100644 --- a/Missionframework/scripts/server/civinformant/init_module.sqf +++ b/Missionframework/scripts/server/civinformant/init_module.sqf @@ -1,6 +1,6 @@ // Scripts // Task selection and spawning -civinfo_task = compileFinal preprocessFileLineNumbers "scripts\server\civinformant\tasks\civinfo_task.sqf"; +civinfo_task = compile preprocessFileLineNumbers "scripts\server\civinformant\tasks\civinfo_task.sqf"; // Start spawn loop execVM "scripts\server\civinformant\civinfo_loop.sqf"; diff --git a/Missionframework/scripts/server/civrep/init_module.sqf b/Missionframework/scripts/server/civrep/init_module.sqf index a85701616..12a33dfef 100644 --- a/Missionframework/scripts/server/civrep/init_module.sqf +++ b/Missionframework/scripts/server/civrep/init_module.sqf @@ -1,15 +1,15 @@ // Functions // Get buildings count for sector -F_cr_getBuildings = compileFinal preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_getBuildings.sqf"; +F_cr_getBuildings = compile preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_getBuildings.sqf"; // Change CR value -F_cr_changeCR = compileFinal preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_changeCR.sqf"; +F_cr_changeCR = compile preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_changeCR.sqf"; // Reputation gain for liberating a sector -F_cr_liberatedSector = compileFinal preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_liberatedSector.sqf"; +F_cr_liberatedSector = compile preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_liberatedSector.sqf"; // Play random wounded animation on unit -F_cr_woundedAnim = compileFinal preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_woundedAnim.sqf"; +F_cr_woundedAnim = compile preprocessFileLineNumbers "scripts\server\civrep\fnc\f_kp_cr_woundedAnim.sqf"; // Scripts // Spawn wounded civilians in a sector -civrep_wounded_civs = compileFinal preprocessFileLineNumbers "scripts\server\civrep\wounded\civrep_wounded_civs.sqf"; +civrep_wounded_civs = compile preprocessFileLineNumbers "scripts\server\civrep\wounded\civrep_wounded_civs.sqf"; // Count initial buildings on each city and bigtown execVM "scripts\server\civrep\init_buildings.sqf"; diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index bbddc3696..7cfb0b5ab 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -1,36 +1,36 @@ // AI -add_civ_waypoints = compileFinal preprocessFileLineNumbers "scripts\server\ai\add_civ_waypoints.sqf"; -add_defense_waypoints = compileFinal preprocessFileLineNumbers "scripts\server\ai\add_defense_waypoints.sqf"; -battlegroup_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\battlegroup_ai.sqf"; -building_defence_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\building_defence_ai.sqf"; -patrol_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\patrol_ai.sqf"; -prisonner_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\prisonner_ai.sqf"; -troup_transport = compileFinal preprocessFileLineNumbers "scripts\server\ai\troup_transport.sqf"; +add_civ_waypoints = compile preprocessFileLineNumbers "scripts\server\ai\add_civ_waypoints.sqf"; +add_defense_waypoints = compile preprocessFileLineNumbers "scripts\server\ai\add_defense_waypoints.sqf"; +battlegroup_ai = compile preprocessFileLineNumbers "scripts\server\ai\battlegroup_ai.sqf"; +building_defence_ai = compile preprocessFileLineNumbers "scripts\server\ai\building_defence_ai.sqf"; +patrol_ai = compile preprocessFileLineNumbers "scripts\server\ai\patrol_ai.sqf"; +prisonner_ai = compile preprocessFileLineNumbers "scripts\server\ai\prisonner_ai.sqf"; +troup_transport = compile preprocessFileLineNumbers "scripts\server\ai\troup_transport.sqf"; // Battlegroup -spawn_air = compileFinal preprocessFileLineNumbers "scripts\server\battlegroup\spawn_air.sqf"; -spawn_battlegroup = compileFinal preprocessFileLineNumbers "scripts\server\battlegroup\spawn_battlegroup.sqf"; +spawn_air = compile preprocessFileLineNumbers "scripts\server\battlegroup\spawn_air.sqf"; +spawn_battlegroup = compile preprocessFileLineNumbers "scripts\server\battlegroup\spawn_battlegroup.sqf"; // Game -check_victory_conditions = compileFinal preprocessFileLineNumbers "scripts\server\game\check_victory_conditions.sqf"; +check_victory_conditions = compile preprocessFileLineNumbers "scripts\server\game\check_victory_conditions.sqf"; // Patrol -manage_one_civilian_patrol = compileFinal preprocessFileLineNumbers "scripts\server\patrols\manage_one_civilian_patrol.sqf"; -manage_one_patrol = compileFinal preprocessFileLineNumbers "scripts\server\patrols\manage_one_patrol.sqf"; -reinforcements_manager = compileFinal preprocessFileLineNumbers "scripts\server\patrols\reinforcements_manager.sqf"; -send_paratroopers = compileFinal preprocessFileLineNumbers "scripts\server\patrols\send_paratroopers.sqf"; +manage_one_civilian_patrol = compile preprocessFileLineNumbers "scripts\server\patrols\manage_one_civilian_patrol.sqf"; +manage_one_patrol = compile preprocessFileLineNumbers "scripts\server\patrols\manage_one_patrol.sqf"; +reinforcements_manager = compile preprocessFileLineNumbers "scripts\server\patrols\reinforcements_manager.sqf"; +send_paratroopers = compile preprocessFileLineNumbers "scripts\server\patrols\send_paratroopers.sqf"; // Secondary objectives -fob_hunting = compileFinal preprocessFileLineNumbers "scripts\server\secondary\fob_hunting.sqf"; -convoy_hijack = compileFinal preprocessFileLineNumbers "scripts\server\secondary\convoy_hijack.sqf"; -search_and_rescue = compileFinal preprocessFileLineNumbers "scripts\server\secondary\search_and_rescue.sqf"; +fob_hunting = compile preprocessFileLineNumbers "scripts\server\secondary\fob_hunting.sqf"; +convoy_hijack = compile preprocessFileLineNumbers "scripts\server\secondary\convoy_hijack.sqf"; +search_and_rescue = compile preprocessFileLineNumbers "scripts\server\secondary\search_and_rescue.sqf"; // Sector -attack_in_progress_fob = compileFinal preprocessFileLineNumbers "scripts\server\sector\attack_in_progress_fob.sqf"; -attack_in_progress_sector = compileFinal preprocessFileLineNumbers "scripts\server\sector\attack_in_progress_sector.sqf"; -ied_manager = compileFinal preprocessFileLineNumbers "scripts\server\sector\ied_manager.sqf"; -manage_one_sector = compileFinal preprocessFileLineNumbers "scripts\server\sector\manage_one_sector.sqf"; -wait_to_spawn_sector = compileFinal preprocessFileLineNumbers "scripts\server\sector\wait_to_spawn_sector.sqf"; +attack_in_progress_fob = compile preprocessFileLineNumbers "scripts\server\sector\attack_in_progress_fob.sqf"; +attack_in_progress_sector = compile preprocessFileLineNumbers "scripts\server\sector\attack_in_progress_sector.sqf"; +ied_manager = compile preprocessFileLineNumbers "scripts\server\sector\ied_manager.sqf"; +manage_one_sector = compile preprocessFileLineNumbers "scripts\server\sector\manage_one_sector.sqf"; +wait_to_spawn_sector = compile preprocessFileLineNumbers "scripts\server\sector\wait_to_spawn_sector.sqf"; // Globals active_sectors = []; publicVariable "active_sectors"; @@ -69,7 +69,7 @@ KPLIB_fsm_sectorMonitor = [] call KPLIB_fnc_sectorMonitor; if (KPLIB_high_command) then {KPLIB_fsm_highcommand = [] call KPLIB_fnc_highcommand;}; // Select FOB templates -switch (KPLIB_preset_opfor) do { +switch (KPLIB_presetEnemies) do { case 1: { KPLIB_fob_templates = [ "scripts\fob_templates\apex\template1.sqf", diff --git a/Missionframework/scripts/server/offloading/hc_manager.sqf b/Missionframework/scripts/server/offloading/hc_manager.sqf index cba1d4f9c..ca5cb7211 100644 --- a/Missionframework/scripts/server/offloading/hc_manager.sqf +++ b/Missionframework/scripts/server/offloading/hc_manager.sqf @@ -1,18 +1,18 @@ -add_civ_waypoints = compileFinal preprocessFileLineNumbers "scripts\server\ai\add_civ_waypoints.sqf"; -add_defense_waypoints = compileFinal preprocessFileLineNumbers "scripts\server\ai\add_defense_waypoints.sqf"; -battlegroup_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\battlegroup_ai.sqf"; -building_defence_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\building_defence_ai.sqf"; -patrol_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\patrol_ai.sqf"; -prisonner_ai = compileFinal preprocessFileLineNumbers "scripts\server\ai\prisonner_ai.sqf"; -troup_transport = compileFinal preprocessFileLineNumbers "scripts\server\ai\troup_transport.sqf"; +add_civ_waypoints = compile preprocessFileLineNumbers "scripts\server\ai\add_civ_waypoints.sqf"; +add_defense_waypoints = compile preprocessFileLineNumbers "scripts\server\ai\add_defense_waypoints.sqf"; +battlegroup_ai = compile preprocessFileLineNumbers "scripts\server\ai\battlegroup_ai.sqf"; +building_defence_ai = compile preprocessFileLineNumbers "scripts\server\ai\building_defence_ai.sqf"; +patrol_ai = compile preprocessFileLineNumbers "scripts\server\ai\patrol_ai.sqf"; +prisonner_ai = compile preprocessFileLineNumbers "scripts\server\ai\prisonner_ai.sqf"; +troup_transport = compile preprocessFileLineNumbers "scripts\server\ai\troup_transport.sqf"; -ied_manager = compileFinal preprocessFileLineNumbers "scripts\server\sector\ied_manager.sqf"; -manage_one_sector = compileFinal preprocessFileLineNumbers "scripts\server\sector\manage_one_sector.sqf"; -wait_to_spawn_sector = compileFinal preprocessFileLineNumbers "scripts\server\sector\wait_to_spawn_sector.sqf"; -manage_asymIED = compileFinal preprocessFileLineNumbers "scripts\server\asymmetric\ied\manage_asymIED.sqf"; -sector_guerilla = compileFinal preprocessFileLineNumbers "scripts\server\asymmetric\random\sector_guerilla.sqf"; -asym_sector_ambush = compileFinal preprocessFileLineNumbers "scripts\server\asymmetric\random\asym_sector_ambush.sqf"; -civinfo_task = compileFinal preprocessFileLineNumbers "scripts\server\civinformant\tasks\civinfo_task.sqf"; +ied_manager = compile preprocessFileLineNumbers "scripts\server\sector\ied_manager.sqf"; +manage_one_sector = compile preprocessFileLineNumbers "scripts\server\sector\manage_one_sector.sqf"; +wait_to_spawn_sector = compile preprocessFileLineNumbers "scripts\server\sector\wait_to_spawn_sector.sqf"; +manage_asymIED = compile preprocessFileLineNumbers "scripts\server\asymmetric\ied\manage_asymIED.sqf"; +sector_guerilla = compile preprocessFileLineNumbers "scripts\server\asymmetric\random\sector_guerilla.sqf"; +asym_sector_ambush = compile preprocessFileLineNumbers "scripts\server\asymmetric\random\asym_sector_ambush.sqf"; +civinfo_task = compile preprocessFileLineNumbers "scripts\server\civinformant\tasks\civinfo_task.sqf"; execVM "scripts\client\misc\synchronise_vars.sqf"; execVM "scripts\client\misc\synchronise_eco.sqf"; diff --git a/Missionframework/scripts/server/secondary/convoy_hijack.sqf b/Missionframework/scripts/server/secondary/convoy_hijack.sqf index 89ee06709..f89887054 100644 --- a/Missionframework/scripts/server/secondary/convoy_hijack.sqf +++ b/Missionframework/scripts/server/secondary/convoy_hijack.sqf @@ -1,5 +1,5 @@ private _convoy_destinations_markers = []; -private _load_box_fnc = compileFinal preprocessFileLineNumbers "scripts\client\ammoboxes\do_load_box.sqf"; +private _load_box_fnc = compile preprocessFileLineNumbers "scripts\client\ammoboxes\do_load_box.sqf"; while { count _convoy_destinations_markers < 3 } do { _convoy_destinations_markers pushback ([2000,999999,false] call KPLIB_fnc_getOpforSpawnPoint); }; diff --git a/Missionframework/scripts/shared/diagnostics.sqf b/Missionframework/scripts/shared/diagnostics.sqf index af4b948a1..c0df0db21 100644 --- a/Missionframework/scripts/shared/diagnostics.sqf +++ b/Missionframework/scripts/shared/diagnostics.sqf @@ -5,11 +5,11 @@ private _source = ""; [format ["World: %1", worldName], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Version: %1", (localize "STR_MISSION_VERSION")], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Author: %1", [missionConfigFile] call BIS_fnc_overviewAuthor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Blufor: %1", KPLIB_preset_blufor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Opfor: %1", KPLIB_preset_opfor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Resistance: %1", KPLIB_preset_resistance], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Civilians: %1", KPLIB_preset_civilians], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Arsenal: %1", KPLIB_arsenal], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Blufor: %1", KPLIB_presetPlayers], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Opfor: %1", KPLIB_presetEnemies], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Resistance: %1", KPLIB_presetResistance], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Civilians: %1", KPLIB_presetCivilians], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Arsenal: %1", KPLIB_presetArsenal], "MISSIONSTART"] call KPLIB_fnc_log; [format ["CBA: %1", KPPLM_CBA], "MISSIONSTART"] call KPLIB_fnc_log; [format ["ACE: %1", KPLIB_ace], "MISSIONSTART"] call KPLIB_fnc_log; [format ["KP Ranks: %1", KPPLM_KPR], "MISSIONSTART"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/shared/init_shared.sqf b/Missionframework/scripts/shared/init_shared.sqf index 118a0e4b6..fdec895e3 100644 --- a/Missionframework/scripts/shared/init_shared.sqf +++ b/Missionframework/scripts/shared/init_shared.sqf @@ -1,38 +1,38 @@ -kill_manager = compileFinal preprocessFileLineNumbers "scripts\shared\kill_manager.sqf"; +kill_manager = compile preprocessFileLineNumbers "scripts\shared\kill_manager.sqf"; -build_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\build_remote_call.sqf"; -build_fob_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\build_fob_remote_call.sqf"; -cancel_build_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\cancel_build_remote_call.sqf"; -prisonner_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\prisonner_remote_call.sqf"; -recycle_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\recycle_remote_call.sqf"; -reinforcements_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\reinforcements_remote_call.sqf"; -sector_liberated_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\sector_liberated_remote_call.sqf"; -intel_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\intel_remote_call.sqf"; -start_secondary_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\start_secondary_remote_call.sqf"; -zeus_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\zeus_remote_call.sqf"; -change_prod_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\change_prod_remote_call.sqf"; -build_fac_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\build_fac_remote_call.sqf"; +build_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\build_remote_call.sqf"; +build_fob_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\build_fob_remote_call.sqf"; +cancel_build_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\cancel_build_remote_call.sqf"; +prisonner_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\prisonner_remote_call.sqf"; +recycle_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\recycle_remote_call.sqf"; +reinforcements_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\reinforcements_remote_call.sqf"; +sector_liberated_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\sector_liberated_remote_call.sqf"; +intel_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\intel_remote_call.sqf"; +start_secondary_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\start_secondary_remote_call.sqf"; +zeus_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\zeus_remote_call.sqf"; +change_prod_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\change_prod_remote_call.sqf"; +build_fac_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\build_fac_remote_call.sqf"; if (KPLIB_ailogistics) then { - add_logiGroup_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\add_logiGroup_remote_call.sqf"; - del_logiGroup_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\del_logiGroup_remote_call.sqf"; - add_logiTruck_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\add_logiTruck_remote_call.sqf"; - del_logiTruck_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\del_logiTruck_remote_call.sqf"; - save_logi_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\save_logi_remote_call.sqf"; - abort_logi_remote_call = compileFinal preprocessFileLineNumbers "scripts\server\remotecall\abort_logi_remote_call.sqf"; + add_logiGroup_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\add_logiGroup_remote_call.sqf"; + del_logiGroup_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\del_logiGroup_remote_call.sqf"; + add_logiTruck_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\add_logiTruck_remote_call.sqf"; + del_logiTruck_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\del_logiTruck_remote_call.sqf"; + save_logi_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\save_logi_remote_call.sqf"; + abort_logi_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\abort_logi_remote_call.sqf"; }; -remote_call_sector = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_sector.sqf"; -remote_call_fob = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_fob.sqf"; -remote_call_battlegroup = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_battlegroup.sqf"; -remote_call_endgame = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_endgame.sqf"; -remote_call_prisonner = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_prisonner.sqf"; -remote_call_intel = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_intel.sqf"; -remote_call_incoming = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_incoming.sqf"; +remote_call_sector = compile preprocessFileLineNumbers "scripts\client\remotecall\remote_call_sector.sqf"; +remote_call_fob = compile preprocessFileLineNumbers "scripts\client\remotecall\remote_call_fob.sqf"; +remote_call_battlegroup = compile preprocessFileLineNumbers "scripts\client\remotecall\remote_call_battlegroup.sqf"; +remote_call_endgame = compile preprocessFileLineNumbers "scripts\client\remotecall\remote_call_endgame.sqf"; +remote_call_prisonner = compile preprocessFileLineNumbers "scripts\client\remotecall\remote_call_prisonner.sqf"; +remote_call_intel = compile preprocessFileLineNumbers "scripts\client\remotecall\remote_call_intel.sqf"; +remote_call_incoming = compile preprocessFileLineNumbers "scripts\client\remotecall\remote_call_incoming.sqf"; -civinfo_notifications = compileFinal preprocessFileLineNumbers "scripts\client\civinformant\civinfo_notifications.sqf"; -civinfo_escort = compileFinal preprocessFileLineNumbers "scripts\client\civinformant\civinfo_escort.sqf"; -civinfo_delivered = compileFinal preprocessFileLineNumbers "scripts\server\civinformant\civinfo_delivered.sqf"; +civinfo_notifications = compile preprocessFileLineNumbers "scripts\client\civinformant\civinfo_notifications.sqf"; +civinfo_escort = compile preprocessFileLineNumbers "scripts\client\civinformant\civinfo_escort.sqf"; +civinfo_delivered = compile preprocessFileLineNumbers "scripts\server\civinformant\civinfo_delivered.sqf"; -asymm_notifications = compileFinal preprocessFileLineNumbers "scripts\client\asymmetric\asymm_notifications.sqf"; +asymm_notifications = compile preprocessFileLineNumbers "scripts\client\asymmetric\asymm_notifications.sqf"; execVM "scripts\shared\diagnostics.sqf"; diff --git a/Missionframework/stringtable.xml b/Missionframework/stringtable.xml index f7569e82e..6c9803b69 100644 --- a/Missionframework/stringtable.xml +++ b/Missionframework/stringtable.xml @@ -13,10 +13,10 @@ - CTI 34 KP Liberation v0.96.7 + CTI 34 KP Liberation v0.96.8 dev - v0.96.7 + v0.96.8 dev Deploy From d23f03ad2ac90e475335f2d32bc86802b6fd7dbd Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 11 May 2020 10:04:29 +0200 Subject: [PATCH 008/115] Removed not used deathscreen hpp and paa --- Missionframework/res/skull.paa | Bin 40147 -> 0 bytes .../ui/liberation_deathscreen.hpp | 46 ------------------ Missionframework/ui/liberation_interface.hpp | 3 +- 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 Missionframework/res/skull.paa delete mode 100644 Missionframework/ui/liberation_deathscreen.hpp diff --git a/Missionframework/res/skull.paa b/Missionframework/res/skull.paa deleted file mode 100644 index 3a170b41a0480cb94311e930061d7e63042ddab3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40147 zcmeFa33yaR);C^td&!7=`}5d<29Ucwd<1VIo)mLw#Itcfc+(n|s|xQr7J z8B_=vWfT=10!TZ)bQTiX3>YwC5@LugiwX+C07=ZfeZN!PxzXYK`yXds=Y3x0`SOVA zUsv5)PMtb+wz`q4G8mq9uMl5Uq&h@r-KvoHL=lT|SOMSk<% z$%1ZA8d1uV71t77c=)M&{QJ*Y7tVJ2i*QU#H_u{he99g$y+^G_OmwF%^P<*-NHIcw zT0O!A56$RGf!~Xpj`HyP`t*?|rX)7SGHw)lf(dB%VRv#kTg4Tr-7U>>DK5`VGsAGRjfmOE_SfL}MkK;Ti?;&> znH*VqJUN=IJNA9+G=mH|0WpKX70FWVk=yV$&Cp{(}U+( zEXs1;TywDx3jE+9nF;N2+EN`^65ncjT)T{&!OeP|rjDF2(3wX%+>q>_GL~HJDtPrx=R;e9%g6uA6fWb@5m$hzz&s88>isA)fT@~3AX2^u5r`# zD^`KOU*}g0G$R(DmqH`Qplo{QPOi?xO(I8Fna;hL z&T*#3baNVc!-$d}3mF?b2D%MyJle!3T4=#=c(4`bWiEhu<#blXwZ8`B`#>M$c^dr} ztB@dPDRX`LA6-!Ol0#uMpt}PaOSSMTxIw!wt`)vU=y{jo?k#B!lO&5@Qm>l&A}k<~ znpLF3pu(GEY_qM)M887MLxZGQS9mr13P-<)b|{7zP+OY0K$Ow8H?DOz*<&t%0;fyy zU15+UYXw;k+cvD!02_If^OJI(s|04c9!sB1F`!_1gVF{Rvj&KFC>>LkM@z{THV6tY zyG$R?NP~&5gAvR)VP85%SJ>mCyk|!A*>Ujo-5q6?GcdM+N6_mqHvdzzi(TK;(ltkO zS%r9VyREAdI&cL9b|gFgOut5Va*AMiodd_%9~i^qb%%NrSxOvQKLeT_-ciZ5%GehA z6&mAGEO91O=ND5n&yjD03LBektb*^Uq+g*i&}mNRs^aq(ueuv~3YMEc;T9i~%r~m0 zw!a_OPAjhAfgqPsK^i=0K;de0Z4J(BmWxbWC-0t?!#%A>pm`nteq8IuxHj^HS?+!k zdMMm&U%1*{)KBqq4)-uOzqg)i-Dx>Pzd|uCg?F}cpKVp~*A%}BkD!+FF2C9?KZ;Qd zs}M!CL4Q%;-@*q$LX-~AAsK9cw1Ne^{V3TpV4{^d|kQI#2%?- zn|?MZ2JOrWJfGtpH*_ekD_}S;{+fceNIR75+@mW#2d&XBUUeygM$hE=YaTX&VrE?B zs^ZJu?#H*X`FJ1Solk47bD1vB1?Mi7GvT!KIU{n(}mZcG-K%SF4u%jEn+b?@%;)aKhb39`d&H`ch_(dGk-?X zEV86Jr0W$-TzKNwc@<6b)p~_U#`}zDwQJaT9Ds6OB=gu1CTwVUVY^n(Fw%~B#Ugs3 zkqf+Rgw}{6TgOg3sj(_~znMNvkRNF=#AGGdl5+2_=Wz4_Y}cBTnL7%3MUIvgGsEZb zLzMIs3~%Qvyt`y&+PZb)Hc zMSQksI`Sg->;Ej7vxDzDV&WReGpvfl!;oah?1eE}eT-yO7vIF@74IOgnqN(ICHp$Z z7uh~P2uFg-X^Z^0N>eS$Ax17aINj#A6>Uz1N73oNA-UQbG<$QJSt*L|;4Aq#WT{>% znd7Ww&+Hr!d8wY=E^Yg!#FbavL+&$&hp+e;SP3P(oPk+PNMesYA9Oi>z=#lU~}agw$2x_n%>8zxo`j{{S@$|+Kk z*gMtwU~w=*kTeLBNi`wlv*>Z3_3<3m#?&Xk8Qp3mpOz}EzxU2kSBqO8M?oZqk1DR+ zue9{Vk)t4G45&D;@=uFkkLI`(51mjsOhER?(|Zis7M-wq?sg#l}J*YWn9~CI8a+$lE=z}>(h#2NRGo# ze8Se%EHj@WmF_v5b1B}LA;s^!Ln@6ZW6Si)M8|zKm?w9ADh|TXuzPC{F`{9YV(|M- zWT#$2WI(r-UG@hO>8U))A)&&26n|{n$=r>LNDC*)Q?e#3&fTtZ;VmDIxAc|sL{lyK za256@YKKJJwr4?m)yj6-e-J|b%%9(xLC@@+uq~V_eHI+kVloogE1vhM_-uX?oU-m7 zR9*H56IWfmpf-xTFwvVOMkCtOE`R@b^WkKd1lQUP?J!?*L@&)SqUl>^^1X06sjZUi zPM{~*?Qk#Hf4LON&$~N;5$ArYx@%1`8OcUT9{ekR4UVr`@_|vJKR#1yUpPk1ikN8m zbl9{}4ly&?X}i&&)kiV27kMvl*E*!2iZzzp&=npa5oRn-aF(+Xe81WigKB4r7~q2= zu>ZF1WNQ;ZhDKWaj=05z?;+)|&i4b{2Ne~7u<{wisLztTw3qLz<+~N+16C}FzGN@# znGLj6JH+A{AME7X*2j%BL?tAdce-$R+q~4HS1*tV2NsWV4q+$3p=*eBCe*H(!WhX; zvs5y=0u&$n!c;XU+E3z)*~3r!@55d;wvp7D>5&gA!>+lJRAu83;JxPT=(t;7Y@nI$4h>I6IFF79|yB0 z7nVPgkL?u)f&aykUDjiT*LnQxrC$HLz-EZBiibD*Pr^HGEVPssmK8_5^o(QzuPfRC z=ZM;Zop6qjNQacs)Pe$}HHuJ&vi6y%E`Ra_=Q}ywE^-qo6DAwg;mXIb$Jzvu9;WTLgp zTxvbWbGp8%Br!EiVf!ktelH$7(UOp?NTOz?k{Qnat88}hWumT;&H=WDvm(@~cP3y25$(l|az!VA1@eB^QatBNDBU-`B*X}L;Dp?>j!Up6mZ#E#`G~iaN zk{y-kcz{ggrJ-%BQs*9&2FXGtw9gJ#dUOwUfHs_1E0zR(?? zlzAzBQVy%#0>bw}y_e(#=i!ne_6OTtxY?O(o&>U2@5Ri1VNYDU_d^5i zp-Z5b`j#CoVJ}`KD9WX{qhZ0JeXyG&C4qoV%<1A01FU8bQr^lFu$wE&eJQ3N4Y(%MVu6hM*^_@$@8pEs3D=7Bsr< zo5f#4qjNxWJ!0$12l?YwSUlY?YRcOL`M4BsRE1@&qZF*86nvZVY70zuLgy#tY=5ms zK?S}0Do8(_lfUMba~+sTB9S_?i&>b53qRHzl9i-3N{2tG%q&ytN0SH(j#aW>;^Ena za87tzz2ZAUp$iX1Dck5C3(W#!Mttb>kL7$H?;gf*XH-w3iSr_AIP@~gZZO73iGl{o39>;bb z>q@Ccy1`c2pFiRh&r&V)kO8fem)?&j zw+9Z|Cu=H+0KDT7~XRvt}8ci?!XM zAOxbueXzblqsL6zV|-;<2#N){tU1M-F6s*4^bCw{cx+zrcn+6s_bI;!bemkQ*qP=~ zNCG=;H;-<81U%rm6Okk5uT1P(=F3O@h zEy5|wd=^sIjVi@&1s!OQIRLuz7_NaI>Pjx_3b#TJHHrz&Q1lV#Gv4j5P<;k5;C-PL z4}ilW!T5!Jv6?gLZFntrlz6$2{-LPHdZPSA1pSUvw8NnZayV-In)=NKf*y9y=q9Vs zg1Uf4!E|(QA1?VCv^N<3Y(976U%-I{AMbX81E-8TqjRBPO>jL^v>K#HgU3`Ey=x|t zJqo76uG67)Th-N|-{>*$uGklezeLQJ>RQJ6_F^SBC&q;<8)x|ZSV?^JnA8~29nHl| zcQA)z{U2ps4SpIF7%!u@k&kAi%Z97X;I--xA>wGlUR(PiU#*qL;M zm53=t-UVRpEQwkxu1Y;Xyjev4YC!iU@G9H&1~6EBowk>cC9-)nSh_^T?j&9{(%^eT z>vDOV(Rehlq>ooyr45~nAMFO~MiTlYRWM;514E_ek3x5MEGl&2+9SzkV>Ny%3XR73 z)C8wPoNop`H8Gh^<-Vs(+)?~dor9s(}OzyN7ZnZB2PBrq%N6Cu9B^=%w^Hjbk@X8UBd9XsdlW2n?oq6$(PS8s^E`@psv-0rR~8u2aw&;QWs(eLx4Rs4$|p z_lYC0jT-J=Hc?PZW1{|o4#bM@z2%nn`8=F3Vmx7={eggK=hRl*hR1*^q-r*?(OF8(9P``W{pcUAM=77>Q)X;)6(b{$x1^3?dq5_4mcC|Pe~!aA zN1q0_gbx1GM@oXKWo#qQHUlZd!3XDj#&b<-M~o!gxrRGw>+&K`REtI_s}nEy=!@Vy zIk5PiaySc@olyReXXDh>qSz$;T424DQ`yB_c5(MeL!1*N2du~J;(b#`v*7(Spd%sU z8sY;v92vc~vXnc{<2lZYiH>~Y?MTF<*IUkj@kK{Ai&HEO5@$`JoQWjaGjt{ARux}$ zZ&(}h@3aNuo3$`XiRw^qIp2E~cvSLswT;@8jk;d1ZaCC4 zcf^*)kx8sb?46Rm47}}X2gVb2`%<}?;Xrs?1?(#`h|+ygVCEv6koHQ!Xb)59HY+pp z6WOt6M|_A=t!TJ2w)7&X;iuBfaJ+eeN97QDQdzT}x=#jqz@^A?D!WaqKr$L5+dGwd zJ=iUhLkP^BoHc5ot7zvZSJ^8iYH+SZ9Q@BRSGE z^Rj&pXm-J;^D$x{BrkJGE!L=o!#KP`o|TMGSh^~KG5inuFUN`YrBslC)7XG^#?)22 zsfj*;g+|VkGS^Ws#=Ojt;%Mhi?zrum+L)zjl4mKkERjS{u4Nm+>jiy_H|_f5s_T=I zk(?qlrha4}*cEqgw4RFtVf^-f<+bgc);uN-5gsQrS1D^=x17;&STpl`@L8%I{vChM1SZ%c`EoywiNw=~e+L7fol8{ki2UYw zUGd18@%-sDvq&821kdsoZlpmO>%X1>x8oJqZe|A8w#%+VoI`{UR9epDM1%ep__lpv zV)hkHHQ7x9%+$Y%0}t+75D??plDj}x4(znATs!-(>e|pn&TojnBZgVzv|WR^1Cl)H zv`+;sc@o)DBOkss7~8-Q89AdZ(eMQew)*`9#5P`xm;$OIZ2Z7pfwioZdA|8(;CbT9 zdl{YO%Ifi5>YDM-A4@Qf3(#_SPV{&ixTwiUqbPDunlWj==eP-;b-;8s9T1m6WNJsZs&vqTQT|*uQ4Ca!*6$if|rqKJjOl7foo%x z`)mMrO3pYM+zB%vPzzpy{dB0kZ#Q*DxP^!V5t9*xA57MhY8ic^m*inJRNR zDPTpEZYeHB#vzaZ_6NtPIavpZa|F44U6Iap+!@gB$rFw+P>h)q=-G|uwR$2-ZUfid zQG#BD&q3e=d$37UtymIKnn)h!ec~IB%1fUkcd{AcOeeVOVc%FX3dwA9hPyA=;L*o) zh27c3F7l*4T+Nn#5vF8I@fmQ4ko88Ac`D$(n2^#KAVjv)?O_BGFLfwDRjtO4$j2W# zUKXIPmIf0mL^zDop6Uxh-;zl#vG)=A`_C(LU?ssB?NWp<4$T5zc|xOdSbraw2G3N7 zH>Md#q*DJQZr#nDB6 z);?`R+g?z6*0bIwaMy3_-OaO=B*!QtEy}7RT1&wl!E2KT0yg7##j+VosGa6zM31z~ z$KSiE7$Q>FeaRLB+A2r)B{-bW=3E}UPwOh`K|K-E2opIy8<=PfuaJC%Gvaq$jN zHsZ1llAWxSF7}kzvach+6{2+Ig>KduC92|BM93DiH`Vhxkhq|fIS+oW4ov2|B#{jX zmVzJDhCu&E)2k{T;&7&_y1+yfp2ha%6lD9#7eTy9^4h?RWIK8C0T;0&Eb9p#hdcKw ztDQX>LvXE?Mmn}QBE-|dZ$Fd~-CbC{1iIYF1hRqmpPFr93Mcoq6ANXwW zNd(DYHKi!QlsK&otId&2yDb_V&=%2SNqQ^!z@o@bcVtA@y^ZH(H?itkF_9B;z!tc} z$*01Ya#q;WgG+b8P`WuqPC6Sj+=!kklfNI0A-J_Hoh>Fkus~CsN_PFW@-IYUl>3#c zka-In?`kt45>`U;!4sL6Y$hNAmbCPhP?x&_O^B{Di%yhOEt`>(ZeB=|Es|4i>tycy zer%dHwhfM#d!5tnY1LX7Z?#!L)`9g2M`190PBtIR@0aeQ5!tLxX#-HqhnzJAwsb@d ze*;$qv@e6P{=nLZv|2ttYWN&&O~f0AVzWk4vzi*PuwrFg2#u|YCv?tic?mp7JI&Dy zIkCLBNNb4KB-GSP3xIaX*1SpX@W$Pn7T{cs#V0w68N0qz!y+7dKsF);2DMvHmoqut zs_<==*Z(0LqSy)?efscTa@nka&F~0c6-U<)!bZ@sWHP_xtK`{5!@yI+Du6Y^vZ~c= z1O_L8zt%!j(G9I@D+0mO8AED86)wxa)4me&0{jn(L`8G9Yiqou?J4Xyf`~alf==N~ zB+7IvSt%ga<2!YQtF;DQM)3HppqGN_4s$i26KQ6`kke0dL0U5jS$pVi=1zhjAaG2@ z86!a7KP4ac?qrvmdI~+UZ9mpXf`CRUBrZk%8V;w7&@X{0IC;g=$+@7(tsoI5G{Jc| zq%;~du|{Q0o3u!yN6~A$`${&ra9QJGc{yk}n~zy>rMC;u?U;wBjcWyiE+3mzD?kNi zvYob3by^2z=5Cf3v}+A0&pSEM%&JYO47v5T%3TK+r5Mrh-B?{fgFBrS5umWVai}7U z`cpMD5VAWsbQ(~OO>2K(IM~RVQ}%_KCp4@CKh;c= zB%}~N^Cm$SpN3bWLe*xU1nV2Q5_OG#>>CU4bpQTTKJZw{yJ`b&dE6(6jIuDJtzmC%Xua*6_9IW+FyT zCdk*V8>KYG)=9|M7DYkunx}MP4LI1)G0vCKSkXZzsjw=ZbiNYd#o=Tnf9@}DAhq6) z@%_;D@jdXdD|27b6ql&WVi3fb_1)`*|lqs+|IR%4ZaBCb#V{UX>_cjtwz zM;dO({D6HqDPT3teWQ%#qqGy583HQqSTWfRZtC}dF~m=`^_2_<(Pc!z2Z_Z>HaF96 z!y(O}ZRuvUC49-F@7cjW__D*8q_2RykNp0a&p%b`Coy+-=-y#djEYW7w$&Ktw5__c z+n>XW%m-^n zkmV3SAqKR06_#dl_};w!&~+NCk7jMEUQc=jmx0#pGMH^dVyjyYf$x};smu$3bZW~& zZMtJ5SqvIi#&l5@Xk2p0GMU;cy9U~F^p0dUi-cLkEwOm19|VNNynW%jD_&HoVe`CA zR_evn7V30ME^npj{LbXx zrC0K=nq(6-W)<$3b{Z2%E*kV0QP&r7W*5zaU9Z${VLnwYE?S#b9Ti00HtUJafKI1b z71KK`{bSV@MP^tX2$cfXA6DuDYs+Q8ZBPf&Dx>ofxP%wBb6BscF1s$MTf6~%7{Yw{ zA}n}zzP48DuQp3?H2>{zM?XPU(A3-peJ(ZVKQp4h*Hrq2;QoxNTZ}K>ER5mst|a|J z*v8r9r~#$Df=948c-)r{t&X~sbSZrIBwD^mQ?oJo+{=~VvX6}gJ~;s58Uz~- z4iZtJve+3lUZZ8fGn*FXafU*7D_x5D4c7jJ5ReJ)gbbqe<2(=6VT+1&kZ<7mco?y~ z?CS@$dI`-O3TUt3z)1=}n|Xz19EjX^!TAZ}P2i2Xw?I~j;+;C_#XfUWE#@1wskIQ; zhwX5;3AKY4#suNH%^{_4ayTIrANiP|hurITfm6IgeX?kR5lLr+){SOyf<6zQADV=r z!GsgiMwWN%jPah)K`G5<3ulWuwQC%q4PvcsS*rK zRdszP*}{qTgrVQ_IJ9%0yzI?hkQlzPV?lBbn!96MitIzc9r4HH zPDn7FT~Sy?w&*3yTx$QM=)FNn*qdDE4}r4K%1|`XO+y5EQ~Gx69-3(u8$5RIat)Ys zqn%4!WUEDy5sMvgn)rVxXY6q+)Q&ht+VHl2yA~ED-ylr}LCa*GI$lzh!YP~QMO^~3 zV~a^joH7tMU@xOAEW1|g!ptKCg@aN8EA}I(z#aK->yj_Juy2dTVX@#3)cOkYdqY$+ z>}EJyTB5P#h}y9*YFz)MR;?oz`zDvIB+H>k*zr=@qlzymTC25){Qbu>mHe`jwGfVO zc-$+9JOhPKogTufwFckC3C7obShaYWBHe&C zSx?yDB)m_gJH>Yg?$ubMRh!6r4kNLF2#G$VD~i!pOGXDgXbP@7tmdTAt0WtIp+_H# zoUe7ISji|}$!EoFd&z~ptzGc34*c-J%pW`(2F4zG8ucCfY|jk(vT*C}N! z`T?|IrBXd!*QE%Fwt_s?eR$A6o;z&z;+1?UK0}3rqPGs{r0jE zTC)*n@F)+RNz5vlPA?SV>R`9{YukyUc zgiiC*lMHjg>$9Q?>U=@a#C4Q2AsI=WLMF+w!GrCc8$?D z1wyg)jU{Q2TM$T7Bjs7XOc(WYd+HvmR)njne;gteX(uO~KOjorbxU+pwXXOUOsWk* zAJPrS$(j>f?GrJGUMCi{Y7JpjUnzj?CNrQJYCW9QugFCcuiGC~8~ouE5fWNyr4{}>7=4C-bF>id05J$D_1RS0lqZ&rk z%F;Bo#@eP#s>vf%Mi&>Dz8&4U@qCKoZZSfcc+Updk0{abP7wKH9p$?Nw*t#)V{=)r_{6u@C@O$)7-*Nc7+ zPGc0FV0wKy*s+E{C$Sjhc~NzL!6wKg0i!0T8Qft**&(zSHeZsw8$#cQOL`LY1kajv z@4ckFTA>SG^EBhKFN>c{iZUIj-6Mx zI6wiL!tZ);ecZ@8YCqN3!hPMd{{!6|&>N4!f~Fm-fb<~Q@wsIy3c*)1qCF4iG9YO( zJJSp(HfC&YlG<#NTt^!k)Ko7W;-;Sy3`f}b<7SZrBbot$tw%U4N@Cvw;f(2Q_L>kz zV^b|bI1G&^_vmS_@C+@YKR>0-&!b8+Y$1e~NBsXK*lz~D@-IT~%$h}-VBp&K+{yBg zDiQ3=$I{Or2r-7w$E`1`IBd>`6!=Zmcy7Lr8Ev=+^A&g&LSoZF@Qm1gtj2EyitgH# z@3r(A@A8U01mPc=G&AFXRaW5(5!ZAp24+451|P~}WrNxFmC)%KcUu07Asn7zd3=sP z*%J<$vvVIT%R86A(_&)eyJH_(M@iY6_x!XQ@FC(-{<^A) zgOG3q%@?|4H2Yji9tUOjJL|cHkfo9I10%{jZZ4|9k6vMaS2K`#z8ji+^@go01ssjx zmuPy-O=v7;pGvQUBttMPzu{!M>K-w0ey{&-yc(P_;NKqC3pp{3W*HSD;;h~wtQT0M z)#8cpv(b zl?|qKL#klB(vg7==t|D>m_LbA&4}i7=Kz_M{JM&^XCc{q66@to$}WU7z;tssNirZv z&>P~w5`FJQ@Q+mvZc%iP34Q2ESH)G3LA-@)1!uOm`{}>2GM|KR>`Tw-O1}QC&~F|= z4>)876N){@E332mz}QSlGH0^jr1>wGjAl?vNfL}AZU0$_88&&kFoSMW3SSzl_E=iW zxkfV5><#(+E?MRYWvzvJXN^9eVuD_9$UuNG`ZG3Gk?5FC5b|PWlHfL7@l^=o5cIM` zHpGOwJtN(P?xtyLK$$9D=FW7Mx)ZkUeEo2V>k17>T?b|SE$B9s-@l-}4A@EyJ_NLk zlR?Igl!O6GGoL|D$0rus$LTDTya{y`Ga$*i9Omz?TgA#m&7VWU$zk{OmTwH?&+H~> zFD%9JLf@IxFF|v}9zOs%I%i9M>XJFxw$suIku-NJOL*Y4U8(w2?#hw;>_XM5qG3Oc zPtxPg#cUYtQ!@G{jgJ>?C8PAdZv;ZpRoJ@4QI!E8Cpy6^69}PH^ng`VKGcObp02c_QNB8>p zP&dVS6tjUE%&-{^d@i#`Yejc#p6xT8W)~;y$;Zb)qX&~;g7!l+IwA-dVXsTpI9DnL zNdgj7GW$Hl4lfR-H-QWmMSQkCu6@1PMn;$!DwC7G&n~{ID~9|+j!8X~Bhsk!Iv)S^Gu|h$ zf0R)ae9<34l6DV}Byg#N^9%sCECfXFxS5@(Cy+|wUwt~D$rR93OD0*Fadk5}d(mYc zSM>IV)G2jlMvTsaDJRJSbxAU->Bkao6$H5*NHXyU8W*|_!r6OOXlaH!K$UCtTR4Wt zC%^B-eBUU8NGYAi)hQhl$uvh85ZEQ#H8)NFCe36{OVZQxJpBOQ>4^?shk*H??3h~ zEb@!&D=v=bbw*~~8LON<1Iz0NIp!%4ru@JGkB0T;e-F7#G+QA2@NUjaTf>B(NVJeP z;$@H|hm}gy96F!3<#4@PFA*iYlD(bhN9jQ=Mv@%o9yr@U@0g_jnTVJOC86J(Ejhoc z#1r`jK?XkYKlUt6qKPA-q%X@Lam2iuNX#NhQ19&GA)YMG4?uMo>A*}v5BQ?CJ^qCc zK7ckn0*V5Y^N~Fujebb#nX`$94@6NT%ATZr^bSbaBhzT-g|2DOPNtG&k_mZFT$Ny1 zFnA4x>WSW;fv(9zkln=uSXJh94i61pI~Afdbj?z}1HI5*Jcc|`BTCM3@SYZ1d6}VF zmuCYJ`h?zJ68gQ2ZG~J~9ml-s-_N+Oc>r}&Kd$7?lyeQVotO?t&aoGrg8-QbJQCBs zN-#s_;7K0V7jpGrXfTje$OizGkaKf1B@BF*QnAHy#?}QH-$xQ_42%()9rCrkQArg5RDz4ug{^oO*D8c}I|qNTHKfCQWj(%YnDBFK<85znxz zO2+I;hvc*;jOe2ap>;2SqI3-tvx6}iP>)A*?4j9eQ-4qmOqr8mwY~t9-R~NeR{aC* zF37c1Ikv%~y?(vEu-%>1HH6PyGXm1~Blwvl=M(v560Yj6mjFzQ;R^ z+)u+fAj9980Xem^!5sqP;wId?urHkl@*|e!YZu)F**eK&rX2Z7*DD3)*LXaAeQv4= zDTYs_p={q!PZryQES%DdT`~yV*^FrCr9|@|zgX?Hn-BX4VnQ~%0kZgP)IOk^;pRd6`@@ZTEPo^8ukQ++Vb};wY5Ikbl z`Zx_6IJU2LCce1_C@-C+GQS3aCYT4DevpP0PL&?z(+S3!h3&9Ld>UfvP;wS5y*R4J zP<=8SJT*uX(Fqq3z$yWcX|GrWVy4ea%_8QWFNe6k1m8F0qv|m+fust)V(Wp_Y;`pg zn`GYT!U5k}E0-ohUGY*0$wI!w1<^*8`p@Ar67wU()8VoJ2m(>s#;Wx8 zeU8pM9Eb_2yI7L>#n)!c4E@AbQ3qbX+R^*esoAyVHjl4w{)ysjS7?DqzY^V3Z;G%@$va-ACN{Nfd@{{`$9bGQ0u9>;oe`6&a6PWSdy{dS8j+DiW?k!td zD-102HGeM***jxknHFpoQ<>*=rXyiYRdFJZTYCB6u{=mne22h5vDYAvNax1RD!Xx%*^;;tz97i4S` zRF!Y&YpY~;DqMKhRos#oaP=H~8GHRj?kHrm!i}7jF=I(0ho4hb+mdxams>lrp7|HX#mn_Bvy^ zZt#7HQBz&uceyTz8a;4^Pjo;a4Ke81F27)q2jPFlEk}I3Z7w|aeK~W^UIeO!2z@8& zn$ByicwUW)oeC~W(tC3mcM+84UE+(a(GCQs z3EtZ@$wmBXP-u1Vn!n!2hd$MG%LALvRhm*i%H7`C#PjD9tS?Mn1FWB>_sxWdB(K}L zH0C&^d6}~2N_&~BjOSrdr~(wUUsp25o#vN$zbZjttXkJEm4OagU%xISaoANz4 z)#i3d`x_DSy2|Wu;YqfceW0uZ-%vNs6nU9Eaa&o3EPlF3j;6t#3x*UJP%nsH4#y~K z9|?KQptgvjlgtl6W{~*VngrvBCQxKRL5%uz3%y|q-W1w<0WWi>5lA_#P(FP2ypjbs zIrttxTTK2TAl%F6eK|>T2-9j08>+TNp43?hsQcutlze*`2*y$p6-S%-=p4F;4S^Pm&LJ2d7wq{^P&p2NU&t8-P5 z#_1=H?rbc9%Rg|Hbo9-cvg0M0WTaIzt<}1EHuyQ1xGp~CW35%j%u|{F3cEuVe67Ng z25kAXU3bORNA5Ix;m1FbT}$D;!|vG|l64sL zn|0>?1zM?q*vdk7|iqvFvf%U*hB*2u{-=tDokF{Dn`$E#Q&hew=1R-o4h< z5^!2ay%E?0mnV!eYbRM?mchxY`AWHO4O~=#kO?n?sC24+F^>aQ=n@^@!%#n!4}XuU zM#nGmyT$ZF$lrKHAbh|^nh(gMA)`>L3D4MB2Pdj{>KVS|f;%B$XoBsNzLM*}N8!ZV zfX+GA0*31H9%kgx zDh(TeMRUql-U0f`G*BT?At!@Csg$fUAf?(I1bMo>>{_^xVQYr87Po%JA|U@?dPD2r zv>0+Ty6ioA!6)i^Vs+(n?hQP2^_=Z=CbN5`%_%J02Lj1sKziG1zB>r0`ISf%vU#Q2 zCGsg@R}%}}FDQzYfpEg!Pk`f}_tW2*C~fB2UnV|nu$u%&w#Tnw1X{41GcV4 zQ>Sdg{KsHEYb-&vz&GOb5B73(G^^1x-o4cc<5#RN#^ZjBqw6hfggvxd$eSS7NTho z3m98aT%r64Ju|&;@QUbEr7_iz*9sdl^tbg6R?JLqkXldcd338!OX51^7lL zEr2&nIDGJko6=^IS`$C=x{6)y!iziZv8>bR18_uTx<KygNK~XZ`Hr7%j_4l6v_j zR$2rC>v5-wEd<+LyriAZHKE(yanPM05_V>$EQGoU@A!*lOoiI2V!}e}AOl7mne3QY zgLMUPIZZ+@=TRTcGcMVrPtpvs$OPBXpiOFvcV?hh*#)i3dwmN@H)JFv7vYHReJ z7ny!Yq|*Ci~lET{YiW}&ubH0v$BRNYo04ANHEOzuKuuY`s!_vGS7dP%%yv$ z!Jek>C>)+3tbM;5GMP4Cxu*BQy5u&T(L$g2c*dFIi&ESIoQ7%$?W3&BA!S2_7Ya<~iJ* zEd8^5?F`5ZhppuOmn)&AZ-9HEBNl;=U=AE1Mzr8sa6{Sy?OLTl*Z(kc)KTpYAf&)F zy^JXJqo`HSY*|p@b5(mB)7-udCZyc_qlkB1Wi5BQBAL1@P{zF_i9hf+j)3FE;#GSm zHJl6BX|ACeSEC-wi=tOaEM8$zrK{y9`WqopFbM*q)O`qjhyD=5$5x+V$po}dL|0b-`fg4^4Z&g zn+Dpi3fe?vmw@@JaIC@4ARdr%zZN@x1ZU#U+DkniN10`?ed##}D#9C~g!YEJ`D=|z z!2jL(3eVFq2%qWi+YSG#^azCevoX>gtnhqlefB4G?gAF5^1lV&cX2(}$X^@ehp^v> zA8xnxzID9*MUA)Y|Nn0scnMx+a_OGY@PwRbq;MgngTiW2NjxZl#5C60H zR(jrU_&5aae?I14!V~z}UnS?%tAui4y>C}M`#cB(n7A3;$a`vM}@_T{SuEbRYZ#An?UB0~97 z?^DWDVgYZuL9uM8fd6581Lw*ARDI?LcwH#GPD8ymh^!M$CFVAh93u7Mi z{|FezL*_J?^aAF`A_DPdG>8Y+$Md{yw=A~({RM;d1)2!;rI3S1vjGJh^kwwlwf{sb z-^4>Exlk@pRlpV=9?sp^CSV1}Z~Yh|x&oeV#q_lygE;=&iIVX@!y$X%CIzHx3iWSo zKlFx;Yl7T*q5RhI{}R64*8A4+g0(gS{C|V~pI^cc^TjkbHPKVP<{g24LVfKQkP`rD zVgeTE^=om`1xWcnyPFs4-`c*WWstm&)W^Z3+MaK$NWp!?`ydG0GTF2`4bo6DaaodaPzmjxz_dE zT>|#M8#dovU4!L;F95d3jTOpA-n6e=ty^3wR<9B; zq4wHF?x=u;^$@V{Y1-eyGyz9`138I}{NQ+!tNCjXB5DxIZ+-sP;-AxwK6ATacuD2o z>HohL$MnH_h~Z^eLVaPs{;Sx>NfV_lZNl@3H27^_`H_G#TH$c87jG5tF3#is6|icS z9MZ0MUchg39i?y(-#We!6)1Z)u0g0TtoJ{QX&=I~x99r5J^APMKcw;gD(u$;7b)Pi zFhYHS3jZpecJPC^_WfMF@ci75vcKy%yMD0!x##Q)=hPC zlMJ-SvmSrbARgFd|0>@9BV8%pOL$)W2)vPQclzLXe_H=vH-Di%ZB+P7f8TBxQrD^c zADqL#iqqZldf}LX=WC<>YA>3%_u)37y@UOfGK%v8PXC@_K4Ab~6{skb|Fbyi0=$== z-!|CaA@pvADz{KCv=@aoY@+sufQ2>t?_xR$p{?6>{b34&_8+Ckzk+>+d+bHw`B-*m z#hHNPjRKY)zd!K0y|7)tabL?^U&)Kl37CJ2Qm-_75D!pQz~e5%sG7Q31w5&Z-ZVbm zAYiYLtLSx=%L2Caz2JWBxqyW=`mHgH>b740=VmOO{B!&7x5CP!tfToUheBxYo(6l| znYZuxF98Qs+LyPNS>_5@_u)FYRu|AN;J}ah-j{#Ba1i@O)v`y{tsKPKcfD7%+a=LL z{iJI*1Fu8wynxf^LpCwIBv`=0`v2DWKVki;{uj3Z;yqv@QTk9EbIo3T(00>JPl}m8 zxa~JLJt_VZWc=`lz@d(f7US<2JeJJ23Z*15y9Ec_0z^)-beEl;#qI>#xJFR%h5C`aW)J;iPy&wX*0a-WKMa=hXE32-63PQ!UT=ZF?D31^rFH3#P~U_8 zdHf%-{xFHCZg7sk+acWappzPqY65Yr zDCc+68bKa<)8=n!|G$gZyh+>aZV>ug@E5o$3@j_)TgMmIYF~I2LL5RlKD@Qd1T6?S z>>voEJzSfBZ+%|Cv{&IX{e8P&Cd%y}83T82#?k$|lrM%WQ7@_lEX?Yc@Yp|Y;Tqu8 z%|dz5x6ocyMVo*Hng|#lfcrU6MZj~Z|LAB*s(}AdfA=*|%JN=9{Zh~vz2H0$a88Hk zrFa6qwSNi7H{gdvp*$V_P8xd@Uhy&;G{(_8y1_ z2zWTRthmU{AD;Rd8~Mu6pW(4J!uk%hH$ZgZ`B1B{zMk@FEpVPe{-IEgkIsQR-E=)Y z<^SybbZ6c1p(Dcc!kXVM>-|gPg}YXh>Ha^B`rPpu0srZHpM_L@3OG6k7yKNDZkbyg z^Rx0LU-G+IUEyH;2RkWc%30xg)lInY4&Mkkvl{ z+gGLu<%Yxdl{-HEslB9^JpMkRzOcRmwqA$M;i8*>BW~~^G=3yt4(-@*9_&K_=dR^t z$v>N4&^;zNGJdKrj1OA9E%(1L{-u+(?)Cqzap2d73qAZX(Ec8H-NW?20--+;zi%uuG9BP z2=!x5!eYabBVb`p|89J{t@o|t&7G`qpZ`D6>tDliY9GQSTA@ATm-dA>AfzYYsvkZ3 zSHNq|(~0Nq}uJ7K#^&IvQEH+G5c%JX| z`0E9nbCOb`yI#Ql&++^u(ANbl`dbwEZ+^l84TbVsF&@wtg>vogk4tv^?D>cvK!2T6 zyjm#dPtz8HkboC=dd?RC&$m+5;3xbn`wTGfHjv) z@-{eP1uU%R?Si8Q<%eg!8V3h|;^U|Jyw3rDz@L8<=5s4O#O;ur0x1eYxiJ6#t?T`d z#uvgbDOBAo+@Xc@-$f@eaEj5_wNiU-~x8i^I{QU>6twrpGm=`=o#?=wI>EZcqvJr}x^6uEUFW1sw1cye9vBtAJ0!MdD{D}F->#&`TPfQ zGC~ANksH_YeE8YVP5hqVId0s~_vBpWD_w2nNduVA?4={)y@cnZzXmg?QvReH@8BydZ- zBo?s#+jYm~xoz&SKdqnig>*uD$u*Nu?rZPF4P(3AX)&~%mruKnMtjmkD1M>-{q**# zICq)>#loC~=YI+RR`V6w7uxgM41X?qAdQFeYw~$ePT==*17XjgQ{eV0#;WO04hS zmwWF!_uO~hdFP&U-#PO9>4fZhSauY)<92aerclTjZduVf@bDmG%^TPg`Rb~OU)n}) z{3CNL8Xr*UJvs?}@pf!2_rGzz>BhRxaEzs56OIKaZY}9$OsajJ#JFG(FLz~q72_45 z&X`{uP{YE-G2bRUPd~T!DaS?+)hJ=oqoy7TE4Qj)%)H++2SDLP?!TU5R>o?T{&v5Z zUGmNr6{nluo86D*i&LGd{eLs8J1e`%JltL~B(4e^i(q`uaHZ@WV7%sMFpIRUjP(=7 zZ2BHD=K0(TW0n4w_n+yrn^uoBHJIPMjFLp`MD|I zCvkYP*iBh+1@-Q>|9OV-W1)Y#X|w*Ln|4urWBuot0^fhzFgUx=5N4b|ec~!*2WJd7 z{!R+R%JWs7rs>oFnfp;#DU;lsa8o#+l5&1T)gZVn72M9tkME5R?W(#?8(!VjSRX;y zN}*RPm4Auf44Rm}x?N8Bdsm3BwS=-&iR<5DgKTXd+iaF!Net?W2=4)ouJoT1c?{>l3T&(~^`_*SoJ#AU-J9Ybm3Yu#!#6&}@> z$S!juzT=?cP3QI`y@(4%Gj4-^K&D^1XKt^EkG-aBGfp{+E{oP^MeP9v$DBr}Eu0=d z&A8xe}I>hdsJ10LU`?|@V`=4D-_LXmg#4`37Lai#%r&Y|K?aa z`O2#MbN9Wa;4ZPWSIil5&fxD0Y9AM-EwEX>dSZzCC)d9@CHlq@$_Gzsrv}jk;(sp+ zmXscBwp*-Zc9xG{YnVRV0y9Iw3r56WxlPZP$+#Qs!A|#VKSgK+R6rVFjb-Jk!w+zhnH+M0D=dxTlG+@%-VsA>>+SthjC5P)nAS z=->CzjGO*`qSxHvu-VpyU)?&0TMnHiwd2gtB-CmG^K>P~3y<|ST*CS#uvt2%zpOzX zVp5BFT5T2&z*5Sxv4C8GNp&g2MYjZPpNq=1E3E#K*Dqyz%%HpYhtAkZG5ZK%EpYNS z=#LV5NgQxtxVbtQ)!!MsuqpyElpuynf+F_|&o3Jk+;yE;23#1PQ3bIZwd|{=$3){x zCucM-?O2^dk5Ovw5Jf$ueg2L;Z8DZ3;>q{$SRiR6rZhhL8(OSIoA>4@k^l(B};=239uGnDv zvoK8qE)!kv`#gs#M*3-(!%^ulwCxz~ZJCg Date: Fri, 15 May 2020 14:20:40 +0200 Subject: [PATCH 009/115] Equalize variable names in opfor presets --- Missionframework/KPLIB_classnameLists.sqf | 44 ++-- Missionframework/KPLIB_transportConfigs.sqf | 24 +-- .../functions/fn_getAdaptiveVehicle.sqf | 4 +- Missionframework/functions/fn_getSaveData.sqf | 6 +- .../functions/fn_getSquadComp.sqf | 4 +- Missionframework/functions/fn_initSectors.sqf | 4 +- .../functions/fn_spawnBuildingSquad.sqf | 4 +- .../functions/fn_spawnMilitaryPostSquad.sqf | 4 +- .../functions/fn_spawnMilitiaCrew.sqf | 4 +- .../functions/fn_spawnVehicle.sqf | 6 +- .../{CUP_ChernoCivs.sqf => cup_cherno.sqf} | 0 .../{CUP_TakiCivs.sqf => cup_takistan.sqf} | 0 .../civilians/{RDSCiv.sqf => rds_civ.sqf} | 0 Missionframework/presets/init_presets.sqf | 196 +++++++++--------- .../players/{3cbBAF_des.sqf => baf_des.sqf} | 0 .../players/{3cbBAF_mtp.sqf => baf_mtp.sqf} | 0 .../{CUP_TakiArmy.sqf => cup_takistan.sqf} | 0 .../{CUP_TakiLocals.sqf => cup_takistan.sqf} | 0 .../remotecall/remote_call_prisonner.sqf | 2 +- .../scripts/client/ui/end_screen.sqf | 8 +- .../scripts/fob_templates/apex/template1.sqf | 52 ++--- .../scripts/fob_templates/apex/template2.sqf | 48 ++--- .../scripts/fob_templates/apex/template3.sqf | 58 +++--- .../scripts/fob_templates/apex/template4.sqf | 52 ++--- .../scripts/fob_templates/apex/template5.sqf | 54 ++--- .../fob_templates/default/template1.sqf | 54 ++--- .../fob_templates/default/template10.sqf | 48 ++--- .../fob_templates/default/template2.sqf | 76 +++---- .../fob_templates/default/template3.sqf | 70 +++---- .../fob_templates/default/template4.sqf | 72 +++---- .../fob_templates/default/template5.sqf | 70 +++---- .../fob_templates/default/template6.sqf | 36 ++-- .../fob_templates/default/template7.sqf | 44 ++-- .../fob_templates/default/template8.sqf | 48 ++--- .../fob_templates/default/template9.sqf | 60 +++--- .../fob_templates/unsung/template1.sqf | 36 ++-- .../fob_templates/unsung/template2.sqf | 46 ++-- .../fob_templates/unsung/template3.sqf | 46 ++-- .../fob_templates/unsung/template4.sqf | 52 ++--- .../fob_templates/unsung/template5.sqf | 52 ++--- .../scripts/server/battlegroup/spawn_air.sqf | 4 +- .../server/battlegroup/spawn_battlegroup.sqf | 6 +- .../civinformant/tasks/civinfo_task.sqf | 6 +- .../server/game/check_victory_conditions.sqf | 8 +- .../scripts/server/game/save_manager.sqf | 12 +- .../server/patrols/manage_one_patrol.sqf | 4 +- .../server/patrols/send_paratroopers.sqf | 10 +- .../remotecall/prisonner_remote_call.sqf | 2 +- .../server/secondary/convoy_hijack.sqf | 10 +- .../scripts/server/secondary/fob_hunting.sqf | 2 +- .../server/secondary/search_and_rescue.sqf | 8 +- .../server/sector/manage_one_sector.sqf | 14 +- .../scripts/shared/kill_manager.sqf | 4 +- 53 files changed, 737 insertions(+), 737 deletions(-) rename Missionframework/presets/civilians/{CUP_ChernoCivs.sqf => cup_cherno.sqf} (100%) rename Missionframework/presets/civilians/{CUP_TakiCivs.sqf => cup_takistan.sqf} (100%) rename Missionframework/presets/civilians/{RDSCiv.sqf => rds_civ.sqf} (100%) rename Missionframework/presets/players/{3cbBAF_des.sqf => baf_des.sqf} (100%) rename Missionframework/presets/players/{3cbBAF_mtp.sqf => baf_mtp.sqf} (100%) rename Missionframework/presets/players/{CUP_TakiArmy.sqf => cup_takistan.sqf} (100%) rename Missionframework/presets/resistance/{CUP_TakiLocals.sqf => cup_takistan.sqf} (100%) diff --git a/Missionframework/KPLIB_classnameLists.sqf b/Missionframework/KPLIB_classnameLists.sqf index 9465feb5f..e049e819b 100644 --- a/Missionframework/KPLIB_classnameLists.sqf +++ b/Missionframework/KPLIB_classnameLists.sqf @@ -2,7 +2,7 @@ File: KPLIB_lists.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-10 - Last Update: 2020-05-11 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,24 +15,24 @@ KPLIB_medical_vehicles = [ "B_T_Truck_01_medical_F", "B_Truck_01_medical_F", "C_Van_02_medevac_F", - "CUP_O_M113_Med_TKA", "CUP_B_BMP2_AMB_CDF", - "CUP_O_BMP2_AMB_CHDKZ", - "CUP_O_BMP2_AMB_sla", + "CUP_B_BMP2_AMB_CZ_Des", + "CUP_B_BMP2_AMB_CZ", + "CUP_B_FV432_GB_Ambulance", + "CUP_B_HMMWV_Ambulance_ACR", "CUP_B_HMMWV_Ambulance_USA", "CUP_B_HMMWV_Ambulance_USMC", "CUP_B_LR_Ambulance_CZ_D", "CUP_B_LR_Ambulance_CZ_W", "CUP_B_LR_Ambulance_GB_D", "CUP_B_LR_Ambulance_GB_W", - "CUP_O_LR_Ambulance_TKA", - "CUP_B_FV432_GB_Ambulance", "CUP_B_S1203_Ambulance_CDF", "CUP_B_UH1Y_MEV_USMC", "CUP_B_UH60M_Unarmed_FFV_MEV_US", - "CUP_B_BMP2_AMB_CZ", - "CUP_B_BMP2_AMB_CZ_Des", - "CUP_B_HMMWV_Ambulance_ACR", + "CUP_O_BMP2_AMB_CHDKZ", + "CUP_O_BMP2_AMB_sla", + "CUP_O_LR_Ambulance_TKA", + "CUP_O_M113_Med_TKA", "gm_gc_army_ural375d_medic_win", "gm_gc_army_ural375d_medic", "gm_ge_army_u1300l_medic_win_rc", @@ -108,8 +108,8 @@ KPLIB_aiResupplySources = [ "O_Truck_03_ammo_F", "rhs_gaz66_ammo_msv", "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d", "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd", "rhsusf_M977A4_AMMO_BKIT_usarmy_d", @@ -136,9 +136,9 @@ vehicle_repair_sources = [ "CUP_B_MTVR_Repair_USMC", "CUP_B_T810_Repair_CZ_DES", "CUP_B_T810_Repair_CZ_WDL", - "CUP_O_V3S_Repair_TKA", - "CUP_O_Ural_Repair_SLA", "CUP_O_Ural_Repair_CHDKZ", + "CUP_O_Ural_Repair_SLA", + "CUP_O_V3S_Repair_TKA", "gm_gc_army_ural4320_repair_win", "gm_gc_army_ural4320_repair", "gm_ge_army_u1300l_repair_win", @@ -150,8 +150,8 @@ vehicle_repair_sources = [ "O_Truck_03_repair_F", "RHS_Ural_Repair_VDV_01", "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_d", "rhsusf_M977A4_REPAIR_BKIT_M2_usarmy_wd", "rhsusf_M977A4_REPAIR_BKIT_usarmy_d", @@ -194,8 +194,8 @@ vehicle_rearm_sources = [ "O_Truck_03_ammo_F", "rhs_gaz66_ammo_msv", "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_d", "rhsusf_M977A4_AMMO_BKIT_M2_usarmy_wd", "rhsusf_M977A4_AMMO_BKIT_usarmy_d", @@ -238,8 +238,8 @@ vehicle_refuel_sources = [ "O_Truck_03_fuel_F", "RHS_Ural_Fuel_VDV_01", "rhsusf_M1078A1R_SOV_M2_D_fmtv_socom", - "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M1239_M2_Deploy_socom_d", + "rhsusf_M1239_MK19_Deploy_socom_d", "rhsusf_M978A4_BKIT_usarmy_d", "rhsusf_M978A4_BKIT_usarmy_wd", "rhsusf_M978A4_usarmy_d", @@ -257,17 +257,17 @@ boats_names = [ "B_SDV_01_F", "B_T_Boat_Armed_01_minigun_F", "B_T_Boat_Transport_01_F", - "O_Boat_Armed_01_hmg_F", - "O_Boat_Transport_01_F", - "O_T_Boat_Armed_01_hmg_F", - "O_T_Boat_Transport_01_F", + "CUP_B_LCU1600_USMC", "CUP_B_MK10_GB", "CUP_B_RHIB_USMC", "CUP_B_RHIB2Turret_USMC", - "CUP_B_LCU1600_USMC", "CUP_O_LCVP_SLA", "CUP_O_LCVP_VIV_SLA", "CUP_O_PBX_SLA", + "O_Boat_Armed_01_hmg_F", + "O_Boat_Transport_01_F", + "O_T_Boat_Armed_01_hmg_F", + "O_T_Boat_Transport_01_F", "rhsusf_mkvsoc", "sfp_gruppbat", "sfp_rbb_norrkoping", @@ -403,8 +403,8 @@ KPLIB_suppMod_artyVeh = [ // Objects which are spawned as intel objects for pickup KPLIB_intelObjectClasses = [ - "Land_File_research_F", - "Land_Document_01_F" + "Land_Document_01_F", + "Land_File_research_F" ]; // Classnames of buildings inside military sectors, which are valid to hold intel items diff --git a/Missionframework/KPLIB_transportConfigs.sqf b/Missionframework/KPLIB_transportConfigs.sqf index 2fbbb556d..c959777aa 100644 --- a/Missionframework/KPLIB_transportConfigs.sqf +++ b/Missionframework/KPLIB_transportConfigs.sqf @@ -2,7 +2,7 @@ File: KPLIB_transportConfigs.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-10 - Last Update: 2020-05-10 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -67,18 +67,18 @@ KPLIB_transportConfigs = [ ["CUP_C_Ural_Civ_01", -6.5, [0,-0.5,0], [0,-2.5,0]], ["CUP_C_Ural_Civ_03", -6.5, [0,-0.5,0], [0,-2.5,0]], ["CUP_C_Ural_Open_Civ_03", -6.5, [0,-0.5,0], [0,-2.5,0]], + ["CUP_O_C130J_Cargo_TKA",-10,[0,0.6,-3.76],[0,-0.9,-3.76],[0,-2.5,-3.76],[0,-4.2,-3.76],[0,2.2,-3.76],[0,3.8,-3.76],[0,5.5,-3.76]], ["CUP_O_Kamaz_Open_RU", -6.5, [0.12,0.4,0], [0.12,-1.8,0]], ["CUP_O_Kamaz_RU", -6.5, [0,-0.4,0], [0,-2.6,0]], + ["CUP_O_MI6A_CHDKZ", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], + ["CUP_O_MI6A_TKA", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], + ["CUP_O_Mi8_SLA_1", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], ["CUP_O_Ural_CHDKZ", -6.5, [0,-0.5,0], [0,-2.5,0]], ["CUP_O_Ural_Open_CHDKZ", -6.5, [0,-0.5,0], [0,-2.5,0]], ["CUP_O_Ural_Open_SLA", -6.5, [0,-0.5,0], [0,-2.5,0]], ["CUP_O_Ural_Open_TKA", -6.5, [0,-0.5,0], [0,-2.5,0]], ["CUP_O_Ural_SLA", -6.5, [0,-0.5,0], [0,-2.5,0]], ["CUP_O_Ural_TKA", -6.5, [0,-0.5,0], [0,-2.5,0]], - ["CUP_O_Mi8_SLA_1", -6.5, [0,2.7,-1.5], [00,0.6,-1.5]], - ["CUP_O_MI6A_CHDKZ", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], - ["CUP_O_MI6A_TKA", -8, [0,6,-0.6], [0,4.3,-0.6], [0,2.5,-0.6], [0,0.5,-0.6], [0,-1.2,-0.6], [0,-3.1,-0.6]], - ["CUP_O_C130J_Cargo_TKA",-10,[0,0.6,-3.76],[0,-0.9,-3.76],[0,-2.5,-3.76],[0,-4.2,-3.76],[0,2.2,-3.76],[0,3.8,-3.76],[0,5.5,-3.76]], ["gm_gc_army_ural4320_cargo_win", -5, [0.0722656,-0.539063,-0.1], [0.076416,-1.76904,-0.1], [0.0773926,-2.85742,-0.1]], ["gm_gc_army_ural4320_cargo", -5, [0.0722656,-0.539063,-0.1], [0.076416,-1.76904,-0.1], [0.0773926,-2.85742,-0.1]], ["gm_gc_bgs_ural4320_cargo", -5, [-0.0373535,-0.535156,-0.1], [-0.0344238,-1.76611,-0.1], [-0.0334473,-2.85547,-0.1]], @@ -154,6 +154,9 @@ KPLIB_transportConfigs = [ ["rhsusf_M1083A1P2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], ["rhsusf_M1083A1P2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], ["rhsusf_M1083A1P2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]], + ["rhsusf_M1239_M2_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], + ["rhsusf_M1239_MK19_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], + ["rhsusf_M1239_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], ["rhsusf_M977A4_BKIT_M2_usarmy_d", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]], ["rhsusf_M977A4_BKIT_M2_usarmy_wd", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]], ["rhsusf_M977A4_BKIT_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], @@ -162,9 +165,6 @@ KPLIB_transportConfigs = [ ["rhsusf_M977A4_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]], ["rhsusf_m998_d_2dr_halftop", -4.5, [0,-0.9,-0.2]], ["rhsusf_m998_w_2dr_halftop", -4.5, [0,-0.9,-0.2]], - ["rhsusf_M1239_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], - ["rhsusf_M1239_M2_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], - ["rhsusf_M1239_MK19_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]], ["sfp_tgb30", -5, [0.2,-0.1,2], [0.2,-2.1,2]], ["sfp_tgb40", -5, [0.1,-0.7,2], [0.1,-2.7,2]], ["UK3CB_BAF_Merlin_HC3_18_DPMT", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], @@ -174,15 +174,15 @@ KPLIB_transportConfigs = [ ["UK3CB_BAF_Merlin_HC4_18_GPMG_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], ["UK3CB_BAF_Merlin_HC4_32_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], ["UK3CB_BAF_Merlin_HC4_CSAR_Arctic", -7.5, [0.25,3.7,-1.5], [0.25,1.6,-1.5], [0.25,-0.4,-1.5]], - ["USAF_C17",-10,[-1.2,14.4,-0.43],[-1.2,12.8,-0.43],[-1.2,11.1,-0.43],[-1.2,9.5,-0.43],[-1.2,7.9,-0.43],[-1.2,6.3,-0.43],[-1.2,4.6,-0.43],[-1.2,3,-0.43],[-1.2,1.4,-0.43],[-1.2,-0.1,-0.43],[-1.2,-1.8,-0.43],[1.2,14.4,-0.43],[1.2,12.8,-0.43],[1.2,11.2,-0.43],[1.2,9.6,-0.43],[1.2,7.9,-0.43],[1.2,6.3,-0.43],[1.2,4.7,-0.43],[1.2,3.1,-0.43],[1.2,1.5,-0.43],[1.2,0,-0.43],[1.2,-1.7,-0.43],[-1.2,14.5,1.22],[-1.2,12.8,1.22],[-1.2,11.2,1.2],[-1.2,9.5,1.22],[-1.2,7.9,1.22],[-1.2,6.3,1.22],[-1.2,4.7,1.22],[-1.2,3,1.22],[-1.2,1.4,1.22],[-1.2,-0.1,1.22],[-1.2,-1.7,1.22],[1.2,14.5,1.22],[1.2,12.8,1.22],[1.2,11.2,1.22],[1.2,9.6,1.22],[1.2,8,1.22],[1.2,6.3,1.22],[1.2,4.7,1.22],[1.2,3.1,1.22],[1.2,1.5,1.22],[1.2,0,1.22],[1.2,-1.6,1.22]], - ["USAF_C130J",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08]], - ["USAF_C130J_Cargo",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08],[0,5.3,2.08],[0,7,2.08]], ["uns_M35A2_Open", -5, [0,-0.6,0.1], [0,-2.3,0.1]], ["uns_M35A2", -5, [0,-0.6,0.1], [0,-2.3,0.1]], ["uns_m37b1", -5, [0,-1.8,0.15]], ["uns_nvatruck_mg", -5, [0,-1.05,0.8], [0,-2.75,0.8]], ["uns_nvatruck_open", -5, [0,-1.05,0.8], [0,-2.75,0.8]], - ["uns_nvatruck", -5, [0,-1.05,0.8], [0,-2.75,0.8]] + ["uns_nvatruck", -5, [0,-1.05,0.8], [0,-2.75,0.8]], + ["USAF_C130J_Cargo",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08],[0,5.3,2.08],[0,7,2.08]], + ["USAF_C130J",-10,[0,3.6,2.08],[0,2,2.08],[0,0.3,2.08],[0,-1.3,2.08]], + ["USAF_C17",-10,[-1.2,14.4,-0.43],[-1.2,12.8,-0.43],[-1.2,11.1,-0.43],[-1.2,9.5,-0.43],[-1.2,7.9,-0.43],[-1.2,6.3,-0.43],[-1.2,4.6,-0.43],[-1.2,3,-0.43],[-1.2,1.4,-0.43],[-1.2,-0.1,-0.43],[-1.2,-1.8,-0.43],[1.2,14.4,-0.43],[1.2,12.8,-0.43],[1.2,11.2,-0.43],[1.2,9.6,-0.43],[1.2,7.9,-0.43],[1.2,6.3,-0.43],[1.2,4.7,-0.43],[1.2,3.1,-0.43],[1.2,1.5,-0.43],[1.2,0,-0.43],[1.2,-1.7,-0.43],[-1.2,14.5,1.22],[-1.2,12.8,1.22],[-1.2,11.2,1.2],[-1.2,9.5,1.22],[-1.2,7.9,1.22],[-1.2,6.3,1.22],[-1.2,4.7,1.22],[-1.2,3,1.22],[-1.2,1.4,1.22],[-1.2,-0.1,1.22],[-1.2,-1.7,1.22],[1.2,14.5,1.22],[1.2,12.8,1.22],[1.2,11.2,1.22],[1.2,9.6,1.22],[1.2,8,1.22],[1.2,6.3,1.22],[1.2,4.7,1.22],[1.2,3.1,1.22],[1.2,1.5,1.22],[1.2,0,1.22],[1.2,-1.6,1.22]] ]; // Large storage area placement position offsets. diff --git a/Missionframework/functions/fn_getAdaptiveVehicle.sqf b/Missionframework/functions/fn_getAdaptiveVehicle.sqf index 2b752bcf3..6bd05b594 100644 --- a/Missionframework/functions/fn_getAdaptiveVehicle.sqf +++ b/Missionframework/functions/fn_getAdaptiveVehicle.sqf @@ -2,7 +2,7 @@ File: fn_getAdaptiveVehicle.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2019-11-26 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,4 +15,4 @@ Vehicle classname [STRING] */ -selectRandom ([opfor_vehicles, opfor_vehicles_low_intensity] select (combat_readiness < 40)) +selectRandom ([KPLIB_o_armyVehicles, KPLIB_o_armyVehiclesLight] select (combat_readiness < 40)) diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index 0aff01ace..a05f69b8c 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -2,7 +2,7 @@ File: fn_getSaveData.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-29 - Last Update: 2020-05-10 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -155,8 +155,8 @@ private _stats = [ stats_ieds_detonated, stats_opfor_killed_by_players, stats_opfor_soldiers_killed, - stats_opfor_vehicles_killed, - stats_opfor_vehicles_killed_by_players, + stats_KPLIB_o_armyVehicles_killed, + stats_KPLIB_o_armyVehicles_killed_by_players, stats_player_deaths, stats_playtime, stats_prisoners_captured, diff --git a/Missionframework/functions/fn_getSquadComp.sqf b/Missionframework/functions/fn_getSquadComp.sqf index bf945ba6f..02f40244b 100644 --- a/Missionframework/functions/fn_getSquadComp.sqf +++ b/Missionframework/functions/fn_getSquadComp.sqf @@ -2,7 +2,7 @@ File: fn_getSquadComp.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -52,7 +52,7 @@ if (_type == "army") then { } else { private _multiplier = 1; if (KPLIB_unitcap < 1) then {_multiplier = KPLIB_unitcap;}; - while {count _squadcomp < (10 * _multiplier)} do {_squadcomp pushback (selectRandom militia_squad)}; + while {count _squadcomp < (10 * _multiplier)} do {_squadcomp pushback (selectRandom KPLIB_o_militiaInfantry)}; }; _squadcomp diff --git a/Missionframework/functions/fn_initSectors.sqf b/Missionframework/functions/fn_initSectors.sqf index e197c1652..ec78fcf36 100644 --- a/Missionframework/functions/fn_initSectors.sqf +++ b/Missionframework/functions/fn_initSectors.sqf @@ -2,7 +2,7 @@ File: fn_initSectors.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-29 - Last Update: 2020-04-29 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -30,7 +30,7 @@ sectors_tower = []; case (_x find "capture" == 0): {sectors_capture pushBack _x; sectors_allSectors pushBack _x;}; case (_x find "factory" == 0): {sectors_factory pushBack _x; sectors_allSectors pushBack _x;}; case (_x find "military" == 0): {sectors_military pushBack _x; sectors_allSectors pushBack _x;}; - case (_x find "opfor_airspawn" == 0): {sectors_airspawn pushBack _x;}; + case (_x find "KPLIB_o_planesspawn" == 0): {sectors_airspawn pushBack _x;}; case (_x find "opfor_point" == 0): {sectors_opfor pushBack _x;}; case (_x find "tower" == 0): {sectors_tower pushBack _x; if (isServer) then {_x setMarkerText format ["%1 %2",markerText _x, mapGridPosition (markerPos _x)];}; sectors_allSectors pushBack _x;}; }; diff --git a/Missionframework/functions/fn_spawnBuildingSquad.sqf b/Missionframework/functions/fn_spawnBuildingSquad.sqf index eab49e40d..967a2d7a1 100644 --- a/Missionframework/functions/fn_spawnBuildingSquad.sqf +++ b/Missionframework/functions/fn_spawnBuildingSquad.sqf @@ -2,7 +2,7 @@ File: fn_spawnBuildingSquad.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -28,7 +28,7 @@ params [ if (_sector isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_error; []}; // Get classnames array -private _classnames = [[] call KPLIB_fnc_getSquadComp, militia_squad] select (_type == "militia"); +private _classnames = [[] call KPLIB_fnc_getSquadComp, KPLIB_o_militiaInfantry] select (_type == "militia"); // Adjust amount, if needed if (_amount > floor ((count _positions) * KPLIB_defended_buildingpos_part)) then { diff --git a/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf b/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf index 0c8b9c30c..97f439ce7 100644 --- a/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf +++ b/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf @@ -2,7 +2,7 @@ File: fn_spawnMilitaryPostSquad.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -34,7 +34,7 @@ private _grp = createGroup [KPLIB_side_enemy, true]; private _unit = objNull; private _units = []; { - _unit = [[opfor_marksman, opfor_machinegunner] select (random 100 > 50), _pos, _grp] call KPLIB_fnc_createManagedUnit; + _unit = [[KPLIB_o_marksman, KPLIB_o_machinegunner] select (random 100 > 50), _pos, _grp] call KPLIB_fnc_createManagedUnit; _unit setdir (180 + (getdir _x)); _unit setpos (([_x] call BIS_fnc_buildingPositions) select 1); [_unit] spawn building_defence_ai; diff --git a/Missionframework/functions/fn_spawnMilitiaCrew.sqf b/Missionframework/functions/fn_spawnMilitiaCrew.sqf index 32d67e20a..7a2efcd22 100644 --- a/Missionframework/functions/fn_spawnMilitiaCrew.sqf +++ b/Missionframework/functions/fn_spawnMilitiaCrew.sqf @@ -2,7 +2,7 @@ File: fn_spawnMilitiaCrew.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,7 +25,7 @@ if (isNull _vehicle) exitWith {["Null object given"] call BIS_fnc_error; false}; private _grp = createGroup [KPLIB_side_enemy, true]; private _units = []; for "_i" from 1 to 3 do { - _units pushBack ([selectRandom militia_squad, getPos _vehicle, _grp] call KPLIB_fnc_createManagedUnit); + _units pushBack ([selectRandom KPLIB_o_militiaInfantry, getPos _vehicle, _grp] call KPLIB_fnc_createManagedUnit); }; // Assign to vehicle diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index 9a842ed52..e572ebfd1 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -2,7 +2,7 @@ File: fn_spawnVehicle.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-15 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -52,7 +52,7 @@ if (_spawnPos isEqualTo zeroPos) exitWith { }; // If it's a chopper, spawn it flying -if (_classname in opfor_choppers) then { +if (_classname in KPLIB_o_helicopters) then { _newvehicle = createVehicle [_classname, _spawnpos, [], 0, 'FLY']; _newvehicle flyInHeight (80 + (random 120)); _newvehicle allowDamage false; @@ -77,7 +77,7 @@ if (_classname in opfor_choppers) then { [_newvehicle] call KPLIB_fnc_addObjectInit; // Spawn crew of vehicle -if (_classname in militia_vehicles) then { +if (_classname in KPLIB_o_militiaVehicles) then { [_newvehicle] call KPLIB_fnc_spawnMilitiaCrew; } else { private _grp = createGroup [KPLIB_side_enemy, true]; diff --git a/Missionframework/presets/civilians/CUP_ChernoCivs.sqf b/Missionframework/presets/civilians/cup_cherno.sqf similarity index 100% rename from Missionframework/presets/civilians/CUP_ChernoCivs.sqf rename to Missionframework/presets/civilians/cup_cherno.sqf diff --git a/Missionframework/presets/civilians/CUP_TakiCivs.sqf b/Missionframework/presets/civilians/cup_takistan.sqf similarity index 100% rename from Missionframework/presets/civilians/CUP_TakiCivs.sqf rename to Missionframework/presets/civilians/cup_takistan.sqf diff --git a/Missionframework/presets/civilians/RDSCiv.sqf b/Missionframework/presets/civilians/rds_civ.sqf similarity index 100% rename from Missionframework/presets/civilians/RDSCiv.sqf rename to Missionframework/presets/civilians/rds_civ.sqf diff --git a/Missionframework/presets/init_presets.sqf b/Missionframework/presets/init_presets.sqf index 45e3507e5..32b44f168 100644 --- a/Missionframework/presets/init_presets.sqf +++ b/Missionframework/presets/init_presets.sqf @@ -10,8 +10,8 @@ if (isServer) then { switch (KPLIB_presetPlayers) do { case 1: {[] call compile preprocessFileLineNumbers "presets\players\apex.sqf";}; - case 2: {[] call compile preprocessFileLineNumbers "presets\players\3cbBAF_mtp.sqf";}; - case 3: {[] call compile preprocessFileLineNumbers "presets\players\3cbBAF_des.sqf";}; + case 2: {[] call compile preprocessFileLineNumbers "presets\players\baf_mtp.sqf";}; + case 3: {[] call compile preprocessFileLineNumbers "presets\players\baf_des.sqf";}; case 4: {[] call compile preprocessFileLineNumbers "presets\players\bwmod.sqf";}; case 5: {[] call compile preprocessFileLineNumbers "presets\players\bwmod_des.sqf";}; case 6: {[] call compile preprocessFileLineNumbers "presets\players\rhs_usaf_wdl.sqf";}; @@ -24,18 +24,18 @@ switch (KPLIB_presetPlayers) do { case 13: {[] call compile preprocessFileLineNumbers "presets\players\csat.sqf";}; case 14: {[] call compile preprocessFileLineNumbers "presets\players\csat_apex.sqf";}; case 15: {[] call compile preprocessFileLineNumbers "presets\players\unsung.sqf";}; - case 16: {[] call compile preprocessFileLineNumbers "presets\players\CUP_BAF_Desert.sqf";}; - case 17: {[] call compile preprocessFileLineNumbers "presets\players\CUP_BAF_Woodland.sqf";}; - case 18: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USMC_Desert.sqf";}; - case 19: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USMC_Woodland.sqf";}; - case 20: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USA_Desert.sqf";}; - case 21: {[] call compile preprocessFileLineNumbers "presets\players\CUP_USA_Woodland.sqf";}; - case 22: {[] call compile preprocessFileLineNumbers "presets\players\CUP_CDF.sqf";}; - case 23: {[] call compile preprocessFileLineNumbers "presets\players\CUP_ACR_Desert.sqf";}; - case 24: {[] call compile preprocessFileLineNumbers "presets\players\CUP_ACR_Woodland.sqf";}; - case 25: {[] call compile preprocessFileLineNumbers "presets\players\CUP_ChDKZ.sqf";}; - case 26: {[] call compile preprocessFileLineNumbers "presets\players\CUP_SLA.sqf";}; - case 27: {[] call compile preprocessFileLineNumbers "presets\players\CUP_TakiArmy.sqf";}; + case 16: {[] call compile preprocessFileLineNumbers "presets\players\cup_baf_desert.sqf";}; + case 17: {[] call compile preprocessFileLineNumbers "presets\players\cup_baf_woodland.sqf";}; + case 18: {[] call compile preprocessFileLineNumbers "presets\players\cup_usmc_desert.sqf";}; + case 19: {[] call compile preprocessFileLineNumbers "presets\players\cup_usmc_woodland.sqf";}; + case 20: {[] call compile preprocessFileLineNumbers "presets\players\cup_usa_desert.sqf";}; + case 21: {[] call compile preprocessFileLineNumbers "presets\players\cup_usa_woodland.sqf";}; + case 22: {[] call compile preprocessFileLineNumbers "presets\players\cup_cdf.sqf";}; + case 23: {[] call compile preprocessFileLineNumbers "presets\players\cup_acr_desert.sqf";}; + case 24: {[] call compile preprocessFileLineNumbers "presets\players\cup_acr_woodland.sqf";}; + case 25: {[] call compile preprocessFileLineNumbers "presets\players\cup_chdkz.sqf";}; + case 26: {[] call compile preprocessFileLineNumbers "presets\players\cup_sla.sqf";}; + case 27: {[] call compile preprocessFileLineNumbers "presets\players\cup_takistan.sqf";}; case 28: {[] call compile preprocessFileLineNumbers "presets\players\sfp_wdl.sqf";}; case 29: {[] call compile preprocessFileLineNumbers "presets\players\sfp_des.sqf";}; case 30: {[] call compile preprocessFileLineNumbers "presets\players\enoch.sqf";}; @@ -47,7 +47,7 @@ switch (KPLIB_presetEnemies) do { case 2: {[] call compile preprocessFileLineNumbers "presets\enemies\rhs_afrf.sqf";}; case 3: {[] call compile preprocessFileLineNumbers "presets\enemies\takistan.sqf";}; case 4: {[] call compile preprocessFileLineNumbers "presets\enemies\islamic_state.sqf";}; - case 5: {[] call compile preprocessFileLineNumbers "presets\enemies\SLA.sqf";}; + case 5: {[] call compile preprocessFileLineNumbers "presets\enemies\sla.sqf";}; case 6: {[] call compile preprocessFileLineNumbers "presets\enemies\aaf.sqf";}; case 7: {[] call compile preprocessFileLineNumbers "presets\enemies\nato.sqf";}; case 8: {[] call compile preprocessFileLineNumbers "presets\enemies\gm_west.sqf";}; @@ -55,14 +55,14 @@ switch (KPLIB_presetEnemies) do { case 10: {[] call compile preprocessFileLineNumbers "presets\enemies\gm_east.sqf";}; case 11: {[] call compile preprocessFileLineNumbers "presets\enemies\gm_east_win.sqf";}; case 12: {[] call compile preprocessFileLineNumbers "presets\enemies\unsung.sqf";}; - case 13: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_SLA.sqf";}; - case 14: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_TakiArmy.sqf";}; - case 15: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_ChDKZ.sqf";}; - case 16: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_AFRF_MSV.sqf";}; - case 17: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_AFRF_ModernMSV.sqf";}; - case 18: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_CDF.sqf";}; - case 19: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_BAF_Desert.sqf";}; - case 20: {[] call compile preprocessFileLineNumbers "presets\enemies\CUP_BAF_Woodland.sqf";}; + case 13: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_sla.sqf";}; + case 14: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_takistan.sqf";}; + case 15: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_chdkz.sqf";}; + case 16: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_afrf_msv.sqf";}; + case 17: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_afrf_msv_modern.sqf";}; + case 18: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_cdf.sqf";}; + case 19: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_baf_desert.sqf";}; + case 20: {[] call compile preprocessFileLineNumbers "presets\enemies\cup_baf_woodland.sqf";}; default {[] call compile preprocessFileLineNumbers "presets\enemies\custom.sqf";}; }; @@ -70,22 +70,22 @@ switch (KPLIB_presetResistance) do { case 1: {[] call compile preprocessFileLineNumbers "presets\resistance\apex.sqf";}; case 2: {[] call compile preprocessFileLineNumbers "presets\resistance\rhs_gref.sqf";}; case 3: {[] call compile preprocessFileLineNumbers "presets\resistance\middle_eastern.sqf";}; - case 4: {[] call compile preprocessFileLineNumbers "presets\resistance\RACS.sqf";}; + case 4: {[] call compile preprocessFileLineNumbers "presets\resistance\racs.sqf";}; case 5: {[] call compile preprocessFileLineNumbers "presets\resistance\germany.sqf";}; case 6: {[] call compile preprocessFileLineNumbers "presets\resistance\unsung.sqf";}; - case 7: {[] call compile preprocessFileLineNumbers "presets\resistance\CUP_TakiLocals.sqf";}; - case 8: {[] call compile preprocessFileLineNumbers "presets\resistance\CUP_NAPA.sqf";}; + case 7: {[] call compile preprocessFileLineNumbers "presets\resistance\cup_takistan.sqf";}; + case 8: {[] call compile preprocessFileLineNumbers "presets\resistance\cup_napa.sqf";}; default {[] call compile preprocessFileLineNumbers "presets\resistance\custom.sqf";}; }; switch (KPLIB_presetCivilians) do { case 1: {[] call compile preprocessFileLineNumbers "presets\civilians\apex.sqf";}; case 2: {[] call compile preprocessFileLineNumbers "presets\civilians\middle_eastern.sqf";}; - case 3: {[] call compile preprocessFileLineNumbers "presets\civilians\RDSCiv.sqf";}; + case 3: {[] call compile preprocessFileLineNumbers "presets\civilians\rds_civ.sqf";}; case 4: {[] call compile preprocessFileLineNumbers "presets\civilians\germany.sqf";}; case 5: {[] call compile preprocessFileLineNumbers "presets\civilians\unsung.sqf";}; - case 6: {[] call compile preprocessFileLineNumbers "presets\civilians\CUP_TakiCivs.sqf";}; - case 7: {[] call compile preprocessFileLineNumbers "presets\civilians\CUP_ChernoCivs.sqf";}; + case 6: {[] call compile preprocessFileLineNumbers "presets\civilians\cup_takistan.sqf";}; + case 7: {[] call compile preprocessFileLineNumbers "presets\civilians\cup_cherno.sqf";}; default {[] call compile preprocessFileLineNumbers "presets\civilians\custom.sqf";}; }; @@ -166,84 +166,84 @@ KPLIB_ignore_colisions_when_building = [ Checking all preset arrays for missing mods and sort out not available classnames */ // Blufor -infantry_units = infantry_units select {[( _x select 0)] call KPLIB_fnc_checkClass}; -light_vehicles = light_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -heavy_vehicles = heavy_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -air_vehicles = air_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -static_vehicles = static_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -buildings = buildings select {[( _x select 0)] call KPLIB_fnc_checkClass}; -support_vehicles = support_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -blufor_squad_inf_light = blufor_squad_inf_light select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_inf = blufor_squad_inf select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_at = blufor_squad_at select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_aa = blufor_squad_aa select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_recon = blufor_squad_recon select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_para = blufor_squad_para select {[_x] call KPLIB_fnc_checkClass}; -elite_vehicles = elite_vehicles select {[_x] call KPLIB_fnc_checkClass}; +infantry_units = infantry_units select {[( _x select 0)] call KPLIB_fnc_checkClass}; +light_vehicles = light_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; +heavy_vehicles = heavy_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; +air_vehicles = air_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; +static_vehicles = static_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; +buildings = buildings select {[( _x select 0)] call KPLIB_fnc_checkClass}; +support_vehicles = support_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; +blufor_squad_inf_light = blufor_squad_inf_light select {[_x] call KPLIB_fnc_checkClass}; +blufor_squad_inf = blufor_squad_inf select {[_x] call KPLIB_fnc_checkClass}; +blufor_squad_at = blufor_squad_at select {[_x] call KPLIB_fnc_checkClass}; +blufor_squad_aa = blufor_squad_aa select {[_x] call KPLIB_fnc_checkClass}; +blufor_squad_recon = blufor_squad_recon select {[_x] call KPLIB_fnc_checkClass}; +blufor_squad_para = blufor_squad_para select {[_x] call KPLIB_fnc_checkClass}; +elite_vehicles = elite_vehicles select {[_x] call KPLIB_fnc_checkClass}; // Opfor -militia_squad = militia_squad select {[_x] call KPLIB_fnc_checkClass}; -militia_vehicles = militia_vehicles select {[_x] call KPLIB_fnc_checkClass}; -opfor_vehicles = opfor_vehicles select {[_x] call KPLIB_fnc_checkClass}; -opfor_vehicles_low_intensity = opfor_vehicles_low_intensity select {[_x] call KPLIB_fnc_checkClass}; -opfor_battlegroup_vehicles = opfor_battlegroup_vehicles select {[_x] call KPLIB_fnc_checkClass}; -opfor_battlegroup_vehicles_low_intensity = opfor_battlegroup_vehicles_low_intensity select {[_x] call KPLIB_fnc_checkClass}; -opfor_troup_transports = opfor_troup_transports select {[_x] call KPLIB_fnc_checkClass}; -opfor_choppers = opfor_choppers select {[_x] call KPLIB_fnc_checkClass}; -opfor_air = opfor_air select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_militiaInfantry = KPLIB_o_militiaInfantry select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_militiaVehicles = KPLIB_o_militiaVehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_armyVehicles = KPLIB_o_armyVehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_armyVehiclesLight = KPLIB_o_armyVehiclesLight select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_battleGrpVehicles = KPLIB_o_battleGrpVehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_battleGrpVehiclesLight = KPLIB_o_battleGrpVehiclesLight select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_troopTransports = KPLIB_o_troopTransports select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_helicopters = KPLIB_o_helicopters select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_o_planes = KPLIB_o_planes select {[_x] call KPLIB_fnc_checkClass}; // Resistance -KPLIB_guerilla_units = KPLIB_guerilla_units select {[_x] call KPLIB_fnc_checkClass}; -KPLIB_guerilla_vehicles = KPLIB_guerilla_vehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_guerilla_units = KPLIB_guerilla_units select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_guerilla_vehicles = KPLIB_guerilla_vehicles select {[_x] call KPLIB_fnc_checkClass}; // Civilians -civilians = civilians select {[_x] call KPLIB_fnc_checkClass}; -civilian_vehicles = civilian_vehicles select {[_x] call KPLIB_fnc_checkClass}; +civilians = civilians select {[_x] call KPLIB_fnc_checkClass}; +civilian_vehicles = civilian_vehicles select {[_x] call KPLIB_fnc_checkClass}; // Misc -KPLIB_transportConfigs = KPLIB_transportConfigs select {[_x select 0] call KPLIB_fnc_checkClass}; -KPLIB_aiResupplySources = KPLIB_aiResupplySources select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_transportConfigs = KPLIB_transportConfigs select {[_x select 0] call KPLIB_fnc_checkClass}; +KPLIB_aiResupplySources = KPLIB_aiResupplySources select {[_x] call KPLIB_fnc_checkClass}; /* Fetch arrays with only classnames from the blufor preset build arrays Beware that all classnames are converted to lowercase. Important for e.g. `in` checks, as it's case-sensitive. */ -KPLIB_b_infantry_classes = infantry_units apply {toLower (_x select 0)}; -KPLIB_b_light_classes = light_vehicles apply {toLower (_x select 0)}; -KPLIB_b_heavy_classes = heavy_vehicles apply {toLower (_x select 0)}; -KPLIB_b_air_classes = air_vehicles apply {toLower (_x select 0)}; -KPLIB_b_static_classes = static_vehicles apply {toLower (_x select 0)}; -KPLIB_b_buildings_classes = buildings apply {toLower (_x select 0)}; -KPLIB_b_support_classes = support_vehicles apply {toLower (_x select 0)}; -KPLIB_transport_classes = KPLIB_transportConfigs apply {toLower (_x select 0)}; +KPLIB_b_infantry_classes = infantry_units apply {toLower (_x select 0)}; +KPLIB_b_light_classes = light_vehicles apply {toLower (_x select 0)}; +KPLIB_b_heavy_classes = heavy_vehicles apply {toLower (_x select 0)}; +KPLIB_b_air_classes = air_vehicles apply {toLower (_x select 0)}; +KPLIB_b_static_classes = static_vehicles apply {toLower (_x select 0)}; +KPLIB_b_buildings_classes = buildings apply {toLower (_x select 0)}; +KPLIB_b_support_classes = support_vehicles apply {toLower (_x select 0)}; +KPLIB_transport_classes = KPLIB_transportConfigs apply {toLower (_x select 0)}; KPLIB_b_infantry_classes append (blufor_squad_inf_light + blufor_squad_inf + blufor_squad_at + blufor_squad_aa + blufor_squad_recon + blufor_squad_para); -KPLIB_b_infantry_classes = KPLIB_b_infantry_classes apply {toLower _x}; -KPLIB_b_infantry_classes = KPLIB_b_infantry_classes arrayIntersect KPLIB_b_infantry_classes; +KPLIB_b_infantry_classes = KPLIB_b_infantry_classes apply {toLower _x}; +KPLIB_b_infantry_classes = KPLIB_b_infantry_classes arrayIntersect KPLIB_b_infantry_classes; /* Opfor squad compositions */ -KPLIB_o_squadStd = [opfor_squad_leader, opfor_medic, opfor_machinegunner, opfor_heavygunner, opfor_medic, opfor_marksman, opfor_grenadier, opfor_rpg]; -KPLIB_o_squadInf = [opfor_squad_leader, opfor_medic, opfor_machinegunner, opfor_heavygunner, opfor_heavygunner, opfor_marksman, opfor_sharpshooter, opfor_sniper]; -KPLIB_o_squadTank = [opfor_squad_leader, opfor_medic, opfor_machinegunner, opfor_rpg, opfor_rpg, opfor_at, opfor_at, opfor_at]; -KPLIB_o_squadAir = [opfor_squad_leader, opfor_medic, opfor_machinegunner, opfor_rpg, opfor_rpg, opfor_aa, opfor_aa, opfor_aa]; +KPLIB_o_squadStd = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_heavyGunner, KPLIB_o_medic, KPLIB_o_marksman, KPLIB_o_grenadier, KPLIB_o_riflemanLAT]; +KPLIB_o_squadInf = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_heavyGunner, KPLIB_o_heavyGunner, KPLIB_o_marksman, KPLIB_o_sharpshooter, KPLIB_o_sniper]; +KPLIB_o_squadTank = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_riflemanLAT, KPLIB_o_riflemanLAT, KPLIB_o_atSpecialist, KPLIB_o_atSpecialist, KPLIB_o_atSpecialist]; +KPLIB_o_squadAir = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_riflemanLAT, KPLIB_o_riflemanLAT, KPLIB_o_aaSpecialist, KPLIB_o_aaSpecialist, KPLIB_o_aaSpecialist]; /* Liberation specific collections */ -KPLIB_buildList = [[], infantry_units, light_vehicles, heavy_vehicles, air_vehicles, static_vehicles, buildings, support_vehicles, KPLIB_b_allSquads]; -KPLIB_crates = [KPLIB_supply_crate, KPLIB_ammo_crate, KPLIB_fuel_crate]; -KPLIB_airSlots = [KPLIB_heli_slot_building, KPLIB_plane_slot_building]; -KPLIB_storageBuildings = [KPLIB_small_storage_building, KPLIB_large_storage_building]; -KPLIB_upgradeBuildings = [KPLIB_recycle_building, KPLIB_air_vehicle_building, KPLIB_heli_slot_building, KPLIB_plane_slot_building]; +KPLIB_buildList = [[], infantry_units, light_vehicles, heavy_vehicles, air_vehicles, static_vehicles, buildings, support_vehicles, KPLIB_b_allSquads]; +KPLIB_crates = [KPLIB_supply_crate, KPLIB_ammo_crate, KPLIB_fuel_crate]; +KPLIB_airSlots = [KPLIB_heli_slot_building, KPLIB_plane_slot_building]; +KPLIB_storageBuildings = [KPLIB_small_storage_building, KPLIB_large_storage_building]; +KPLIB_upgradeBuildings = [KPLIB_recycle_building, KPLIB_air_vehicle_building, KPLIB_heli_slot_building, KPLIB_plane_slot_building]; KPLIB_aiResupplySources append [Respawn_truck_typename, huron_typename, Arsenal_typename]; -KPLIB_crates = KPLIB_crates apply {toLower _x}; -KPLIB_airSlots = KPLIB_airSlots apply {toLower _x}; -KPLIB_storageBuildings = KPLIB_storageBuildings apply {toLower _x}; -KPLIB_upgradeBuildings = KPLIB_upgradeBuildings apply {toLower _x}; -KPLIB_aiResupplySources = KPLIB_aiResupplySources apply {toLower _x}; +KPLIB_crates = KPLIB_crates apply {toLower _x}; +KPLIB_airSlots = KPLIB_airSlots apply {toLower _x}; +KPLIB_storageBuildings = KPLIB_storageBuildings apply {toLower _x}; +KPLIB_upgradeBuildings = KPLIB_upgradeBuildings apply {toLower _x}; +KPLIB_aiResupplySources = KPLIB_aiResupplySources apply {toLower _x}; /* Classname collections @@ -253,12 +253,12 @@ KPLIB_allLandVeh_classes = [[], [huron_typename]] select (huron_typename isKindO { KPLIB_allLandVeh_classes append _x; } forEach [ - militia_vehicles apply {toLower _x}, - opfor_vehicles apply {toLower _x}, - opfor_vehicles_low_intensity apply {toLower _x}, - opfor_battlegroup_vehicles apply {toLower _x}, - opfor_battlegroup_vehicles_low_intensity apply {toLower _x}, - opfor_troup_transports apply {toLower _x}, + KPLIB_o_militiaVehicles apply {toLower _x}, + KPLIB_o_armyVehicles apply {toLower _x}, + KPLIB_o_armyVehiclesLight apply {toLower _x}, + KPLIB_o_battleGrpVehicles apply {toLower _x}, + KPLIB_o_battleGrpVehiclesLight apply {toLower _x}, + KPLIB_o_troopTransports apply {toLower _x}, KPLIB_b_light_classes, KPLIB_b_heavy_classes, KPLIB_b_support_classes select {_x isKindOf "Car" || _x isKindOf "Tank"} @@ -269,7 +269,7 @@ KPLIB_allLandVeh_classes = KPLIB_allLandVeh_classes arrayIntersect KPLIB_allLand KPLIB_allAirVeh_classes = [[], [huron_typename]] select (huron_typename isKindOf "Air"); { KPLIB_allAirVeh_classes append _x; -} forEach [opfor_choppers apply {toLower _x}, opfor_air apply {toLower _x}, KPLIB_b_air_classes, KPLIB_b_support_classes select {_x isKindOf "Air"}]; +} forEach [KPLIB_o_helicopters apply {toLower _x}, KPLIB_o_planes apply {toLower _x}, KPLIB_b_air_classes, KPLIB_b_support_classes select {_x isKindOf "Air"}]; // All blufor vehicle (land and air) classnames KPLIB_b_allVeh_classes = []; @@ -282,20 +282,20 @@ KPLIB_o_allVeh_classes = []; { KPLIB_o_allVeh_classes append _x; } forEach [ - militia_vehicles, - opfor_vehicles, - opfor_vehicles_low_intensity, - opfor_battlegroup_vehicles, - opfor_battlegroup_vehicles_low_intensity, - opfor_troup_transports, - opfor_choppers, - opfor_air + KPLIB_o_militiaVehicles, + KPLIB_o_armyVehicles, + KPLIB_o_armyVehiclesLight, + KPLIB_o_battleGrpVehicles, + KPLIB_o_battleGrpVehiclesLight, + KPLIB_o_troopTransports, + KPLIB_o_helicopters, + KPLIB_o_planes ]; KPLIB_o_allVeh_classes = KPLIB_o_allVeh_classes apply {toLower _x}; KPLIB_o_allVeh_classes = KPLIB_o_allVeh_classes arrayIntersect KPLIB_o_allVeh_classes; // All regular opfor soldier classnames -KPLIB_o_inf_classes = [opfor_sentry, opfor_rifleman, opfor_grenadier, opfor_squad_leader, opfor_team_leader, opfor_marksman, opfor_machinegunner, opfor_heavygunner, opfor_medic, opfor_rpg, opfor_at, opfor_aa, opfor_officer, opfor_sharpshooter, opfor_sniper,opfor_engineer]; +KPLIB_o_inf_classes = [KPLIB_o_sentry, KPLIB_o_rifleman, KPLIB_o_grenadier, KPLIB_o_squadLeader, KPLIB_o_teamLeader, KPLIB_o_marksman, KPLIB_o_machinegunner, KPLIB_o_heavyGunner, KPLIB_o_medic, KPLIB_o_riflemanLAT, KPLIB_o_atSpecialist, KPLIB_o_aaSpecialist, KPLIB_o_officer, KPLIB_o_sharpshooter, KPLIB_o_sniper,KPLIB_o_engineer]; KPLIB_o_inf_classes = KPLIB_o_inf_classes apply {toLower _x}; /* diff --git a/Missionframework/presets/players/3cbBAF_des.sqf b/Missionframework/presets/players/baf_des.sqf similarity index 100% rename from Missionframework/presets/players/3cbBAF_des.sqf rename to Missionframework/presets/players/baf_des.sqf diff --git a/Missionframework/presets/players/3cbBAF_mtp.sqf b/Missionframework/presets/players/baf_mtp.sqf similarity index 100% rename from Missionframework/presets/players/3cbBAF_mtp.sqf rename to Missionframework/presets/players/baf_mtp.sqf diff --git a/Missionframework/presets/players/CUP_TakiArmy.sqf b/Missionframework/presets/players/cup_takistan.sqf similarity index 100% rename from Missionframework/presets/players/CUP_TakiArmy.sqf rename to Missionframework/presets/players/cup_takistan.sqf diff --git a/Missionframework/presets/resistance/CUP_TakiLocals.sqf b/Missionframework/presets/resistance/cup_takistan.sqf similarity index 100% rename from Missionframework/presets/resistance/CUP_TakiLocals.sqf rename to Missionframework/presets/resistance/cup_takistan.sqf diff --git a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf index 9feaee211..9575513ed 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf @@ -32,7 +32,7 @@ waitUntil { sleep 5; if ( !_is_near_blufor ) then { { if ((_x distance _unit) < 100) exitWith { _is_near_blufor = true }; - } forEach (allUnits select {!((toLower (typeof _x)) in KPLIB_o_inf_classes || (typeof _x) in militia_squad)}); + } forEach (allUnits select {!((toLower (typeof _x)) in KPLIB_o_inf_classes || (typeof _x) in KPLIB_o_militiaInfantry)}); }; !alive _unit || !(_is_near_blufor) || (_is_near_fob && (vehicle _unit == _unit)) diff --git a/Missionframework/scripts/client/ui/end_screen.sqf b/Missionframework/scripts/client/ui/end_screen.sqf index dfcfd630e..fff3dcc58 100644 --- a/Missionframework/scripts/client/ui/end_screen.sqf +++ b/Missionframework/scripts/client/ui/end_screen.sqf @@ -21,8 +21,8 @@ params [ "_stats_ieds_detonated", "_stats_opfor_killed_by_players", "_stats_opfor_soldiers_killed", - "_stats_opfor_vehicles_killed", - "_stats_opfor_vehicles_killed_by_players", + "_stats_KPLIB_o_armyVehicles_killed", + "_stats_KPLIB_o_armyVehicles_killed_by_players", "_stats_player_deaths", "_stats_playtime", "_stats_prisoners_captured", @@ -88,8 +88,8 @@ if (dialog) then {sleep 3}; // First page [691, format [localize "STR_STATS_OPFOR_K_INF", _stats_opfor_soldiers_killed]] call _addReportLine; [692, format [localize "STR_STATS_OPFOR_K_INF_PL", _stats_opfor_killed_by_players]] call _addReportLine; -[693, format [localize "STR_STATS_OPFOR_K_VEH", _stats_opfor_vehicles_killed]] call _addReportLine; -[694, format [localize "STR_STATS_OPFOR_K_VEH_PL", _stats_opfor_vehicles_killed_by_players], true] call _addReportLine; +[693, format [localize "STR_STATS_OPFOR_K_VEH", _stats_KPLIB_o_armyVehicles_killed]] call _addReportLine; +[694, format [localize "STR_STATS_OPFOR_K_VEH_PL", _stats_KPLIB_o_armyVehicles_killed_by_players], true] call _addReportLine; [] call _cleanPage; // Second page diff --git a/Missionframework/scripts/fob_templates/apex/template1.sqf b/Missionframework/scripts/fob_templates/apex/template1.sqf index 83cb7f2fa..fa12bcfed 100644 --- a/Missionframework/scripts/fob_templates/apex/template1.sqf +++ b/Missionframework/scripts/fob_templates/apex/template1.sqf @@ -34,35 +34,35 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_ammo_container, [-17.69, 6.55, 0.00], 0.00], - [opfor_ammo_container, [-8.52, 6.50, 0.00], 0.00], - [opfor_fuel_container, [-12.98, 6.80, 0.00], 0.00], - [opfor_fuel_container, [-17.49, 15.73, 0.00], 0.00], - [opfor_fuel_truck, [14.76, -3.44, 0.00], 270.00], - [opfor_ammo_truck, [14.92, 1.33, 0.00], 270.00] + [KPLIB_o_ammoContainer, [-17.69, 6.55, 0.00], 0.00], + [KPLIB_o_ammoContainer, [-8.52, 6.50, 0.00], 0.00], + [KPLIB_o_fuelContainer, [-12.98, 6.80, 0.00], 0.00], + [KPLIB_o_fuelContainer, [-17.49, 15.73, 0.00], 0.00], + [KPLIB_o_fuelTruck, [14.76, -3.44, 0.00], 270.00], + [KPLIB_o_ammoTruck, [14.92, 1.33, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_engineer, [15.07, -0.94, 0.00], 258.84], - [opfor_heavygunner, [-18.40, -1.96, 0.00], 134.25], - [opfor_heavygunner, [17.84, -17.31, 4.35], 162.32], - [opfor_medic, [-0.88, -22.03, 0.00], 170.13], - [opfor_medic, [-6.09, -18.08, 0.00], 106.59], - [opfor_medic, [18.34, 12.30, 0.00], 229.95], - [opfor_officer, [17.04, 14.01, 15.37], 228.55], - [opfor_sharpshooter, [18.24, 16.25, 17.89], 60.85], - [opfor_rifleman, [-10.67, 19.15, 0.00], 145.13], - [opfor_rifleman, [-15.09, -17.86, 4.35], 152.65], - [opfor_rifleman, [14.53, -17.52, 4.35], 183.66], - [opfor_rifleman, [17.84, 9.35, 17.89], 120.37], - [opfor_rifleman, [8.78, -18.50, 0.00], 38.44], - [opfor_rifleman, [9.42, 8.60, 12.77], 0.00], - [opfor_rpg, [10.13, 6.74, 17.79], 190.12], - [opfor_sentry, [-15.34, 11.18, 0.00], 43.12], - [opfor_sentry, [15.14, 9.85, 12.77], 0.00], - [opfor_marksman, [-17.65, -17.73, 4.35], 192.66], - [opfor_grenadier, [-7.66, -1.47, 0.00], 186.27], - [opfor_grenadier, [18.23, -6.30, 0.00], 235.17] + [KPLIB_o_engineer, [15.07, -0.94, 0.00], 258.84], + [KPLIB_o_heavyGunner, [-18.40, -1.96, 0.00], 134.25], + [KPLIB_o_heavyGunner, [17.84, -17.31, 4.35], 162.32], + [KPLIB_o_medic, [-0.88, -22.03, 0.00], 170.13], + [KPLIB_o_medic, [-6.09, -18.08, 0.00], 106.59], + [KPLIB_o_medic, [18.34, 12.30, 0.00], 229.95], + [KPLIB_o_officer, [17.04, 14.01, 15.37], 228.55], + [KPLIB_o_sharpshooter, [18.24, 16.25, 17.89], 60.85], + [KPLIB_o_rifleman, [-10.67, 19.15, 0.00], 145.13], + [KPLIB_o_rifleman, [-15.09, -17.86, 4.35], 152.65], + [KPLIB_o_rifleman, [14.53, -17.52, 4.35], 183.66], + [KPLIB_o_rifleman, [17.84, 9.35, 17.89], 120.37], + [KPLIB_o_rifleman, [8.78, -18.50, 0.00], 38.44], + [KPLIB_o_rifleman, [9.42, 8.60, 12.77], 0.00], + [KPLIB_o_riflemanLAT, [10.13, 6.74, 17.79], 190.12], + [KPLIB_o_sentry, [-15.34, 11.18, 0.00], 43.12], + [KPLIB_o_sentry, [15.14, 9.85, 12.77], 0.00], + [KPLIB_o_marksman, [-17.65, -17.73, 4.35], 192.66], + [KPLIB_o_grenadier, [-7.66, -1.47, 0.00], 186.27], + [KPLIB_o_grenadier, [18.23, -6.30, 0.00], 235.17] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/apex/template2.sqf b/Missionframework/scripts/fob_templates/apex/template2.sqf index d18c5f522..db2e32d5b 100644 --- a/Missionframework/scripts/fob_templates/apex/template2.sqf +++ b/Missionframework/scripts/fob_templates/apex/template2.sqf @@ -1,5 +1,5 @@ private _objects_to_build = [ - [opfor_flag, [-3.09, -13.03, 0.00], 0.00], + [KPLIB_o_flag, [-3.09, -13.03, 0.00], 0.00], ["Land_BarGate_F", [-20.99, -7.13, 0.00], 270.00], ["Land_Cargo_HQ_V4_F", [12.64, -4.76, 0.00], 0.00], ["Land_Cargo_Patrol_V4_F", [18.54, 14.75, 0.00], 180.00], @@ -35,35 +35,35 @@ private _objects_to_build = [ ["Land_HBarrier_01_line_5_green_F", [6.90, 7.29, 0.00], 270.00], ["Land_HBarrier_01_line_5_green_F", [8.91, 3.67, 0.00], 0.00], ["Land_HBarrier_01_tower_green_F", [-21.15, 6.09, 0.00], 0.00], - [opfor_mrap_armed, [-15.71, -1.05, -0.00], 0.00] + [KPLIB_o_mrapArmed, [-15.71, -1.05, -0.00], 0.00] ]; private _objectives_to_build = [ - [opfor_ammo_container, [-2.27, 6.72, 0.00], 270.00], - [opfor_ammo_container, [-2.50, 14.76, 0.00], 270.00], - [opfor_fuel_container, [-11.02, 13.18, 0.00], 0.00], - [opfor_fuel_container, [-15.81, 13.28, 0.00], 0.00] + [KPLIB_o_ammoContainer, [-2.27, 6.72, 0.00], 270.00], + [KPLIB_o_ammoContainer, [-2.50, 14.76, 0.00], 270.00], + [KPLIB_o_fuelContainer, [-11.02, 13.18, 0.00], 0.00], + [KPLIB_o_fuelContainer, [-15.81, 13.28, 0.00], 0.00] ]; private _defenders_to_build = [ - [opfor_engineer, [-13.04, 1.42, 0.00], 145.49], - [opfor_medic, [12.00, -11.32, 0.72], 0.00], - [opfor_machinegunner, [9.36, -9.69, 3.13], 224.39], - [opfor_rifleman, [-15.90, 6.20, 0.00], 53.33], - [opfor_rifleman, [-18.61, -12.86, 0.00], 256.70], - [opfor_rifleman, [-2.21, 2.14, 0.00], 154.38], - [opfor_rifleman, [-21.42, 5.74, 0.00], 0.00], - [opfor_rifleman, [-21.63, 3.43, 2.78], 259.20], - [opfor_rifleman, [-7.60, 14.78, 0.00], 177.51], - [opfor_rifleman, [17.97, -2.54, 0.60], 222.59], - [opfor_at, [9.42, -3.19, 3.13], 299.23], - [opfor_sentry, [-1.28, -12.69, 0.00], 0.00], - [opfor_sentry, [21.72, 6.34, 0.00], 290.24], - [opfor_marksman, [16.94, 14.54, 4.35], 333.07], - [opfor_marksman, [19.91, 14.21, 4.35], 0.00], - [opfor_team_leader, [10.12, -4.12, 0.60], 175.70], - [opfor_grenadier, [-21.11, 7.85, 2.78], 285.67], - [opfor_grenadier, [9.27, 7.95, 0.00], 0.00] + [KPLIB_o_engineer, [-13.04, 1.42, 0.00], 145.49], + [KPLIB_o_medic, [12.00, -11.32, 0.72], 0.00], + [KPLIB_o_machinegunner, [9.36, -9.69, 3.13], 224.39], + [KPLIB_o_rifleman, [-15.90, 6.20, 0.00], 53.33], + [KPLIB_o_rifleman, [-18.61, -12.86, 0.00], 256.70], + [KPLIB_o_rifleman, [-2.21, 2.14, 0.00], 154.38], + [KPLIB_o_rifleman, [-21.42, 5.74, 0.00], 0.00], + [KPLIB_o_rifleman, [-21.63, 3.43, 2.78], 259.20], + [KPLIB_o_rifleman, [-7.60, 14.78, 0.00], 177.51], + [KPLIB_o_rifleman, [17.97, -2.54, 0.60], 222.59], + [KPLIB_o_atSpecialist, [9.42, -3.19, 3.13], 299.23], + [KPLIB_o_sentry, [-1.28, -12.69, 0.00], 0.00], + [KPLIB_o_sentry, [21.72, 6.34, 0.00], 290.24], + [KPLIB_o_marksman, [16.94, 14.54, 4.35], 333.07], + [KPLIB_o_marksman, [19.91, 14.21, 4.35], 0.00], + [KPLIB_o_teamLeader, [10.12, -4.12, 0.60], 175.70], + [KPLIB_o_grenadier, [-21.11, 7.85, 2.78], 285.67], + [KPLIB_o_grenadier, [9.27, 7.95, 0.00], 0.00] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/apex/template3.sqf b/Missionframework/scripts/fob_templates/apex/template3.sqf index f16907e04..fb46a4478 100644 --- a/Missionframework/scripts/fob_templates/apex/template3.sqf +++ b/Missionframework/scripts/fob_templates/apex/template3.sqf @@ -38,41 +38,41 @@ private _objects_to_build = [ ["Land_HBarrier_01_big_4_green_F", [7.61, 27.67, 0.00], 18.42], ["Land_HBarrier_01_big_4_green_F", [9.03, -20.34, 0.00], 270.00], ["Land_HBarrier_01_big_4_green_F", [9.11, -11.97, 0.00], 270.00], - [opfor_mrap, [10.41, -1.98, -0.00], 0.00] + [KPLIB_o_mrap, [10.41, -1.98, -0.00], 0.00] ]; private _objectives_to_build = [ - [opfor_ammo_truck, [15.60, 18.85, 0.00], 136.21], - [opfor_fuel_truck, [21.62, 8.37, 0.00], 167.18], - [opfor_ammo_container, [-2.98, -19.06, 0.00], 0.00], - [opfor_ammo_container, [-8.06, -19.04, 0.00], 0.00], - [opfor_fuel_container, [1.23, -19.09, 0.00], 0.00], - [opfor_fuel_container, [5.80, -19.12, 0.00], 0.00] + [KPLIB_o_ammoTruck, [15.60, 18.85, 0.00], 136.21], + [KPLIB_o_fuelTruck, [21.62, 8.37, 0.00], 167.18], + [KPLIB_o_ammoContainer, [-2.98, -19.06, 0.00], 0.00], + [KPLIB_o_ammoContainer, [-8.06, -19.04, 0.00], 0.00], + [KPLIB_o_fuelContainer, [1.23, -19.09, 0.00], 0.00], + [KPLIB_o_fuelContainer, [5.80, -19.12, 0.00], 0.00] ]; private _defenders_to_build = [ - [opfor_engineer, [19.58, 13.89, 0.00], 244.49], - [opfor_heavygunner, [-14.31, 17.85, 0.00], 149.97], - [opfor_medic, [-1.31, 25.09, 0.73], 135.61], - [opfor_aa, [3.89, 2.24, 17.89], 0.00], - [opfor_machinegunner, [-25.14, -10.78, 4.35], 214.93], - [opfor_at, [2.97, -4.28, 17.89], 130.54], - [opfor_rifleman, [-16.34, -19.12, 0.00], 0.00], - [opfor_rifleman, [-21.59, 9.39, 4.35], 282.14], - [opfor_rifleman, [-3.73, 2.96, 17.89], 0.00], - [opfor_rifleman, [-4.31, -3.06, 12.77], 0.00], - [opfor_rifleman, [-5.05, -15.86, 0.00], 0.00], - [opfor_rifleman, [-6.97, 23.81, 0.00], 143.84], - [opfor_rifleman, [24.14, 0.05, 0.00], 177.25], - [opfor_rifleman, [4.39, 9.33, 0.00], 317.44], - [opfor_sentry, [12.06, -16.47, 0.00], 0.00], - [opfor_sentry, [5.83, -11.76, 0.00], 233.53], - [opfor_marksman, [-20.07, 11.31, 4.35], 327.13], - [opfor_marksman, [14.45, -17.63, 4.35], 143.40], - [opfor_squad_leader, [-1.89, -3.39, 15.37], 0.00], - [opfor_grenadier, [-1.96, -2.51, 0.00], 265.28], - [opfor_grenadier, [-23.10, -13.48, 4.35], 220.27], - [opfor_grenadier, [17.35, -16.11, 4.35], 139.83] + [KPLIB_o_engineer, [19.58, 13.89, 0.00], 244.49], + [KPLIB_o_heavyGunner, [-14.31, 17.85, 0.00], 149.97], + [KPLIB_o_medic, [-1.31, 25.09, 0.73], 135.61], + [KPLIB_o_aaSpecialist, [3.89, 2.24, 17.89], 0.00], + [KPLIB_o_machinegunner, [-25.14, -10.78, 4.35], 214.93], + [KPLIB_o_atSpecialist, [2.97, -4.28, 17.89], 130.54], + [KPLIB_o_rifleman, [-16.34, -19.12, 0.00], 0.00], + [KPLIB_o_rifleman, [-21.59, 9.39, 4.35], 282.14], + [KPLIB_o_rifleman, [-3.73, 2.96, 17.89], 0.00], + [KPLIB_o_rifleman, [-4.31, -3.06, 12.77], 0.00], + [KPLIB_o_rifleman, [-5.05, -15.86, 0.00], 0.00], + [KPLIB_o_rifleman, [-6.97, 23.81, 0.00], 143.84], + [KPLIB_o_rifleman, [24.14, 0.05, 0.00], 177.25], + [KPLIB_o_rifleman, [4.39, 9.33, 0.00], 317.44], + [KPLIB_o_sentry, [12.06, -16.47, 0.00], 0.00], + [KPLIB_o_sentry, [5.83, -11.76, 0.00], 233.53], + [KPLIB_o_marksman, [-20.07, 11.31, 4.35], 327.13], + [KPLIB_o_marksman, [14.45, -17.63, 4.35], 143.40], + [KPLIB_o_squadLeader, [-1.89, -3.39, 15.37], 0.00], + [KPLIB_o_grenadier, [-1.96, -2.51, 0.00], 265.28], + [KPLIB_o_grenadier, [-23.10, -13.48, 4.35], 220.27], + [KPLIB_o_grenadier, [17.35, -16.11, 4.35], 139.83] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/apex/template4.sqf b/Missionframework/scripts/fob_templates/apex/template4.sqf index 34f273d80..9a4170dec 100644 --- a/Missionframework/scripts/fob_templates/apex/template4.sqf +++ b/Missionframework/scripts/fob_templates/apex/template4.sqf @@ -29,38 +29,38 @@ private _objects_to_build = [ ["Land_HBarrier_01_line_5_green_F", [-19.12, 19.94, 0.00], 0.00], ["Land_HBarrier_01_line_5_green_F", [-24.19, 5.00, 0.00], 270.00], ["Land_HBarrier_01_line_5_green_F", [-24.22, 17.71, 0.00], 270.00], - [opfor_mrap_armed, [-17.72, 14.91, -0.00], 270.00], - [opfor_transport_truck, [-16.45, 7.09, 0.00], 270.00] + [KPLIB_o_mrapArmed, [-17.72, 14.91, -0.00], 270.00], + [KPLIB_o_transportTruck, [-16.45, 7.09, 0.00], 270.00] ]; private _objectives_to_build = [ - [opfor_fuel_truck, [14.36, -11.61, 0.00], 270.00], - [opfor_fuel_container, [-19.81, -11.27, 0.00], 270.00], - [opfor_fuel_container, [-19.85, -3.96, 0.00], 270.00] + [KPLIB_o_fuelTruck, [14.36, -11.61, 0.00], 270.00], + [KPLIB_o_fuelContainer, [-19.81, -11.27, 0.00], 270.00], + [KPLIB_o_fuelContainer, [-19.85, -3.96, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_engineer, [-13.45, 3.53, 0.00], 280.96], - [opfor_heavygunner, [17.42, 5.17, 3.13], 137.06], - [opfor_medic, [17.92, 5.97, 0.60], 274.39], - [opfor_officer, [12.32, 11.76, 0.60], 140.46], - [opfor_sharpshooter, [-5.79, 11.84, 4.35], 297.99], - [opfor_machinegunner, [-11.76, -18.72, 2.28], 152.95], - [opfor_machinegunner, [-12.18, -3.17, 0.00], 204.36], - [opfor_rifleman, [-13.48, -17.94, 2.28], 170.62], - [opfor_rifleman, [-21.78, 17.73, 0.00], 176.87], - [opfor_rifleman, [-5.56, -18.04, 0.00], 155.59], - [opfor_rifleman, [10.34, 6.15, 0.60], 99.59], - [opfor_rifleman, [19.16, 0.25, 0.00], 252.60], - [opfor_rifleman, [4.08, 16.23, 0.00], 195.28], - [opfor_rifleman, [8.68, -11.60, 0.00], 258.53], - [opfor_rpg, [11.21, 13.16, 3.13], 309.16], - [opfor_sentry, [-21.30, -7.60, 0.00], 97.63], - [opfor_sentry, [-6.04, 4.12, 0.00], 80.41], - [opfor_sentry, [2.14, -17.64, 2.28], 246.88], - [opfor_marksman, [-3.27, 13.64, 4.35], 332.14], - [opfor_marksman, [11.79, 5.74, 3.13], 224.23], - [opfor_grenadier, [3.70, -19.06, 2.28], 179.85] + [KPLIB_o_engineer, [-13.45, 3.53, 0.00], 280.96], + [KPLIB_o_heavyGunner, [17.42, 5.17, 3.13], 137.06], + [KPLIB_o_medic, [17.92, 5.97, 0.60], 274.39], + [KPLIB_o_officer, [12.32, 11.76, 0.60], 140.46], + [KPLIB_o_sharpshooter, [-5.79, 11.84, 4.35], 297.99], + [KPLIB_o_machinegunner, [-11.76, -18.72, 2.28], 152.95], + [KPLIB_o_machinegunner, [-12.18, -3.17, 0.00], 204.36], + [KPLIB_o_rifleman, [-13.48, -17.94, 2.28], 170.62], + [KPLIB_o_rifleman, [-21.78, 17.73, 0.00], 176.87], + [KPLIB_o_rifleman, [-5.56, -18.04, 0.00], 155.59], + [KPLIB_o_rifleman, [10.34, 6.15, 0.60], 99.59], + [KPLIB_o_rifleman, [19.16, 0.25, 0.00], 252.60], + [KPLIB_o_rifleman, [4.08, 16.23, 0.00], 195.28], + [KPLIB_o_rifleman, [8.68, -11.60, 0.00], 258.53], + [KPLIB_o_riflemanLAT, [11.21, 13.16, 3.13], 309.16], + [KPLIB_o_sentry, [-21.30, -7.60, 0.00], 97.63], + [KPLIB_o_sentry, [-6.04, 4.12, 0.00], 80.41], + [KPLIB_o_sentry, [2.14, -17.64, 2.28], 246.88], + [KPLIB_o_marksman, [-3.27, 13.64, 4.35], 332.14], + [KPLIB_o_marksman, [11.79, 5.74, 3.13], 224.23], + [KPLIB_o_grenadier, [3.70, -19.06, 2.28], 179.85] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/apex/template5.sqf b/Missionframework/scripts/fob_templates/apex/template5.sqf index a72f62dda..ec7ebd619 100644 --- a/Missionframework/scripts/fob_templates/apex/template5.sqf +++ b/Missionframework/scripts/fob_templates/apex/template5.sqf @@ -24,39 +24,39 @@ private _objects_to_build = [ ["Land_HBarrier_01_big_4_green_F", [23.00, 8.71, 0.00], 270.00], ["Land_HBarrier_01_big_4_green_F", [23.12, 17.03, 0.00], 270.00], ["Land_HBarrier_01_big_4_green_F", [9.57, 20.36, 0.00], 0.00], - [opfor_mrap, [14.22, -4.50, -0.00], 270.00] + [KPLIB_o_mrap, [14.22, -4.50, -0.00], 270.00] ]; private _objectives_to_build = [ - [opfor_ammo_truck, [15.77, -10.81, 0.00], 270.00], - [opfor_fuel_truck, [15.39, 1.95, 0.00], 270.00], - [opfor_ammo_container, [-12.54, 6.21, 0.00], 0.00], - [opfor_ammo_container, [-16.98, 6.38, 0.00], 0.00], - [opfor_fuel_container, [-12.00, -3.02, 0.00], 0.00], - [opfor_fuel_container, [-16.72, -3.11, 0.00], 0.00] + [KPLIB_o_ammoTruck, [15.77, -10.81, 0.00], 270.00], + [KPLIB_o_fuelTruck, [15.39, 1.95, 0.00], 270.00], + [KPLIB_o_ammoContainer, [-12.54, 6.21, 0.00], 0.00], + [KPLIB_o_ammoContainer, [-16.98, 6.38, 0.00], 0.00], + [KPLIB_o_fuelContainer, [-12.00, -3.02, 0.00], 0.00], + [KPLIB_o_fuelContainer, [-16.72, -3.11, 0.00], 0.00] ]; private _defenders_to_build = [ - [opfor_engineer, [16.86, -0.86, 0.00], 257.93], - [opfor_heavygunner, [2.53, -18.79, 0.00], 162.42], - [opfor_medic, [-8.69, -15.93, 0.59], 0.00], - [opfor_sharpshooter, [-17.05, 16.71, 4.35], 272.72], - [opfor_sharpshooter, [10.26, 6.69, 17.79], 198.44], - [opfor_machinegunner, [-15.20, 1.00, 0.00], 86.01], - [opfor_rifleman, [-13.07, 16.89, 0.00], 139.62], - [opfor_rifleman, [-16.95, 13.45, 4.35], 259.48], - [opfor_rifleman, [-17.18, -17.18, 0.73], 0.00], - [opfor_rifleman, [10.74, 10.43, 15.37], 81.16], - [opfor_rifleman, [11.20, 10.90, 12.77], 0.00], - [opfor_rifleman, [12.76, -16.90, 0.00], 323.09], - [opfor_rifleman, [16.63, 12.67, 0.00], 229.50], - [opfor_rifleman, [18.63, 15.47, 17.89], 46.70], - [opfor_at, [-17.43, -7.40, 0.00], 101.79], - [opfor_rpg, [10.88, 16.67, 17.89], 313.11], - [opfor_sentry, [18.68, 15.42, 15.37], 240.93], - [opfor_marksman, [13.72, -18.55, 4.35], 210.97], - [opfor_squad_leader, [-14.42, -16.98, 0.73], 333.26], - [opfor_grenadier, [16.74, -18.14, 4.35], 172.08] + [KPLIB_o_engineer, [16.86, -0.86, 0.00], 257.93], + [KPLIB_o_heavyGunner, [2.53, -18.79, 0.00], 162.42], + [KPLIB_o_medic, [-8.69, -15.93, 0.59], 0.00], + [KPLIB_o_sharpshooter, [-17.05, 16.71, 4.35], 272.72], + [KPLIB_o_sharpshooter, [10.26, 6.69, 17.79], 198.44], + [KPLIB_o_machinegunner, [-15.20, 1.00, 0.00], 86.01], + [KPLIB_o_rifleman, [-13.07, 16.89, 0.00], 139.62], + [KPLIB_o_rifleman, [-16.95, 13.45, 4.35], 259.48], + [KPLIB_o_rifleman, [-17.18, -17.18, 0.73], 0.00], + [KPLIB_o_rifleman, [10.74, 10.43, 15.37], 81.16], + [KPLIB_o_rifleman, [11.20, 10.90, 12.77], 0.00], + [KPLIB_o_rifleman, [12.76, -16.90, 0.00], 323.09], + [KPLIB_o_rifleman, [16.63, 12.67, 0.00], 229.50], + [KPLIB_o_rifleman, [18.63, 15.47, 17.89], 46.70], + [KPLIB_o_atSpecialist, [-17.43, -7.40, 0.00], 101.79], + [KPLIB_o_riflemanLAT, [10.88, 16.67, 17.89], 313.11], + [KPLIB_o_sentry, [18.68, 15.42, 15.37], 240.93], + [KPLIB_o_marksman, [13.72, -18.55, 4.35], 210.97], + [KPLIB_o_squadLeader, [-14.42, -16.98, 0.73], 333.26], + [KPLIB_o_grenadier, [16.74, -18.14, 4.35], 172.08] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template1.sqf b/Missionframework/scripts/fob_templates/default/template1.sqf index b0d130ebc..bd4fd6e51 100644 --- a/Missionframework/scripts/fob_templates/default/template1.sqf +++ b/Missionframework/scripts/fob_templates/default/template1.sqf @@ -35,41 +35,41 @@ private _objects_to_build = [ ["Land_Tank_rust_F",[-9,10,0],180], ["Land_Tank_rust_F",[-9,14,0],180], ["Land_Tank_rust_F",[-9,6,0],180], - [opfor_flag,[-14,-5,0],180], - [opfor_flag,[-14,5,0],180], - [opfor_flag,[14,-5,0],90], + [KPLIB_o_flag,[-14,-5,0],180], + [KPLIB_o_flag,[-14,5,0],180], + [KPLIB_o_flag,[14,-5,0],90], ["Land_BarGate_F",[20,0,0],90], ["Land_BarGate_F",[-13,0,0],270], - [opfor_mrap,[7,-7,0],60] + [KPLIB_o_mrap,[7,-7,0],60] ]; private _objectives_to_build = [ - [opfor_fuel_truck,[10,8,0],185], - [opfor_fuel_truck,[5,8.5,0],190], - [opfor_fuel_truck,[0,9,0],192], - [opfor_ammo_truck,[-9,-8,0],10], - [opfor_ammo_truck,[-3,-8,0],15] + [KPLIB_o_fuelTruck,[10,8,0],185], + [KPLIB_o_fuelTruck,[5,8.5,0],190], + [KPLIB_o_fuelTruck,[0,9,0],192], + [KPLIB_o_ammoTruck,[-9,-8,0],10], + [KPLIB_o_ammoTruck,[-3,-8,0],15] ]; private _defenders_to_build = [ - [opfor_marksman,[11,26.5,4.5],0], - [opfor_marksman,[-11,-26.5,4.5],180], - [opfor_heavygunner,[9,26.5,4.5],0], - [opfor_heavygunner,[-9,-26.5,4.5],180], - [opfor_rifleman,[12,23,4.5],90], - [opfor_rifleman,[-12,-23,4.5],270], - [opfor_sentry,[6,-20,1],0], - [opfor_sentry,[3,-23,1],90], - [opfor_rifleman,[3,-20,1],180], - [opfor_team_leader,[6,-23,1],270], - [opfor_team_leader,[3,-18,1],180], - [opfor_sentry,[6,-18,1],270], - [opfor_rifleman,[-9,25,1],180], - [opfor_sentry,[-11,25,1],180], - [opfor_rifleman,[-1,25,1],180], - [opfor_sentry,[-3,25,1],180], - [opfor_sentry,[0,-5,0],0], - [opfor_sentry,[2,5,0],180] + [KPLIB_o_marksman,[11,26.5,4.5],0], + [KPLIB_o_marksman,[-11,-26.5,4.5],180], + [KPLIB_o_heavyGunner,[9,26.5,4.5],0], + [KPLIB_o_heavyGunner,[-9,-26.5,4.5],180], + [KPLIB_o_rifleman,[12,23,4.5],90], + [KPLIB_o_rifleman,[-12,-23,4.5],270], + [KPLIB_o_sentry,[6,-20,1],0], + [KPLIB_o_sentry,[3,-23,1],90], + [KPLIB_o_rifleman,[3,-20,1],180], + [KPLIB_o_teamLeader,[6,-23,1],270], + [KPLIB_o_teamLeader,[3,-18,1],180], + [KPLIB_o_sentry,[6,-18,1],270], + [KPLIB_o_rifleman,[-9,25,1],180], + [KPLIB_o_sentry,[-11,25,1],180], + [KPLIB_o_rifleman,[-1,25,1],180], + [KPLIB_o_sentry,[-3,25,1],180], + [KPLIB_o_sentry,[0,-5,0],0], + [KPLIB_o_sentry,[2,5,0],180] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template10.sqf b/Missionframework/scripts/fob_templates/default/template10.sqf index 954d359f4..c34181058 100644 --- a/Missionframework/scripts/fob_templates/default/template10.sqf +++ b/Missionframework/scripts/fob_templates/default/template10.sqf @@ -22,36 +22,36 @@ private _objects_to_build = [ ["Land_HBarrier_Big_F", [21.51, -15.29, 0.00], 270.00], ["Land_HBarrier_Big_F", [8.11, 24.41, 0.00], 0.00], ["Land_HBarrier_Big_F", [9.42, -21.10, 0.00], 0.00], - [opfor_mrap_armed, [12.38, 7.12, -0.00], 270.00], - [opfor_transport_truck, [13.36, 2.53, 0.00], 270.00] + [KPLIB_o_mrapArmed, [12.38, 7.12, -0.00], 270.00], + [KPLIB_o_transportTruck, [13.36, 2.53, 0.00], 270.00] ]; private _objectives_to_build = [ - [opfor_ammo_container, [-1.20, 20.76, 0.00], 270.00], - [opfor_ammo_container, [-1.59, 15.88, 0.00], 270.00], - [opfor_fuel_container, [6.70, 15.99, 0.00], 270.00], - [opfor_fuel_container, [6.82, 21.17, 0.00], 270.00], - [opfor_ammo_truck, [13.86, -1.90, 0.00], 270.00] + [KPLIB_o_ammoContainer, [-1.20, 20.76, 0.00], 270.00], + [KPLIB_o_ammoContainer, [-1.59, 15.88, 0.00], 270.00], + [KPLIB_o_fuelContainer, [6.70, 15.99, 0.00], 270.00], + [KPLIB_o_fuelContainer, [6.82, 21.17, 0.00], 270.00], + [KPLIB_o_ammoTruck, [13.86, -1.90, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_engineer, [16.56, 0.29, 0.00], 272.36], - [opfor_heavygunner, [15.94, 21.60, 4.35], 0.00], - [opfor_medic, [13.96, -10.08, 0.60], 212.28], - [opfor_sharpshooter, [-16.85, 16.02, 4.35], 262.35], - [opfor_machinegunner, [-7.51, -17.34, 4.35], 172.74], - [opfor_rifleman, [-8.52, -15.95, 0.00], 25.64], - [opfor_rifleman, [-9.09, 6.77, 0.00], 198.94], - [opfor_rifleman, [14.18, -6.52, 3.08], 0.00], - [opfor_rifleman, [16.20, 18.42, 4.35], 94.53], - [opfor_rifleman, [2.83, 18.98, 0.00], 179.03], - [opfor_rifleman, [7.46, -17.77, 0.72], 0.00], - [opfor_at, [7.10, -9.09, 3.13], 279.26], - [opfor_sentry, [16.67, 16.95, 0.00], 231.16], - [opfor_marksman, [-17.06, 19.60, 4.35], 273.13], - [opfor_squad_leader, [9.67, -10.00, 0.60], 198.89], - [opfor_grenadier, [-14.41, 20.23, 0.00], 137.98], - [opfor_grenadier, [-4.67, -17.54, 4.35], 177.14] + [KPLIB_o_engineer, [16.56, 0.29, 0.00], 272.36], + [KPLIB_o_heavyGunner, [15.94, 21.60, 4.35], 0.00], + [KPLIB_o_medic, [13.96, -10.08, 0.60], 212.28], + [KPLIB_o_sharpshooter, [-16.85, 16.02, 4.35], 262.35], + [KPLIB_o_machinegunner, [-7.51, -17.34, 4.35], 172.74], + [KPLIB_o_rifleman, [-8.52, -15.95, 0.00], 25.64], + [KPLIB_o_rifleman, [-9.09, 6.77, 0.00], 198.94], + [KPLIB_o_rifleman, [14.18, -6.52, 3.08], 0.00], + [KPLIB_o_rifleman, [16.20, 18.42, 4.35], 94.53], + [KPLIB_o_rifleman, [2.83, 18.98, 0.00], 179.03], + [KPLIB_o_rifleman, [7.46, -17.77, 0.72], 0.00], + [KPLIB_o_atSpecialist, [7.10, -9.09, 3.13], 279.26], + [KPLIB_o_sentry, [16.67, 16.95, 0.00], 231.16], + [KPLIB_o_marksman, [-17.06, 19.60, 4.35], 273.13], + [KPLIB_o_squadLeader, [9.67, -10.00, 0.60], 198.89], + [KPLIB_o_grenadier, [-14.41, 20.23, 0.00], 137.98], + [KPLIB_o_grenadier, [-4.67, -17.54, 4.35], 177.14] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template2.sqf b/Missionframework/scripts/fob_templates/default/template2.sqf index 37f13abb0..e85d3a824 100644 --- a/Missionframework/scripts/fob_templates/default/template2.sqf +++ b/Missionframework/scripts/fob_templates/default/template2.sqf @@ -4,11 +4,11 @@ private _objects_to_build = [ [ "Land_PaperBox_open_empty_F", [5.84, -3.25, 0], 332.09 ], [ "Land_HBarrierBig_F", [7.84, -6.52, 0], 359.62 ], [ "Land_PaperBox_closed_F", [10.77, -2.11, 0], 90.97 ], - [ opfor_flag, [2.46, 10.93, 0], 90 ], + [ KPLIB_o_flag, [2.46, 10.93, 0], 90 ], [ "Land_HBarrierBig_F", [-9.22, -6.62, 0], 0.11 ], - [ opfor_transport_truck, [4.9, -10.96, -0.03], 272.46 ], + [ KPLIB_o_transportTruck, [4.9, -10.96, -0.03], 272.46 ], [ "Land_HBarrierBig_F", [-1.17, 12.94, 0], 0.25 ], - [ opfor_transport_truck, [-8.91, -11.52, -0.03], 266.11 ], + [ KPLIB_o_transportTruck, [-8.91, -11.52, -0.03], 266.11 ], [ "Land_HBarrierWall_corridor_F", [-14.26, 3.18, 0], 180.24 ], [ "Land_PaperBox_open_full_F", [11.39, 9.16, 0], 302.69 ], [ "Land_HBarrierBig_F", [-14.52, -3.07, 0], 89.68 ], @@ -25,16 +25,16 @@ private _objects_to_build = [ [ "Land_HBarrierBig_F", [8.34, 18.55, 0], 0.52 ], [ "Land_HBarrierBig_F", [-9.38, 18.42, 0], 359.5 ], [ "Land_HBarrier_1_F", [-21.07, -4.36, 0], 179.54 ], - [ opfor_mrap_armed, [-13.81, -17.08, 0.01], 254.24 ], + [ KPLIB_o_mrapArmed, [-13.81, -17.08, 0.01], 254.24 ], [ "Land_HBarrierBig_F", [-1.71, -21.88, 0], 179.75 ], [ "Land_HBarrierBig_F", [22.65, -1.94, 0], 89.87 ], - [ opfor_flag, [-21.18, -9.33, 0], 90 ], + [ KPLIB_o_flag, [-21.18, -9.33, 0], 90 ], [ "Land_HBarrierBig_F", [7.15, -21.71, 0], 179.75 ], [ "Land_Cargo_Patrol_V3_F", [17.02, -16.67, 0], 359.51 ], [ "Land_HBarrierBig_F", [-22.85, 1.21, 0], 269.41 ], [ "Land_HBarrierBig_F", [22.51, 6.8, 0], 89.87 ], [ "Land_HBarrierBig_F", [-22.77, -7.28, 0], 269.41 ], - [ opfor_flag, [-11.36, -21.78, 0], 90 ], + [ KPLIB_o_flag, [-11.36, -21.78, 0], 90 ], [ "Land_HBarrierBig_F", [-13.12, 20.99, 0], 90.15 ], [ "Land_HBarrierBig_F", [-10.02, -22.67, 0], 347.15 ], [ "Land_HBarrierBig_F", [-22.81, 10.07, 0], 270.43 ], @@ -43,7 +43,7 @@ private _objects_to_build = [ [ "Land_Cargo_Patrol_V3_F", [-18.01, 19.63, 0], 180.02 ], [ "Land_CncBarrierMedium4_F", [-23.12, -12.98, 0], 235.1 ], [ "Land_HBarrierBig_F", [15.93, -21.54, 0], 179.75 ], - [ opfor_flag, [20.64, 16.83, 0], 90 ], + [ KPLIB_o_flag, [20.64, 16.83, 0], 90 ], [ "Land_BarGate_F", [-19.55, -17.64, 0], 235.1 ], [ "Land_HBarrierBig_F", [22.45, 15.67, 0], 88.84 ], [ "Land_HBarrierBig_F", [22.23, -18.72, 0], 277.09 ], @@ -56,40 +56,40 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [ opfor_ammo_container, [-3.32, 3.11, 0], 270.02 ], - [ opfor_ammo_container, [6.28, 8, 0], 270.25 ] + [ KPLIB_o_ammoContainer, [-3.32, 3.11, 0], 270.02 ], + [ KPLIB_o_ammoContainer, [6.28, 8, 0], 270.25 ] ]; private _defenders_to_build = [ - [ opfor_sentry, [3.35, -3.18, 0], 285.5 ], - [ opfor_machinegunner, [-4.14, 3.26, 4.64], 155.19 ], - [ opfor_marksman, [-1.97, 5.92, 17.89], 39.77 ], - [ opfor_sentry, [-5.07, 4.03, 13.02], 288.05 ], - [ opfor_team_leader, [-6.25, 3.04, 15.37], 288.05 ], - [ opfor_sentry, [5.03, 5.17, 0], 245.18 ], - [ opfor_sentry, [7.48, 0.16, 0], 140.42 ], - [ opfor_sentry, [-7.52, 2.19, 15.37], 53.89 ], - [ opfor_rifleman, [-6.91, 4.18, 12.77], 105.44 ], - [ opfor_rifleman, [8.29, -1.01, 0], 15.07 ], - [ opfor_sentry, [-7.72, 3.47, 15.37], 129.9 ], - [ opfor_aa, [-8.16, -3.53, 17.79], 162.03 ], - [ opfor_rifleman, [-7.69, 5.02, 8.59], 339.29 ], - [ opfor_engineer, [9.66, -0.3, 0], 270.08 ], - [ opfor_heavygunner, [-9.94, -3.52, 17.79], 197.2 ], - [ opfor_aa, [-8.92, 7.21, 17.89], 17.44 ], - [ opfor_sentry, [-12.71, -1.34, 0], 70.65 ], - [ opfor_sentry, [-0.21, -13.35, 0], 222.75 ], - [ opfor_sentry, [12.7, 4.78, 0], 245.18 ], - [ opfor_sentry, [-12.62, 7.78, 0], 95.16 ], - [ opfor_heavygunner, [-17.46, 1.05, 0], 191.23 ], - [ opfor_sentry, [-15.52, -9.95, 0], 222.75 ], - [ opfor_sentry, [-20.07, 1.58, 0], 162.91 ], - [ opfor_heavygunner, [15.94, -17.43, 4.35], 264.53 ], - [ opfor_rpg, [-19.21, -14.96, 0], 184.12 ], - [ opfor_marksman, [18.17, -16.98, 4.35], 120.79 ], - [ opfor_machinegunner, [-15.66, -20.49, 0], 272.29 ], - [ opfor_heavygunner, [-16.9, 20.39, 4.35], 85.04 ], - [ opfor_marksman, [-19.16, 19.94, 4.35], 301.3 ] + [ KPLIB_o_sentry, [3.35, -3.18, 0], 285.5 ], + [ KPLIB_o_machinegunner, [-4.14, 3.26, 4.64], 155.19 ], + [ KPLIB_o_marksman, [-1.97, 5.92, 17.89], 39.77 ], + [ KPLIB_o_sentry, [-5.07, 4.03, 13.02], 288.05 ], + [ KPLIB_o_teamLeader, [-6.25, 3.04, 15.37], 288.05 ], + [ KPLIB_o_sentry, [5.03, 5.17, 0], 245.18 ], + [ KPLIB_o_sentry, [7.48, 0.16, 0], 140.42 ], + [ KPLIB_o_sentry, [-7.52, 2.19, 15.37], 53.89 ], + [ KPLIB_o_rifleman, [-6.91, 4.18, 12.77], 105.44 ], + [ KPLIB_o_rifleman, [8.29, -1.01, 0], 15.07 ], + [ KPLIB_o_sentry, [-7.72, 3.47, 15.37], 129.9 ], + [ KPLIB_o_aaSpecialist, [-8.16, -3.53, 17.79], 162.03 ], + [ KPLIB_o_rifleman, [-7.69, 5.02, 8.59], 339.29 ], + [ KPLIB_o_engineer, [9.66, -0.3, 0], 270.08 ], + [ KPLIB_o_heavyGunner, [-9.94, -3.52, 17.79], 197.2 ], + [ KPLIB_o_aaSpecialist, [-8.92, 7.21, 17.89], 17.44 ], + [ KPLIB_o_sentry, [-12.71, -1.34, 0], 70.65 ], + [ KPLIB_o_sentry, [-0.21, -13.35, 0], 222.75 ], + [ KPLIB_o_sentry, [12.7, 4.78, 0], 245.18 ], + [ KPLIB_o_sentry, [-12.62, 7.78, 0], 95.16 ], + [ KPLIB_o_heavyGunner, [-17.46, 1.05, 0], 191.23 ], + [ KPLIB_o_sentry, [-15.52, -9.95, 0], 222.75 ], + [ KPLIB_o_sentry, [-20.07, 1.58, 0], 162.91 ], + [ KPLIB_o_heavyGunner, [15.94, -17.43, 4.35], 264.53 ], + [ KPLIB_o_riflemanLAT, [-19.21, -14.96, 0], 184.12 ], + [ KPLIB_o_marksman, [18.17, -16.98, 4.35], 120.79 ], + [ KPLIB_o_machinegunner, [-15.66, -20.49, 0], 272.29 ], + [ KPLIB_o_heavyGunner, [-16.9, 20.39, 4.35], 85.04 ], + [ KPLIB_o_marksman, [-19.16, 19.94, 4.35], 301.3 ] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template3.sqf b/Missionframework/scripts/fob_templates/default/template3.sqf index 5a31c2e18..dade76e62 100644 --- a/Missionframework/scripts/fob_templates/default/template3.sqf +++ b/Missionframework/scripts/fob_templates/default/template3.sqf @@ -12,25 +12,25 @@ private _objects_to_build = [ [ "CamoNet_OPFOR_open_F", [13.71, -11.54, 0], 270.25 ], [ "Land_HBarrierBig_F", [16.94, 5.18, 0], 181.2 ], [ "Land_Cargo_House_V3_F", [-16.03, -9.69, 0], 269.88 ], - [ opfor_transport_truck, [-10.4, 14.9, -0.02], 181.03 ], + [ KPLIB_o_transportTruck, [-10.4, 14.9, -0.02], 181.03 ], [ "Land_HBarrierBig_F", [-17.6, 5.28, 0], 359.67 ], [ "Land_Cargo_HQ_V3_F", [11.25, 14.59, 0], 89.97 ], [ "Land_HBarrierBig_F", [20.42, 1.73, 0], 89.37 ], [ "Land_HBarrierBig_F", [-1.65, -21.15, 0], 0.36 ], - [ opfor_flag, [-20.59, 7.5, 0], 90 ], + [ KPLIB_o_flag, [-20.59, 7.5, 0], 90 ], [ "Land_HBarrierBig_F", [21.02, -7.36, 0], 90.4 ], [ "Land_HBarrierBig_F", [7.21, -21.33, 0], 1.39 ], [ "Land_HBarrierBig_F", [-22.71, 1.71, 0], 91.24 ], - [ opfor_mrap_armed, [-17.33, 14.88, 0.01], 359.22 ], + [ KPLIB_o_mrapArmed, [-17.33, 14.88, 0.01], 359.22 ], [ "Land_HBarrierBig_F", [20.76, 10.25, 0], 89.37 ], [ "Land_HBarrierBig_F", [-10.52, -21.21, 0], 0.36 ], [ "Land_HBarrierBig_F", [-22.91, -6.7, 0], 270.29 ], [ "Land_HBarrierBig_F", [-23.19, 10.11, 0], 89.68 ], [ "Land_HBarrierBig_F", [21.1, -16.14, 0], 90.4 ], [ "Land_HBarrierBig_F", [15.97, -21.41, 0], 1.39 ], - [ opfor_flag, [18.67, -19.05, 0], 90 ], - [ opfor_mrap, [11.09, 25.14, 0.01], 268.69 ], - [ opfor_flag, [-20.66, -18.6, 0], 90 ], + [ KPLIB_o_flag, [18.67, -19.05, 0], 90 ], + [ KPLIB_o_mrap, [11.09, 25.14, 0.01], 268.69 ], + [ KPLIB_o_flag, [-20.66, -18.6, 0], 90 ], [ "Land_HBarrierBig_F", [-23.05, -15.49, 0], 271.36 ], [ "Land_HBarrierBig_F", [20.55, 19.13, 0], 89.37 ], [ "Land_HBarrierBig_F", [-19.29, -21.29, 0], 0.36 ], @@ -38,38 +38,38 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [ opfor_fuel_container, [2.64, -13.76, -0.04], 0.35 ], - [ opfor_ammo_container, [-3.69, -14.92, 0], 180.33 ], - [ opfor_fuel_container, [2.7, -5.53, -0.04], 358.03 ], - [ opfor_ammo_container, [-3.96, -5.86, 0], 180.38 ] + [ KPLIB_o_fuelContainer, [2.64, -13.76, -0.04], 0.35 ], + [ KPLIB_o_ammoContainer, [-3.69, -14.92, 0], 180.33 ], + [ KPLIB_o_fuelContainer, [2.7, -5.53, -0.04], 358.03 ], + [ KPLIB_o_ammoContainer, [-3.96, -5.86, 0], 180.38 ] ]; private _defenders_to_build = [ - [ opfor_rifleman, [-6.54, 2.05, 0], 157.41 ], - [ opfor_sentry, [6.66, 2.1, 0], 192.72 ], - [ opfor_rifleman, [-3.64, 12.06, 0], 339.29 ], - [ opfor_sentry, [-10.31, -7.7, 0], 122.29 ], - [ opfor_marksman, [14.38, 0.22, 4.35], 346.89 ], - [ opfor_grenadier, [-2.56, 14.33, 0], 228.17 ], - [ opfor_machinegunner, [-4.79, 14.33, 0], 155.19 ], - [ opfor_heavygunner, [-16.04, 0.4, 4.35], 84.99 ], - [ opfor_heavygunner, [16.6, 0.75, 4.35], 83.99 ], - [ opfor_rifleman, [10.82, 12.69, 0.6], 105.44 ], - [ opfor_sentry, [12.36, 12.48, 0.6], 288.05 ], - [ opfor_machinegunner, [14.41, -10.39, 0], 183.06 ], - [ opfor_engineer, [9.45, 15.46, 0.6], 53.89 ], - [ opfor_sharpshooter, [-18.26, -0.02, 4.35], 301.25 ], - [ opfor_sentry, [13.86, -12.54, 0], 348.81 ], - [ opfor_engineer, [15.06, -11.78, 0], 288.05 ], - [ opfor_rifleman, [9.24, 16.75, 0.6], 129.9 ], - [ opfor_team_leader, [10.71, 16.31, 0.6], 288.05 ], - [ opfor_aa, [15.62, 12.01, 3.09], 124.01 ], - [ opfor_sentry, [-17.92, -8.58, 0.73], 122.29 ], - [ opfor_aa, [8.45, 18.85, 3.13], 335.85 ], - [ opfor_sentry, [-18, -11.54, 0.73], 122.29 ], - [ opfor_sentry, [-13.77, 16.65, 0], 339.29 ], - [ opfor_heavygunner, [14.04, 17.46, 3.13], 48.56 ], - [ opfor_rpg, [12.44, 18.69, 3.13], 16.72 ] + [ KPLIB_o_rifleman, [-6.54, 2.05, 0], 157.41 ], + [ KPLIB_o_sentry, [6.66, 2.1, 0], 192.72 ], + [ KPLIB_o_rifleman, [-3.64, 12.06, 0], 339.29 ], + [ KPLIB_o_sentry, [-10.31, -7.7, 0], 122.29 ], + [ KPLIB_o_marksman, [14.38, 0.22, 4.35], 346.89 ], + [ KPLIB_o_grenadier, [-2.56, 14.33, 0], 228.17 ], + [ KPLIB_o_machinegunner, [-4.79, 14.33, 0], 155.19 ], + [ KPLIB_o_heavyGunner, [-16.04, 0.4, 4.35], 84.99 ], + [ KPLIB_o_heavyGunner, [16.6, 0.75, 4.35], 83.99 ], + [ KPLIB_o_rifleman, [10.82, 12.69, 0.6], 105.44 ], + [ KPLIB_o_sentry, [12.36, 12.48, 0.6], 288.05 ], + [ KPLIB_o_machinegunner, [14.41, -10.39, 0], 183.06 ], + [ KPLIB_o_engineer, [9.45, 15.46, 0.6], 53.89 ], + [ KPLIB_o_sharpshooter, [-18.26, -0.02, 4.35], 301.25 ], + [ KPLIB_o_sentry, [13.86, -12.54, 0], 348.81 ], + [ KPLIB_o_engineer, [15.06, -11.78, 0], 288.05 ], + [ KPLIB_o_rifleman, [9.24, 16.75, 0.6], 129.9 ], + [ KPLIB_o_teamLeader, [10.71, 16.31, 0.6], 288.05 ], + [ KPLIB_o_aaSpecialist, [15.62, 12.01, 3.09], 124.01 ], + [ KPLIB_o_sentry, [-17.92, -8.58, 0.73], 122.29 ], + [ KPLIB_o_aaSpecialist, [8.45, 18.85, 3.13], 335.85 ], + [ KPLIB_o_sentry, [-18, -11.54, 0.73], 122.29 ], + [ KPLIB_o_sentry, [-13.77, 16.65, 0], 339.29 ], + [ KPLIB_o_heavyGunner, [14.04, 17.46, 3.13], 48.56 ], + [ KPLIB_o_riflemanLAT, [12.44, 18.69, 3.13], 16.72 ] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template4.sqf b/Missionframework/scripts/fob_templates/default/template4.sqf index d1936c20a..d663f7626 100644 --- a/Missionframework/scripts/fob_templates/default/template4.sqf +++ b/Missionframework/scripts/fob_templates/default/template4.sqf @@ -1,21 +1,21 @@ private _objects_to_build = [ - [ opfor_mrap, [13.31, 0, 0.01], 268.69 ], + [ KPLIB_o_mrap, [13.31, 0, 0.01], 268.69 ], [ "Land_Cargo_HQ_V3_F", [11.47, -12.17, 0], 89.97 ], [ "Land_CncBarrierMedium4_F", [-15.55, -1.69, 0], 90.88 ], [ "Land_HBarrierBig_F", [-13.27, -8.61, 0], 91.24 ], - [ opfor_transport_truck, [1.21, 15.8, -0.03], 274.41 ], + [ KPLIB_o_transportTruck, [1.21, 15.8, -0.03], 274.41 ], [ "Land_BarGate_F", [-16.65, 2.15, 0], 90.88 ], - [ opfor_mrap_armed, [-20.26, -3.22, 0.01], 359.22 ], + [ KPLIB_o_mrapArmed, [-20.26, -3.22, 0.01], 359.22 ], [ "Land_HBarrierBig_F", [1.23, 20.94, 0], 0.69 ], [ "Land_Cargo_Patrol_V3_F", [16.23, 15.36, 0], 269.81 ], - [ opfor_flag, [-12.14, 18.09, 0], 90 ], + [ KPLIB_o_flag, [-12.14, 18.09, 0], 90 ], [ "Land_HBarrierBig_F", [22.07, -0.21, 0], 89.37 ], [ "Land_HBarrierBig_F", [-18.87, 11.86, 0], 182.13 ], [ "Land_HBarrierBig_F", [-19.02, -11.48, 0], 180.79 ], [ "Land_HBarrierBig_F", [-7.55, 20.91, 0], 0.69 ], [ "Land_Cargo_Patrol_V3_F", [-16.73, 16.16, 0], 89.4 ], [ "Land_HBarrierBig_F", [-0.63, -22.83, 0], 0.36 ], - [ opfor_flag, [-11.33, -19.92, 0], 90 ], + [ KPLIB_o_flag, [-11.33, -19.92, 0], 90 ], [ "Land_HBarrierBig_F", [9.38, 20.92, 0], 181.2 ], [ "Land_Cargo_Patrol_V3_F", [-16.22, -17.77, 0], 0.54 ], [ "Land_HBarrierBig_F", [21.86, 8.66, 0], 89.37 ], @@ -27,46 +27,46 @@ private _objects_to_build = [ [ "Land_HBarrierBig_F", [18.15, 20.89, 0], 181.2 ], [ "Land_HBarrierBig_F", [21.63, 17.44, 0], 89.37 ], [ "Land_HBarrierBig_F", [-22.04, -17.17, 0], 271.36 ], - [ opfor_flag, [19.21, -20.29, 0], 90 ], + [ KPLIB_o_flag, [19.21, -20.29, 0], 90 ], [ "Land_HBarrierBig_F", [22.12, -17.82, 0], 90.4 ], [ "Land_HBarrierBig_F", [16.99, -23.08, 0], 1.39 ], [ "Land_HBarrierBig_F", [-18.27, -22.97, 0], 0.36 ] ]; private _objectives_to_build = [ - [ opfor_fuel_truck, [1.41, 11.53, -0.03], 271.88 ], - [ opfor_ammo_truck, [-1.45, -13.1, -0.04], 357.37 ], - [ opfor_ammo_container, [13.59, 4.13, 0.02], 96.77 ], - [ opfor_ammo_truck, [-7.67, -13, -0.04], 0.71 ], - [ opfor_ammo_container, [13.76, 9.31, 0.02], 270.25 ] + [ KPLIB_o_fuelTruck, [1.41, 11.53, -0.03], 271.88 ], + [ KPLIB_o_ammoTruck, [-1.45, -13.1, -0.04], 357.37 ], + [ KPLIB_o_ammoContainer, [13.59, 4.13, 0.02], 96.77 ], + [ KPLIB_o_ammoTruck, [-7.67, -13, -0.04], 0.71 ], + [ KPLIB_o_ammoContainer, [13.76, 9.31, 0.02], 270.25 ] ]; private _defenders_to_build = [ - [ opfor_machinegunner, [-3.53, 4.47, 0], 348.81 ], - [ opfor_sentry, [-2.09, 5.78, 0], 288.05 ], - [ opfor_rifleman, [-5.93, -4.74, 0], 288.05 ], - [ opfor_sentry, [-7.45, -5.82, 0], 348.81 ], - [ opfor_engineer, [8.02, 6.59, 0], 87.82 ], - [ opfor_sentry, [-4.42, -10.1, 0], 349.58 ], - [ opfor_heavygunner, [8.68, -7.9, 3.13], 335.85 ], - [ opfor_engineer, [-4.24, 12.69, 0], 71.91 ], - [ opfor_sentry, [-13.57, -0.21, 0], 280.01 ], - [ opfor_rifleman, [9.47, -10.01, 0.6], 129.9 ], - [ opfor_rifleman, [9.67, -11.29, 0.6], 53.89 ], - [ opfor_team_leader, [10.93, -10.44, 0.6], 288.05 ], - [ opfor_aa, [14.26, -9.29, 3.13], 48.56 ], - [ opfor_rifleman, [11.05, -14.06, 0.6], 105.44 ], - [ opfor_at, [8.89, -16.68, 3.13], 201.77 ], - [ opfor_rifleman, [12.59, -14.27, 0.6], 288.05 ], - [ opfor_rifleman, [-20.21, 2.04, 0], 286.68 ], - [ opfor_machinegunner, [-19.96, 4.15, 0], 241.27 ], - [ opfor_marksman, [15.84, -14.74, 3.09], 124.01 ], - [ opfor_heavygunner, [17.02, 14.26, 4.35], 174.84 ], - [ opfor_marksman, [-16.98, 15.1, 4.35], 210.68 ], - [ opfor_sharpshooter, [16.58, 16.48, 4.35], 31.1 ], - [ opfor_machinegunner, [-15.08, -18.12, 4.35], 121.82 ], - [ opfor_heavygunner, [-17.42, 17.33, 4.35], 354.42 ], - [ opfor_sharpshooter, [-17.31, -18.53, 4.35], 265.56 ] + [ KPLIB_o_machinegunner, [-3.53, 4.47, 0], 348.81 ], + [ KPLIB_o_sentry, [-2.09, 5.78, 0], 288.05 ], + [ KPLIB_o_rifleman, [-5.93, -4.74, 0], 288.05 ], + [ KPLIB_o_sentry, [-7.45, -5.82, 0], 348.81 ], + [ KPLIB_o_engineer, [8.02, 6.59, 0], 87.82 ], + [ KPLIB_o_sentry, [-4.42, -10.1, 0], 349.58 ], + [ KPLIB_o_heavyGunner, [8.68, -7.9, 3.13], 335.85 ], + [ KPLIB_o_engineer, [-4.24, 12.69, 0], 71.91 ], + [ KPLIB_o_sentry, [-13.57, -0.21, 0], 280.01 ], + [ KPLIB_o_rifleman, [9.47, -10.01, 0.6], 129.9 ], + [ KPLIB_o_rifleman, [9.67, -11.29, 0.6], 53.89 ], + [ KPLIB_o_teamLeader, [10.93, -10.44, 0.6], 288.05 ], + [ KPLIB_o_aaSpecialist, [14.26, -9.29, 3.13], 48.56 ], + [ KPLIB_o_rifleman, [11.05, -14.06, 0.6], 105.44 ], + [ KPLIB_o_atSpecialist, [8.89, -16.68, 3.13], 201.77 ], + [ KPLIB_o_rifleman, [12.59, -14.27, 0.6], 288.05 ], + [ KPLIB_o_rifleman, [-20.21, 2.04, 0], 286.68 ], + [ KPLIB_o_machinegunner, [-19.96, 4.15, 0], 241.27 ], + [ KPLIB_o_marksman, [15.84, -14.74, 3.09], 124.01 ], + [ KPLIB_o_heavyGunner, [17.02, 14.26, 4.35], 174.84 ], + [ KPLIB_o_marksman, [-16.98, 15.1, 4.35], 210.68 ], + [ KPLIB_o_sharpshooter, [16.58, 16.48, 4.35], 31.1 ], + [ KPLIB_o_machinegunner, [-15.08, -18.12, 4.35], 121.82 ], + [ KPLIB_o_heavyGunner, [-17.42, 17.33, 4.35], 354.42 ], + [ KPLIB_o_sharpshooter, [-17.31, -18.53, 4.35], 265.56 ] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template5.sqf b/Missionframework/scripts/fob_templates/default/template5.sqf index df1a5894a..45a9d75a0 100644 --- a/Missionframework/scripts/fob_templates/default/template5.sqf +++ b/Missionframework/scripts/fob_templates/default/template5.sqf @@ -1,26 +1,26 @@ private _objects_to_build = [ [ "Land_HelipadCircle_F", [-1.31, 11.44, 0], 0 ], - [ opfor_transport_helo, [-1.31, 11.45, 0], 134.19 ], + [ KPLIB_o_transportHeli, [-1.31, 11.45, 0], 134.19 ], [ "Land_Cargo_Patrol_V3_F", [17.36, 1.08, 0], 269.81 ], [ "Land_Cargo_House_V3_F", [15.93, -7.13, 0], 90.12 ], [ "Land_Cargo_HQ_V3_F", [-11.82, -13.91, 0], 89.97 ], - [ opfor_transport_truck, [-17.59, 5.76, -0.03], 310.87 ], - [ opfor_flag, [-20.4, -2.8, 0], 90 ], + [ KPLIB_o_transportTruck, [-17.59, 5.76, -0.03], 310.87 ], + [ KPLIB_o_flag, [-20.4, -2.8, 0], 90 ], [ "Land_PaperBox_open_full_F", [12.36, -16.46, 0], 228.14 ], - [ opfor_flag, [20.06, 6.22, 0], 90 ], + [ KPLIB_o_flag, [20.06, 6.22, 0], 90 ], [ "Land_PaperBox_open_empty_F", [14.86, -16.08, 0], 2.94 ], [ "Land_PaperBox_closed_F", [13.68, -18.27, 0], 287.62 ], [ "Land_HBarrierBig_F", [-22.99, -3.72, 0], 89.34 ], [ "CamoNet_OPFOR_open_F", [14.88, -18.51, 0], 0 ], [ "Land_HBarrierBig_F", [22.88, 3.58, 0], 89.34 ], - [ opfor_mrap, [17.18, 16.24, 0.01], 326.13 ], + [ KPLIB_o_mrap, [17.18, 16.24, 0.01], 326.13 ], [ "Land_HBarrierBig_F", [23.08, -5.21, 0], 89.34 ], [ "Land_HBarrierBig_F", [0.66, -24.24, 0], 0.36 ], [ "Land_HBarrierBig_F", [-8.2, -24.3, 0], 0.36 ], [ "Land_HBarrierBig_F", [-22.79, -12.51, 0], 89.34 ], [ "Land_HBarrierBig_F", [9.52, -24.42, 0], 1.39 ], [ "Land_HBarrierBig_F", [23.35, -14.06, 0], 89.34 ], - [ opfor_flag, [19.21, -21.72, 0], 90 ], + [ KPLIB_o_flag, [19.21, -21.72, 0], 90 ], [ "Land_HBarrierBig_F", [-16.97, -24.38, 0], 0.36 ], [ "Land_HBarrierBig_F", [18.28, -24.49, 0], 1.39 ], [ "Land_HBarrierBig_F", [-22.52, -21.36, 0], 89.34 ], @@ -28,38 +28,38 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [ opfor_fuel_container, [-16.82, 17.67, -0.01], 47.97 ], - [ opfor_ammo_container, [-0.42, -3.26, 0.02], 104.66 ], - [ opfor_fuel_container, [-9.52, -0.47, -0.04], 295.86 ], - [ opfor_ammo_container, [2.85, -14.48, 0], 0.69 ] + [ KPLIB_o_fuelContainer, [-16.82, 17.67, -0.01], 47.97 ], + [ KPLIB_o_ammoContainer, [-0.42, -3.26, 0.02], 104.66 ], + [ KPLIB_o_fuelContainer, [-9.52, -0.47, -0.04], 295.86 ], + [ KPLIB_o_ammoContainer, [2.85, -14.48, 0], 0.69 ] ]; private _defenders_to_build = [ - [ opfor_engineer, [2.32, 3.25, 0], 10.12 ], - [ opfor_engineer, [3.59, 3.89, 0], 288.05 ], - [ opfor_engineer, [2.31, 4.93, 0], 158.22 ], - [ opfor_rifleman, [3.96, -9.85, 0], 37.83 ], - [ opfor_machinegunner, [-9.04, -11.04, 3.13], 48.56 ], - [ opfor_team_leader, [-12.46, -12.21, 0.6], 288.05 ], - [ opfor_aa, [-14.62, -9.64, 3.13], 335.85 ], - [ opfor_sharpshooter, [17.7, 2.21, 4.35], 31.1 ], - [ opfor_aa, [-7.46, -16.48, 3.09], 124.01 ], - [ opfor_heavygunner, [18.14, -0.02, 4.35], 174.84 ], - [ opfor_rifleman, [-13.89, -11.76, 0.6], 129.9 ], - [ opfor_sentry, [-13.62, -13.03, 0.6], 53.89 ], - [ opfor_sentry, [10.86, -15.42, 0], 348.81 ], - [ opfor_sentry, [17.87, -6.07, 0.73], 294.41 ], - [ opfor_rifleman, [12.59, -14.14, 0], 288.05 ], - [ opfor_rifleman, [-10.49, -15.94, 0.6], 288.05 ], - [ opfor_sentry, [-12.03, -15.74, 0.6], 105.44 ], - [ opfor_sentry, [17.96, -8.4, 0.73], 294.41 ], - [ opfor_sentry, [-2.5, 20.13, 0], 288.05 ], - [ opfor_grenadier, [-5.17, 20.37, 0], 84.75 ], - [ opfor_engineer, [-17.83, 11.21, 0], 288.05 ], - [ opfor_at, [-13.21, -18.42, 3.13], 196.73 ], - [ opfor_sentry, [-20.27, 11.9, 0], 112.14 ], - [ opfor_sentry, [13.03, 19.64, 0], 348.81 ], - [ opfor_rifleman, [14.76, 20.92, 0], 288.05 ] + [ KPLIB_o_engineer, [2.32, 3.25, 0], 10.12 ], + [ KPLIB_o_engineer, [3.59, 3.89, 0], 288.05 ], + [ KPLIB_o_engineer, [2.31, 4.93, 0], 158.22 ], + [ KPLIB_o_rifleman, [3.96, -9.85, 0], 37.83 ], + [ KPLIB_o_machinegunner, [-9.04, -11.04, 3.13], 48.56 ], + [ KPLIB_o_teamLeader, [-12.46, -12.21, 0.6], 288.05 ], + [ KPLIB_o_aaSpecialist, [-14.62, -9.64, 3.13], 335.85 ], + [ KPLIB_o_sharpshooter, [17.7, 2.21, 4.35], 31.1 ], + [ KPLIB_o_aaSpecialist, [-7.46, -16.48, 3.09], 124.01 ], + [ KPLIB_o_heavyGunner, [18.14, -0.02, 4.35], 174.84 ], + [ KPLIB_o_rifleman, [-13.89, -11.76, 0.6], 129.9 ], + [ KPLIB_o_sentry, [-13.62, -13.03, 0.6], 53.89 ], + [ KPLIB_o_sentry, [10.86, -15.42, 0], 348.81 ], + [ KPLIB_o_sentry, [17.87, -6.07, 0.73], 294.41 ], + [ KPLIB_o_rifleman, [12.59, -14.14, 0], 288.05 ], + [ KPLIB_o_rifleman, [-10.49, -15.94, 0.6], 288.05 ], + [ KPLIB_o_sentry, [-12.03, -15.74, 0.6], 105.44 ], + [ KPLIB_o_sentry, [17.96, -8.4, 0.73], 294.41 ], + [ KPLIB_o_sentry, [-2.5, 20.13, 0], 288.05 ], + [ KPLIB_o_grenadier, [-5.17, 20.37, 0], 84.75 ], + [ KPLIB_o_engineer, [-17.83, 11.21, 0], 288.05 ], + [ KPLIB_o_atSpecialist, [-13.21, -18.42, 3.13], 196.73 ], + [ KPLIB_o_sentry, [-20.27, 11.9, 0], 112.14 ], + [ KPLIB_o_sentry, [13.03, 19.64, 0], 348.81 ], + [ KPLIB_o_rifleman, [14.76, 20.92, 0], 288.05 ] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template6.sqf b/Missionframework/scripts/fob_templates/default/template6.sqf index 31a0d80a0..54817bad1 100644 --- a/Missionframework/scripts/fob_templates/default/template6.sqf +++ b/Missionframework/scripts/fob_templates/default/template6.sqf @@ -30,27 +30,27 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_fuel_truck, [-13.32, -0.24, 0.00], 270.00], - [opfor_ammo_truck, [-13.24, 3.86, 0.00], 270.00], - [opfor_fuel_container, [6.71, 13.81, 0.00], 270.00], - [opfor_ammo_container, [7.09, 1.62, 0.00], 270.00], - [opfor_fuel_container, [6.87, 7.71, 0.00], 270.00] + [KPLIB_o_fuelTruck, [-13.32, -0.24, 0.00], 270.00], + [KPLIB_o_ammoTruck, [-13.24, 3.86, 0.00], 270.00], + [KPLIB_o_fuelContainer, [6.71, 13.81, 0.00], 270.00], + [KPLIB_o_ammoContainer, [7.09, 1.62, 0.00], 270.00], + [KPLIB_o_fuelContainer, [6.87, 7.71, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_machinegunner, [3.87, -7.16, 0.00], 102.55], - [opfor_rpg, [4.48, 10.62, 0.00], 90.00], - [opfor_rpg, [-1.45, 14.18, 0.00], 199.35], - [opfor_sentry, [4.03, -13.81, 0.00], 45.23], - [opfor_engineer, [14.05, -8.39, 4.35], 58.33], - [opfor_grenadier, [-16.46, -5.86, 0.00], 90.00], - [opfor_machinegunner, [-16.45, 6.53, 0.00], 90.00], - [opfor_sentry, [-12.40, 12.03, 4.35], 0.00], - [opfor_rifleman, [14.11, -11.35, 4.35], 134.48], - [opfor_rifleman, [-15.71, 12.02, 4.35], 355.76], - [opfor_rifleman, [14.62, 15.10, 0.00], 180.00], - [opfor_rifleman, [-13.29, -17.54, 2.28], 163.03], - [opfor_heavygunner, [-14.64, -17.31, 2.28], 180.00] + [KPLIB_o_machinegunner, [3.87, -7.16, 0.00], 102.55], + [KPLIB_o_riflemanLAT, [4.48, 10.62, 0.00], 90.00], + [KPLIB_o_riflemanLAT, [-1.45, 14.18, 0.00], 199.35], + [KPLIB_o_sentry, [4.03, -13.81, 0.00], 45.23], + [KPLIB_o_engineer, [14.05, -8.39, 4.35], 58.33], + [KPLIB_o_grenadier, [-16.46, -5.86, 0.00], 90.00], + [KPLIB_o_machinegunner, [-16.45, 6.53, 0.00], 90.00], + [KPLIB_o_sentry, [-12.40, 12.03, 4.35], 0.00], + [KPLIB_o_rifleman, [14.11, -11.35, 4.35], 134.48], + [KPLIB_o_rifleman, [-15.71, 12.02, 4.35], 355.76], + [KPLIB_o_rifleman, [14.62, 15.10, 0.00], 180.00], + [KPLIB_o_rifleman, [-13.29, -17.54, 2.28], 163.03], + [KPLIB_o_heavyGunner, [-14.64, -17.31, 2.28], 180.00] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template7.sqf b/Missionframework/scripts/fob_templates/default/template7.sqf index 82194c4b1..f839dfd18 100644 --- a/Missionframework/scripts/fob_templates/default/template7.sqf +++ b/Missionframework/scripts/fob_templates/default/template7.sqf @@ -16,7 +16,7 @@ private _objects_to_build = [ ["Land_HBarrier_Big_F", [2.53, -17.80, 0.00], 0.00], ["Land_HBarrier_Big_F", [11.20, -17.64, 0.00], 0.00], ["Land_HBarrierWall_corner_F", [-13.71, -15.85, 0.00], 90.00], - [opfor_flag, [13.91, -15.57, 0.00], 0.00], + [KPLIB_o_flag, [13.91, -15.57, 0.00], 0.00], ["Land_HBarrier_Big_F", [12.50, 17.11, 0.00], 0.00], ["Land_HBarrier_Big_F", [21.62, -1.75, 0.00], 0.00], ["Land_HBarrier_Big_F", [16.65, -14.10, 0.00], 270.00], @@ -34,30 +34,30 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_ammo_truck, [-13.14, 10.16, 0.00], 0.00], - [opfor_fuel_container, [18.22, 5.43, 0.00], 270.00], - [opfor_fuel_container, [17.86, 11.39, 0.00], 270.00], - [opfor_fuel_truck, [-17.96, 9.56, 0.00], 0.00] + [KPLIB_o_ammoTruck, [-13.14, 10.16, 0.00], 0.00], + [KPLIB_o_fuelContainer, [18.22, 5.43, 0.00], 270.00], + [KPLIB_o_fuelContainer, [17.86, 11.39, 0.00], 270.00], + [KPLIB_o_fuelTruck, [-17.96, 9.56, 0.00], 0.00] ]; private _defenders_to_build = [ - [opfor_heavygunner, [-5.65, 0.87, 1.25], 196.97], - [opfor_rifleman, [8.77, -4.14, 0.73], 133.49], - [opfor_grenadier, [12.04, -4.37, 0.73], 205.94], - [opfor_heavygunner, [0.80, -16.01, 1.25], 224.40], - [opfor_rifleman, [-4.46, 5.64, 15.37], 0.00], - [opfor_rifleman, [1.55, 11.61, 12.77], 202.68], - [opfor_at, [1.20, 3.98, 17.89], 176.06], - [opfor_rifleman, [10.76, -15.11, 0.00], 291.66], - [opfor_sentry, [-16.09, 10.06, 0.00], 184.01], - [opfor_rifleman, [18.18, 8.32, 0.00], 264.25], - [opfor_marksman, [-5.72, 10.17, 17.89], 287.12], - [opfor_rifleman, [-14.59, -16.40, 1.24], 156.40], - [opfor_medic, [22.50, 1.32, 0.00], 275.86], - [opfor_rifleman, [-23.11, 1.83, 0.00], 77.87], - [opfor_rifleman, [-21.51, -9.11, 4.35], 279.37], - [opfor_sentry, [-23.58, -2.96, 0.00], 118.12], - [opfor_marksman, [-21.28, -12.32, 4.35], 232.31] + [KPLIB_o_heavyGunner, [-5.65, 0.87, 1.25], 196.97], + [KPLIB_o_rifleman, [8.77, -4.14, 0.73], 133.49], + [KPLIB_o_grenadier, [12.04, -4.37, 0.73], 205.94], + [KPLIB_o_heavyGunner, [0.80, -16.01, 1.25], 224.40], + [KPLIB_o_rifleman, [-4.46, 5.64, 15.37], 0.00], + [KPLIB_o_rifleman, [1.55, 11.61, 12.77], 202.68], + [KPLIB_o_atSpecialist, [1.20, 3.98, 17.89], 176.06], + [KPLIB_o_rifleman, [10.76, -15.11, 0.00], 291.66], + [KPLIB_o_sentry, [-16.09, 10.06, 0.00], 184.01], + [KPLIB_o_rifleman, [18.18, 8.32, 0.00], 264.25], + [KPLIB_o_marksman, [-5.72, 10.17, 17.89], 287.12], + [KPLIB_o_rifleman, [-14.59, -16.40, 1.24], 156.40], + [KPLIB_o_medic, [22.50, 1.32, 0.00], 275.86], + [KPLIB_o_rifleman, [-23.11, 1.83, 0.00], 77.87], + [KPLIB_o_rifleman, [-21.51, -9.11, 4.35], 279.37], + [KPLIB_o_sentry, [-23.58, -2.96, 0.00], 118.12], + [KPLIB_o_marksman, [-21.28, -12.32, 4.35], 232.31] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template8.sqf b/Missionframework/scripts/fob_templates/default/template8.sqf index 70aaca54b..4db4a3185 100644 --- a/Missionframework/scripts/fob_templates/default/template8.sqf +++ b/Missionframework/scripts/fob_templates/default/template8.sqf @@ -43,36 +43,36 @@ private _objects_to_build = [ ["Land_HBarrier_Big_F", [6.52, -9.98, 0.00], 270.00], ["Land_HBarrier_Big_F", [6.78, -18.56, 0.00], 270.00], ["Land_HBarrier_Big_F", [6.93, 23.16, 0.00], 180.13], - [opfor_flag, [14.12, 19.01, 0.00], 0.00], - [opfor_mrap_armed, [23.49, 2.01, -0.00], 0.00], - [opfor_mrap, [16.54, 1.76, -0.00], 0.00] + [KPLIB_o_flag, [14.12, 19.01, 0.00], 0.00], + [KPLIB_o_mrapArmed, [23.49, 2.01, -0.00], 0.00], + [KPLIB_o_mrap, [16.54, 1.76, -0.00], 0.00] ]; private _objectives_to_build = [ - [opfor_ammo_container, [-20.65, -16.90, 0.00], 326.51], - [opfor_ammo_container, [-13.62, -23.20, 0.00], 306.22], - [opfor_ammo_truck, [-9.16, 16.70, 0.00], 0.00], - [opfor_fuel_container, [-18.07, -7.63, 0.00], 270.00], - [opfor_fuel_truck, [-4.62, 16.86, 0.00], 0.00], - [opfor_fuel_container, [-18.02, -2.18, 0.00], 270.00] + [KPLIB_o_ammoContainer, [-20.65, -16.90, 0.00], 326.51], + [KPLIB_o_ammoContainer, [-13.62, -23.20, 0.00], 306.22], + [KPLIB_o_ammoTruck, [-9.16, 16.70, 0.00], 0.00], + [KPLIB_o_fuelContainer, [-18.07, -7.63, 0.00], 270.00], + [KPLIB_o_fuelTruck, [-4.62, 16.86, 0.00], 0.00], + [KPLIB_o_fuelContainer, [-18.02, -2.18, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_engineer, [1.33, 20.43, 0.00], 224.42], - [opfor_heavygunner, [-9.34, -1.30, 17.89], 0.00], - [opfor_medic, [-15.26, 18.70, 0.00], 198.18], - [opfor_officer, [4.52, 20.27, 0.73], 121.81], - [opfor_sharpshooter, [23.62, -12.61, 4.35], 90.59], - [opfor_rifleman, [-2.12, -1.42, 12.77], 205.28], - [opfor_rifleman, [-20.20, 18.70, 4.35], 0.00], - [opfor_rifleman, [-6.93, -5.71, 15.37], 0.00], - [opfor_rifleman, [20.35, -0.20, 0.00], 0.00], - [opfor_rifleman, [3.38, 0.09, 0.00], 182.65], - [opfor_rpg, [0.18, -8.11, 17.79], 129.88], - [opfor_sentry, [-25.60, 0.02, 0.00], 156.91], - [opfor_marksman, [-17.47, 18.68, 4.35], 0.00], - [opfor_marksman, [23.70, -9.01, 4.35], 74.26], - [opfor_grenadier, [14.67, -8.28, 0.00], 160.61] + [KPLIB_o_engineer, [1.33, 20.43, 0.00], 224.42], + [KPLIB_o_heavyGunner, [-9.34, -1.30, 17.89], 0.00], + [KPLIB_o_medic, [-15.26, 18.70, 0.00], 198.18], + [KPLIB_o_officer, [4.52, 20.27, 0.73], 121.81], + [KPLIB_o_sharpshooter, [23.62, -12.61, 4.35], 90.59], + [KPLIB_o_rifleman, [-2.12, -1.42, 12.77], 205.28], + [KPLIB_o_rifleman, [-20.20, 18.70, 4.35], 0.00], + [KPLIB_o_rifleman, [-6.93, -5.71, 15.37], 0.00], + [KPLIB_o_rifleman, [20.35, -0.20, 0.00], 0.00], + [KPLIB_o_rifleman, [3.38, 0.09, 0.00], 182.65], + [KPLIB_o_riflemanLAT, [0.18, -8.11, 17.79], 129.88], + [KPLIB_o_sentry, [-25.60, 0.02, 0.00], 156.91], + [KPLIB_o_marksman, [-17.47, 18.68, 4.35], 0.00], + [KPLIB_o_marksman, [23.70, -9.01, 4.35], 74.26], + [KPLIB_o_grenadier, [14.67, -8.28, 0.00], 160.61] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/default/template9.sqf b/Missionframework/scripts/fob_templates/default/template9.sqf index d12a8cd8d..7ccc3377f 100644 --- a/Missionframework/scripts/fob_templates/default/template9.sqf +++ b/Missionframework/scripts/fob_templates/default/template9.sqf @@ -1,6 +1,6 @@ private _objects_to_build = [ - [opfor_flag, [-19.05, -5.29, 0.00], 0.00], - [opfor_flag, [2.55, 4.91, 0.00], 0.00], + [KPLIB_o_flag, [-19.05, -5.29, 0.00], 0.00], + [KPLIB_o_flag, [2.55, 4.91, 0.00], 0.00], ["Land_BarGate_F", [-18.53, 3.79, 0.00], 270.00], ["Land_Cargo_HQ_V3_F", [8.99, 1.74, 0.00], 0.00], ["Land_Cargo_Patrol_V3_F", [-3.15, 24.19, 0.00], 180.00], @@ -23,38 +23,38 @@ private _objects_to_build = [ ["Land_HBarrierTower_F", [-17.88, 17.11, 0.00], 90.00], ["Land_HBarrierTower_F", [21.12, 18.04, 0.00], 270.00], ["Land_HBarrierTower_F", [21.43, -14.52, 0.00], 270.00], - [opfor_mrap, [-12.85, -10.52, -0.00], 180.00], - [opfor_transport_truck, [-8.65, -8.70, 0.00], 180.00] + [KPLIB_o_mrap, [-12.85, -10.52, -0.00], 180.00], + [KPLIB_o_transportTruck, [-8.65, -8.70, 0.00], 180.00] ]; private _objectives_to_build = [ - [opfor_ammo_container, [12.70, -11.73, 0.00], 0.00], - [opfor_ammo_container, [8.19, -11.71, 0.00], 0.00], - [opfor_fuel_container, [12.28, 15.45, 0.00], 0.00], - [opfor_fuel_container, [7.56, 15.24, 0.00], 0.00], - [opfor_ammo_truck, [-12.86, 10.58, 0.00], 0.00], - [opfor_fuel_truck, [-8.32, 10.38, 0.00], 0.00] + [KPLIB_o_ammoContainer, [12.70, -11.73, 0.00], 0.00], + [KPLIB_o_ammoContainer, [8.19, -11.71, 0.00], 0.00], + [KPLIB_o_fuelContainer, [12.28, 15.45, 0.00], 0.00], + [KPLIB_o_fuelContainer, [7.56, 15.24, 0.00], 0.00], + [KPLIB_o_ammoTruck, [-12.86, 10.58, 0.00], 0.00], + [KPLIB_o_fuelTruck, [-8.32, 10.38, 0.00], 0.00] ]; private _defenders_to_build = [ - [opfor_engineer, [-10.53, -4.64, 0.00], 0.00], - [opfor_heavygunner, [-18.74, -15.05, 2.28], 270.00], - [opfor_heavygunner, [22.80, 18.84, 2.28], 0.00], - [opfor_heavygunner, [6.31, -14.37, 0.00], 318.61], - [opfor_medic, [12.50, 1.07, 0.60], 244.47], - [opfor_squad_leader, [7.16, -3.84, 0.60], 308.87], - [opfor_at, [5.57, 4.09, 3.13], 270.00], - [opfor_rifleman, [-10.39, 6.70, 0.00], 181.51], - [opfor_rifleman, [-18.42, -16.71, 2.28], 263.48], - [opfor_rifleman, [-19.11, 5.66, 0.00], 251.10], - [opfor_rifleman, [-19.58, 16.36, 2.28], 262.09], - [opfor_rifleman, [-4.32, 24.55, 4.35], 0.00], - [opfor_rifleman, [22.19, -15.53, 2.28], 155.63], - [opfor_rifleman, [23.32, -13.89, 2.28], 84.56], - [opfor_rifleman, [5.96, -3.84, 3.13], 265.58], - [opfor_sentry, [-20.00, 17.92, 2.28], 0.00], - [opfor_sentry, [10.18, 11.45, 0.00], 214.49], - [opfor_marksman, [-2.31, 24.52, 4.35], 0.00], - [opfor_grenadier, [-6.11, -14.77, 0.00], 0.00], - [opfor_grenadier, [22.96, 17.33, 2.28], 82.66] + [KPLIB_o_engineer, [-10.53, -4.64, 0.00], 0.00], + [KPLIB_o_heavyGunner, [-18.74, -15.05, 2.28], 270.00], + [KPLIB_o_heavyGunner, [22.80, 18.84, 2.28], 0.00], + [KPLIB_o_heavyGunner, [6.31, -14.37, 0.00], 318.61], + [KPLIB_o_medic, [12.50, 1.07, 0.60], 244.47], + [KPLIB_o_squadLeader, [7.16, -3.84, 0.60], 308.87], + [KPLIB_o_atSpecialist, [5.57, 4.09, 3.13], 270.00], + [KPLIB_o_rifleman, [-10.39, 6.70, 0.00], 181.51], + [KPLIB_o_rifleman, [-18.42, -16.71, 2.28], 263.48], + [KPLIB_o_rifleman, [-19.11, 5.66, 0.00], 251.10], + [KPLIB_o_rifleman, [-19.58, 16.36, 2.28], 262.09], + [KPLIB_o_rifleman, [-4.32, 24.55, 4.35], 0.00], + [KPLIB_o_rifleman, [22.19, -15.53, 2.28], 155.63], + [KPLIB_o_rifleman, [23.32, -13.89, 2.28], 84.56], + [KPLIB_o_rifleman, [5.96, -3.84, 3.13], 265.58], + [KPLIB_o_sentry, [-20.00, 17.92, 2.28], 0.00], + [KPLIB_o_sentry, [10.18, 11.45, 0.00], 214.49], + [KPLIB_o_marksman, [-2.31, 24.52, 4.35], 0.00], + [KPLIB_o_grenadier, [-6.11, -14.77, 0.00], 0.00], + [KPLIB_o_grenadier, [22.96, 17.33, 2.28], 82.66] ]; private _base_corners = [ [40, 40, 0], diff --git a/Missionframework/scripts/fob_templates/unsung/template1.sqf b/Missionframework/scripts/fob_templates/unsung/template1.sqf index 1548bf8bd..0bc87a72a 100644 --- a/Missionframework/scripts/fob_templates/unsung/template1.sqf +++ b/Missionframework/scripts/fob_templates/unsung/template1.sqf @@ -10,8 +10,8 @@ private _objects_to_build = [ ["LAND_uns_vctower1", [10.47, -11.34, 0.00], 324.04], ["LAND_uns_vctower1", [12.42, 14.10, 0.00], 211.82], ["LAND_uns_vctower2", [-11.86, -6.29, 0.00], 57.67], - [opfor_mrap_armed, [5.61, 12.49, -0.00], 90.00], - [opfor_flag, [0.39, -10.73, 0.00], 0.00], + [KPLIB_o_mrapArmed, [5.61, 12.49, -0.00], 90.00], + [KPLIB_o_flag, [0.39, -10.73, 0.00], 0.00], ["Vil_Fence", [-13.37, 11.66, 0.00], 270.00], ["Vil_Fence", [-13.42, 5.62, 0.00], 270.00], ["Vil_Fence", [-2.75, 15.24, 0.00], 0.00], @@ -26,25 +26,25 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_fuel_container, [13.71, -1.74, 0.00], 270.00], - [opfor_ammo_container, [13.61, 3.38, 0.00], 270.00] + [KPLIB_o_fuelContainer, [13.71, -1.74, 0.00], 270.00], + [KPLIB_o_ammoContainer, [13.61, 3.38, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_engineer, [4.25, 10.00, 0.00], 176.53], - [opfor_heavygunner, [12.59, 14.31, 4.85], 35.26], - [opfor_medic, [-2.52, -5.68, 0.00], 209.23], - [opfor_officer, [-2.23, -8.35, 0.00], 336.06], - [opfor_rifleman, [-12.16, 0.48, 0.00], 258.30], - [opfor_rifleman, [-4.69, -7.79, 0.00], 23.76], - [opfor_rifleman, [-4.84, 8.98, 0.00], 165.32], - [opfor_rifleman, [1.21, -9.56, 0.00], 157.97], - [opfor_rifleman, [10.06, 1.24, 0.00], 255.76], - [opfor_rifleman, [10.65, -11.13, 4.86], 155.65], - [opfor_rifleman, [15.96, 6.35, 0.00], 78.60], - [opfor_rpg, [-7.23, 13.95, 0.00], 312.21], - [opfor_sentry, [-7.64, 5.85, 0.00], 99.50], - [opfor_marksman, [-12.80, -6.27, 4.80], 248.21] + [KPLIB_o_engineer, [4.25, 10.00, 0.00], 176.53], + [KPLIB_o_heavyGunner, [12.59, 14.31, 4.85], 35.26], + [KPLIB_o_medic, [-2.52, -5.68, 0.00], 209.23], + [KPLIB_o_officer, [-2.23, -8.35, 0.00], 336.06], + [KPLIB_o_rifleman, [-12.16, 0.48, 0.00], 258.30], + [KPLIB_o_rifleman, [-4.69, -7.79, 0.00], 23.76], + [KPLIB_o_rifleman, [-4.84, 8.98, 0.00], 165.32], + [KPLIB_o_rifleman, [1.21, -9.56, 0.00], 157.97], + [KPLIB_o_rifleman, [10.06, 1.24, 0.00], 255.76], + [KPLIB_o_rifleman, [10.65, -11.13, 4.86], 155.65], + [KPLIB_o_rifleman, [15.96, 6.35, 0.00], 78.60], + [KPLIB_o_riflemanLAT, [-7.23, 13.95, 0.00], 312.21], + [KPLIB_o_sentry, [-7.64, 5.85, 0.00], 99.50], + [KPLIB_o_marksman, [-12.80, -6.27, 4.80], 248.21] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/unsung/template2.sqf b/Missionframework/scripts/fob_templates/unsung/template2.sqf index db815f715..910f9f777 100644 --- a/Missionframework/scripts/fob_templates/unsung/template2.sqf +++ b/Missionframework/scripts/fob_templates/unsung/template2.sqf @@ -18,8 +18,8 @@ private _objects_to_build = [ ["LAND_uns_villseat", [-6.29, 5.83, 0.00], 0.00], ["LAND_uns_villtable1a", [-5.51, 5.85, 0.00], 0.00], ["uns_crate1", [-13.79, 15.85, 0.00], 163.23], - [opfor_flag, [14.77, -9.94, 0.00], 0.00], - [opfor_flag, [15.10, 1.55, 0.00], 0.00], + [KPLIB_o_flag, [14.77, -9.94, 0.00], 0.00], + [KPLIB_o_flag, [15.10, 1.55, 0.00], 0.00], ["uns_villtable1", [-2.26, 5.86, 0.00], 0.00], ["Vil_Fence", [-0.27, 16.94, 0.00], 205.79], ["Vil_Fence", [-0.65, -15.95, 0.00], 0.00], @@ -34,30 +34,30 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_ammo_truck, [2.50, -6.89, 0.00], 90.00], - [opfor_fuel_container, [-3.77, -11.61, 0.00], 0.00], - [opfor_fuel_container, [1.46, -11.62, 0.00], 0.00], - [opfor_fuel_container, [6.37, -11.54, 0.00], 0.00] + [KPLIB_o_ammoTruck, [2.50, -6.89, 0.00], 90.00], + [KPLIB_o_fuelContainer, [-3.77, -11.61, 0.00], 0.00], + [KPLIB_o_fuelContainer, [1.46, -11.62, 0.00], 0.00], + [KPLIB_o_fuelContainer, [6.37, -11.54, 0.00], 0.00] ]; private _defenders_to_build = [ - [opfor_engineer, [-1.39, -7.99, 0.00], 320.58], - [opfor_heavygunner, [-18.11, -3.26, 0.00], 253.65], - [opfor_medic, [-12.55, 13.97, 0.00], 177.21], - [opfor_medic, [-3.45, 15.76, 0.00], 0.00], - [opfor_rifleman, [-14.83, 13.12, 0.00], 138.45], - [opfor_rifleman, [-18.42, -1.54, 0.00], 319.02], - [opfor_rifleman, [-6.20, -14.27, 0.00], 244.68], - [opfor_rifleman, [11.79, 7.26, 0.00], 58.15], - [opfor_rifleman, [13.05, -8.81, 0.00], 39.37], - [opfor_rpg, [16.12, -13.59, 0.00], 70.33], - [opfor_sentry, [-11.88, 0.79, 0.00], 0.00], - [opfor_sentry, [-5.27, 3.62, 0.00], 143.78], - [opfor_marksman, [-10.45, -12.21, 4.84], 206.60], - [opfor_squad_leader, [7.02, 13.98, 0.00], 190.09], - [opfor_team_leader, [9.40, 12.45, 0.00], 240.68], - [opfor_grenadier, [-1.73, 3.11, 0.00], 215.79], - [opfor_grenadier, [16.61, 5.00, 0.00], 71.25] + [KPLIB_o_engineer, [-1.39, -7.99, 0.00], 320.58], + [KPLIB_o_heavyGunner, [-18.11, -3.26, 0.00], 253.65], + [KPLIB_o_medic, [-12.55, 13.97, 0.00], 177.21], + [KPLIB_o_medic, [-3.45, 15.76, 0.00], 0.00], + [KPLIB_o_rifleman, [-14.83, 13.12, 0.00], 138.45], + [KPLIB_o_rifleman, [-18.42, -1.54, 0.00], 319.02], + [KPLIB_o_rifleman, [-6.20, -14.27, 0.00], 244.68], + [KPLIB_o_rifleman, [11.79, 7.26, 0.00], 58.15], + [KPLIB_o_rifleman, [13.05, -8.81, 0.00], 39.37], + [KPLIB_o_riflemanLAT, [16.12, -13.59, 0.00], 70.33], + [KPLIB_o_sentry, [-11.88, 0.79, 0.00], 0.00], + [KPLIB_o_sentry, [-5.27, 3.62, 0.00], 143.78], + [KPLIB_o_marksman, [-10.45, -12.21, 4.84], 206.60], + [KPLIB_o_squadLeader, [7.02, 13.98, 0.00], 190.09], + [KPLIB_o_teamLeader, [9.40, 12.45, 0.00], 240.68], + [KPLIB_o_grenadier, [-1.73, 3.11, 0.00], 215.79], + [KPLIB_o_grenadier, [16.61, 5.00, 0.00], 71.25] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/unsung/template3.sqf b/Missionframework/scripts/fob_templates/unsung/template3.sqf index e76f115b6..1f27acae8 100644 --- a/Missionframework/scripts/fob_templates/unsung/template3.sqf +++ b/Missionframework/scripts/fob_templates/unsung/template3.sqf @@ -12,8 +12,8 @@ private _objects_to_build = [ ["LAND_uns_vcshelter4", [-5.87, -9.61, 0.00], 270.00], ["LAND_uns_vcshelter4", [1.77, -14.25, 0.00], 270.00], ["LAND_uns_vcshelter4", [1.78, -9.53, 0.00], 270.00], - [opfor_flag, [-15.79, -3.95, 0.00], 0.00], - [opfor_flag, [16.39, 1.56, 0.00], 0.00], + [KPLIB_o_flag, [-15.79, -3.95, 0.00], 0.00], + [KPLIB_o_flag, [16.39, 1.56, 0.00], 0.00], ["Vil_Fence", [-0.49, -16.46, 0.00], 0.00], ["Vil_Fence", [-1.22, 16.53, 0.00], 0.00], ["Vil_Fence", [-15.78, 9.56, 0.00], 114.93], @@ -28,30 +28,30 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_ammo_container, [1.76, -8.89, 0.00], 270.00], - [opfor_ammo_container, [1.85, -13.44, 0.00], 270.00], - [opfor_fuel_container, [-6.11, -13.37, 0.00], 270.00], - [opfor_fuel_container, [-6.15, -8.81, 0.00], 270.00] + [KPLIB_o_ammoContainer, [1.76, -8.89, 0.00], 270.00], + [KPLIB_o_ammoContainer, [1.85, -13.44, 0.00], 270.00], + [KPLIB_o_fuelContainer, [-6.11, -13.37, 0.00], 270.00], + [KPLIB_o_fuelContainer, [-6.15, -8.81, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_engineer, [14.44, 1.66, 0.00], 124.27], - [opfor_heavygunner, [3.22, 13.79, 0.00], 0.00], - [opfor_medic, [2.37, 3.09, 0.00], 86.61], - [opfor_officer, [0.73, 13.99, 0.00], 154.25], - [opfor_rifleman, [-11.72, 19.08, 0.00], 308.60], - [opfor_rifleman, [-14.81, -10.93, 0.00], 297.93], - [opfor_rifleman, [-2.47, -11.92, 0.00], 0.00], - [opfor_rifleman, [11.05, -16.87, 0.00], 103.44], - [opfor_rifleman, [13.61, -6.92, 0.00], 70.80], - [opfor_rifleman, [14.00, 11.59, 0.00], 107.80], - [opfor_rpg, [9.81, -17.28, 0.00], 183.70], - [opfor_sentry, [-11.14, 1.90, 0.00], 64.87], - [opfor_sentry, [-2.53, 15.10, 0.00], 0.00], - [opfor_sentry, [3.43, 0.56, 0.00], 0.00], - [opfor_marksman, [-10.66, 19.57, 0.00], 0.00], - [opfor_grenadier, [-10.48, 6.93, 0.00], 121.83], - [opfor_grenadier, [14.28, 12.52, 0.00], 0.00] + [KPLIB_o_engineer, [14.44, 1.66, 0.00], 124.27], + [KPLIB_o_heavyGunner, [3.22, 13.79, 0.00], 0.00], + [KPLIB_o_medic, [2.37, 3.09, 0.00], 86.61], + [KPLIB_o_officer, [0.73, 13.99, 0.00], 154.25], + [KPLIB_o_rifleman, [-11.72, 19.08, 0.00], 308.60], + [KPLIB_o_rifleman, [-14.81, -10.93, 0.00], 297.93], + [KPLIB_o_rifleman, [-2.47, -11.92, 0.00], 0.00], + [KPLIB_o_rifleman, [11.05, -16.87, 0.00], 103.44], + [KPLIB_o_rifleman, [13.61, -6.92, 0.00], 70.80], + [KPLIB_o_rifleman, [14.00, 11.59, 0.00], 107.80], + [KPLIB_o_riflemanLAT, [9.81, -17.28, 0.00], 183.70], + [KPLIB_o_sentry, [-11.14, 1.90, 0.00], 64.87], + [KPLIB_o_sentry, [-2.53, 15.10, 0.00], 0.00], + [KPLIB_o_sentry, [3.43, 0.56, 0.00], 0.00], + [KPLIB_o_marksman, [-10.66, 19.57, 0.00], 0.00], + [KPLIB_o_grenadier, [-10.48, 6.93, 0.00], 121.83], + [KPLIB_o_grenadier, [14.28, 12.52, 0.00], 0.00] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/unsung/template4.sqf b/Missionframework/scripts/fob_templates/unsung/template4.sqf index fce59b018..a0977c1b0 100644 --- a/Missionframework/scripts/fob_templates/unsung/template4.sqf +++ b/Missionframework/scripts/fob_templates/unsung/template4.sqf @@ -7,9 +7,9 @@ private _objects_to_build = [ ["LAND_uns_vctower1", [-14.13, -13.21, 0.00], 42.90], ["LAND_uns_vctower1", [12.95, -12.88, 0.00], 318.28], ["LAND_uns_vctower1", [13.68, 14.05, 0.00], 224.50], - [opfor_mrap, [9.04, -7.43, -0.00], 270.00], - [opfor_flag, [-6.05, -13.43, 0.00], 0.00], - [opfor_flag, [0.55, 14.33, 0.00], 0.00], + [KPLIB_o_mrap, [9.04, -7.43, -0.00], 270.00], + [KPLIB_o_flag, [-6.05, -13.43, 0.00], 0.00], + [KPLIB_o_flag, [0.55, 14.33, 0.00], 0.00], ["Vil_Fence", [-14.66, 12.34, 0.00], 270.00], ["Vil_Fence", [-14.71, 6.41, 0.00], 270.00], ["Vil_Fence", [-14.77, 0.42, 0.00], 270.00], @@ -29,32 +29,32 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_ammo_truck, [9.96, -2.73, 0.00], 270.00], - [opfor_fuel_truck, [10.24, 2.73, 0.00], 270.00], - [opfor_ammo_container, [-10.12, -7.24, 0.00], 270.00], - [opfor_ammo_container, [-9.74, -2.72, 0.00], 270.00], - [opfor_fuel_container, [-9.75, 2.07, 0.00], 270.00], - [opfor_fuel_container, [-9.82, 6.30, 0.00], 270.00] + [KPLIB_o_ammoTruck, [9.96, -2.73, 0.00], 270.00], + [KPLIB_o_fuelTruck, [10.24, 2.73, 0.00], 270.00], + [KPLIB_o_ammoContainer, [-10.12, -7.24, 0.00], 270.00], + [KPLIB_o_ammoContainer, [-9.74, -2.72, 0.00], 270.00], + [KPLIB_o_fuelContainer, [-9.75, 2.07, 0.00], 270.00], + [KPLIB_o_fuelContainer, [-9.82, 6.30, 0.00], 270.00] ]; private _defenders_to_build = [ - [opfor_engineer, [12.94, -4.11, 0.00], 93.06], - [opfor_heavygunner, [-13.52, -13.88, 4.88], 186.59], - [opfor_medic, [8.98, 11.77, 0.00], 210.35], - [opfor_rifleman, [-13.37, 0.92, 0.00], 271.85], - [opfor_rifleman, [-13.78, 13.34, 4.87], 235.25], - [opfor_rifleman, [-4.09, 0.81, 0.00], 114.75], - [opfor_rifleman, [-6.94, 13.46, 0.00], 0.00], - [opfor_rifleman, [14.09, 13.37, 4.83], 98.03], - [opfor_at, [6.97, 0.37, 0.00], 285.40], - [opfor_sentry, [-14.61, -12.85, 4.83], 239.93], - [opfor_sentry, [-4.64, -1.39, 0.00], 147.93], - [opfor_sentry, [12.63, -13.31, 4.83], 197.32], - [opfor_marksman, [-13.29, 14.03, 4.85], 323.41], - [opfor_marksman, [12.96, 14.41, 4.87], 0.00], - [opfor_marksman, [13.41, -12.52, 4.86], 126.65], - [opfor_squad_leader, [9.30, 8.28, 0.00], 250.30], - [opfor_grenadier, [1.15, -12.96, 0.00], 206.96] + [KPLIB_o_engineer, [12.94, -4.11, 0.00], 93.06], + [KPLIB_o_heavyGunner, [-13.52, -13.88, 4.88], 186.59], + [KPLIB_o_medic, [8.98, 11.77, 0.00], 210.35], + [KPLIB_o_rifleman, [-13.37, 0.92, 0.00], 271.85], + [KPLIB_o_rifleman, [-13.78, 13.34, 4.87], 235.25], + [KPLIB_o_rifleman, [-4.09, 0.81, 0.00], 114.75], + [KPLIB_o_rifleman, [-6.94, 13.46, 0.00], 0.00], + [KPLIB_o_rifleman, [14.09, 13.37, 4.83], 98.03], + [KPLIB_o_atSpecialist, [6.97, 0.37, 0.00], 285.40], + [KPLIB_o_sentry, [-14.61, -12.85, 4.83], 239.93], + [KPLIB_o_sentry, [-4.64, -1.39, 0.00], 147.93], + [KPLIB_o_sentry, [12.63, -13.31, 4.83], 197.32], + [KPLIB_o_marksman, [-13.29, 14.03, 4.85], 323.41], + [KPLIB_o_marksman, [12.96, 14.41, 4.87], 0.00], + [KPLIB_o_marksman, [13.41, -12.52, 4.86], 126.65], + [KPLIB_o_squadLeader, [9.30, 8.28, 0.00], 250.30], + [KPLIB_o_grenadier, [1.15, -12.96, 0.00], 206.96] ]; private _base_corners = [ diff --git a/Missionframework/scripts/fob_templates/unsung/template5.sqf b/Missionframework/scripts/fob_templates/unsung/template5.sqf index 7711c6ce2..1249d9afb 100644 --- a/Missionframework/scripts/fob_templates/unsung/template5.sqf +++ b/Missionframework/scripts/fob_templates/unsung/template5.sqf @@ -21,11 +21,11 @@ private _objects_to_build = [ ["LAND_uns_villseat", [-7.24, -1.44, 0.00], 5.24], ["LAND_uns_villseat", [-9.06, 2.52, 0.00], 355.69], ["LAND_uns_villseat", [-9.11, -1.45, 0.00], 4.71], - [opfor_mrap, [-3.07, 15.27, -0.00], 89.49], + [KPLIB_o_mrap, [-3.07, 15.27, -0.00], 89.49], ["uns_bench1", [-4.67, -6.81, 0.00], 30.92], ["uns_bench1", [-7.78, -7.16, 0.00], 136.72], - [opfor_flag, [12.70, -15.73, 0.00], 0.00], - [opfor_flag, [4.94, -19.60, 0.00], 0.00], + [KPLIB_o_flag, [12.70, -15.73, 0.00], 0.00], + [KPLIB_o_flag, [4.94, -19.60, 0.00], 0.00], ["uns_villtable1", [-4.48, -1.54, 0.00], 0.00], ["uns_villtable1", [-4.62, 2.33, 0.00], 0.00], ["uns_villtable1", [-8.15, 2.62, 0.00], 0.00], @@ -42,32 +42,32 @@ private _objects_to_build = [ ]; private _objectives_to_build = [ - [opfor_ammo_container, [11.83, 7.85, 0.00], 244.41], - [opfor_fuel_container, [14.17, 2.33, 0.00], 247.91], - [opfor_fuel_container, [7.65, 12.72, 0.00], 223.11] + [KPLIB_o_ammoContainer, [11.83, 7.85, 0.00], 244.41], + [KPLIB_o_fuelContainer, [14.17, 2.33, 0.00], 247.91], + [KPLIB_o_fuelContainer, [7.65, 12.72, 0.00], 223.11] ]; private _defenders_to_build = [ - [opfor_engineer, [-4.18, 13.73, 0.00], 176.93], - [opfor_heavygunner, [-12.66, -10.52, 0.00], 0.00], - [opfor_heavygunner, [-4.12, -20.00, 0.00], 249.04], - [opfor_medic, [-15.97, -6.49, 0.00], 0.00], - [opfor_sharpshooter, [1.09, 18.82, 4.83], 0.00], - [opfor_rifleman, [-1.82, -20.39, 0.00], 154.51], - [opfor_rifleman, [-10.58, 17.79, 4.81], 143.79], - [opfor_rifleman, [-15.11, 2.16, 0.00], 108.85], - [opfor_rifleman, [-16.03, -3.77, 0.00], 91.87], - [opfor_rifleman, [-4.67, -4.78, 0.00], 212.50], - [opfor_rifleman, [18.35, -7.05, 0.00], 0.00], - [opfor_rifleman, [6.01, -19.19, 0.00], 133.28], - [opfor_rifleman, [7.52, 8.87, 0.00], 220.50], - [opfor_rpg, [10.95, -10.90, 0.00], 291.65], - [opfor_sentry, [11.95, 4.52, 0.00], 43.29], - [opfor_marksman, [-0.29, 18.86, 4.87], 305.92], - [opfor_marksman, [-16.39, 9.43, 4.84], 317.61], - [opfor_marksman, [-16.53, 8.30, 4.87], 223.01], - [opfor_grenadier, [-7.72, -4.93, 0.00], 120.76], - [opfor_grenadier, [18.02, -9.31, 0.00], 141.02] + [KPLIB_o_engineer, [-4.18, 13.73, 0.00], 176.93], + [KPLIB_o_heavyGunner, [-12.66, -10.52, 0.00], 0.00], + [KPLIB_o_heavyGunner, [-4.12, -20.00, 0.00], 249.04], + [KPLIB_o_medic, [-15.97, -6.49, 0.00], 0.00], + [KPLIB_o_sharpshooter, [1.09, 18.82, 4.83], 0.00], + [KPLIB_o_rifleman, [-1.82, -20.39, 0.00], 154.51], + [KPLIB_o_rifleman, [-10.58, 17.79, 4.81], 143.79], + [KPLIB_o_rifleman, [-15.11, 2.16, 0.00], 108.85], + [KPLIB_o_rifleman, [-16.03, -3.77, 0.00], 91.87], + [KPLIB_o_rifleman, [-4.67, -4.78, 0.00], 212.50], + [KPLIB_o_rifleman, [18.35, -7.05, 0.00], 0.00], + [KPLIB_o_rifleman, [6.01, -19.19, 0.00], 133.28], + [KPLIB_o_rifleman, [7.52, 8.87, 0.00], 220.50], + [KPLIB_o_riflemanLAT, [10.95, -10.90, 0.00], 291.65], + [KPLIB_o_sentry, [11.95, 4.52, 0.00], 43.29], + [KPLIB_o_marksman, [-0.29, 18.86, 4.87], 305.92], + [KPLIB_o_marksman, [-16.39, 9.43, 4.84], 317.61], + [KPLIB_o_marksman, [-16.53, 8.30, 4.87], 223.01], + [KPLIB_o_grenadier, [-7.72, -4.93, 0.00], 120.76], + [KPLIB_o_grenadier, [18.02, -9.31, 0.00], 141.02] ]; private _base_corners = [ diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index 8a56b4916..1ff33cda0 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -1,12 +1,12 @@ params ["_first_objective"]; -if (opfor_air isEqualTo []) exitWith {false}; +if (KPLIB_o_planes isEqualTo []) exitWith {false}; private _planes_number = ((floor linearConversion [40, 100, combat_readiness, 1, 3]) min 3) max 0; if (_planes_number < 1) exitWith {}; -private _class = selectRandom opfor_air; +private _class = selectRandom KPLIB_o_planes; private _spawnPoint = ([sectors_airspawn, [_first_objective], {(markerPos _x) distance _input0}, "ASCEND"] call BIS_fnc_sortBy) select 0; private _spawnPos = []; private _plane = objNull; diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index 842db97e7..abba35a20 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -24,7 +24,7 @@ if !(_spawn_marker isEqualTo "") then { if (_infOnly) then { // Infantry units to choose from - private _infClasses = [KPLIB_o_inf_classes, militia_squad] select (combat_readiness < 50); + private _infClasses = [KPLIB_o_inf_classes, KPLIB_o_militiaInfantry] select (combat_readiness < 50); // Adjust target size for infantry _target_size = 12 max (_target_size * 4); @@ -41,7 +41,7 @@ if !(_spawn_marker isEqualTo "") then { [_grp] spawn battlegroup_ai; _bg_groups pushBack _grp; } else { - private _vehicle_pool = [opfor_battlegroup_vehicles, opfor_battlegroup_vehicles_low_intensity] select (combat_readiness < 50); + private _vehicle_pool = [KPLIB_o_battleGrpVehicles, KPLIB_o_battleGrpVehiclesLight] select (combat_readiness < 50); while {count _selected_opfor_battlegroup < _target_size} do { _selected_opfor_battlegroup pushback (selectRandom _vehicle_pool); @@ -58,7 +58,7 @@ if !(_spawn_marker isEqualTo "") then { [_nextgrp] spawn battlegroup_ai; _bg_groups pushback _nextgrp; - if ((_x in opfor_troup_transports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap)) then { + if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap)) then { if (_vehicle isKindOf "Air") then { [[markerPos _spawn_marker] call KPLIB_fnc_getNearestBluforObjective, _vehicle] spawn send_paratroopers; } else { diff --git a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf index f6379ced9..dac6207c0 100644 --- a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf +++ b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf @@ -5,7 +5,7 @@ private _roadObj = [markerPos _spawn_marker, 400, []] call BIS_fnc_nearestRoad; if (isNull _roadObj) exitWith {if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> no road found", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; -private _veh = createVehicle [opfor_mrap, getPos _roadObj, [], 0, "NONE"]; +private _veh = createVehicle [KPLIB_o_mrap, getPos _roadObj, [], 0, "NONE"]; _veh setDir (getDir _roadObj); { if ((_x find "FWheel") != -1) then { @@ -14,10 +14,10 @@ _veh setDir (getDir _roadObj); } forEach ((getAllHitPointsDamage _veh) select 0); private _grp = createGroup [KPLIB_side_enemy, true]; -private _hvt = [opfor_officer, getPos _roadObj, _grp, "CAPTAIN", 30] call KPLIB_fnc_createManagedUnit; +private _hvt = [KPLIB_o_officer, getPos _roadObj, _grp, "CAPTAIN", 30] call KPLIB_fnc_createManagedUnit; for "_i" from 1 to 4 do { - [selectRandom militia_squad, _grp, _grp] call KPLIB_fnc_createManagedUnit; + [selectRandom KPLIB_o_militiaInfantry, _grp, _grp] call KPLIB_fnc_createManagedUnit; sleep 0.1; }; diff --git a/Missionframework/scripts/server/game/check_victory_conditions.sqf b/Missionframework/scripts/server/game/check_victory_conditions.sqf index a84644e53..b29ae82f4 100644 --- a/Missionframework/scripts/server/game/check_victory_conditions.sqf +++ b/Missionframework/scripts/server/game/check_victory_conditions.sqf @@ -30,8 +30,8 @@ if ([] call KPLIB_victoryCheck && KPLIB_endgame != 1) then { publicstats pushback stats_ieds_detonated; publicstats pushback stats_opfor_killed_by_players; publicstats pushback stats_opfor_soldiers_killed; - publicstats pushback stats_opfor_vehicles_killed; - publicstats pushback stats_opfor_vehicles_killed_by_players; + publicstats pushback stats_KPLIB_o_armyVehicles_killed; + publicstats pushback stats_KPLIB_o_armyVehicles_killed_by_players; publicstats pushback stats_player_deaths; publicstats pushback stats_playtime; publicstats pushback stats_prisoners_captured; @@ -60,8 +60,8 @@ if ([] call KPLIB_victoryCheck && KPLIB_endgame != 1) then { [format ["Playtime: %1 days, %2 hours, %3 minutes, %4 seconds", _playtime_days, _playtime_hours, _playtime_minutes, _playtime_seconds], "MISSION END"] call KPLIB_fnc_log; [format ["OPFOR infantry killed: %1", stats_opfor_soldiers_killed], "MISSION END"] call KPLIB_fnc_log; [format ["OPFOR infantry killed by players: %1", stats_opfor_killed_by_players], "MISSION END"] call KPLIB_fnc_log; - [format ["OPFOR vehicles destroyed: %1", stats_opfor_vehicles_killed], "MISSION END"] call KPLIB_fnc_log; - [format ["OPFOR vehicles destroyed by players: %1", stats_opfor_vehicles_killed_by_players], "MISSION END"] call KPLIB_fnc_log; + [format ["OPFOR vehicles destroyed: %1", stats_KPLIB_o_armyVehicles_killed], "MISSION END"] call KPLIB_fnc_log; + [format ["OPFOR vehicles destroyed by players: %1", stats_KPLIB_o_armyVehicles_killed_by_players], "MISSION END"] call KPLIB_fnc_log; [format ["BLUFOR infantry recruited: %1", stats_blufor_soldiers_recruited], "MISSION END"] call KPLIB_fnc_log; [format ["BLUFOR infantry killed: %1", stats_blufor_soldiers_killed], "MISSION END"] call KPLIB_fnc_log; [format ["BLUFOR vehicles built: %1", stats_blufor_vehicles_built], "MISSION END"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 13733dfa1..cfd75db5f 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -134,8 +134,8 @@ stats_hostile_battlegroups = 0; stats_ieds_detonated = 0; stats_opfor_killed_by_players = 0; stats_opfor_soldiers_killed = 0; -stats_opfor_vehicles_killed = 0; -stats_opfor_vehicles_killed_by_players = 0; +stats_KPLIB_o_armyVehicles_killed = 0; +stats_KPLIB_o_armyVehicles_killed_by_players = 0; stats_player_deaths = 0; stats_playtime = 0; stats_prisoners_captured = 0; @@ -214,8 +214,8 @@ if (!isNil "_saveData") then { stats_ieds_detonated = _stats select 19; stats_opfor_killed_by_players = _stats select 20; stats_opfor_soldiers_killed = _stats select 21; - stats_opfor_vehicles_killed = _stats select 22; - stats_opfor_vehicles_killed_by_players = _stats select 23; + stats_KPLIB_o_armyVehicles_killed = _stats select 22; + stats_KPLIB_o_armyVehicles_killed_by_players = _stats select 23; stats_player_deaths = _stats select 24; stats_playtime = _stats select 25; stats_prisoners_captured = _stats select 26; @@ -257,8 +257,8 @@ if (!isNil "_saveData") then { stats_opfor_killed_by_players = _stats select 1; stats_blufor_soldiers_killed = _stats select 2; stats_player_deaths = _stats select 3; - stats_opfor_vehicles_killed = _stats select 4; - stats_opfor_vehicles_killed_by_players = _stats select 5; + stats_KPLIB_o_armyVehicles_killed = _stats select 4; + stats_KPLIB_o_armyVehicles_killed_by_players = _stats select 5; stats_blufor_vehicles_killed = _stats select 6; stats_blufor_soldiers_recruited = _stats select 7; stats_blufor_vehicles_built = _stats select 8; diff --git a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf index f2710b312..d1dc0f107 100644 --- a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf @@ -35,8 +35,8 @@ while { KPLIB_endgame == 0 } do { } else { private [ "_vehicle_object" ]; - if ((combat_readiness > 75) && ((random 100) > 85) && !(opfor_choppers isEqualTo [])) then { - _vehicle_object = [_sector_spawn_pos, selectRandom opfor_choppers] call KPLIB_fnc_spawnVehicle; + if ((combat_readiness > 75) && ((random 100) > 85) && !(KPLIB_o_helicopters isEqualTo [])) then { + _vehicle_object = [_sector_spawn_pos, selectRandom KPLIB_o_helicopters] call KPLIB_fnc_spawnVehicle; } else { _vehicle_object = [_sector_spawn_pos, [] call KPLIB_fnc_getAdaptiveVehicle] call KPLIB_fnc_spawnVehicle; }; diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index 28365fbb7..5387478da 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -3,7 +3,7 @@ params [ ["_chopper_type", objNull, [objNull]] ]; -if (_targetsector isEqualTo "" || opfor_choppers isEqualTo []) exitWith {false}; +if (_targetsector isEqualTo "" || KPLIB_o_helicopters isEqualTo []) exitWith {false}; private _targetpos = _targetsector; if (_targetpos isEqualType "") then { @@ -13,10 +13,10 @@ private _spawnsector = ([sectors_airspawn, [_targetpos], {(markerpos _x) distanc private _newvehicle = objNull; private _pilot_group = grpNull; if (isNull _chopper_type) then { - _chopper_type = selectRandom opfor_choppers; + _chopper_type = selectRandom KPLIB_o_helicopters; - while {!(_chopper_type in opfor_troup_transports)} do { - _chopper_type = selectRandom opfor_choppers; + while {!(_chopper_type in KPLIB_o_troopTransports)} do { + _chopper_type = selectRandom KPLIB_o_helicopters; }; _newvehicle = createVehicle [_chopper_type, markerpos _spawnsector, [], 0, "FLY"]; @@ -36,7 +36,7 @@ if (isNull _chopper_type) then { private _para_group = createGroup [KPLIB_side_enemy, true]; while {(count (units _para_group)) < 8} do { - [opfor_paratrooper, markerPos _spawnsector, _para_group] call KPLIB_fnc_createManagedUnit; + [KPLIB_o_paratrooper, markerPos _spawnsector, _para_group] call KPLIB_fnc_createManagedUnit; }; {removeBackpack _x; _x addBackPack "B_parachute"; _x moveInCargo _newvehicle;} forEach (units _para_group); diff --git a/Missionframework/scripts/server/remotecall/prisonner_remote_call.sqf b/Missionframework/scripts/server/remotecall/prisonner_remote_call.sqf index 55996f30e..75c672386 100644 --- a/Missionframework/scripts/server/remotecall/prisonner_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/prisonner_remote_call.sqf @@ -5,7 +5,7 @@ private _csat_prisonner_intel_yield = 6; if (isServer) then { private _yield = _csat_prisonner_intel_yield; - if ((typeof _unit) in militia_squad) then { + if ((typeof _unit) in KPLIB_o_militiaInfantry) then { _yield = _milita_prisonner_intel_yield; }; resources_intel = resources_intel + ( _yield + (round (random _yield))); diff --git a/Missionframework/scripts/server/secondary/convoy_hijack.sqf b/Missionframework/scripts/server/secondary/convoy_hijack.sqf index f89887054..9289d1765 100644 --- a/Missionframework/scripts/server/secondary/convoy_hijack.sqf +++ b/Missionframework/scripts/server/secondary/convoy_hijack.sqf @@ -13,13 +13,13 @@ private _convoy_destinations = []; private _spawnpos = _convoy_destinations select 0; [4, _spawnpos] remoteExec ["remote_call_intel"]; -private _scout_vehicle = [_spawnpos getPos [30, 0], opfor_mrap, true, false] call KPLIB_fnc_spawnVehicle; -private _escort_vehicle = [_spawnpos getPos [10, 0], selectRandom opfor_vehicles_low_intensity, true, false] call KPLIB_fnc_spawnVehicle; -private _transport_vehicle = [_spawnpos getPos [10, 180], opfor_ammobox_transport, true, false] call KPLIB_fnc_spawnVehicle; +private _scout_vehicle = [_spawnpos getPos [30, 0], KPLIB_o_mrap, true, false] call KPLIB_fnc_spawnVehicle; +private _escort_vehicle = [_spawnpos getPos [10, 0], selectRandom KPLIB_o_armyVehiclesLight, true, false] call KPLIB_fnc_spawnVehicle; +private _transport_vehicle = [_spawnpos getPos [10, 180], KPLIB_o_transportTruckAmmo, true, false] call KPLIB_fnc_spawnVehicle; private _boxes_amount = 0; { - if ( _x select 0 == opfor_ammobox_transport ) exitWith { _boxes_amount = (count _x) - 2 }; + if ( _x select 0 == KPLIB_o_transportTruckAmmo ) exitWith { _boxes_amount = (count _x) - 2 }; } foreach KPLIB_transportConfigs; if ( _boxes_amount == 0 ) exitWith {["Opfor ammobox truck classname doesn't allow for ammobox transport, correct your preset and/or transport config", "ERROR"] call KPLIB_fnc_log;}; @@ -38,7 +38,7 @@ while { _boxes_loaded < _boxes_amount } do { sleep 0.5; -private _troop_vehicle = [_spawnpos getPos [30, 180], opfor_transport_truck, true, true, false ] call KPLIB_fnc_spawnVehicle; +private _troop_vehicle = [_spawnpos getPos [30, 180], KPLIB_o_transportTruck, true, true, false ] call KPLIB_fnc_spawnVehicle; sleep 0.5; diff --git a/Missionframework/scripts/server/secondary/fob_hunting.sqf b/Missionframework/scripts/server/secondary/fob_hunting.sqf index baa774d2e..3963435c7 100644 --- a/Missionframework/scripts/server/secondary/fob_hunting.sqf +++ b/Missionframework/scripts/server/secondary/fob_hunting.sqf @@ -96,7 +96,7 @@ private _sentryMax = ceil ((3 + (floor (random 4))) * (sqrt (KPLIB_unitcap))); _grpsentry = createGroup [KPLIB_side_enemy, true]; _base_sentry_pos = [(_base_position select 0) + ((_base_corners select 0) select 0), (_base_position select 1) + ((_base_corners select 0) select 1), 0]; for [{_idx=0}, {_idx < _sentryMax}, {_idx=_idx+1}] do { - [opfor_sentry, _base_sentry_pos, _grpsentry, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; + [KPLIB_o_sentry, _base_sentry_pos, _grpsentry, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; }; while {(count (waypoints _grpsentry)) != 0} do {deleteWaypoint ((waypoints _grpsentry) select 0);}; diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index 037883a50..355a54628 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -61,16 +61,16 @@ private _grpsentry = createGroup [KPLIB_side_enemy, true]; private _nbsentry = 2 + (floor (random 3)); for [ {_idx=0},{_idx < _nbsentry},{_idx=_idx+1} ] do { - [opfor_sentry, _pilotsPos getPos [1, random 360], _grpsentry, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; + [KPLIB_o_sentry, _pilotsPos getPos [1, random 360], _grpsentry, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; }; (leader _grpsentry) setDir (random 360); -(opfor_transport_truck createVehicle ((getpos _helowreck) getPos [25, random 360])) setDir random 360; +(KPLIB_o_transportTruck createVehicle ((getpos _helowreck) getPos [25, random 360])) setDir random 360; -private _vehicle_pool = opfor_vehicles; +private _vehicle_pool = KPLIB_o_armyVehicles; if ( combat_readiness < 50 ) then { - _vehicle_pool = opfor_vehicles_low_intensity; + _vehicle_pool = KPLIB_o_armyVehiclesLight; }; private _vehtospawn = []; diff --git a/Missionframework/scripts/server/sector/manage_one_sector.sqf b/Missionframework/scripts/server/sector/manage_one_sector.sqf index 66afbcc55..d7067b8b4 100644 --- a/Missionframework/scripts/server/sector/manage_one_sector.sqf +++ b/Missionframework/scripts/server/sector/manage_one_sector.sqf @@ -50,9 +50,9 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (KPLIB_unitcap >= 1) then {_squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; if (KPLIB_unitcap >= 1.5) then {_squad4 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; - _vehtospawn = [(selectRandom militia_vehicles),(selectRandom militia_vehicles)]; - if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; - if ((random 100) > (50 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; + _vehtospawn = [(selectRandom KPLIB_o_militiaVehicles),(selectRandom KPLIB_o_militiaVehicles)]; + if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; + if ((random 100) > (50 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; if (_infsquad == "army") then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); @@ -83,10 +83,10 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); if (KPLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; - if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; - if ((random 100) > (33 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom militia_vehicles);}; + if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; + if ((random 100) > (33 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; if (_infsquad == "army") then { - _vehtospawn pushback (selectRandom militia_vehicles); + _vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles); if ((random 100) > (33 / KPLIB_difficulty_modifier)) then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp); @@ -135,7 +135,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (KPLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; if ((random 100) > 66) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; - if ((random 100) > 33) then {_vehtospawn pushback (selectRandom militia_vehicles);}; + if ((random 100) > 33) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; _spawncivs = false; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 1d625f4af..d91a3007a 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -137,11 +137,11 @@ if (isServer) then { } else { // Enemy vehicle casualty if ((toLower (typeof _unit)) in KPLIB_o_allVeh_classes) then { - stats_opfor_vehicles_killed = stats_opfor_vehicles_killed + 1; + stats_KPLIB_o_armyVehicles_killed = stats_KPLIB_o_armyVehicles_killed + 1; // Destroyed by player if (isplayer _killer) then { - stats_opfor_vehicles_killed_by_players = stats_opfor_vehicles_killed_by_players + 1; + stats_KPLIB_o_armyVehicles_killed_by_players = stats_KPLIB_o_armyVehicles_killed_by_players + 1; }; } else { // Civilian vehicle casualty From 9e1b28e428263fa946153a628b723e2348c263c1 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Fri, 15 May 2020 14:22:06 +0200 Subject: [PATCH 010/115] Headers and variable name changes in enemy presets --- .../presets/enemies/CUP_AFRF_MSV.sqf | 89 +++--- .../presets/enemies/CUP_BAF_Desert.sqf | 91 +++--- .../presets/enemies/CUP_BAF_Woodland.sqf | 89 +++--- Missionframework/presets/enemies/CUP_CDF.sqf | 89 +++--- .../presets/enemies/CUP_ChDKZ.sqf | 89 +++--- Missionframework/presets/enemies/CUP_SLA.sqf | 265 +++++++++--------- Missionframework/presets/enemies/SLA.sqf | 88 +++--- Missionframework/presets/enemies/aaf.sqf | 85 +++--- Missionframework/presets/enemies/apex.sqf | 85 +++--- ..._ModernMSV.sqf => cup_afrf_msv_modern.sqf} | 89 +++--- .../{CUP_TakiArmy.sqf => cup_takistan.sqf} | 89 +++--- Missionframework/presets/enemies/custom.sqf | 85 +++--- Missionframework/presets/enemies/gm_east.sqf | 85 +++--- .../presets/enemies/gm_east_win.sqf | 85 +++--- Missionframework/presets/enemies/gm_west.sqf | 85 +++--- .../presets/enemies/gm_west_win.sqf | 85 +++--- .../presets/enemies/islamic_state.sqf | 90 +++--- Missionframework/presets/enemies/nato.sqf | 103 +++---- Missionframework/presets/enemies/rhs_afrf.sqf | 85 +++--- Missionframework/presets/enemies/takistan.sqf | 90 +++--- Missionframework/presets/enemies/unsung.sqf | 85 +++--- 21 files changed, 1110 insertions(+), 916 deletions(-) rename Missionframework/presets/enemies/{CUP_AFRF_ModernMSV.sqf => cup_afrf_msv_modern.sqf} (82%) rename Missionframework/presets/enemies/{CUP_TakiArmy.sqf => cup_takistan.sqf} (83%) diff --git a/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf b/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf index 1b4ec9137..66bdb2ec6 100644 --- a/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf +++ b/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf @@ -1,50 +1,59 @@ /* + File: cup_afrf_msv.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-20 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP AFRF MSV enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_O_RU_Officer_EMR"; // Officer -opfor_squad_leader = "CUP_O_RU_Soldier_SL_EMR"; // Squad Leader -opfor_team_leader = "CUP_O_RU_Soldier_TL_EMR"; // Team Leader -opfor_sentry = "CUP_O_RU_Soldier_Saiga_EMR"; // Rifleman (Lite) -opfor_rifleman = "CUP_O_RU_Soldier_EMR"; // Rifleman -opfor_rpg = "CUP_O_RU_Soldier_AT_EMR"; // Rifleman (LAT) -opfor_grenadier = "CUP_O_RU_Soldier_GL_EMR"; // Grenadier -opfor_machinegunner = "CUP_O_RU_Soldier_AR_EMR"; // Autorifleman -opfor_heavygunner = "CUP_O_RU_Soldier_MG_EMR"; // Heavy Gunner -opfor_marksman = "CUP_O_RU_Soldier_Marksman_EMR"; // Marksman -opfor_sharpshooter = "CUP_O_RU_Sniper_EMR"; // Sharpshooter -opfor_sniper = "CUP_O_RU_Sniper_KSVK_EMR"; // Sniper -opfor_at = "CUP_O_RU_Soldier_HAT_EMR"; // AT Specialist -opfor_aa = "CUP_O_RU_Soldier_AA_EMR"; // AA Specialist -opfor_medic = "CUP_O_RU_Medic_EMR"; // Medic -opfor_engineer = "CUP_O_RU_Engineer_EMR"; // Engineer -opfor_paratrooper = "CUP_O_RU_Soldier_LAT_EMR"; // Paratrooper +KPLIB_o_officer = "CUP_O_RU_Officer_EMR"; // Officer +KPLIB_o_squadLeader = "CUP_O_RU_Soldier_SL_EMR"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_RU_Soldier_TL_EMR"; // Team Leader +KPLIB_o_sentry = "CUP_O_RU_Soldier_Saiga_EMR"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_RU_Soldier_EMR"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_RU_Soldier_AT_EMR"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_RU_Soldier_GL_EMR"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_RU_Soldier_AR_EMR"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_RU_Soldier_MG_EMR"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_RU_Soldier_Marksman_EMR"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_RU_Sniper_EMR"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_RU_Sniper_KSVK_EMR"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_RU_Soldier_HAT_EMR"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_RU_Soldier_AA_EMR"; // AA Specialist +KPLIB_o_medic = "CUP_O_RU_Medic_EMR"; // Medic +KPLIB_o_engineer = "CUP_O_RU_Engineer_EMR"; // Engineer +KPLIB_o_paratrooper = "CUP_O_RU_Soldier_LAT_EMR"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_O_UAZ_Unarmed_RU"; // UAZ -opfor_mrap_armed = "CUP_O_UAZ_MG_RU"; // UAZ (DShKM) -opfor_transport_helo = "CUP_O_Mi8_RU"; // Mi-8MTV3 -opfor_transport_truck = "CUP_O_Kamaz_RU"; // Kamaz 5350 -opfor_ammobox_transport = "CUP_O_Kamaz_Open_RU"; // Kamaz 5350 (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_O_Kamaz_Refuel_RU"; // Kamaz 5350 (Fuel) -opfor_ammo_truck = "CUP_O_Kamaz_Reammo_RU"; // Kamaz 5350 (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagCarrierRU"; // Flag +KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_RU"; // UAZ +KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_RU"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_O_Mi8_RU"; // Mi-8MTV3 +KPLIB_o_transportTruck = "CUP_O_Kamaz_RU"; // Kamaz 5350 +KPLIB_o_transportTruckAmmo = "CUP_O_Kamaz_Open_RU"; // Kamaz 5350 (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Kamaz_Refuel_RU"; // Kamaz 5350 (Fuel) +KPLIB_o_ammoTruck = "CUP_O_Kamaz_Reammo_RU"; // Kamaz 5350 (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierRU"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "CUP_O_RU_Soldier_Saiga", // Rifleman (Saiga) "CUP_O_RU_Soldier_Saiga", // Rifleman (Saiga) "CUP_O_RU_Soldier", // Rifleman @@ -57,12 +66,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "CUP_O_UAZ_MG_RU" // UAZ (DShKM) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) @@ -87,7 +96,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "CUP_O_UAZ_MG_RU", // UAZ (DShKM) "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) @@ -100,7 +109,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) @@ -130,7 +139,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "CUP_O_UAZ_MG_RU", // UAZ (DShKM) "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) @@ -146,7 +155,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) "CUP_O_Mi8_RU", // Mi-8MTV3 "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V @@ -164,7 +173,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P "CUP_O_Mi8_RU", // Mi-8MTV3 @@ -174,7 +183,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "CUP_O_Su25_Dyn_RU", // Su-25T Frogfoot "CUP_O_SU34_RU" // Su-34 ]; diff --git a/Missionframework/presets/enemies/CUP_BAF_Desert.sqf b/Missionframework/presets/enemies/CUP_BAF_Desert.sqf index ef645e2c0..4d3608985 100644 --- a/Missionframework/presets/enemies/CUP_BAF_Desert.sqf +++ b/Missionframework/presets/enemies/CUP_BAF_Desert.sqf @@ -1,50 +1,59 @@ /* + File: cup_bad_desert.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-16 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP BAF Desert enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_B_BAF_Soldier_Officer_DDPM"; // Officer -opfor_squad_leader = "CUP_B_BAF_Soldier_SquadLeader_DDPM"; // Squad Leader -opfor_team_leader = "CUP_B_BAF_Soldier_TeamLeader_DDPM"; // Team Leader -opfor_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DDPM"; // Rifleman (Lite) -opfor_rifleman = "CUP_B_BAF_Soldier_Rifleman_DDPM"; // Rifleman -opfor_rpg = "CUP_B_BAF_Soldier_RiflemanLAT_DDPM"; // Rifleman (LAT) -opfor_grenadier = "CUP_B_BAF_Soldier_Grenadier_DDPM"; // Grenadier -opfor_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DDPM"; // Autorifleman -opfor_heavygunner = "CUP_B_BAF_Soldier_HeavyGunner_DDPM"; // Heavy Gunner -opfor_marksman = "CUP_B_BAF_Soldier_Marksman_DDPM"; // Marksman -opfor_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DDPM"; // Sharpshooter -opfor_sniper = "CUP_B_BAF_Sniper_AS50_DDPM"; // Sniper -opfor_at = "CUP_B_BAF_Soldier_AT_DDPM"; // AT Specialist -opfor_aa = "CUP_B_BAF_Soldier_AA_DDPM"; // AA Specialist -opfor_medic = "CUP_B_BAF_Soldier_Medic_DDPM"; // Medic -opfor_engineer = "CUP_B_BAF_Soldier_Engineer_DDPM"; // Engineer -opfor_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DDPM"; // Paratrooper +KPLIB_o_officer = "CUP_B_BAF_Soldier_Officer_DDPM"; // Officer +KPLIB_o_squadLeader = "CUP_B_BAF_Soldier_SquadLeader_DDPM"; // Squad Leader +KPLIB_o_teamLeader = "CUP_B_BAF_Soldier_TeamLeader_DDPM"; // Team Leader +KPLIB_o_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DDPM"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_B_BAF_Soldier_Rifleman_DDPM"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_B_BAF_Soldier_RiflemanLAT_DDPM"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_B_BAF_Soldier_Grenadier_DDPM"; // Grenadier +KPLIB_o_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DDPM"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_B_BAF_Soldier_HeavyGunner_DDPM"; // Heavy Gunner +KPLIB_o_marksman = "CUP_B_BAF_Soldier_Marksman_DDPM"; // Marksman +KPLIB_o_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DDPM"; // Sharpshooter +KPLIB_o_sniper = "CUP_B_BAF_Sniper_AS50_DDPM"; // Sniper +KPLIB_o_atSpecialist = "CUP_B_BAF_Soldier_AT_DDPM"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_B_BAF_Soldier_AA_DDPM"; // AA Specialist +KPLIB_o_medic = "CUP_B_BAF_Soldier_Medic_DDPM"; // Medic +KPLIB_o_engineer = "CUP_B_BAF_Soldier_Engineer_DDPM"; // Engineer +KPLIB_o_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DDPM"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_B_Ridgeback_LMG_GB_D"; // Ridgeback PPV LMG Woodland -opfor_mrap_armed = "CUP_B_Ridgeback_HMG_GB_D"; // Ridgeback PPV HMG Woodland -opfor_transport_helo = "CUP_B_CH47F_GB"; // Chinook HC-4 -opfor_transport_truck = "CUP_B_MTVR_BAF_DES"; // MTVR -opfor_ammobox_transport = "CUP_B_MTVR_BAF_DES"; // MTVR -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_B_MTVR_Refuel_BAF_DES"; // MTVR (Refuel) -opfor_ammo_truck = "CUP_B_MTVR_Ammo_BAF_DES"; // MTVR (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "Flag_UK_F"; // Flag +KPLIB_o_mrap = "CUP_B_Ridgeback_LMG_GB_D"; // Ridgeback PPV LMG Woodland +KPLIB_o_mrapArmed = "CUP_B_Ridgeback_HMG_GB_D"; // Ridgeback PPV HMG Woodland +KPLIB_o_transportHeli = "CUP_B_CH47F_GB"; // Chinook HC-4 +KPLIB_o_transportTruck = "CUP_B_MTVR_BAF_DES"; // MTVR +KPLIB_o_transportTruckAmmo = "CUP_B_MTVR_BAF_DES"; // MTVR -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_B_MTVR_Refuel_BAF_DES"; // MTVR (Refuel) +KPLIB_o_ammoTruck = "CUP_B_MTVR_Ammo_BAF_DES"; // MTVR (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "Flag_UK_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "CUP_B_BAF_Soldier_TeamLeader_MTP", // Team Leader "CUP_B_BAF_Soldier_Medic_MTP", // Combat Life Saver "CUP_B_BAF_Soldier_RiflemanLAT_MTP", // Rifleman (Light AT) @@ -54,12 +63,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "CUP_B_LR_MG_GB_D" // Land Rover 110 (M2) Woodland ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) @@ -81,7 +90,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland @@ -94,7 +103,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) @@ -112,7 +121,7 @@ opfor_battlegroup_vehicles = [ "CUP_B_FV510_GB_D", // FV510 Warrior (Woodland) "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT - Woodland) "CUP_B_Challenger2_2CD_BAF", // FV4034 Challenger 2 (Two Color Woodland) - "CUP_B_Challenger2_Desert_BAF", // FV4034 Challenger 2 (Woodland) + "CUP_B_Challenger2_Desert_BAF", // FV4034 Challenger 2 (Woodland) "CUP_B_AH1_DL_BAF", // AH1 "CUP_B_AH1_DL_BAF", // AH1 "CUP_B_AW159_GB", // AW159 Wildcat (Green) @@ -122,7 +131,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland @@ -139,7 +148,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) "CUP_B_BAF_Coyote_GMG_D", // Coyote GMG (Woodland) "CUP_B_Mastiff_LMG_GB_D", // Mastiff PPV LMG Woodland @@ -154,7 +163,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "CUP_B_AH1_DL_BAF", // AH1 "CUP_B_AW159_GB", // AW159 Wildcat (Green) "CUP_B_CH47F_GB", // Chinook HC-4 @@ -162,7 +171,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "CUP_B_F35B_BAF", // F-35B Lightning II "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) "CUP_B_GR9_DYN_GB" // Harrier GR.9 diff --git a/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf b/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf index 1bdc97612..4100c1cb8 100644 --- a/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf +++ b/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf @@ -1,50 +1,59 @@ /* + File: cup_baf_woodland.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-16 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP BAF Woodland enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_B_BAF_Soldier_Officer_DPM"; // Officer -opfor_squad_leader = "CUP_B_BAF_Soldier_SquadLeader_DPM"; // Squad Leader -opfor_team_leader = "CUP_B_BAF_Soldier_TeamLeader_DPM"; // Team Leader -opfor_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DPM"; // Rifleman (Lite) -opfor_rifleman = "CUP_B_BAF_Soldier_Rifleman_DPM"; // Rifleman -opfor_rpg = "CUP_B_BAF_Soldier_RiflemanLAT_DPM"; // Rifleman (LAT) -opfor_grenadier = "CUP_B_BAF_Soldier_Grenadier_DPM"; // Grenadier -opfor_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DPM"; // Autorifleman -opfor_heavygunner = "CUP_B_BAF_Soldier_HeavyGunner_DPM"; // Heavy Gunner -opfor_marksman = "CUP_B_BAF_Soldier_Marksman_DPM"; // Marksman -opfor_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DPM"; // Sharpshooter -opfor_sniper = "CUP_B_BAF_Sniper_AS50_DPM"; // Sniper -opfor_at = "CUP_B_BAF_Soldier_AT_DPM"; // AT Specialist -opfor_aa = "CUP_B_BAF_Soldier_AA_DPM"; // AA Specialist -opfor_medic = "CUP_B_BAF_Soldier_Medic_DPM"; // Medic -opfor_engineer = "CUP_B_BAF_Soldier_Engineer_DPM"; // Engineer -opfor_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DPM"; // Paratrooper +KPLIB_o_officer = "CUP_B_BAF_Soldier_Officer_DPM"; // Officer +KPLIB_o_squadLeader = "CUP_B_BAF_Soldier_SquadLeader_DPM"; // Squad Leader +KPLIB_o_teamLeader = "CUP_B_BAF_Soldier_TeamLeader_DPM"; // Team Leader +KPLIB_o_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DPM"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_B_BAF_Soldier_Rifleman_DPM"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_B_BAF_Soldier_RiflemanLAT_DPM"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_B_BAF_Soldier_Grenadier_DPM"; // Grenadier +KPLIB_o_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DPM"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_B_BAF_Soldier_HeavyGunner_DPM"; // Heavy Gunner +KPLIB_o_marksman = "CUP_B_BAF_Soldier_Marksman_DPM"; // Marksman +KPLIB_o_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DPM"; // Sharpshooter +KPLIB_o_sniper = "CUP_B_BAF_Sniper_AS50_DPM"; // Sniper +KPLIB_o_atSpecialist = "CUP_B_BAF_Soldier_AT_DPM"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_B_BAF_Soldier_AA_DPM"; // AA Specialist +KPLIB_o_medic = "CUP_B_BAF_Soldier_Medic_DPM"; // Medic +KPLIB_o_engineer = "CUP_B_BAF_Soldier_Engineer_DPM"; // Engineer +KPLIB_o_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DPM"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_B_Ridgeback_LMG_GB_W"; // Ridgeback PPV LMG Woodland -opfor_mrap_armed = "CUP_B_Ridgeback_HMG_GB_W"; // Ridgeback PPV HMG Woodland -opfor_transport_helo = "CUP_B_CH47F_GB"; // Chinook HC-4 -opfor_transport_truck = "CUP_B_MTVR_BAF_WOOD"; // MTVR -opfor_ammobox_transport = "CUP_B_MTVR_BAF_WOOD"; // MTVR -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_B_MTVR_Refuel_BAF_WOOD"; // MTVR (Refuel) -opfor_ammo_truck = "CUP_B_MTVR_Ammo_BAF_WOOD"; // MTVR (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "Flag_UK_F"; // Flag +KPLIB_o_mrap = "CUP_B_Ridgeback_LMG_GB_W"; // Ridgeback PPV LMG Woodland +KPLIB_o_mrapArmed = "CUP_B_Ridgeback_HMG_GB_W"; // Ridgeback PPV HMG Woodland +KPLIB_o_transportHeli = "CUP_B_CH47F_GB"; // Chinook HC-4 +KPLIB_o_transportTruck = "CUP_B_MTVR_BAF_WOOD"; // MTVR +KPLIB_o_transportTruckAmmo = "CUP_B_MTVR_BAF_WOOD"; // MTVR -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_B_MTVR_Refuel_BAF_WOOD"; // MTVR (Refuel) +KPLIB_o_ammoTruck = "CUP_B_MTVR_Ammo_BAF_WOOD"; // MTVR (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "Flag_UK_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "CUP_B_BAF_Soldier_TeamLeader_MTP", // Team Leader "CUP_B_BAF_Soldier_Medic_MTP", // Combat Life Saver "CUP_B_BAF_Soldier_RiflemanLAT_MTP", // Rifleman (Light AT) @@ -54,12 +63,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "CUP_B_LR_MG_GB_W" // Land Rover 110 (M2) Woodland ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) @@ -81,7 +90,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland @@ -94,7 +103,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) @@ -122,7 +131,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland @@ -139,7 +148,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) "CUP_B_BAF_Coyote_GMG_W", // Coyote GMG (Woodland) "CUP_B_Mastiff_LMG_GB_W", // Mastiff PPV LMG Woodland @@ -154,7 +163,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "CUP_B_AH1_DL_BAF", // AH1 "CUP_B_AW159_GB", // AW159 Wildcat (Green) "CUP_B_CH47F_GB", // Chinook HC-4 @@ -162,7 +171,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "CUP_B_F35B_BAF", // F-35B Lightning II "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) "CUP_B_GR9_DYN_GB" // Harrier GR.9 diff --git a/Missionframework/presets/enemies/CUP_CDF.sqf b/Missionframework/presets/enemies/CUP_CDF.sqf index 3536eb035..d475075bb 100644 --- a/Missionframework/presets/enemies/CUP_CDF.sqf +++ b/Missionframework/presets/enemies/CUP_CDF.sqf @@ -1,50 +1,59 @@ /* + File: cup_cdf.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-06 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP CDF enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_B_CDF_Commander_FST"; // Officer -opfor_squad_leader = "CUP_B_CDF_Officer_FST"; // Squad Leader -opfor_team_leader = "CUP_B_CDF_Soldier_TL_FST"; // Team Leader -opfor_sentry = "CUP_B_CDF_Militia_FST"; // Rifleman (Lite) -opfor_rifleman = "CUP_B_CDF_Soldier_FST"; // Rifleman -opfor_rpg = "CUP_B_CDF_Soldier_RPG18_FST"; // Rifleman (LAT) -opfor_grenadier = "CUP_B_CDF_Soldier_GL_FST"; // Grenadier -opfor_machinegunner = "CUP_B_CDF_Soldier_AR_FST"; // Autorifleman -opfor_heavygunner = "CUP_B_CDF_Soldier_MG_FST"; // Heavy Gunner -opfor_marksman = "CUP_B_CDF_Soldier_Marksman_FST"; // Marksman -opfor_sharpshooter = "CUP_B_CDF_Soldier_Marksman_FST"; // Sharpshooter -opfor_sniper = "CUP_B_CDF_Sniper_FST"; // Sniper -opfor_at = "CUP_B_CDF_Soldier_LAT_FST"; // AT Specialist -opfor_aa = "CUP_B_CDF_Soldier_AA_FST"; // AA Specialist -opfor_medic = "CUP_B_CDF_Medic_FST"; // Medic -opfor_engineer = "CUP_B_CDF_Engineer_FST"; // Engineer -opfor_paratrooper = "CUP_B_CDF_Soldier_RPG18_FST"; // Paratrooper +KPLIB_o_officer = "CUP_B_CDF_Commander_FST"; // Officer +KPLIB_o_squadLeader = "CUP_B_CDF_Officer_FST"; // Squad Leader +KPLIB_o_teamLeader = "CUP_B_CDF_Soldier_TL_FST"; // Team Leader +KPLIB_o_sentry = "CUP_B_CDF_Militia_FST"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_B_CDF_Soldier_FST"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_B_CDF_Soldier_RPG18_FST"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_B_CDF_Soldier_GL_FST"; // Grenadier +KPLIB_o_machinegunner = "CUP_B_CDF_Soldier_AR_FST"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_B_CDF_Soldier_MG_FST"; // Heavy Gunner +KPLIB_o_marksman = "CUP_B_CDF_Soldier_Marksman_FST"; // Marksman +KPLIB_o_sharpshooter = "CUP_B_CDF_Soldier_Marksman_FST"; // Sharpshooter +KPLIB_o_sniper = "CUP_B_CDF_Sniper_FST"; // Sniper +KPLIB_o_atSpecialist = "CUP_B_CDF_Soldier_LAT_FST"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_B_CDF_Soldier_AA_FST"; // AA Specialist +KPLIB_o_medic = "CUP_B_CDF_Medic_FST"; // Medic +KPLIB_o_engineer = "CUP_B_CDF_Engineer_FST"; // Engineer +KPLIB_o_paratrooper = "CUP_B_CDF_Soldier_RPG18_FST"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_B_UAZ_Unarmed_CDF"; // UAZ -opfor_mrap_armed = "CUP_B_UAZ_MG_CDF"; // UAZ (DShKM) -opfor_transport_helo = "CUP_B_Mi17_CDF"; // Mi-8MT -opfor_transport_truck = "CUP_B_Ural_CDF"; // Ural -opfor_ammobox_transport = "CUP_B_Ural_Open_CDF"; // Ural (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_B_Kamaz_Refuel_CDF"; // Kamaz 5350 (Fuel) -opfor_ammo_truck = "CUP_B_Kamaz_Reammo_CDF"; // Kamaz 5350 (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagCarrierCDF"; // Flag +KPLIB_o_mrap = "CUP_B_UAZ_Unarmed_CDF"; // UAZ +KPLIB_o_mrapArmed = "CUP_B_UAZ_MG_CDF"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_B_Mi17_CDF"; // Mi-8MT +KPLIB_o_transportTruck = "CUP_B_Ural_CDF"; // Ural +KPLIB_o_transportTruckAmmo = "CUP_B_Ural_Open_CDF"; // Ural (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_B_Kamaz_Refuel_CDF"; // Kamaz 5350 (Fuel) +KPLIB_o_ammoTruck = "CUP_B_Kamaz_Reammo_CDF"; // Kamaz 5350 (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierCDF"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "CUP_B_CDF_Soldier_TL_FST", // Team Leader "CUP_B_CDF_Militia_FST", // Militia "CUP_B_CDF_Militia_FST", // Militia @@ -54,13 +63,13 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) "CUP_B_UAZ_AGS30_CDF" // UAZ (AGS-30) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) "CUP_B_UAZ_AA_CDF", // UAZ (AA) "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) @@ -81,7 +90,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) "CUP_B_MTLB_pk_CDF", // MT-LB LV @@ -93,7 +102,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) "CUP_B_UAZ_AA_CDF", // UAZ (AA) "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) @@ -118,7 +127,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) "CUP_B_MTLB_pk_CDF", // MT-LB LV @@ -132,7 +141,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "CUP_B_BTR60_CDF", // BTR-60PB "CUP_B_MTLB_pk_CDF", // MT-LB LV "CUP_B_BMP2_CDF", // BMP-2 @@ -143,13 +152,13 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D "CUP_B_Mi17_CDF" // Mi-8MT ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "CUP_B_SU34_CDF", // Su-34 "CUP_B_Su25_Dyn_CDF" // Su-25 Frogfoot ]; diff --git a/Missionframework/presets/enemies/CUP_ChDKZ.sqf b/Missionframework/presets/enemies/CUP_ChDKZ.sqf index 8dc46c74a..d3d6e5166 100644 --- a/Missionframework/presets/enemies/CUP_ChDKZ.sqf +++ b/Missionframework/presets/enemies/CUP_ChDKZ.sqf @@ -1,50 +1,59 @@ /* + File: cup_chdkz.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-20 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP ChDKZ enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_O_INS_Story_Lopotev"; // Officer -opfor_squad_leader = "CUP_O_INS_Commander"; // Squad Leader -opfor_team_leader = "CUP_O_INS_Officer"; // Team Leader -opfor_sentry = "CUP_O_INS_Soldier"; // Rifleman (Lite) -opfor_rifleman = "CUP_O_INS_Soldier_AK74"; // Rifleman -opfor_rpg = "CUP_O_INS_Soldier_Exp"; // Rifleman (LAT) -opfor_grenadier = "CUP_O_INS_Soldier_GL"; // Grenadier -opfor_machinegunner = "CUP_O_INS_Soldier"; // Autorifleman -opfor_heavygunner = "CUP_O_INS_Soldier_MG"; // Heavy Gunner -opfor_marksman = "CUP_O_INS_Woodlander2"; // Marksman -opfor_sharpshooter = "CUP_O_INS_Villager3"; // Sharpshooter -opfor_sniper = "CUP_O_INS_Sniper"; // Sniper -opfor_at = "CUP_O_INS_Soldier_AT"; // AT Specialist -opfor_aa = "CUP_O_INS_Soldier_AA"; // AA Specialist -opfor_medic = "CUP_O_INS_Medic"; // Medic -opfor_engineer = "CUP_O_INS_Soldier_Engineer"; // Engineer -opfor_paratrooper = "CUP_O_INS_Saboteur"; // Paratrooper +KPLIB_o_officer = "CUP_O_INS_Story_Lopotev"; // Officer +KPLIB_o_squadLeader = "CUP_O_INS_Commander"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_INS_Officer"; // Team Leader +KPLIB_o_sentry = "CUP_O_INS_Soldier"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_INS_Soldier_AK74"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_INS_Soldier_Exp"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_INS_Soldier_GL"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_INS_Soldier"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_INS_Soldier_MG"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_INS_Woodlander2"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_INS_Villager3"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_INS_Sniper"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_INS_Soldier_AT"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_INS_Soldier_AA"; // AA Specialist +KPLIB_o_medic = "CUP_O_INS_Medic"; // Medic +KPLIB_o_engineer = "CUP_O_INS_Soldier_Engineer"; // Engineer +KPLIB_o_paratrooper = "CUP_O_INS_Saboteur"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_O_UAZ_Unarmed_CHDKZ"; // UAZ -opfor_mrap_armed = "CUP_O_UAZ_MG_CHDKZ"; // UAZ (DShKM) -opfor_transport_helo = "CUP_O_Mi8_CHDKZ"; // Mi-8MT -opfor_transport_truck = "CUP_O_Ural_CHDKZ"; // Ural -opfor_ammobox_transport = "CUP_O_Ural_Open_CHDKZ"; // Ural (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_O_Ural_Refuel_CHDKZ"; // Ural (Refuel) -opfor_ammo_truck = "CUP_O_Ural_Reammo_CHDKZ"; // Ural (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagCarrierINS"; // Flag +KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_CHDKZ"; // UAZ +KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_CHDKZ"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_O_Mi8_CHDKZ"; // Mi-8MT +KPLIB_o_transportTruck = "CUP_O_Ural_CHDKZ"; // Ural +KPLIB_o_transportTruckAmmo = "CUP_O_Ural_Open_CHDKZ"; // Ural (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Ural_Refuel_CHDKZ"; // Ural (Refuel) +KPLIB_o_ammoTruck = "CUP_O_Ural_Reammo_CHDKZ"; // Ural (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierINS"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "CUP_O_INS_Villager3", // Farmer "CUP_O_INS_Woodlander3", // Forester "CUP_O_INS_Woodlander2", // Gamekeeper @@ -54,12 +63,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "CUP_O_Datsun_PK_Random" // Datsun 620 Pickup (PK) Woodland ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) "CUP_O_UAZ_AA_CHDKZ", // UAZ (AA) "CUP_O_UAZ_AGS30_CHDKZ", // UAZ (AGS-30) @@ -83,7 +92,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) "CUP_O_Datsun_AA_Random", // Datsun 620 Pickup (AA) "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV @@ -93,7 +102,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) "CUP_O_UAZ_AA_CHDKZ", // UAZ (AA) "CUP_O_UAZ_AGS30_CHDKZ", // UAZ (AGS-30) @@ -119,7 +128,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) "CUP_O_Datsun_AA_Random", // Datsun 620 Pickup (AA) "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV @@ -131,7 +140,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "CUP_O_BTR60_CHDKZ", // BTR-60PB "CUP_O_BTR80_CHDKZ", // BTR-80 "CUP_O_BTR80A_CHDKZ", // BTR-80A @@ -141,11 +150,11 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "CUP_O_Mi8_CHDKZ" // Mi-8MT ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "CUP_O_Su25_Dyn_RU" // Su-25T Frogfoot ]; diff --git a/Missionframework/presets/enemies/CUP_SLA.sqf b/Missionframework/presets/enemies/CUP_SLA.sqf index ee277466d..8a032cebc 100644 --- a/Missionframework/presets/enemies/CUP_SLA.sqf +++ b/Missionframework/presets/enemies/CUP_SLA.sqf @@ -1,169 +1,178 @@ /* + File: cup_sla.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP SLA enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_O_sla_Officer"; // Officer -opfor_squad_leader = "CUP_O_sla_Soldier_SL"; // Squad Leader -opfor_team_leader = "CUP_O_sla_Soldier_SL"; // Team Leader -opfor_sentry = "CUP_O_sla_Soldier"; // Rifleman (Lite) -opfor_rifleman = "CUP_O_SLA_Soldier_Backpack"; // Rifleman -opfor_rpg = "CUP_O_sla_Soldier_AT"; // Rifleman (LAT) -opfor_grenadier = "CUP_O_sla_Soldier_GL"; // Grenadier -opfor_machinegunner = "CUP_O_sla_Soldier_AR"; // Autorifleman -opfor_heavygunner = "CUP_O_sla_Soldier_MG"; // Heavy Gunner -opfor_marksman = "CUP_O_sla_Sniper"; // Marksman -opfor_sharpshooter = "CUP_O_SLA_Sniper_SVD_Night"; // Sharpshooter -opfor_sniper = "CUP_O_sla_Sniper_KSVK"; // Sniper -opfor_at = "CUP_O_sla_Soldier_HAT"; // AT Specialist -opfor_aa = "CUP_O_sla_Soldier_AA"; // AA Specialist -opfor_medic = "CUP_O_sla_Medic"; // Medic -opfor_engineer = "CUP_O_sla_Engineer"; // Engineer -opfor_paratrooper = "CUP_O_sla_Soldier_LAT"; // Paratrooper +KPLIB_o_officer = "CUP_O_sla_Officer"; // Officer +KPLIB_o_squadLeader = "CUP_O_sla_Soldier_SL"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_sla_Soldier_SL"; // Team Leader +KPLIB_o_sentry = "CUP_O_sla_Soldier"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_SLA_Soldier_Backpack"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_sla_Soldier_AT"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_sla_Soldier_GL"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_sla_Soldier_AR"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_sla_Soldier_MG"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_sla_Sniper"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_SLA_Sniper_SVD_Night"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_sla_Sniper_KSVK"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_sla_Soldier_HAT"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_sla_Soldier_AA"; // AA Specialist +KPLIB_o_medic = "CUP_O_sla_Medic"; // Medic +KPLIB_o_engineer = "CUP_O_sla_Engineer"; // Engineer +KPLIB_o_paratrooper = "CUP_O_sla_Soldier_LAT"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_O_UAZ_Unarmed_SLA"; // UAZ -opfor_mrap_armed = "CUP_O_UAZ_MG_SLA"; // UAZ (DShKM) -opfor_transport_helo = "CUP_O_Mi8_SLA_1"; // Mi-8MT -opfor_transport_truck = "CUP_O_Ural_SLA"; // Ural -opfor_ammobox_transport = "CUP_O_Ural_Open_SLA"; // Ural (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_O_Ural_Refuel_SLA"; // Ural (Refuel) -opfor_ammo_truck = "CUP_O_Ural_Reammo_SLA"; // Ural (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagCarrierNorth"; // Flag +KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_SLA"; // UAZ +KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_SLA"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_O_Mi8_SLA_1"; // Mi-8MT +KPLIB_o_transportTruck = "CUP_O_Ural_SLA"; // Ural +KPLIB_o_transportTruckAmmo = "CUP_O_Ural_Open_SLA"; // Ural (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Ural_Refuel_SLA"; // Ural (Refuel) +KPLIB_o_ammoTruck = "CUP_O_Ural_Reammo_SLA"; // Ural (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierNorth"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ - "CUP_O_sla_Soldier_militia", // Militiaman - "CUP_O_sla_Soldier_militia", // Militiaman - "CUP_O_sla_Soldier_LAT_militia", // Militiaman (RPG-18) - "CUP_O_sla_Soldier_AA_militia", // AA Specialist - "CUP_O_sla_Soldier_AT_militia", // Militiaman (RPG-7) - "CUP_O_sla_Soldier_AR_militia", // Militia Automatic Rifleman - "CUP_O_sla_Soldier_GL_militia", // Militia Grenadier - "CUP_O_sla_Medic_militia", // Militia Medic - "CUP_O_sla_Engineer_militia" // Militia Engineer +KPLIB_o_militiaInfantry = [ + "CUP_O_sla_Soldier_militia", // Militiaman + "CUP_O_sla_Soldier_militia", // Militiaman + "CUP_O_sla_Soldier_LAT_militia", // Militiaman (RPG-18) + "CUP_O_sla_Soldier_AA_militia", // AA Specialist + "CUP_O_sla_Soldier_AT_militia", // Militiaman (RPG-7) + "CUP_O_sla_Soldier_AR_militia", // Militia Automatic Rifleman + "CUP_O_sla_Soldier_GL_militia", // Militia Grenadier + "CUP_O_sla_Medic_militia", // Militia Medic + "CUP_O_sla_Engineer_militia" // Militia Engineer ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ - "CUP_O_UAZ_MG_SLA" // UAZ (DShKM) +KPLIB_o_militiaVehicles = [ + "CUP_O_UAZ_MG_SLA" // UAZ (DShKM) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR80_SLA", // BTR-80 - "CUP_O_BTR80A_SLA", // BTR-80A - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_ZSU23_SLA", // ZSU-23-4 - "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski - "CUP_O_T55_SLA", // T-55 - "CUP_O_T55_SLA", // T-55 - "CUP_O_T72_SLA", // T-72 - "CUP_O_T72_SLA" // T-72 +KPLIB_o_armyVehicles = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR80_SLA", // BTR-80 + "CUP_O_BTR80A_SLA", // BTR-80A + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_ZSU23_SLA", // ZSU-23-4 + "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski + "CUP_O_T55_SLA", // T-55 + "CUP_O_T55_SLA", // T-55 + "CUP_O_T72_SLA", // T-72 + "CUP_O_T72_SLA" // T-72 ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_MTLB_pk_SLA" // MT-LB LV +KPLIB_o_armyVehiclesLight = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_MTLB_pk_SLA" // MT-LB LV ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR80_SLA", // BTR-80 - "CUP_O_BTR80A_SLA", // BTR-80A - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_ZSU23_SLA", // ZSU-23-4 - "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski - "CUP_O_T55_SLA", // T-55 - "CUP_O_T55_SLA", // T-55 - "CUP_O_T72_SLA", // T-72 - "CUP_O_T72_SLA", // T-72 - "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark - "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D - "CUP_O_Mi8_SLA_2", // Mi-8MTV3 - "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) - "CUP_O_UH1H_gunship_SLA" // UH-1H (Gunship) +KPLIB_o_battleGrpVehicles = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR80_SLA", // BTR-80 + "CUP_O_BTR80A_SLA", // BTR-80A + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_ZSU23_SLA", // ZSU-23-4 + "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski + "CUP_O_T55_SLA", // T-55 + "CUP_O_T55_SLA", // T-55 + "CUP_O_T72_SLA", // T-72 + "CUP_O_T72_SLA", // T-72 + "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark + "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D + "CUP_O_Mi8_SLA_2", // Mi-8MTV3 + "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) + "CUP_O_UH1H_gunship_SLA" // UH-1H (Gunship) ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_MTLB_pk_SLA", // MT-LB LV - "CUP_O_Mi8_SLA_1", // Mi-8MT - "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) - "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) - "CUP_O_UH1H_SLA" // UH-1H +KPLIB_o_battleGrpVehiclesLight = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_MTLB_pk_SLA", // MT-LB LV + "CUP_O_Mi8_SLA_1", // Mi-8MT + "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) + "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) + "CUP_O_UH1H_SLA" // UH-1H ]; /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D - "CUP_O_Mi8_SLA_2", // Mi-8MTV3 - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR80_SLA", // BTR-80 - "CUP_O_BTR80A_SLA", // BTR-80A - "CUP_O_MTLB_pk_SLA", // MT-LB LV - "CUP_O_Mi8_SLA_1", // Mi-8MT - "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) - "CUP_O_UH1H_SLA" // UH-1H +KPLIB_o_troopTransports = [ + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D + "CUP_O_Mi8_SLA_2", // Mi-8MTV3 + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR80_SLA", // BTR-80 + "CUP_O_BTR80A_SLA", // BTR-80A + "CUP_O_MTLB_pk_SLA", // MT-LB LV + "CUP_O_Mi8_SLA_1", // Mi-8MT + "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) + "CUP_O_UH1H_SLA" // UH-1H ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ - "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark - "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D - "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) - "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) - "CUP_O_UH1H_SLA", // UH-1H - "CUP_O_Mi8_SLA_1", // Mi-8MT - "CUP_O_Mi8_SLA_2" // Mi-8MTV3 +KPLIB_o_helicopters = [ + "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark + "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D + "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) + "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) + "CUP_O_UH1H_SLA", // UH-1H + "CUP_O_Mi8_SLA_1", // Mi-8MT + "CUP_O_Mi8_SLA_2" // Mi-8MTV3 ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ - "CUP_O_Su25_Dyn_SLA", // Su-25 Frogfoot - "CUP_O_SU34_SLA" // Su-34 +KPLIB_o_planes = [ + "CUP_O_Su25_Dyn_SLA", // Su-25 Frogfoot + "CUP_O_SU34_SLA" // Su-34 ]; diff --git a/Missionframework/presets/enemies/SLA.sqf b/Missionframework/presets/enemies/SLA.sqf index f9826430e..0f975f25a 100644 --- a/Missionframework/presets/enemies/SLA.sqf +++ b/Missionframework/presets/enemies/SLA.sqf @@ -1,48 +1,60 @@ /* + File: sla.sqf + Author: PSYKO-nz - https://github.com/PSYKO-nz + Date: 2018-02-19 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Sahrani Liberation Army enemy preset. + Needed Mods: - - Project OPFOR + - Project OPFOR + - RHS AFRF + - RHS GREF + - RHS USAF Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "LOP_SLA_Infantry_Officer"; -opfor_squad_leader = "LOP_SLA_Infantry_SL"; -opfor_team_leader = "LOP_SLA_Infantry_TL"; -opfor_sentry = "LOP_SLA_Infantry_Rifleman"; -opfor_rifleman = "LOP_SLA_Infantry_Rifleman_2"; -opfor_rpg = "LOP_SLA_Infantry_AT"; -opfor_grenadier = "LOP_SLA_Infantry_GL"; -opfor_machinegunner = "LOP_SLA_Infantry_MG"; -opfor_heavygunner = "LOP_SLA_Infantry_MG"; -opfor_marksman = "LOP_SLA_Infantry_Marksman"; -opfor_sharpshooter = "LOP_SLA_Infantry_Marksman"; -opfor_sniper = "LOP_SLA_Infantry_Marksman"; -opfor_at = "LOP_SLA_Infantry_AT"; -opfor_aa = "LOP_SLA_Infantry_AA"; -opfor_medic = "LOP_SLA_Infantry_Corpsman"; -opfor_engineer = "LOP_SLA_Infantry_Engineer"; -opfor_paratrooper = "LOP_SLA_Infantry_Rifleman"; +KPLIB_o_officer = "LOP_SLA_Infantry_Officer"; +KPLIB_o_squadLeader = "LOP_SLA_Infantry_SL"; +KPLIB_o_teamLeader = "LOP_SLA_Infantry_TL"; +KPLIB_o_sentry = "LOP_SLA_Infantry_Rifleman"; +KPLIB_o_rifleman = "LOP_SLA_Infantry_Rifleman_2"; +KPLIB_o_riflemanLAT = "LOP_SLA_Infantry_AT"; +KPLIB_o_grenadier = "LOP_SLA_Infantry_GL"; +KPLIB_o_machinegunner = "LOP_SLA_Infantry_MG"; +KPLIB_o_heavyGunner = "LOP_SLA_Infantry_MG"; +KPLIB_o_marksman = "LOP_SLA_Infantry_Marksman"; +KPLIB_o_sharpshooter = "LOP_SLA_Infantry_Marksman"; +KPLIB_o_sniper = "LOP_SLA_Infantry_Marksman"; +KPLIB_o_atSpecialist = "LOP_SLA_Infantry_AT"; +KPLIB_o_aaSpecialist = "LOP_SLA_Infantry_AA"; +KPLIB_o_medic = "LOP_SLA_Infantry_Corpsman"; +KPLIB_o_engineer = "LOP_SLA_Infantry_Engineer"; +KPLIB_o_paratrooper = "LOP_SLA_Infantry_Rifleman"; // Enemy vehicles used by secondary objectives. -opfor_mrap = "LOP_SLA_UAZ"; -opfor_mrap_armed = "LOP_SLA_UAZ_DshKM"; -opfor_transport_helo = "LOP_SLA_Mi8MT_Cargo"; -opfor_transport_truck = "LOP_SLA_Ural"; -opfor_ammobox_transport = "LOP_SLA_Ural_open"; //-> Has to be able to transport resource crates! -opfor_fuel_truck = "rhs_gaz66_ammo_vmf"; -opfor_ammo_truck = "rhs_gaz66_ammo_vmf"; -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; -opfor_flag = "lop_Flag_sla_F"; +KPLIB_o_mrap = "LOP_SLA_UAZ"; +KPLIB_o_mrapArmed = "LOP_SLA_UAZ_DshKM"; +KPLIB_o_transportHeli = "LOP_SLA_Mi8MT_Cargo"; +KPLIB_o_transportTruck = "LOP_SLA_Ural"; +KPLIB_o_transportTruckAmmo = "LOP_SLA_Ural_open"; //-> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "rhs_gaz66_ammo_vmf"; +KPLIB_o_ammoTruck = "rhs_gaz66_ammo_vmf"; +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; +KPLIB_o_flag = "lop_Flag_sla_F"; /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "LOP_SLA_Infantry_Rifleman", "LOP_SLA_Infantry_Rifleman_2", "LOP_SLA_Infantry_GL", @@ -57,7 +69,7 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "LOP_SLA_UAZ_SPG", "LOP_SLA_UAZ_DshKM", "LOP_SLA_UAZ_AGS", @@ -66,7 +78,7 @@ militia_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "LOP_SLA_UAZ_SPG", "LOP_SLA_UAZ_DshKM", "LOP_SLA_UAZ_AGS", @@ -82,7 +94,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "LOP_SLA_UAZ_SPG", "LOP_SLA_UAZ_DshKM", "LOP_SLA_UAZ_AGS", @@ -91,7 +103,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "LOP_SLA_UAZ_SPG", "LOP_SLA_UAZ_DshKM", "LOP_SLA_UAZ_AGS", @@ -108,7 +120,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "LOP_SLA_UAZ_DshKM", "LOP_SLA_UAZ_AGS", "LOP_SLA_Ural", @@ -123,7 +135,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "LOP_SLA_Ural_open", "LOP_SLA_Ural", "LOP_SLA_Mi8MTV3_FAB", @@ -132,11 +144,11 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "LOP_SLA_Mi8MTV3_FAB", "LOP_SLA_Mi8MT_Cargo", "LOP_SLA_Mi8MTV3_UPK23" ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = []; +KPLIB_o_planes = []; diff --git a/Missionframework/presets/enemies/aaf.sqf b/Missionframework/presets/enemies/aaf.sqf index d87613191..db1e6b788 100644 --- a/Missionframework/presets/enemies/aaf.sqf +++ b/Missionframework/presets/enemies/aaf.sqf @@ -1,48 +1,57 @@ /* + File: aaf.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-03 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + AAF enemy preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "I_officer_F"; // Officer -opfor_squad_leader = "I_Soldier_SL_F"; // Squad Leader -opfor_team_leader = "I_Soldier_TL_F"; // Team Leader -opfor_sentry = "I_Soldier_lite_F"; // Rifleman (Lite) -opfor_rifleman = "I_soldier_F"; // Rifleman -opfor_rpg = "I_Soldier_LAT2_F"; // Rifleman (LAT) -opfor_grenadier = "I_Soldier_GL_F"; // Grenadier -opfor_machinegunner = "I_Soldier_AR_F"; // Autorifleman -opfor_heavygunner = "I_Soldier_AR_F"; // Heavy Gunner -opfor_marksman = "I_Soldier_M_F"; // Marksman -opfor_sharpshooter = "I_Soldier_M_F"; // Sharpshooter -opfor_sniper = "I_ghillie_sard_F"; // Sniper -opfor_at = "I_Soldier_AT_F"; // AT Specialist -opfor_aa = "I_Soldier_AA_F"; // AA Specialist -opfor_medic = "I_medic_F"; // Combat Life Saver -opfor_engineer = "I_engineer_F"; // Engineer -opfor_paratrooper = "B_soldier_PG_F"; // Paratrooper +KPLIB_o_officer = "I_officer_F"; // Officer +KPLIB_o_squadLeader = "I_Soldier_SL_F"; // Squad Leader +KPLIB_o_teamLeader = "I_Soldier_TL_F"; // Team Leader +KPLIB_o_sentry = "I_Soldier_lite_F"; // Rifleman (Lite) +KPLIB_o_rifleman = "I_soldier_F"; // Rifleman +KPLIB_o_riflemanLAT = "I_Soldier_LAT2_F"; // Rifleman (LAT) +KPLIB_o_grenadier = "I_Soldier_GL_F"; // Grenadier +KPLIB_o_machinegunner = "I_Soldier_AR_F"; // Autorifleman +KPLIB_o_heavyGunner = "I_Soldier_AR_F"; // Heavy Gunner +KPLIB_o_marksman = "I_Soldier_M_F"; // Marksman +KPLIB_o_sharpshooter = "I_Soldier_M_F"; // Sharpshooter +KPLIB_o_sniper = "I_ghillie_sard_F"; // Sniper +KPLIB_o_atSpecialist = "I_Soldier_AT_F"; // AT Specialist +KPLIB_o_aaSpecialist = "I_Soldier_AA_F"; // AA Specialist +KPLIB_o_medic = "I_medic_F"; // Combat Life Saver +KPLIB_o_engineer = "I_engineer_F"; // Engineer +KPLIB_o_paratrooper = "B_soldier_PG_F"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "I_MRAP_03_F"; // M-ATV -opfor_mrap_armed = "I_MRAP_03_hmg_F"; // MATV (HMG) -opfor_transport_helo = "I_Heli_Transport_02_F"; // Merlin -opfor_transport_truck = "I_Truck_02_covered_F"; // Kamaz Transport (Covered) -opfor_ammobox_transport = "I_Truck_02_transport_F"; // Kamaz Transport (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "I_Truck_02_fuel_F"; // Kamaz Fuel -opfor_ammo_truck = "I_Truck_02_ammo_F"; // Kamz Ammo -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Pod -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Pod -opfor_flag = "Flag_AAF_F"; // Flag +KPLIB_o_mrap = "I_MRAP_03_F"; // M-ATV +KPLIB_o_mrapArmed = "I_MRAP_03_hmg_F"; // MATV (HMG) +KPLIB_o_transportHeli = "I_Heli_Transport_02_F"; // Merlin +KPLIB_o_transportTruck = "I_Truck_02_covered_F"; // Kamaz Transport (Covered) +KPLIB_o_transportTruckAmmo = "I_Truck_02_transport_F"; // Kamaz Transport (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "I_Truck_02_fuel_F"; // Kamaz Fuel +KPLIB_o_ammoTruck = "I_Truck_02_ammo_F"; // Kamz Ammo +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Pod +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Pod +KPLIB_o_flag = "Flag_AAF_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "I_Soldier_lite_F", // Rifleman (Lite) "I_Soldier_lite_F", // Rifleman (Lite) "I_soldier_F", // Rifleman @@ -55,7 +64,7 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "B_LSV_01_armed_F", // Polaris DAGOR (XM312) "B_LSV_01_armed_F", // Polaris DAGOR (XM312) "I_MRAP_03_hmg_F", // MATV (HMG) @@ -66,7 +75,7 @@ militia_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "I_MRAP_03_hmg_F", // M-ATV (HMG) "I_MRAP_03_hmg_F", // M-ATV (HMG) "I_MRAP_03_gmg_F", // M-ATV (GMG) @@ -86,7 +95,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "I_MRAP_03_hmg_F", // M-ATV (HMG) "I_MRAP_03_hmg_F", // M-ATV (HMG) "B_LSV_01_AT_F", // Polaris DAGOR (Mini-Spike PZAbw) @@ -98,7 +107,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "I_MRAP_03_hmg_F", // M-ATV (HMG) "I_MRAP_03_gmg_F", // M-ATV (GMG) "I_MRAP_03_gmg_F", // M-ATV (GMG) @@ -123,7 +132,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "I_MRAP_03_hmg_F", // M-ATV (HMG) "I_MRAP_03_hmg_F", // M-ATV (HMG) "I_LT_01_cannon_F", // Wiesel MK20 @@ -140,7 +149,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "I_Truck_02_transport_F", // Kamaz Transport "I_Truck_02_covered_F", // Kamaz Transport (Covered) "I_APC_Wheeled_03_cannon_F", // SPz Pandur @@ -149,7 +158,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "I_Heli_light_03_dynamicLoadout_F", // Wildcat (Armed) "B_CTRG_Heli_Transport_01_sand_F", // UH-80 Ghost Hawk (Sand) "B_Heli_Attack_01_dynamicLoadout_F", // RAH-66 Comanche @@ -159,7 +168,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "B_Plane_CAS_01_dynamicLoadout_F", // A-10D Thunderbolt II (CAS) "I_Plane_Fighter_03_dynamicLoadout_F", // L-159 "I_Plane_Fighter_04_F" // Gripen diff --git a/Missionframework/presets/enemies/apex.sqf b/Missionframework/presets/enemies/apex.sqf index 2cbb3938d..7c08ced99 100644 --- a/Missionframework/presets/enemies/apex.sqf +++ b/Missionframework/presets/enemies/apex.sqf @@ -1,48 +1,57 @@ /* + File: apex.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CSAT pacific enemy preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "O_T_Officer_F"; // Officer -opfor_squad_leader = "O_T_Soldier_SL_F"; // Squad Leader -opfor_team_leader = "O_T_Soldier_TL_F"; // Team Leader -opfor_sentry = "O_T_Soldier_F"; // Rifleman -opfor_rifleman = "O_T_Soldier_F"; // Rifleman -opfor_rpg = "O_T_Soldier_LAT_F"; // Rifleman (LAT) -opfor_grenadier = "O_T_Soldier_GL_F"; // Grenadier -opfor_machinegunner = "O_T_Soldier_AR_F"; // Autorifleman -opfor_heavygunner = "O_T_Soldier_AR_F"; // Autorifleman -opfor_marksman = "O_T_Soldier_M_F"; // Marksman -opfor_sharpshooter = "O_T_Soldier_M_F"; // Marksman -opfor_sniper = "O_T_Sniper_F"; // Sniper -opfor_at = "O_T_Soldier_AT_F"; // AT Specialist -opfor_aa = "O_T_Soldier_AA_F"; // AA Specialist -opfor_medic = "O_T_Medic_F"; // Combat Life Saver -opfor_engineer = "O_T_Engineer_F"; // Engineer -opfor_paratrooper = "O_T_Soldier_PG_F"; // Paratrooper +KPLIB_o_officer = "O_T_Officer_F"; // Officer +KPLIB_o_squadLeader = "O_T_Soldier_SL_F"; // Squad Leader +KPLIB_o_teamLeader = "O_T_Soldier_TL_F"; // Team Leader +KPLIB_o_sentry = "O_T_Soldier_F"; // Rifleman +KPLIB_o_rifleman = "O_T_Soldier_F"; // Rifleman +KPLIB_o_riflemanLAT = "O_T_Soldier_LAT_F"; // Rifleman (LAT) +KPLIB_o_grenadier = "O_T_Soldier_GL_F"; // Grenadier +KPLIB_o_machinegunner = "O_T_Soldier_AR_F"; // Autorifleman +KPLIB_o_heavyGunner = "O_T_Soldier_AR_F"; // Autorifleman +KPLIB_o_marksman = "O_T_Soldier_M_F"; // Marksman +KPLIB_o_sharpshooter = "O_T_Soldier_M_F"; // Marksman +KPLIB_o_sniper = "O_T_Sniper_F"; // Sniper +KPLIB_o_atSpecialist = "O_T_Soldier_AT_F"; // AT Specialist +KPLIB_o_aaSpecialist = "O_T_Soldier_AA_F"; // AA Specialist +KPLIB_o_medic = "O_T_Medic_F"; // Combat Life Saver +KPLIB_o_engineer = "O_T_Engineer_F"; // Engineer +KPLIB_o_paratrooper = "O_T_Soldier_PG_F"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "O_T_LSV_02_unarmed_F"; // Qilin -opfor_mrap_armed = "O_T_LSV_02_armed_F"; // Qilin (HMG) -opfor_transport_helo = "O_Heli_Transport_04_bench_F"; // Mi-290 Taru (Bench) -opfor_transport_truck = "O_T_Truck_03_covered_ghex_F"; // Tempest Transport (Covered) -opfor_ammobox_transport = "O_T_Truck_03_transport_ghex_F"; // Tempest Transport (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "O_T_Truck_03_fuel_ghex_F"; // Tempest Fuel -opfor_ammo_truck = "O_T_Truck_03_ammo_ghex_F"; // Tempest Ammo -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod -opfor_flag = "Flag_CSAT_F"; // Flag +KPLIB_o_mrap = "O_T_LSV_02_unarmed_F"; // Qilin +KPLIB_o_mrapArmed = "O_T_LSV_02_armed_F"; // Qilin (HMG) +KPLIB_o_transportHeli = "O_Heli_Transport_04_bench_F"; // Mi-290 Taru (Bench) +KPLIB_o_transportTruck = "O_T_Truck_03_covered_ghex_F"; // Tempest Transport (Covered) +KPLIB_o_transportTruckAmmo = "O_T_Truck_03_transport_ghex_F"; // Tempest Transport (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "O_T_Truck_03_fuel_ghex_F"; // Tempest Fuel +KPLIB_o_ammoTruck = "O_T_Truck_03_ammo_ghex_F"; // Tempest Ammo +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod +KPLIB_o_flag = "Flag_CSAT_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "O_soldierU_F", // Rifleman (Lite) "O_soldierU_F", // Rifleman (Lite) "O_soldierU_F", // Rifleman @@ -55,12 +64,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "O_T_LSV_02_armed_F" // Qilin (armed) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels) -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "O_T_MRAP_02_hmg_ghex_F", // Ifrit (HMG) "O_T_MRAP_02_hmg_ghex_F", // Ifrit (HMG) "O_T_MRAP_02_gmg_ghex_F", // Ifrit (GMG) @@ -76,7 +85,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "O_T_MRAP_02_hmg_ghex_F", // Ifrit (HMG) "O_T_MRAP_02_hmg_ghex_F", // Ifrit (HMG) "O_T_LSV_02_AT_F", // Qilin (AT) @@ -85,7 +94,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "O_T_MRAP_02_hmg_ghex_F", // Ifrit (HMG) "O_T_MRAP_02_gmg_ghex_F", // Ifrit (GMG) "O_T_MRAP_02_gmg_ghex_F", // Ifrit (GMG) @@ -108,7 +117,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "O_T_MRAP_02_ghex_F", // Ifrit "O_T_MRAP_02_hmg_ghex_F", // Ifrit (HMG) "O_T_MRAP_02_hmg_ghex_F", // Ifrit (HMG) @@ -122,7 +131,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "O_T_Truck_03_transport_ghex_F", // Tempest Transport "O_T_Truck_03_covered_ghex_F", // Tempest Transport (Covered) "O_T_APC_Wheeled_02_rcws_ghex_F", // MSE-3 Marid @@ -132,7 +141,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "O_Heli_Transport_04_bench_F", // Mi-290 Taru (Bench) "O_Heli_Light_02_dynamicLoadout_F", // Po-30 Orca (Armed) "O_Heli_Attack_02_dynamicLoadout_F", // Mi-48 Kajman @@ -140,7 +149,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "O_Plane_CAS_02_dynamicLoadout_F", // To-199 Neophron (CAS) "O_Plane_Fighter_02_F" // To-201 Shikra ]; diff --git a/Missionframework/presets/enemies/CUP_AFRF_ModernMSV.sqf b/Missionframework/presets/enemies/cup_afrf_msv_modern.sqf similarity index 82% rename from Missionframework/presets/enemies/CUP_AFRF_ModernMSV.sqf rename to Missionframework/presets/enemies/cup_afrf_msv_modern.sqf index 4d8a61a41..5be057239 100644 --- a/Missionframework/presets/enemies/CUP_AFRF_ModernMSV.sqf +++ b/Missionframework/presets/enemies/cup_afrf_msv_modern.sqf @@ -1,50 +1,59 @@ /* + File: cup_afrf_msv_modern.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-21 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP AFRF MSV Modern enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_O_RU_Officer_M_EMR"; // Officer -opfor_squad_leader = "CUP_O_RU_Soldier_SL_M_EMR"; // Squad Leader -opfor_team_leader = "CUP_O_RU_Soldier_TL_M_EMR"; // Team Leader -opfor_sentry = "CUP_O_RU_Soldier_Saiga_M_EMR"; // Rifleman (Lite) -opfor_rifleman = "CUP_O_RU_Soldier_M_EMR"; // Rifleman -opfor_rpg = "CUP_O_RU_Soldier_AT_M_EMR"; // Rifleman (LAT) -opfor_grenadier = "CUP_O_RU_Soldier_GL_M_EMR"; // Grenadier -opfor_machinegunner = "CUP_O_RU_Soldier_AR_M_EMR"; // Autorifleman -opfor_heavygunner = "CUP_O_RU_Soldier_MG_M_EMR"; // Heavy Gunner -opfor_marksman = "CUP_O_RU_Soldier_Marksman_M_EMR"; // Marksman -opfor_sharpshooter = "CUP_O_RU_Sniper_M_EMR"; // Sharpshooter -opfor_sniper = "CUP_O_RU_Sniper_KSVK_M_EMR"; // Sniper -opfor_at = "CUP_O_RU_Soldier_HAT_M_EMR"; // AT Specialist -opfor_aa = "CUP_O_RU_Soldier_AA_M_EMR"; // AA Specialist -opfor_medic = "CUP_O_RU_Medic_M_EMR"; // Medic -opfor_engineer = "CUP_O_RU_Engineer_M_EMR"; // Engineer -opfor_paratrooper = "CUP_O_RU_Soldier_LAT_M_EMR"; // Paratrooper +KPLIB_o_officer = "CUP_O_RU_Officer_M_EMR"; // Officer +KPLIB_o_squadLeader = "CUP_O_RU_Soldier_SL_M_EMR"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_RU_Soldier_TL_M_EMR"; // Team Leader +KPLIB_o_sentry = "CUP_O_RU_Soldier_Saiga_M_EMR"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_RU_Soldier_M_EMR"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_RU_Soldier_AT_M_EMR"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_RU_Soldier_GL_M_EMR"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_RU_Soldier_AR_M_EMR"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_RU_Soldier_MG_M_EMR"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_RU_Soldier_Marksman_M_EMR"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_RU_Sniper_M_EMR"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_RU_Sniper_KSVK_M_EMR"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_RU_Soldier_HAT_M_EMR"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_RU_Soldier_AA_M_EMR"; // AA Specialist +KPLIB_o_medic = "CUP_O_RU_Medic_M_EMR"; // Medic +KPLIB_o_engineer = "CUP_O_RU_Engineer_M_EMR"; // Engineer +KPLIB_o_paratrooper = "CUP_O_RU_Soldier_LAT_M_EMR"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_O_UAZ_Unarmed_RU"; // UAZ -opfor_mrap_armed = "CUP_O_UAZ_MG_RU"; // UAZ (DShKM) -opfor_transport_helo = "CUP_O_Mi8_RU"; // Mi-8MTV3 -opfor_transport_truck = "CUP_O_Kamaz_RU"; // Kamaz 5350 -opfor_ammobox_transport = "CUP_O_Kamaz_Open_RU"; // Kamaz 5350 (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_O_Kamaz_Refuel_RU"; // Kamaz 5350 (Fuel) -opfor_ammo_truck = "CUP_O_Kamaz_Reammo_RU"; // Kamaz 5350 (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagCarrierRU"; // Flag +KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_RU"; // UAZ +KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_RU"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_O_Mi8_RU"; // Mi-8MTV3 +KPLIB_o_transportTruck = "CUP_O_Kamaz_RU"; // Kamaz 5350 +KPLIB_o_transportTruckAmmo = "CUP_O_Kamaz_Open_RU"; // Kamaz 5350 (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Kamaz_Refuel_RU"; // Kamaz 5350 (Fuel) +KPLIB_o_ammoTruck = "CUP_O_Kamaz_Reammo_RU"; // Kamaz 5350 (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierRU"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "CUP_O_RU_Soldier_Saiga_EMR", // Rifleman (Saiga) "CUP_O_RU_Soldier_Saiga_EMR", // Rifleman (Saiga) "CUP_O_RU_Soldier_EMR", // Rifleman @@ -57,12 +66,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "CUP_O_UAZ_MG_RU" // UAZ (DShKM) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) @@ -87,7 +96,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "CUP_O_UAZ_MG_RU", // UAZ (DShKM) "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) @@ -100,7 +109,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) @@ -130,7 +139,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "CUP_O_UAZ_MG_RU", // UAZ (DShKM) "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) @@ -146,7 +155,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) "CUP_O_Mi8_RU", // Mi-8MTV3 "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V @@ -164,7 +173,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P "CUP_O_Mi8_RU", // Mi-8MTV3 @@ -174,7 +183,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "CUP_O_Su25_Dyn_RU", // Su-25T Frogfoot "CUP_O_SU34_RU" // Su-34 ]; diff --git a/Missionframework/presets/enemies/CUP_TakiArmy.sqf b/Missionframework/presets/enemies/cup_takistan.sqf similarity index 83% rename from Missionframework/presets/enemies/CUP_TakiArmy.sqf rename to Missionframework/presets/enemies/cup_takistan.sqf index f952b1bb3..caef34873 100644 --- a/Missionframework/presets/enemies/CUP_TakiArmy.sqf +++ b/Missionframework/presets/enemies/cup_takistan.sqf @@ -1,50 +1,59 @@ /* + File: cup_takistan.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP Takistan Army enemy preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "CUP_O_TK_Officer"; // Officer -opfor_squad_leader = "CUP_O_TK_Soldier_SL"; // Squad Leader -opfor_team_leader = "CUP_O_TK_Soldier_SL"; // Team Leader -opfor_sentry = "CUP_O_TK_Soldier"; // Rifleman (Lite) -opfor_rifleman = "CUP_O_TK_Soldier_Backpack"; // Rifleman -opfor_rpg = "CUP_O_TK_Soldier_AT"; // Rifleman (LAT) -opfor_grenadier = "CUP_O_TK_Soldier_GL"; // Grenadier -opfor_machinegunner = "CUP_O_TK_Soldier_AR"; // Autorifleman -opfor_heavygunner = "CUP_O_TK_Soldier_MG"; // Heavy Gunner -opfor_marksman = "CUP_O_TK_Sniper"; // Marksman -opfor_sharpshooter = "CUP_O_TK_Sniper_SVD_Night"; // Sharpshooter -opfor_sniper = "CUP_O_TK_Sniper_KSVK"; // Sniper -opfor_at = "CUP_O_TK_Soldier_HAT"; // AT Specialist -opfor_aa = "CUP_O_TK_Soldier_AA"; // AA Specialist -opfor_medic = "CUP_O_TK_Medic"; // Medic -opfor_engineer = "CUP_O_TK_Engineer"; // Engineer -opfor_paratrooper = "CUP_O_TK_Soldier_AKS_74_GOSHAWK"; // Paratrooper +KPLIB_o_officer = "CUP_O_TK_Officer"; // Officer +KPLIB_o_squadLeader = "CUP_O_TK_Soldier_SL"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_TK_Soldier_SL"; // Team Leader +KPLIB_o_sentry = "CUP_O_TK_Soldier"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_TK_Soldier_Backpack"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_TK_Soldier_AT"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_TK_Soldier_GL"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_TK_Soldier_AR"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_TK_Soldier_MG"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_TK_Sniper"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_TK_Sniper_SVD_Night"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_TK_Sniper_KSVK"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_TK_Soldier_HAT"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_TK_Soldier_AA"; // AA Specialist +KPLIB_o_medic = "CUP_O_TK_Medic"; // Medic +KPLIB_o_engineer = "CUP_O_TK_Engineer"; // Engineer +KPLIB_o_paratrooper = "CUP_O_TK_Soldier_AKS_74_GOSHAWK"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "CUP_O_LR_Transport_TKA"; // Land Rover 110 (Transport) -opfor_mrap_armed = "CUP_O_LR_MG_TKA"; // Land Rover 110 (M2) -opfor_transport_helo = "CUP_O_UH1H_TKA"; // UH-1H -opfor_transport_truck = "CUP_O_Ural_TKA"; // Ural -opfor_ammobox_transport = "CUP_O_Ural_Open_TKA"; // Ural (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "CUP_O_Ural_Refuel_TKA"; // Ural (Refuel) -opfor_ammo_truck = "CUP_O_Ural_Reammo_TKA"; // Ural (Ammo) -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagCarrierTakistan_EP1"; // Flag +KPLIB_o_mrap = "CUP_O_LR_Transport_TKA"; // Land Rover 110 (Transport) +KPLIB_o_mrapArmed = "CUP_O_LR_MG_TKA"; // Land Rover 110 (M2) +KPLIB_o_transportHeli = "CUP_O_UH1H_TKA"; // UH-1H +KPLIB_o_transportTruck = "CUP_O_Ural_TKA"; // Ural +KPLIB_o_transportTruckAmmo = "CUP_O_Ural_Open_TKA"; // Ural (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Ural_Refuel_TKA"; // Ural (Refuel) +KPLIB_o_ammoTruck = "CUP_O_Ural_Reammo_TKA"; // Ural (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierTakistan_EP1"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "CUP_O_TK_INS_Soldier_FNFAL", // Militiaman (FN FAL) "CUP_O_TK_INS_Soldier", // Militiaman (AK-74) "CUP_O_TK_INS_Soldier_GL", // Militiaman (AK-74 GL) @@ -57,7 +66,7 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "CUP_O_LR_MG_TKM", // Land Rover 110 (M2) "CUP_O_LR_MG_TKM", // Land Rover 110 (M2) "CUP_O_Hilux_AGS30_TK_INS", // Hilux (AGS-30) @@ -72,7 +81,7 @@ militia_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "CUP_O_UAZ_MG_TKA", // UAZ (DShKM) "CUP_O_UAZ_AGS30_TKA", // UAZ (AGS-30) "CUP_O_UAZ_SPG9_TKA", // UAZ (SPG-9) @@ -92,7 +101,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "CUP_O_UAZ_MG_TKA", // UAZ (DShKM) "CUP_O_UAZ_MG_TKA", // UAZ (DShKM) "CUP_O_UAZ_AGS30_TKA", // UAZ (AGS-30) @@ -110,7 +119,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "CUP_O_UAZ_MG_TKA", // UAZ (DShKM) "CUP_O_UAZ_AGS30_TKA", // UAZ (AGS-30) "CUP_O_UAZ_AGS30_TKA", // UAZ (AGS-30) @@ -136,7 +145,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "CUP_O_UAZ_MG_TKA", // UAZ (DShKM) "CUP_O_UAZ_MG_TKA", // UAZ (DShKM) "CUP_O_MTLB_pk_TKA", // MT-LB LV @@ -157,7 +166,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "CUP_O_BMP1_TKA", // BMP-1 "CUP_O_M113_TKA", // M113A3 "CUP_O_MTLB_pk_TKA", // MT-LB LV @@ -174,7 +183,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "CUP_O_UH1H_TKA", // UH-1H "CUP_O_UH1H_armed_TKA", // UH-1H (Armed) "CUP_O_UH1H_gunship_SLA_TKA", // UH-1H (Gunship) @@ -183,7 +192,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "CUP_O_L39_TK", // L-39ZA "CUP_O_Su25_Dyn_TKA" // Su-25 Frogfoot ]; diff --git a/Missionframework/presets/enemies/custom.sqf b/Missionframework/presets/enemies/custom.sqf index f37cd8a30..c6cee9085 100644 --- a/Missionframework/presets/enemies/custom.sqf +++ b/Missionframework/presets/enemies/custom.sqf @@ -1,48 +1,57 @@ /* + File: custom.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Custom (default CSAT) enemy preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "O_officer_F"; // Officer -opfor_squad_leader = "O_Soldier_SL_F"; // Squad Leader -opfor_team_leader = "O_Soldier_TL_F"; // Team Leader -opfor_sentry = "O_Soldier_lite_F"; // Rifleman (Lite) -opfor_rifleman = "O_Soldier_F"; // Rifleman -opfor_rpg = "O_Soldier_LAT_F"; // Rifleman (LAT) -opfor_grenadier = "O_Soldier_GL_F"; // Grenadier -opfor_machinegunner = "O_Soldier_AR_F"; // Autorifleman -opfor_heavygunner = "O_HeavyGunner_F"; // Heavy Gunner -opfor_marksman = "O_soldier_M_F"; // Marksman -opfor_sharpshooter = "O_Sharpshooter_F"; // Sharpshooter -opfor_sniper = "O_sniper_F"; // Sniper -opfor_at = "O_Soldier_AT_F"; // AT Specialist -opfor_aa = "O_Soldier_AA_F"; // AA Specialist -opfor_medic = "O_medic_F"; // Combat Life Saver -opfor_engineer = "O_engineer_F"; // Engineer -opfor_paratrooper = "O_soldier_PG_F"; // Paratrooper +KPLIB_o_officer = "O_officer_F"; // Officer +KPLIB_o_squadLeader = "O_Soldier_SL_F"; // Squad Leader +KPLIB_o_teamLeader = "O_Soldier_TL_F"; // Team Leader +KPLIB_o_sentry = "O_Soldier_lite_F"; // Rifleman (Lite) +KPLIB_o_rifleman = "O_Soldier_F"; // Rifleman +KPLIB_o_riflemanLAT = "O_Soldier_LAT_F"; // Rifleman (LAT) +KPLIB_o_grenadier = "O_Soldier_GL_F"; // Grenadier +KPLIB_o_machinegunner = "O_Soldier_AR_F"; // Autorifleman +KPLIB_o_heavyGunner = "O_HeavyGunner_F"; // Heavy Gunner +KPLIB_o_marksman = "O_soldier_M_F"; // Marksman +KPLIB_o_sharpshooter = "O_Sharpshooter_F"; // Sharpshooter +KPLIB_o_sniper = "O_sniper_F"; // Sniper +KPLIB_o_atSpecialist = "O_Soldier_AT_F"; // AT Specialist +KPLIB_o_aaSpecialist = "O_Soldier_AA_F"; // AA Specialist +KPLIB_o_medic = "O_medic_F"; // Combat Life Saver +KPLIB_o_engineer = "O_engineer_F"; // Engineer +KPLIB_o_paratrooper = "O_soldier_PG_F"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "O_MRAP_02_F"; // Ifrit -opfor_mrap_armed = "O_MRAP_02_hmg_F"; // Ifrit (HMG) -opfor_transport_helo = "O_Heli_Transport_04_bench_F"; // Mi-290 Taru (Bench) -opfor_transport_truck = "O_Truck_03_covered_F"; // Tempest Transport (Covered) -opfor_ammobox_transport = "O_Truck_03_transport_F"; // Tempest Transport (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "O_Truck_03_fuel_F"; // Tempest Fuel -opfor_ammo_truck = "O_Truck_03_ammo_F"; // Tempest Ammo -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod -opfor_flag = "Flag_CSAT_F"; // Flag +KPLIB_o_mrap = "O_MRAP_02_F"; // Ifrit +KPLIB_o_mrapArmed = "O_MRAP_02_hmg_F"; // Ifrit (HMG) +KPLIB_o_transportHeli = "O_Heli_Transport_04_bench_F"; // Mi-290 Taru (Bench) +KPLIB_o_transportTruck = "O_Truck_03_covered_F"; // Tempest Transport (Covered) +KPLIB_o_transportTruckAmmo = "O_Truck_03_transport_F"; // Tempest Transport (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "O_Truck_03_fuel_F"; // Tempest Fuel +KPLIB_o_ammoTruck = "O_Truck_03_ammo_F"; // Tempest Ammo +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod +KPLIB_o_flag = "Flag_CSAT_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "O_soldierU_F", // Rifleman (Lite) "O_soldierU_F", // Rifleman (Lite) "O_soldierU_F", // Rifleman @@ -55,12 +64,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "O_LSV_02_armed_F" // Qilin (armed) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "O_MRAP_02_hmg_F", // Ifrit (HMG) "O_MRAP_02_hmg_F", // Ifrit (GMG) "O_MRAP_02_gmg_F", // Ifrit (GMG) @@ -76,7 +85,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "O_MRAP_02_hmg_F", // Ifrit (HMG) "O_MRAP_02_hmg_F", // Ifrit (HMG) "O_LSV_02_AT_F", // Qilin (AT) @@ -85,7 +94,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "O_MRAP_02_hmg_F", // Ifrit (HMG) "O_MRAP_02_gmg_F", // Ifrit (GMG) "O_MRAP_02_gmg_F", // Ifrit (GMG) @@ -107,7 +116,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "O_MRAP_02_hmg_F", // Ifrit (HMG) "O_MRAP_02_hmg_F", // Ifrit (HMG) "O_Truck_03_transport_F", // Tempest Transport @@ -120,7 +129,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "O_Truck_03_transport_F", // Tempest Transport "O_Truck_03_covered_F", // Tempest Transport (Covered) "O_APC_Wheeled_02_rcws_F", // MSE-3 Marid @@ -129,14 +138,14 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "O_Heli_Transport_04_bench_F", // Mi-290 Taru (Bench) "O_Heli_Light_02_dynamicLoadout_F", // Po-30 Orca (Armed) "O_Heli_Attack_02_dynamicLoadout_F" // Mi-48 Kajman ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "O_Plane_CAS_02_dynamicLoadout_F", // To-199 Neophron (CAS) "O_Plane_Fighter_02_F" // To-201 Shikra ]; diff --git a/Missionframework/presets/enemies/gm_east.sqf b/Missionframework/presets/enemies/gm_east.sqf index 23cc75429..83605e853 100644 --- a/Missionframework/presets/enemies/gm_east.sqf +++ b/Missionframework/presets/enemies/gm_east.sqf @@ -1,48 +1,57 @@ /* + File: gm_east.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-06 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + East Germany enemy preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Aircraft (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ // Enemy infantry classes -opfor_officer = "gm_gc_army_officer_80_gry"; // Officer -opfor_squad_leader = "gm_gc_army_squadleader_mpiak74n_80_str"; // Squad Leader -opfor_team_leader = "gm_gc_army_squadleader_mpiak74n_80_str"; // Team Leader -opfor_sentry = "gm_gc_army_rifleman_mpiak74n_80_str"; // Rifleman (Lite) -opfor_rifleman = "gm_gc_army_rifleman_mpiak74n_80_str"; // Rifleman -opfor_rpg = "gm_gc_army_antitank_mpiak74n_rpg7_80_str"; // Rifleman (LAT) -opfor_grenadier = "gm_gc_army_demolition_mpiaks74n_80_str"; // Grenadier -opfor_machinegunner = "gm_gc_army_machinegunner_lmgrpk_80_str"; // Autorifleman -opfor_heavygunner = "gm_gc_army_machinegunner_pk_80_str"; // Heavy Gunner -opfor_marksman = "gm_gc_army_rifleman_mpiak74n_80_str"; // Marksman -opfor_sharpshooter = "gm_gc_army_rifleman_mpiak74n_80_str"; // Sharpshooter -opfor_sniper = "gm_gc_army_rifleman_mpiak74n_80_str"; // Sniper -opfor_at = "gm_gc_army_antitank_mpiak74n_rpg7_80_str"; // AT Specialist -opfor_aa = "gm_gc_army_demolition_mpiaks74n_80_str"; // AA Specialist -opfor_medic = "gm_gc_army_rifleman_mpiak74n_80_str"; // Combat Life Saver -opfor_engineer = "gm_gc_army_engineer_mpiaks74n_80_str"; // Engineer -opfor_paratrooper = "gm_gc_army_rifleman_mpiak74n_80_str"; // Paratrooper +KPLIB_o_officer = "gm_gc_army_officer_80_gry"; // Officer +KPLIB_o_squadLeader = "gm_gc_army_squadleader_mpiak74n_80_str"; // Squad Leader +KPLIB_o_teamLeader = "gm_gc_army_squadleader_mpiak74n_80_str"; // Team Leader +KPLIB_o_sentry = "gm_gc_army_rifleman_mpiak74n_80_str"; // Rifleman (Lite) +KPLIB_o_rifleman = "gm_gc_army_rifleman_mpiak74n_80_str"; // Rifleman +KPLIB_o_riflemanLAT = "gm_gc_army_antitank_mpiak74n_rpg7_80_str"; // Rifleman (LAT) +KPLIB_o_grenadier = "gm_gc_army_demolition_mpiaks74n_80_str"; // Grenadier +KPLIB_o_machinegunner = "gm_gc_army_machinegunner_lmgrpk_80_str"; // Autorifleman +KPLIB_o_heavyGunner = "gm_gc_army_machinegunner_pk_80_str"; // Heavy Gunner +KPLIB_o_marksman = "gm_gc_army_rifleman_mpiak74n_80_str"; // Marksman +KPLIB_o_sharpshooter = "gm_gc_army_rifleman_mpiak74n_80_str"; // Sharpshooter +KPLIB_o_sniper = "gm_gc_army_rifleman_mpiak74n_80_str"; // Sniper +KPLIB_o_atSpecialist = "gm_gc_army_antitank_mpiak74n_rpg7_80_str"; // AT Specialist +KPLIB_o_aaSpecialist = "gm_gc_army_demolition_mpiaks74n_80_str"; // AA Specialist +KPLIB_o_medic = "gm_gc_army_rifleman_mpiak74n_80_str"; // Combat Life Saver +KPLIB_o_engineer = "gm_gc_army_engineer_mpiaks74n_80_str"; // Engineer +KPLIB_o_paratrooper = "gm_gc_army_rifleman_mpiak74n_80_str"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "gm_gc_army_brdm2um"; // SPW40-P2UM -opfor_mrap_armed = "gm_gc_army_brdm2"; // SPW-40P2 -opfor_transport_helo = "gm_gc_army_ural4320_cargo"; // Truck gel. 5 Transport -opfor_transport_truck = "gm_gc_army_ural4320_cargo"; // Truck gel. 5 Transport -opfor_ammobox_transport = "gm_gc_army_ural4320_cargo"; // Truck gel. 5 Transport -> Has to be able to transport resource crates! -opfor_fuel_truck = "gm_gc_army_ural4320_refuel"; // Truck gel. 5 Fuel -opfor_ammo_truck = "gm_gc_army_ural4320_reammo"; // Truck gel. 5 Ammo -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod -opfor_flag = "FlagPole_F"; // Flag +KPLIB_o_mrap = "gm_gc_army_brdm2um"; // SPW40-P2UM +KPLIB_o_mrapArmed = "gm_gc_army_brdm2"; // SPW-40P2 +KPLIB_o_transportHeli = "gm_gc_army_ural4320_cargo"; // Truck gel. 5 Transport +KPLIB_o_transportTruck = "gm_gc_army_ural4320_cargo"; // Truck gel. 5 Transport +KPLIB_o_transportTruckAmmo = "gm_gc_army_ural4320_cargo"; // Truck gel. 5 Transport -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "gm_gc_army_ural4320_refuel"; // Truck gel. 5 Fuel +KPLIB_o_ammoTruck = "gm_gc_army_ural4320_reammo"; // Truck gel. 5 Ammo +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod +KPLIB_o_flag = "FlagPole_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "gm_gc_army_rifleman_mpiak74n_80_str", // Rifleman (Lite) "gm_gc_army_rifleman_mpiak74n_80_str", // Rifleman (Lite) "gm_gc_army_rifleman_mpiak74n_80_str", // Rifleman @@ -55,12 +64,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "gm_gc_army_brdm2um" // SPW40-P2UM ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "gm_gc_army_brdm2um", // SPW40-P2UM "gm_gc_army_brdm2", // SPW-40P2 "gm_gc_army_btr60pa", // SPW-60PA @@ -73,7 +82,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "gm_gc_army_brdm2um", // SPW40-P2UM "gm_gc_army_brdm2", // SPW-40P2 "gm_gc_army_btr60pa", // SPW-60PA @@ -81,7 +90,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "gm_gc_army_ural4320_cargo", // Truck gel. 5 Transport "gm_gc_army_brdm2um", // SPW40-P2UM "gm_gc_army_brdm2", // SPW-40P2 @@ -96,7 +105,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "gm_gc_army_ural4320_cargo", // Truck gel. 5 Transport "gm_gc_army_brdm2um", // SPW40-P2UM "gm_gc_army_brdm2", // SPW-40P2 @@ -109,7 +118,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "gm_gc_army_ural4320_cargo", // Truck gel. 5 Transport "gm_gc_army_btr60pa", // SPW-60PA "gm_gc_army_btr60pb", // SPW-60PB @@ -117,7 +126,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "len_mi8amt_nva", // Mi8amt "len_mi24d_AT_nva", // Mi-24D (AT) "len_mi24d_CAS_nva", // Mi-24D (CAS) @@ -128,6 +137,6 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "len_l39_nva" // Aero L-39 ]; diff --git a/Missionframework/presets/enemies/gm_east_win.sqf b/Missionframework/presets/enemies/gm_east_win.sqf index 23f857e45..945a31b15 100644 --- a/Missionframework/presets/enemies/gm_east_win.sqf +++ b/Missionframework/presets/enemies/gm_east_win.sqf @@ -1,48 +1,57 @@ /* + File: gm_east_win.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-09 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + East Germany Winter enemy preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Aircraft (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ // Enemy infantry classes -opfor_officer = "gm_gc_army_officer_pm_80_win"; // Officer -opfor_squad_leader = "gm_gc_army_squadleader_mpiak74n_80_win"; // Squad Leader -opfor_team_leader = "gm_gc_army_squadleader_mpiak74n_80_win"; // Team Leader -opfor_sentry = "gm_gc_army_rifleman_mpiak74n_80_win"; // Rifleman (Lite) -opfor_rifleman = "gm_gc_army_rifleman_mpiak74n_80_win"; // Rifleman -opfor_rpg = "gm_gc_army_antitank_mpiak74n_rpg7_80_win"; // Rifleman (LAT) -opfor_grenadier = "gm_gc_army_demolition_mpiaks74n_80_win"; // Grenadier -opfor_machinegunner = "gm_gc_army_machinegunner_lmgrpk_80_win"; // Autorifleman -opfor_heavygunner = "gm_gc_army_machinegunner_pk_80_win"; // Heavy Gunner -opfor_marksman = "gm_gc_army_rifleman_mpiak74n_80_win"; // Marksman -opfor_sharpshooter = "gm_gc_army_rifleman_mpiak74n_80_win"; // Sharpshooter -opfor_sniper = "gm_gc_army_rifleman_mpiak74n_80_win"; // Sniper -opfor_at = "gm_gc_army_antitank_mpiak74n_rpg7_80_win"; // AT Specialist -opfor_aa = "gm_gc_army_demolition_mpiaks74n_80_win"; // AA Specialist -opfor_medic = "gm_gc_army_rifleman_mpiak74n_80_win"; // Combat Life Saver -opfor_engineer = "gm_gc_army_engineer_mpiaks74n_80_win"; // Engineer -opfor_paratrooper = "gm_gc_army_rifleman_mpiak74n_80_win"; // Paratrooper +KPLIB_o_officer = "gm_gc_army_officer_pm_80_win"; // Officer +KPLIB_o_squadLeader = "gm_gc_army_squadleader_mpiak74n_80_win"; // Squad Leader +KPLIB_o_teamLeader = "gm_gc_army_squadleader_mpiak74n_80_win"; // Team Leader +KPLIB_o_sentry = "gm_gc_army_rifleman_mpiak74n_80_win"; // Rifleman (Lite) +KPLIB_o_rifleman = "gm_gc_army_rifleman_mpiak74n_80_win"; // Rifleman +KPLIB_o_riflemanLAT = "gm_gc_army_antitank_mpiak74n_rpg7_80_win"; // Rifleman (LAT) +KPLIB_o_grenadier = "gm_gc_army_demolition_mpiaks74n_80_win"; // Grenadier +KPLIB_o_machinegunner = "gm_gc_army_machinegunner_lmgrpk_80_win"; // Autorifleman +KPLIB_o_heavyGunner = "gm_gc_army_machinegunner_pk_80_win"; // Heavy Gunner +KPLIB_o_marksman = "gm_gc_army_rifleman_mpiak74n_80_win"; // Marksman +KPLIB_o_sharpshooter = "gm_gc_army_rifleman_mpiak74n_80_win"; // Sharpshooter +KPLIB_o_sniper = "gm_gc_army_rifleman_mpiak74n_80_win"; // Sniper +KPLIB_o_atSpecialist = "gm_gc_army_antitank_mpiak74n_rpg7_80_win"; // AT Specialist +KPLIB_o_aaSpecialist = "gm_gc_army_demolition_mpiaks74n_80_win"; // AA Specialist +KPLIB_o_medic = "gm_gc_army_rifleman_mpiak74n_80_win"; // Combat Life Saver +KPLIB_o_engineer = "gm_gc_army_engineer_mpiaks74n_80_win"; // Engineer +KPLIB_o_paratrooper = "gm_gc_army_rifleman_mpiak74n_80_win"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "gm_gc_army_brdm2um_win"; // SPW40-P2UM -opfor_mrap_armed = "gm_gc_army_brdm2_win"; // SPW-40P2 -opfor_transport_helo = "gm_gc_army_ural4320_cargo_win"; // Truck gel. 5 Transport -opfor_transport_truck = "gm_gc_army_ural4320_cargo_win"; // Truck gel. 5 Transport -opfor_ammobox_transport = "gm_gc_army_ural4320_cargo_win"; // Truck gel. 5 Transport -> Has to be able to transport resource crates! -opfor_fuel_truck = "gm_gc_army_ural4320_refuel_win"; // Truck gel. 5 Fuel -opfor_ammo_truck = "gm_gc_army_ural4320_reammo_win"; // Truck gel. 5 Ammo -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod -opfor_flag = "FlagPole_F"; // Flag +KPLIB_o_mrap = "gm_gc_army_brdm2um_win"; // SPW40-P2UM +KPLIB_o_mrapArmed = "gm_gc_army_brdm2_win"; // SPW-40P2 +KPLIB_o_transportHeli = "gm_gc_army_ural4320_cargo_win"; // Truck gel. 5 Transport +KPLIB_o_transportTruck = "gm_gc_army_ural4320_cargo_win"; // Truck gel. 5 Transport +KPLIB_o_transportTruckAmmo = "gm_gc_army_ural4320_cargo_win"; // Truck gel. 5 Transport -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "gm_gc_army_ural4320_refuel_win"; // Truck gel. 5 Fuel +KPLIB_o_ammoTruck = "gm_gc_army_ural4320_reammo_win"; // Truck gel. 5 Ammo +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod +KPLIB_o_flag = "FlagPole_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "gm_gc_army_rifleman_mpiak74n_80_win", // Rifleman (Lite) "gm_gc_army_rifleman_mpiak74n_80_win", // Rifleman (Lite) "gm_gc_army_rifleman_mpiak74n_80_win", // Rifleman @@ -55,12 +64,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "gm_gc_army_brdm2um_win" // SPW40-P2UM ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "gm_gc_army_brdm2um_win", // SPW40-P2UM "gm_gc_army_brdm2_win", // SPW-40P2 "gm_gc_army_btr60pa_win", // SPW-60PA @@ -73,7 +82,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "gm_gc_army_brdm2um_win", // SPW40-P2UM "gm_gc_army_brdm2_win", // SPW-40P2 "gm_gc_army_btr60pa_win", // SPW-60PA @@ -81,7 +90,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "gm_gc_army_ural4320_cargo_win", // Truck gel. 5 Transport "gm_gc_army_brdm2um_win", // SPW40-P2UM "gm_gc_army_brdm2_win", // SPW-40P2 @@ -96,7 +105,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "gm_gc_army_ural4320_cargo_win", // Truck gel. 5 Transport "gm_gc_army_brdm2um_win", // SPW40-P2UM "gm_gc_army_brdm2_win", // SPW-40P2 @@ -109,7 +118,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "gm_gc_army_ural4320_cargo_win", // Truck gel. 5 Transport "gm_gc_army_btr60pa_win", // SPW-60PA "gm_gc_army_btr60pb_win", // SPW-60PB @@ -117,7 +126,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "len_mi8amt_nva", // Mi8amt "len_mi24d_AT_nva", // Mi-24D (AT) "len_mi24d_CAS_nva", // Mi-24D (CAS) @@ -128,6 +137,6 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "len_l39_nva" // Aero L-39 ]; diff --git a/Missionframework/presets/enemies/gm_west.sqf b/Missionframework/presets/enemies/gm_west.sqf index b348f821e..8b7422beb 100644 --- a/Missionframework/presets/enemies/gm_west.sqf +++ b/Missionframework/presets/enemies/gm_west.sqf @@ -1,48 +1,57 @@ /* + File: gm_west.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-06 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + West Germany enemy preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Helicopters (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ // Enemy infantry classes -opfor_officer = "gm_ge_army_officer_p1_80_oli"; // Officer -opfor_squad_leader = "gm_ge_army_squadleader_g3a3_p2a1_80_ols"; // Squad Leader -opfor_team_leader = "gm_ge_army_squadleader_g3a3_p2a1_80_ols"; // Team Leader -opfor_sentry = "gm_ge_army_rifleman_g3a3_80_ols"; // Rifleman (Lite) -opfor_rifleman = "gm_ge_army_rifleman_g3a3_80_ols"; // Rifleman -opfor_rpg = "gm_ge_army_antitank_g3a3_pzf44_80_ols"; // Rifleman (LAT) -opfor_grenadier = "gm_ge_army_grenadier_g3a3_80_ols"; // Grenadier -opfor_machinegunner = "gm_ge_army_machinegunner_mg3_80_ols"; // Autorifleman -opfor_heavygunner = "gm_ge_army_machinegunner_mg3_80_ols"; // Heavy Gunner -opfor_marksman = "gm_ge_army_rifleman_g3a3_80_ols"; // Marksman -opfor_sharpshooter = "gm_ge_army_rifleman_g3a3_80_ols"; // Sharpshooter -opfor_sniper = "gm_ge_army_rifleman_g3a3_80_ols"; // Sniper -opfor_at = "gm_ge_army_antitank_g3a3_pzf84_80_ols"; // AT Specialist -opfor_aa = "gm_ge_army_demolition_g3a4_80_ols"; // AA Specialist -opfor_medic = "gm_ge_army_medic_g3a3_80_ols"; // Combat Life Saver -opfor_engineer = "gm_ge_army_engineer_g3a4_80_ols"; // Engineer -opfor_paratrooper = "gm_ge_army_rifleman_g3a3_80_ols"; // Paratrooper +KPLIB_o_officer = "gm_ge_army_officer_p1_80_oli"; // Officer +KPLIB_o_squadLeader = "gm_ge_army_squadleader_g3a3_p2a1_80_ols"; // Squad Leader +KPLIB_o_teamLeader = "gm_ge_army_squadleader_g3a3_p2a1_80_ols"; // Team Leader +KPLIB_o_sentry = "gm_ge_army_rifleman_g3a3_80_ols"; // Rifleman (Lite) +KPLIB_o_rifleman = "gm_ge_army_rifleman_g3a3_80_ols"; // Rifleman +KPLIB_o_riflemanLAT = "gm_ge_army_antitank_g3a3_pzf44_80_ols"; // Rifleman (LAT) +KPLIB_o_grenadier = "gm_ge_army_grenadier_g3a3_80_ols"; // Grenadier +KPLIB_o_machinegunner = "gm_ge_army_machinegunner_mg3_80_ols"; // Autorifleman +KPLIB_o_heavyGunner = "gm_ge_army_machinegunner_mg3_80_ols"; // Heavy Gunner +KPLIB_o_marksman = "gm_ge_army_rifleman_g3a3_80_ols"; // Marksman +KPLIB_o_sharpshooter = "gm_ge_army_rifleman_g3a3_80_ols"; // Sharpshooter +KPLIB_o_sniper = "gm_ge_army_rifleman_g3a3_80_ols"; // Sniper +KPLIB_o_atSpecialist = "gm_ge_army_antitank_g3a3_pzf84_80_ols"; // AT Specialist +KPLIB_o_aaSpecialist = "gm_ge_army_demolition_g3a4_80_ols"; // AA Specialist +KPLIB_o_medic = "gm_ge_army_medic_g3a3_80_ols"; // Combat Life Saver +KPLIB_o_engineer = "gm_ge_army_engineer_g3a4_80_ols"; // Engineer +KPLIB_o_paratrooper = "gm_ge_army_rifleman_g3a3_80_ols"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "gm_ge_army_iltis_cargo"; // Truck 0.5t -opfor_mrap_armed = "gm_ge_army_iltis_milan"; // Truck 0.5t MILAN -opfor_transport_helo = "gm_ge_army_kat1_454_cargo"; // Truck 10t mil gl Transport -opfor_transport_truck = "gm_ge_army_kat1_451_cargo"; // Truck 5t mil gl Transport -opfor_ammobox_transport = "gm_ge_army_kat1_451_container"; // Truck 5t mil gl Container -> Has to be able to transport resource crates! -opfor_fuel_truck = "gm_ge_army_kat1_451_refuel"; // Truck 5t mil gl Fuel -opfor_ammo_truck = "gm_ge_army_kat1_451_reammo"; // Truck 5t mil gl Ammo -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagPole_F"; // Flag +KPLIB_o_mrap = "gm_ge_army_iltis_cargo"; // Truck 0.5t +KPLIB_o_mrapArmed = "gm_ge_army_iltis_milan"; // Truck 0.5t MILAN +KPLIB_o_transportHeli = "gm_ge_army_kat1_454_cargo"; // Truck 10t mil gl Transport +KPLIB_o_transportTruck = "gm_ge_army_kat1_451_cargo"; // Truck 5t mil gl Transport +KPLIB_o_transportTruckAmmo = "gm_ge_army_kat1_451_container"; // Truck 5t mil gl Container -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "gm_ge_army_kat1_451_refuel"; // Truck 5t mil gl Fuel +KPLIB_o_ammoTruck = "gm_ge_army_kat1_451_reammo"; // Truck 5t mil gl Ammo +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagPole_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "gm_ge_army_rifleman_g3a3_80_ols", // Rifleman (Lite) "gm_ge_army_rifleman_g3a3_80_ols", // Rifleman (Lite) "gm_ge_army_rifleman_g3a3_80_ols", // Rifleman @@ -55,12 +64,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "gm_ge_army_u1300l_cargo" // Truck 2t Transport ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "gm_ge_army_u1300l_cargo", // Truck 2t Transport "gm_ge_army_iltis_milan", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer", // Fuchs (Engineer) @@ -74,7 +83,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "gm_ge_army_u1300l_cargo", // Truck 2t Transport "gm_ge_army_iltis_milan", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer", // Fuchs (Engineer) @@ -82,7 +91,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "gm_ge_army_u1300l_cargo", // Truck 2t Transport "gm_ge_army_iltis_milan", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer", // Fuchs (Engineer) @@ -97,7 +106,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "gm_ge_army_u1300l_cargo", // Truck 2t Transport "gm_ge_army_iltis_milan", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer", // Fuchs (Engineer) @@ -110,7 +119,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "gm_ge_army_u1300l_cargo", // Truck 2t Transport "gm_ge_army_fuchsa0_engineer", // Fuchs (Engineer) "gm_ge_army_fuchsa0_reconnaissance", // Fuchs (Recon, MILAN) @@ -119,9 +128,9 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "len_uh1d_bw" // BW UH-1D ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = []; +KPLIB_o_planes = []; diff --git a/Missionframework/presets/enemies/gm_west_win.sqf b/Missionframework/presets/enemies/gm_west_win.sqf index 5b40ef1f0..93b19df8e 100644 --- a/Missionframework/presets/enemies/gm_west_win.sqf +++ b/Missionframework/presets/enemies/gm_west_win.sqf @@ -1,48 +1,57 @@ /* + File: gm_west_win.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-09 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + West Germany Winter enemy preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Helicopters (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ // Enemy infantry classes -opfor_officer = "gm_ge_army_officer_p1_parka_80_win"; // Officer -opfor_squad_leader = "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win"; // Squad Leader -opfor_team_leader = "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win"; // Team Leader -opfor_sentry = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Rifleman (Lite) -opfor_rifleman = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Rifleman -opfor_rpg = "gm_ge_army_antitank_g3a3_pzf44_parka_80_win"; // Rifleman (LAT) -opfor_grenadier = "gm_ge_army_grenadier_g3a3_parka_80_win"; // Grenadier -opfor_machinegunner = "gm_ge_army_machinegunner_mg3_parka_80_win"; // Autorifleman -opfor_heavygunner = "gm_ge_army_machinegunner_mg3_parka_80_win"; // Heavy Gunner -opfor_marksman = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Marksman -opfor_sharpshooter = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Sharpshooter -opfor_sniper = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Sniper -opfor_at = "gm_ge_army_antitank_g3a3_pzf84_parka_80_win"; // AT Specialist -opfor_aa = "gm_ge_army_demolition_g3a4_parka_80_win"; // AA Specialist -opfor_medic = "gm_ge_army_medic_g3a3_parka_80_win"; // Combat Life Saver -opfor_engineer = "gm_ge_army_engineer_g3a4_parka_80_win"; // Engineer -opfor_paratrooper = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Paratrooper +KPLIB_o_officer = "gm_ge_army_officer_p1_parka_80_win"; // Officer +KPLIB_o_squadLeader = "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win"; // Squad Leader +KPLIB_o_teamLeader = "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win"; // Team Leader +KPLIB_o_sentry = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Rifleman (Lite) +KPLIB_o_rifleman = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Rifleman +KPLIB_o_riflemanLAT = "gm_ge_army_antitank_g3a3_pzf44_parka_80_win"; // Rifleman (LAT) +KPLIB_o_grenadier = "gm_ge_army_grenadier_g3a3_parka_80_win"; // Grenadier +KPLIB_o_machinegunner = "gm_ge_army_machinegunner_mg3_parka_80_win"; // Autorifleman +KPLIB_o_heavyGunner = "gm_ge_army_machinegunner_mg3_parka_80_win"; // Heavy Gunner +KPLIB_o_marksman = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Marksman +KPLIB_o_sharpshooter = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Sharpshooter +KPLIB_o_sniper = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Sniper +KPLIB_o_atSpecialist = "gm_ge_army_antitank_g3a3_pzf84_parka_80_win"; // AT Specialist +KPLIB_o_aaSpecialist = "gm_ge_army_demolition_g3a4_parka_80_win"; // AA Specialist +KPLIB_o_medic = "gm_ge_army_medic_g3a3_parka_80_win"; // Combat Life Saver +KPLIB_o_engineer = "gm_ge_army_engineer_g3a4_parka_80_win"; // Engineer +KPLIB_o_paratrooper = "gm_ge_army_rifleman_g3a3_parka_80_win"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "gm_ge_army_iltis_cargo_win"; // Truck 0.5t -opfor_mrap_armed = "gm_ge_army_iltis_milan_win"; // Truck 0.5t MILAN -opfor_transport_helo = "gm_ge_army_kat1_454_cargo_win"; // Truck 10t mil gl Transport -opfor_transport_truck = "gm_ge_army_kat1_451_cargo_win"; // Truck 5t mil gl Transport -opfor_ammobox_transport = "gm_ge_army_kat1_451_container_win"; // Truck 5t mil gl Container -> Has to be able to transport resource crates! -opfor_fuel_truck = "gm_ge_army_kat1_451_refuel_win"; // Truck 5t mil gl Fuel -opfor_ammo_truck = "gm_ge_army_kat1_451_reammo_win"; // Truck 5t mil gl Ammo -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -opfor_flag = "FlagPole_F"; // Flag +KPLIB_o_mrap = "gm_ge_army_iltis_cargo_win"; // Truck 0.5t +KPLIB_o_mrapArmed = "gm_ge_army_iltis_milan_win"; // Truck 0.5t MILAN +KPLIB_o_transportHeli = "gm_ge_army_kat1_454_cargo_win"; // Truck 10t mil gl Transport +KPLIB_o_transportTruck = "gm_ge_army_kat1_451_cargo_win"; // Truck 5t mil gl Transport +KPLIB_o_transportTruckAmmo = "gm_ge_army_kat1_451_container_win"; // Truck 5t mil gl Container -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "gm_ge_army_kat1_451_refuel_win"; // Truck 5t mil gl Fuel +KPLIB_o_ammoTruck = "gm_ge_army_kat1_451_reammo_win"; // Truck 5t mil gl Ammo +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagPole_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "gm_ge_army_rifleman_g3a3_parka_80_win", // Rifleman (Lite) "gm_ge_army_rifleman_g3a3_parka_80_win", // Rifleman (Lite) "gm_ge_army_rifleman_g3a3_parka_80_win", // Rifleman @@ -55,12 +64,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "gm_ge_army_u1300l_cargo" // Truck 2t Transport ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "gm_ge_army_u1300l_cargo_win", // Truck 2t Transport "gm_ge_army_iltis_milan_win", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer_win", // Fuchs (Engineer) @@ -74,7 +83,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "gm_ge_army_u1300l_cargo_win", // Truck 2t Transport "gm_ge_army_iltis_milan_win", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer_win", // Fuchs (Engineer) @@ -82,7 +91,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "gm_ge_army_u1300l_cargo_win", // Truck 2t Transport "gm_ge_army_iltis_milan_win", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer_win", // Fuchs (Engineer) @@ -97,7 +106,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "gm_ge_army_u1300l_cargo_win", // Truck 2t Transport "gm_ge_army_iltis_milan_win", // Truck 0.5t MILAN "gm_ge_army_fuchsa0_engineer_win", // Fuchs (Engineer) @@ -110,7 +119,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "gm_ge_army_u1300l_cargo_win", // Truck 2t Transport "gm_ge_army_fuchsa0_engineer_win", // Fuchs (Engineer) "gm_ge_army_fuchsa0_reconnaissance_win", // Fuchs (Recon, MILAN) @@ -119,9 +128,9 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "len_uh1d_bw" // BW UH-1D ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = []; +KPLIB_o_planes = []; diff --git a/Missionframework/presets/enemies/islamic_state.sqf b/Missionframework/presets/enemies/islamic_state.sqf index c218fea87..07c96a9b8 100644 --- a/Missionframework/presets/enemies/islamic_state.sqf +++ b/Missionframework/presets/enemies/islamic_state.sqf @@ -1,50 +1,60 @@ /* + File: islamic_state.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-09 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Islamic State enemy preset. + Needed Mods: - - RHS USAF - - RHS AFRF - - Project OPFOR + - Project OPFOR + - RHS AFRF + - RHS GREF + - RHS USAF Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "LOP_ISTS_OPF_Infantry_SL"; // Officer (Warlord) -opfor_squad_leader = "LOP_ISTS_OPF_Infantry_SL"; // Squad Leader (Warlord) -opfor_team_leader = "LOP_ISTS_OPF_Infantry_TL"; // Team Leader (Chief) -opfor_sentry = "LOP_ISTS_OPF_Infantry_Rifleman"; // Rifleman (AKM) -opfor_rifleman = "LOP_ISTS_OPF_Infantry_Rifleman_5"; // Rifleman (AK-74) -opfor_rpg = "LOP_ISTS_OPF_Infantry_AT"; // Rifleman (RPG-7) -opfor_grenadier = "LOP_ISTS_OPF_Infantry_GL"; // Grenadier (AKM GP-25) -opfor_machinegunner = "LOP_ISTS_OPF_Infantry_AR_Asst"; // Autorifleman (AR_Asst) -opfor_heavygunner = "LOP_ISTS_OPF_Infantry_AR"; // Heavy Gunner (PKM) -opfor_marksman = "LOP_ISTS_OPF_Infantry_Rifleman_2"; // Marksman (Lee Enfield) -opfor_sharpshooter = "LOP_ISTS_OPF_Infantry_Marksman"; // Sharpshooter (SVD) -opfor_sniper = "LOP_ISTS_OPF_Infantry_Marksman"; // Sniper (SVD) -opfor_at = "LOP_ISTS_OPF_Infantry_AT"; // AT Specialist (RPG-7) -opfor_aa = "LOP_ISTS_OPF_Infantry_AT"; // AA Specialist (RPG-7) -opfor_medic = "LOP_ISTS_OPF_Infantry_Corpsman"; // Combat Life Saver (Bonesetter) -opfor_engineer = "LOP_ISTS_OPF_Infantry_Engineer"; // Engineer (Bomber) -opfor_paratrooper = "LOP_ISTS_OPF_Infantry_Rifleman_6"; // Paratrooper (AKM PM-63) +KPLIB_o_officer = "LOP_ISTS_OPF_Infantry_SL"; // Officer (Warlord) +KPLIB_o_squadLeader = "LOP_ISTS_OPF_Infantry_SL"; // Squad Leader (Warlord) +KPLIB_o_teamLeader = "LOP_ISTS_OPF_Infantry_TL"; // Team Leader (Chief) +KPLIB_o_sentry = "LOP_ISTS_OPF_Infantry_Rifleman"; // Rifleman (AKM) +KPLIB_o_rifleman = "LOP_ISTS_OPF_Infantry_Rifleman_5"; // Rifleman (AK-74) +KPLIB_o_riflemanLAT = "LOP_ISTS_OPF_Infantry_AT"; // Rifleman (RPG-7) +KPLIB_o_grenadier = "LOP_ISTS_OPF_Infantry_GL"; // Grenadier (AKM GP-25) +KPLIB_o_machinegunner = "LOP_ISTS_OPF_Infantry_AR_Asst"; // Autorifleman (AR_Asst) +KPLIB_o_heavyGunner = "LOP_ISTS_OPF_Infantry_AR"; // Heavy Gunner (PKM) +KPLIB_o_marksman = "LOP_ISTS_OPF_Infantry_Rifleman_2"; // Marksman (Lee Enfield) +KPLIB_o_sharpshooter = "LOP_ISTS_OPF_Infantry_Marksman"; // Sharpshooter (SVD) +KPLIB_o_sniper = "LOP_ISTS_OPF_Infantry_Marksman"; // Sniper (SVD) +KPLIB_o_atSpecialist = "LOP_ISTS_OPF_Infantry_AT"; // AT Specialist (RPG-7) +KPLIB_o_aaSpecialist = "LOP_ISTS_OPF_Infantry_AT"; // AA Specialist (RPG-7) +KPLIB_o_medic = "LOP_ISTS_OPF_Infantry_Corpsman"; // Combat Life Saver (Bonesetter) +KPLIB_o_engineer = "LOP_ISTS_OPF_Infantry_Engineer"; // Engineer (Bomber) +KPLIB_o_paratrooper = "LOP_ISTS_OPF_Infantry_Rifleman_6"; // Paratrooper (AKM PM-63) // Enemy vehicles used by secondary objectives. -opfor_mrap = "LOP_ISTS_OPF_Offroad"; // Offroad -opfor_mrap_armed = "LOP_ISTS_OPF_Offroad_M2"; // Offroad (M2) -opfor_transport_helo = "LOP_TKA_Mi8MT_Cargo"; // Mi-8MT (Cargo) -opfor_transport_truck = "LOP_TKA_Ural"; // Ural-4320 (Covered) -opfor_ammobox_transport = "LOP_TKA_Ural_open"; // Ural-4320 (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "RHS_Ural_Fuel_MSV_01"; // Ural-4320 (Fuel) -opfor_ammo_truck = "rhs_gaz66_ammo_msv"; // GAZ-66 (Ammo) -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod -opfor_flag = "lop_Flag_tak_F"; // Flag +KPLIB_o_mrap = "LOP_ISTS_OPF_Offroad"; // Offroad +KPLIB_o_mrapArmed = "LOP_ISTS_OPF_Offroad_M2"; // Offroad (M2) +KPLIB_o_transportHeli = "LOP_TKA_Mi8MT_Cargo"; // Mi-8MT (Cargo) +KPLIB_o_transportTruck = "LOP_TKA_Ural"; // Ural-4320 (Covered) +KPLIB_o_transportTruckAmmo = "LOP_TKA_Ural_open"; // Ural-4320 (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "RHS_Ural_Fuel_MSV_01"; // Ural-4320 (Fuel) +KPLIB_o_ammoTruck = "rhs_gaz66_ammo_msv"; // GAZ-66 (Ammo) +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod +KPLIB_o_flag = "lop_Flag_tak_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "LOP_AM_OPF_Infantry_Rifleman", // Rifleman (AKM) "LOP_AM_OPF_Infantry_Rifleman", // Rifleman (AKM) "LOP_AM_OPF_Infantry_Rifleman_5", // Rifleman (AKM-74) @@ -57,12 +67,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "LOP_AM_OPF_UAZ_DshKM" // UAZ-3151 (DShKM) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "LOP_ISTS_OPF_Landrover_M2", // Land Rover (M2) "LOP_ISTS_OPF_Landrover_SPG9", // Land Rover (SPG) "LOP_ISTS_OPF_M1025_W_M2", // M10252 (M2) @@ -80,7 +90,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "LOP_ISTS_OPF_Landrover_M2", // Land Rover (M2) "LOP_ISTS_OPF_Nissan_PKM", // Nissan (PKM) "LOP_ISTS_OPF_Nissan_PKM", // Nissan (PKM) @@ -92,7 +102,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "LOP_ISTS_OPF_Landrover_M2", // Land Rover (M2) "LOP_ISTS_OPF_Landrover_SPG9", // Land Rover (SPG) "LOP_ISTS_OPF_M1025_W_M2", // M10252 (M2) @@ -116,7 +126,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "LOP_ISTS_OPF_Landrover_M2", // Land Rover (M2) "LOP_ISTS_OPF_Nissan_PKM", // Nissan (PKM) "LOP_ISTS_OPF_Nissan_PKM", // Nissan (PKM) @@ -137,7 +147,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "LOP_ISTS_OPF_Truck", // Truck (Cargo) "LOP_ISTS_OPF_BMP1", // BMP-1 "LOP_ISTS_OPF_BMP2", // BMP-2 @@ -146,7 +156,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "LOP_TKA_Mi8MT_Cargo", // Mi-8MT (Cargo) "LOP_TKA_Mi24V_AT", // Mi-24V (AT) "LOP_TKA_Mi24V_FAB", // Mi-24V (FAB) @@ -154,7 +164,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "RHS_Su25SM_vvsc", // Su-25 "RHS_Su25SM_KH29_vvsc" // Su-25 (KH29) ]; diff --git a/Missionframework/presets/enemies/nato.sqf b/Missionframework/presets/enemies/nato.sqf index a80d5a65f..002d15da5 100644 --- a/Missionframework/presets/enemies/nato.sqf +++ b/Missionframework/presets/enemies/nato.sqf @@ -1,61 +1,70 @@ /* + File: nato.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-03 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + NATO enemy preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "B_officer_F"; // Officer -opfor_squad_leader = "B_Soldier_SL_F"; // Squad Leader -opfor_team_leader = "B_Soldier_TL_F"; // Team Leader -opfor_sentry = "B_Soldier_lite_F"; // Rifleman (Lite) -opfor_rifleman = "B_Soldier_F"; // Rifleman -opfor_rpg = "B_soldier_LAT_F"; // Rifleman (LAT) -opfor_grenadier = "B_Soldier_GL_F"; // Grenadier -opfor_machinegunner = "B_soldier_AR_F"; // Autorifleman -opfor_heavygunner = "B_HeavyGunner_F"; // Heavy Gunner -opfor_marksman = "B_soldier_M_F"; // Marksman -opfor_sharpshooter = "B_Sharpshooter_F"; // Sharpshooter -opfor_sniper = "B_sniper_F"; // Sniper -opfor_at = "B_soldier_AT_F"; // AT Specialist -opfor_aa = "B_soldier_AA_F"; // AA Specialist -opfor_medic = "B_medic_F"; // Combat Life Saver -opfor_engineer = "B_engineer_F"; // Engineer -opfor_paratrooper = "B_soldier_PG_F"; // Paratrooper +KPLIB_o_officer = "B_officer_F"; // Officer +KPLIB_o_squadLeader = "B_Soldier_SL_F"; // Squad Leader +KPLIB_o_teamLeader = "B_Soldier_TL_F"; // Team Leader +KPLIB_o_sentry = "B_Soldier_lite_F"; // Rifleman (Lite) +KPLIB_o_rifleman = "B_Soldier_F"; // Rifleman +KPLIB_o_riflemanLAT = "B_soldier_LAT_F"; // Rifleman (LAT) +KPLIB_o_grenadier = "B_Soldier_GL_F"; // Grenadier +KPLIB_o_machinegunner = "B_soldier_AR_F"; // Autorifleman +KPLIB_o_heavyGunner = "B_HeavyGunner_F"; // Heavy Gunner +KPLIB_o_marksman = "B_soldier_M_F"; // Marksman +KPLIB_o_sharpshooter = "B_Sharpshooter_F"; // Sharpshooter +KPLIB_o_sniper = "B_sniper_F"; // Sniper +KPLIB_o_atSpecialist = "B_soldier_AT_F"; // AT Specialist +KPLIB_o_aaSpecialist = "B_soldier_AA_F"; // AA Specialist +KPLIB_o_medic = "B_medic_F"; // Combat Life Saver +KPLIB_o_engineer = "B_engineer_F"; // Engineer +KPLIB_o_paratrooper = "B_soldier_PG_F"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "B_MRAP_01_F"; // M-ATV -opfor_mrap_armed = "B_MRAP_01_hmg_F"; // MATV (HMG) -opfor_transport_helo = "B_Heli_Transport_03_unarmed_F"; // CH-47l Chinook (unarmed) -opfor_transport_truck = "B_Truck_01_covered_F"; // HEMTT Transport (Covered) -opfor_ammobox_transport = "B_Truck_01_transport_F"; // HEMTT Transport (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "B_Truck_01_fuel_F"; // HEMTT Fuel -opfor_ammo_truck = "B_Truck_01_ammo_F"; // HEMTT Ammo -opfor_fuel_container = "B_Slingload_01_Fuel_F"; // Huron Fuel Pod -opfor_ammo_container = "B_Slingload_01_Ammo_F"; // Huron Ammo Pod -opfor_flag = "Flag_NATO_F"; // Flag +KPLIB_o_mrap = "B_MRAP_01_F"; // M-ATV +KPLIB_o_mrapArmed = "B_MRAP_01_hmg_F"; // MATV (HMG) +KPLIB_o_transportHeli = "B_Heli_Transport_03_unarmed_F"; // CH-47l Chinook (unarmed) +KPLIB_o_transportTruck = "B_Truck_01_covered_F"; // HEMTT Transport (Covered) +KPLIB_o_transportTruckAmmo = "B_Truck_01_transport_F"; // HEMTT Transport (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "B_Truck_01_fuel_F"; // HEMTT Fuel +KPLIB_o_ammoTruck = "B_Truck_01_ammo_F"; // HEMTT Ammo +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Pod +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Pod +KPLIB_o_flag = "Flag_NATO_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ - "B_Soldier_F", // Rifleman (Lite) - "B_Soldier_F", // Rifleman (Lite) - "B_Soldier_F", // Rifleman - "B_Soldier_F", // Rifleman - "B_soldier_LAT_F", // Rifleman (AT) - "B_soldier_AR_F", // Autorifleman - "B_soldier_M_F", // Marksman - "B_medic_F", // Medic - "B_engineer_F" // Engineer +KPLIB_o_militiaInfantry = [ + "B_Soldier_F", // Rifleman (Lite) + "B_Soldier_F", // Rifleman (Lite) + "B_Soldier_F", // Rifleman + "B_Soldier_F", // Rifleman + "B_soldier_LAT_F", // Rifleman (AT) + "B_soldier_AR_F", // Autorifleman + "B_soldier_M_F", // Marksman + "B_medic_F", // Medic + "B_engineer_F" // Engineer ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "B_LSV_01_armed_F", // Polaris DAGOR (XM312) "B_LSV_01_armed_F", // Polaris DAGOR (XM312) "B_MRAP_01_hmg_F", // Ifrit (HMG) @@ -63,7 +72,7 @@ militia_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "B_MRAP_01_hmg_F", // M-ATV (HMG) "B_MRAP_01_hmg_F", // M-ATV (HMG) "B_MRAP_01_gmg_F", // M-ATV (GMG) @@ -80,7 +89,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "B_MRAP_01_hmg_F", // M-ATV (HMG) "B_MRAP_01_hmg_F", // M-ATV (HMG) "B_LSV_01_AT_F", // Polaris DAGOR (Mini-Spike PZAbw) @@ -89,7 +98,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "B_MRAP_01_hmg_F", // M-ATV (HMG) "B_MRAP_01_gmg_F", // M-ATV (GMG) "B_MRAP_01_gmg_F", // M-ATV (GMG) @@ -111,7 +120,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "B_MRAP_01_hmg_F", // M-ATV (HMG) "B_MRAP_01_hmg_F", // M-ATV (HMG) "B_Truck_01_transport_F", // HEMTT Transport @@ -124,7 +133,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "B_Truck_01_transport_F", // HEMTT Transport "B_Truck_01_covered_F", // HEMTT Transport (Covered) "B_APC_Wheeled_01_cannon_F", // SPz Badger @@ -133,7 +142,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "B_Heli_Light_01_dynamicLoadout_F", // AH-6 Little Bird (Armed) "B_CTRG_Heli_Transport_01_sand_F", // UH-80 Ghost Hawk (Sand) "B_Heli_Attack_01_dynamicLoadout_F", // RAH-66 Comanche @@ -143,7 +152,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "B_Plane_CAS_01_dynamicLoadout_F", // A-10D Thunderbolt II (CAS) "B_Plane_Fighter_01_F" // F/A-181 Black Wasp II ]; diff --git a/Missionframework/presets/enemies/rhs_afrf.sqf b/Missionframework/presets/enemies/rhs_afrf.sqf index a8ce82fc3..3733d91fe 100644 --- a/Missionframework/presets/enemies/rhs_afrf.sqf +++ b/Missionframework/presets/enemies/rhs_afrf.sqf @@ -1,48 +1,57 @@ /* + File: rhs_afrf.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Armed Forces of the Russian Federation enemy preset. + Needed Mods: - - RHS AFRF + - RHS AFRF Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "rhs_msv_emr_officer"; // Officer -opfor_squad_leader = "rhs_msv_emr_sergeant"; // Squad Leader -opfor_team_leader = "rhs_msv_emr_efreitor"; // Team Leader -opfor_sentry = "rhs_msv_emr_rifleman"; // Rifleman (Lite) -opfor_rifleman = "rhs_msv_emr_rifleman"; // Rifleman -opfor_rpg = "rhs_msv_emr_LAT"; // Rifleman (LAT) -opfor_grenadier = "rhs_msv_emr_grenadier"; // Grenadier -opfor_machinegunner = "rhs_msv_emr_arifleman"; // Autorifleman -opfor_heavygunner = "rhs_msv_emr_machinegunner"; // Heavy Gunner -opfor_marksman = "rhs_msv_emr_marksman"; // Marksman -opfor_sharpshooter = "rhs_msv_emr_marksman"; // Sharpshooter -opfor_sniper = "rhs_msv_emr_marksman"; // Sniper -opfor_at = "rhs_msv_emr_at"; // AT Specialist -opfor_aa = "rhs_msv_emr_aa"; // AA Specialist -opfor_medic = "rhs_msv_emr_medic"; // Combat Life Saver -opfor_engineer = "rhs_msv_emr_engineer"; // Engineer -opfor_paratrooper = "rhs_msv_emr_RShG2"; // Paratrooper +KPLIB_o_officer = "rhs_msv_emr_officer"; // Officer +KPLIB_o_squadLeader = "rhs_msv_emr_sergeant"; // Squad Leader +KPLIB_o_teamLeader = "rhs_msv_emr_efreitor"; // Team Leader +KPLIB_o_sentry = "rhs_msv_emr_rifleman"; // Rifleman (Lite) +KPLIB_o_rifleman = "rhs_msv_emr_rifleman"; // Rifleman +KPLIB_o_riflemanLAT = "rhs_msv_emr_LAT"; // Rifleman (LAT) +KPLIB_o_grenadier = "rhs_msv_emr_grenadier"; // Grenadier +KPLIB_o_machinegunner = "rhs_msv_emr_arifleman"; // Autorifleman +KPLIB_o_heavyGunner = "rhs_msv_emr_machinegunner"; // Heavy Gunner +KPLIB_o_marksman = "rhs_msv_emr_marksman"; // Marksman +KPLIB_o_sharpshooter = "rhs_msv_emr_marksman"; // Sharpshooter +KPLIB_o_sniper = "rhs_msv_emr_marksman"; // Sniper +KPLIB_o_atSpecialist = "rhs_msv_emr_at"; // AT Specialist +KPLIB_o_aaSpecialist = "rhs_msv_emr_aa"; // AA Specialist +KPLIB_o_medic = "rhs_msv_emr_medic"; // Combat Life Saver +KPLIB_o_engineer = "rhs_msv_emr_engineer"; // Engineer +KPLIB_o_paratrooper = "rhs_msv_emr_RShG2"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "rhs_tigr_msv"; // GAZ-233011 -opfor_mrap_armed = "rhs_tigr_sts_msv"; // GAZ-233014 (Armed) -opfor_transport_helo = "RHS_Mi8mt_Cargo_vvsc"; // Mi-8MT (Cargo) -opfor_transport_truck = "RHS_Ural_MSV_01"; // Ural-4320 Transport (Covered) -opfor_ammobox_transport = "RHS_Ural_Open_MSV_01"; // Ural-4320 Transport (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "RHS_Ural_Fuel_MSV_01"; // Ural-4320 Fuel -opfor_ammo_truck = "rhs_gaz66_ammo_msv"; // GAZ-66 Ammo -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod -opfor_flag = "rhs_Flag_Russia_F"; // Flag +KPLIB_o_mrap = "rhs_tigr_msv"; // GAZ-233011 +KPLIB_o_mrapArmed = "rhs_tigr_sts_msv"; // GAZ-233014 (Armed) +KPLIB_o_transportHeli = "RHS_Mi8mt_Cargo_vvsc"; // Mi-8MT (Cargo) +KPLIB_o_transportTruck = "RHS_Ural_MSV_01"; // Ural-4320 Transport (Covered) +KPLIB_o_transportTruckAmmo = "RHS_Ural_Open_MSV_01"; // Ural-4320 Transport (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "RHS_Ural_Fuel_MSV_01"; // Ural-4320 Fuel +KPLIB_o_ammoTruck = "rhs_gaz66_ammo_msv"; // GAZ-66 Ammo +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod +KPLIB_o_flag = "rhs_Flag_Russia_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "rhs_msv_emr_rifleman", // Rifleman "rhs_msv_emr_rifleman", // Rifleman "rhs_msv_emr_rifleman", // Rifleman @@ -54,12 +63,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "rhs_tigr_sts_msv" // GAZ-233014 (Armed) ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "rhs_tigr_sts_msv", // GAZ-233014 (Armed) "rhs_tigr_sts_msv", // GAZ-233014 (Armed) "rhs_tigr_sts_msv", // GAZ-233014 (Armed) @@ -76,7 +85,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "rhs_tigr_sts_msv", // GAZ-233014 (Armed) "rhs_tigr_sts_msv", // GAZ-233014 (Armed) "rhs_btr80_msv", // BTR-80 @@ -84,7 +93,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "rhs_tigr_sts_msv", // GAZ-233014 (Armed) "rhs_tigr_sts_msv", // GAZ-233014 (Armed) "rhs_tigr_sts_msv", // GAZ-233014 (Armed) @@ -105,7 +114,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "rhs_tigr_msv", // GAZ-233011 "rhs_tigr_sts_msv", // GAZ-233014 (Armed) "rhs_tigr_sts_msv", // GAZ-233014 (Armed) @@ -120,7 +129,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "RHS_Ural_Open_MSV_01", // Ural-4320 Transport "RHS_Ural_MSV_01", // Ural-4320 Transport (Covered) "rhs_btr80_msv", // BTR-80 @@ -132,7 +141,7 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "RHS_Mi8mt_Cargo_vvsc", // Mi-8MT (Cargo) "RHS_Mi24P_AT_vvsc", // Mi-24P (AT) "RHS_Mi24V_AT_vvsc", // Mi-24V (AT) @@ -140,7 +149,7 @@ opfor_choppers = [ ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "RHS_Su25SM_vvsc", // Su-25 "RHS_Su25SM_KH29_vvsc" // Su-25 (KH29) ]; diff --git a/Missionframework/presets/enemies/takistan.sqf b/Missionframework/presets/enemies/takistan.sqf index 9bcd7e00f..73740df2b 100644 --- a/Missionframework/presets/enemies/takistan.sqf +++ b/Missionframework/presets/enemies/takistan.sqf @@ -1,50 +1,60 @@ /* + File: takistan.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Takistani Armed Forces enemy preset. + Needed Mods: - - RHS USAF - - RHS AFRF - - Project OPFOR + - Project OPFOR + - RHS AFRF + - RHS GREF + - RHS USAF Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "LOP_TKA_Infantry_Officer"; // Officer -opfor_squad_leader = "LOP_TKA_Infantry_SL"; // Squad Leader -opfor_team_leader = "LOP_TKA_Infantry_TL"; // Team Leader -opfor_sentry = "LOP_TKA_Infantry_Rifleman"; // Rifleman (Lite) -opfor_rifleman = "LOP_TKA_Infantry_Rifleman_2"; // Rifleman -opfor_rpg = "LOP_TKA_Infantry_Rifleman_3"; // Rifleman (LAT) -opfor_grenadier = "LOP_TKA_Infantry_GL"; // Grenadier -opfor_machinegunner = "LOP_TKA_Infantry_MG"; // Autorifleman -opfor_heavygunner = "LOP_TKA_Infantry_MG"; // Heavy Gunner -opfor_marksman = "LOP_TKA_Infantry_Marksman"; // Marksman -opfor_sharpshooter = "LOP_TKA_Infantry_Marksman"; // Sharpshooter -opfor_sniper = "LOP_TKA_Infantry_Marksman"; // Sniper -opfor_at = "LOP_TKA_Infantry_AT"; // AT Specialist -opfor_aa = "LOP_TKA_Infantry_AA"; // AA Specialist -opfor_medic = "LOP_TKA_Infantry_Corpsman"; // Combat Life Saver -opfor_engineer = "LOP_TKA_Infantry_Engineer"; // Engineer -opfor_paratrooper = "LOP_TKA_Infantry_Rifleman"; // Paratrooper +KPLIB_o_officer = "LOP_TKA_Infantry_Officer"; // Officer +KPLIB_o_squadLeader = "LOP_TKA_Infantry_SL"; // Squad Leader +KPLIB_o_teamLeader = "LOP_TKA_Infantry_TL"; // Team Leader +KPLIB_o_sentry = "LOP_TKA_Infantry_Rifleman"; // Rifleman (Lite) +KPLIB_o_rifleman = "LOP_TKA_Infantry_Rifleman_2"; // Rifleman +KPLIB_o_riflemanLAT = "LOP_TKA_Infantry_Rifleman_3"; // Rifleman (LAT) +KPLIB_o_grenadier = "LOP_TKA_Infantry_GL"; // Grenadier +KPLIB_o_machinegunner = "LOP_TKA_Infantry_MG"; // Autorifleman +KPLIB_o_heavyGunner = "LOP_TKA_Infantry_MG"; // Heavy Gunner +KPLIB_o_marksman = "LOP_TKA_Infantry_Marksman"; // Marksman +KPLIB_o_sharpshooter = "LOP_TKA_Infantry_Marksman"; // Sharpshooter +KPLIB_o_sniper = "LOP_TKA_Infantry_Marksman"; // Sniper +KPLIB_o_atSpecialist = "LOP_TKA_Infantry_AT"; // AT Specialist +KPLIB_o_aaSpecialist = "LOP_TKA_Infantry_AA"; // AA Specialist +KPLIB_o_medic = "LOP_TKA_Infantry_Corpsman"; // Combat Life Saver +KPLIB_o_engineer = "LOP_TKA_Infantry_Engineer"; // Engineer +KPLIB_o_paratrooper = "LOP_TKA_Infantry_Rifleman"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "LOP_TKA_UAZ"; // UAZ-3151 -opfor_mrap_armed = "LOP_TKA_UAZ_AGS"; // UAZ-3151 (AGS-30) -opfor_transport_helo = "LOP_TKA_Mi8MT_Cargo"; // Mi-8MT (Cargo) -opfor_transport_truck = "LOP_TKA_Ural"; // Ural-4320 Transport (Covered) -opfor_ammobox_transport = "LOP_TKA_Ural_open"; // Ural-4320 Transport (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "RHS_Ural_Fuel_MSV_01"; // Ural-4320 Fuel -opfor_ammo_truck = "rhs_gaz66_ammo_msv"; // GAZ-66 Ammo -opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod -opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod -opfor_flag = "lop_Flag_tak_F"; // Flag +KPLIB_o_mrap = "LOP_TKA_UAZ"; // UAZ-3151 +KPLIB_o_mrapArmed = "LOP_TKA_UAZ_AGS"; // UAZ-3151 (AGS-30) +KPLIB_o_transportHeli = "LOP_TKA_Mi8MT_Cargo"; // Mi-8MT (Cargo) +KPLIB_o_transportTruck = "LOP_TKA_Ural"; // Ural-4320 Transport (Covered) +KPLIB_o_transportTruckAmmo = "LOP_TKA_Ural_open"; // Ural-4320 Transport (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "RHS_Ural_Fuel_MSV_01"; // Ural-4320 Fuel +KPLIB_o_ammoTruck = "rhs_gaz66_ammo_msv"; // GAZ-66 Ammo +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; // Taru Fuel Pod +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; // Taru Ammo Pod +KPLIB_o_flag = "lop_Flag_tak_F"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "LOP_TKA_Infantry_Rifleman", // Rifleman (Lite) "LOP_TKA_Infantry_Rifleman", // Rifleman (Lite) "LOP_TKA_Infantry_Rifleman_2", // Rifleman @@ -57,12 +67,12 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = [ +KPLIB_o_militiaVehicles = [ "LOP_TKA_UAZ_DshKM" // UAZ-3151 (DShKM) ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "LOP_TKA_UAZ_DshKM", // UAZ-3151 (DShKM) "LOP_TKA_UAZ_AGS", // UAZ-3151 (AGS-30) "LOP_TKA_UAZ_SPG", // UAZ-3151 (SPG-9) @@ -77,7 +87,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "LOP_TKA_UAZ_DshKM", // UAZ-3151 (DShKM) "LOP_TKA_UAZ_AGS", // UAZ-3151 (AGS-30) "LOP_TKA_BMP1", // BMP-1 @@ -86,7 +96,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "LOP_TKA_UAZ", // UAZ-3151 (Covered) "LOP_TKA_UAZ_DshKM", // UAZ-3151 (DShKM) "LOP_TKA_UAZ_AGS", // UAZ-3151 (AGS-30) @@ -107,7 +117,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "LOP_TKA_UAZ_Open", // UAZ-3151 "LOP_TKA_UAZ_DshKM", // UAZ-3151 (DShKM) "LOP_TKA_UAZ_AGS", // UAZ-3151 (AGS-30) @@ -123,7 +133,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "LOP_TKA_Ural_open", // Ural-4320 Transport "LOP_TKA_Ural", // Ural-4320 Transport (Covered) "LOP_TKA_BTR70", // BTR-70 @@ -135,14 +145,14 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "LOP_TKA_Mi8MT_Cargo", // Mi-8MT (Cargo) "LOP_TKA_Mi24V_AT", // Mi-24P (AT) "LOP_TKA_Mi24V_UPK23" // Mi-24V (UPK) ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "RHS_Su25SM_vvsc", // Su-25 "RHS_Su25SM_KH29_vvsc" // Su-25 (KH29) ]; diff --git a/Missionframework/presets/enemies/unsung.sqf b/Missionframework/presets/enemies/unsung.sqf index f41cd4e6d..6ed02d267 100644 --- a/Missionframework/presets/enemies/unsung.sqf +++ b/Missionframework/presets/enemies/unsung.sqf @@ -1,48 +1,57 @@ /* + File: unsung.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-07-08 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + North Vietnamese Army enemy preset. + Needed Mods: - - The Unsung Vietnam War Mod + - Unsung Optional Mods: - - None + - None */ // Enemy infantry classes -opfor_officer = "uns_men_NVA_68_COM"; // Officer -opfor_squad_leader = "uns_men_NVA_68_off"; // Squad Leader -opfor_team_leader = "uns_men_NVA_68_nco"; // Team Leader -opfor_sentry = "uns_men_NVA_68_RSAP"; // Rifleman (Lite) -opfor_rifleman = "uns_men_NVA_68_AS5"; // Rifleman -opfor_rpg = "uns_men_NVA_68_AT2"; // Rifleman (LAT) -opfor_grenadier = "uns_men_NVA_68_AS1"; // Grenadier -opfor_machinegunner = "uns_men_NVA_68_LMG"; // Autorifleman -opfor_heavygunner = "uns_men_NVA_68_HMG"; // Heavy Gunner -opfor_marksman = "uns_men_NVA_68_RF2"; // Marksman -opfor_sharpshooter = "uns_men_NVA_68_RF1"; // Sharpshooter -opfor_sniper = "uns_men_NVA_68_Rmrk"; // Sniper -opfor_at = "uns_men_NVA_68_AT"; // AT Specialist -opfor_aa = "uns_men_NVA_68_AA"; // AA Specialist -opfor_medic = "uns_men_NVA_68_MED"; // Combat Life Saver -opfor_engineer = "uns_men_NVA_68_SAP"; // Engineer -opfor_paratrooper = "uns_men_NVA_68_Ra2"; // Paratrooper +KPLIB_o_officer = "uns_men_NVA_68_COM"; // Officer +KPLIB_o_squadLeader = "uns_men_NVA_68_off"; // Squad Leader +KPLIB_o_teamLeader = "uns_men_NVA_68_nco"; // Team Leader +KPLIB_o_sentry = "uns_men_NVA_68_RSAP"; // Rifleman (Lite) +KPLIB_o_rifleman = "uns_men_NVA_68_AS5"; // Rifleman +KPLIB_o_riflemanLAT = "uns_men_NVA_68_AT2"; // Rifleman (LAT) +KPLIB_o_grenadier = "uns_men_NVA_68_AS1"; // Grenadier +KPLIB_o_machinegunner = "uns_men_NVA_68_LMG"; // Autorifleman +KPLIB_o_heavyGunner = "uns_men_NVA_68_HMG"; // Heavy Gunner +KPLIB_o_marksman = "uns_men_NVA_68_RF2"; // Marksman +KPLIB_o_sharpshooter = "uns_men_NVA_68_RF1"; // Sharpshooter +KPLIB_o_sniper = "uns_men_NVA_68_Rmrk"; // Sniper +KPLIB_o_atSpecialist = "uns_men_NVA_68_AT"; // AT Specialist +KPLIB_o_aaSpecialist = "uns_men_NVA_68_AA"; // AA Specialist +KPLIB_o_medic = "uns_men_NVA_68_MED"; // Combat Life Saver +KPLIB_o_engineer = "uns_men_NVA_68_SAP"; // Engineer +KPLIB_o_paratrooper = "uns_men_NVA_68_Ra2"; // Paratrooper // Enemy vehicles used by secondary objectives. -opfor_mrap = "uns_Type55"; // Type 55 (Transport) -opfor_mrap_armed = "uns_Type55_MG"; // Type 55 APC (DShk) -opfor_transport_helo = "uns_Mi8T_VPAF"; // Mi-8T Hip-C (Transport) -opfor_transport_truck = "uns_nvatruck"; // Ural Truck -opfor_ammobox_transport = "uns_nvatruck_open"; // Ural Truck (Open) -> Has to be able to transport resource crates! -opfor_fuel_truck = "uns_nvatruck_refuel"; // Ural Truck (refuel) -opfor_ammo_truck = "uns_nvatruck_reammo"; // Ural Truck (ammo) -opfor_fuel_container = "Box_EAF_AmmoVeh_F"; // LDF Vehicle Ammo Box -opfor_ammo_container = "Box_EAF_AmmoVeh_F"; // LDF Vehicle Ammo Box -opfor_flag = "uns_FlagCarrierNVA"; // Flag +KPLIB_o_mrap = "uns_Type55"; // Type 55 (Transport) +KPLIB_o_mrapArmed = "uns_Type55_MG"; // Type 55 APC (DShk) +KPLIB_o_transportHeli = "uns_Mi8T_VPAF"; // Mi-8T Hip-C (Transport) +KPLIB_o_transportTruck = "uns_nvatruck"; // Ural Truck +KPLIB_o_transportTruckAmmo = "uns_nvatruck_open"; // Ural Truck (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "uns_nvatruck_refuel"; // Ural Truck (refuel) +KPLIB_o_ammoTruck = "uns_nvatruck_reammo"; // Ural Truck (ammo) +KPLIB_o_fuelContainer = "Box_EAF_AmmoVeh_F"; // LDF Vehicle Ammo Box +KPLIB_o_ammoContainer = "Box_EAF_AmmoVeh_F"; // LDF Vehicle Ammo Box +KPLIB_o_flag = "uns_FlagCarrierNVA"; // Flag /* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ /* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -militia_squad = [ +KPLIB_o_militiaInfantry = [ "uns_men_VC_local_RF4", // Rifleman (MAS36) "uns_men_VC_local_RF4", // Rifleman (MAS36) "uns_men_VC_local_RF2", // Rifleman (Mosin) @@ -56,10 +65,10 @@ militia_squad = [ ]; // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -militia_vehicles = []; +KPLIB_o_militiaVehicles = []; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -opfor_vehicles = [ +KPLIB_o_armyVehicles = [ "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_Type55_patrol", // Type 55 APC (Patrol) @@ -82,7 +91,7 @@ opfor_vehicles = [ ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -opfor_vehicles_low_intensity = [ +KPLIB_o_armyVehiclesLight = [ "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_Type55_RR57", // Type 55 APC (57mm Type36) @@ -91,7 +100,7 @@ opfor_vehicles_low_intensity = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles = [ +KPLIB_o_battleGrpVehicles = [ "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_Type55_RR57", // Type 55 APC (57mm Type36) @@ -111,7 +120,7 @@ opfor_battlegroup_vehicles = [ ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -opfor_battlegroup_vehicles_low_intensity = [ +KPLIB_o_battleGrpVehiclesLight = [ "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_Type55_patrol", // Type 55 APC (Patrol) "uns_nvatruck_mg", // Ural Truck (MG) @@ -123,7 +132,7 @@ opfor_battlegroup_vehicles_low_intensity = [ /* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -opfor_troup_transports = [ +KPLIB_o_troopTransports = [ "uns_nvatruck_open", // Ural Truck (Open) "uns_nvatruck", // Ural Truck "uns_nvatruck_mg", // Ural Truck (MG) @@ -132,12 +141,12 @@ opfor_troup_transports = [ ]; // Enemy rotary-wings that will need to spawn in flight. -opfor_choppers = [ +KPLIB_o_helicopters = [ "uns_Mi8TV_VPAF_MG" // Mi-8TV Hip-C (Transport) ]; // Enemy fixed-wings that will need to spawn in the air. -opfor_air = [ +KPLIB_o_planes = [ "uns_an2_cas", // An-2 Colt (CAS) "uns_Mig21_CAP", // Mig-21 Fishbed F (CAP) "uns_Mig21_CAS" // Mig-21 Fishbed F (CAS) From fbd29bc6fc8a718915904af748c9d88e15db32b9 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Fri, 15 May 2020 14:25:22 +0200 Subject: [PATCH 011/115] changed preset file names to lowercase --- .../presets/enemies/cup_afrf_msv.sqf | 189 +++++++++ .../presets/enemies/cup_baf_desert.sqf | 178 ++++++++ .../presets/enemies/cup_baf_woodland.sqf | 178 ++++++++ Missionframework/presets/enemies/cup_cdf.sqf | 164 ++++++++ .../presets/enemies/cup_chdkz.sqf | 160 ++++++++ Missionframework/presets/enemies/cup_sla.sqf | 178 ++++++++ Missionframework/presets/enemies/sla.sqf | 154 +++++++ .../presets/players/cup_acr_desert.sqf | 330 +++++++++++++++ .../presets/players/cup_acr_woodland.sqf | 328 +++++++++++++++ .../presets/players/cup_baf_desert.sqf | 333 +++++++++++++++ .../presets/players/cup_baf_woodland.sqf | 337 ++++++++++++++++ Missionframework/presets/players/cup_cdf.sqf | 327 +++++++++++++++ .../presets/players/cup_chdkz.sqf | 317 +++++++++++++++ Missionframework/presets/players/cup_sla.sqf | 327 +++++++++++++++ .../presets/players/cup_usa_desert.sqf | 378 +++++++++++++++++ .../presets/players/cup_usa_woodland.sqf | 381 ++++++++++++++++++ .../presets/players/cup_usmc_desert.sqf | 374 +++++++++++++++++ .../presets/players/cup_usmc_woodland.sqf | 375 +++++++++++++++++ .../presets/resistance/cup_napa.sqf | 214 ++++++++++ Missionframework/presets/resistance/racs.sqf | 201 +++++++++ 20 files changed, 5423 insertions(+) create mode 100644 Missionframework/presets/enemies/cup_afrf_msv.sqf create mode 100644 Missionframework/presets/enemies/cup_baf_desert.sqf create mode 100644 Missionframework/presets/enemies/cup_baf_woodland.sqf create mode 100644 Missionframework/presets/enemies/cup_cdf.sqf create mode 100644 Missionframework/presets/enemies/cup_chdkz.sqf create mode 100644 Missionframework/presets/enemies/cup_sla.sqf create mode 100644 Missionframework/presets/enemies/sla.sqf create mode 100644 Missionframework/presets/players/cup_acr_desert.sqf create mode 100644 Missionframework/presets/players/cup_acr_woodland.sqf create mode 100644 Missionframework/presets/players/cup_baf_desert.sqf create mode 100644 Missionframework/presets/players/cup_baf_woodland.sqf create mode 100644 Missionframework/presets/players/cup_cdf.sqf create mode 100644 Missionframework/presets/players/cup_chdkz.sqf create mode 100644 Missionframework/presets/players/cup_sla.sqf create mode 100644 Missionframework/presets/players/cup_usa_desert.sqf create mode 100644 Missionframework/presets/players/cup_usa_woodland.sqf create mode 100644 Missionframework/presets/players/cup_usmc_desert.sqf create mode 100644 Missionframework/presets/players/cup_usmc_woodland.sqf create mode 100644 Missionframework/presets/resistance/cup_napa.sqf create mode 100644 Missionframework/presets/resistance/racs.sqf diff --git a/Missionframework/presets/enemies/cup_afrf_msv.sqf b/Missionframework/presets/enemies/cup_afrf_msv.sqf new file mode 100644 index 000000000..66bdb2ec6 --- /dev/null +++ b/Missionframework/presets/enemies/cup_afrf_msv.sqf @@ -0,0 +1,189 @@ +/* + File: cup_afrf_msv.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-20 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP AFRF MSV enemy preset. + + Needed Mods: + - CUP Units + - CUP Vehicles + - CUP Weapons + + Optional Mods: + - None +*/ + +// Enemy infantry classes +KPLIB_o_officer = "CUP_O_RU_Officer_EMR"; // Officer +KPLIB_o_squadLeader = "CUP_O_RU_Soldier_SL_EMR"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_RU_Soldier_TL_EMR"; // Team Leader +KPLIB_o_sentry = "CUP_O_RU_Soldier_Saiga_EMR"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_RU_Soldier_EMR"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_RU_Soldier_AT_EMR"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_RU_Soldier_GL_EMR"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_RU_Soldier_AR_EMR"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_RU_Soldier_MG_EMR"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_RU_Soldier_Marksman_EMR"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_RU_Sniper_EMR"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_RU_Sniper_KSVK_EMR"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_RU_Soldier_HAT_EMR"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_RU_Soldier_AA_EMR"; // AA Specialist +KPLIB_o_medic = "CUP_O_RU_Medic_EMR"; // Medic +KPLIB_o_engineer = "CUP_O_RU_Engineer_EMR"; // Engineer +KPLIB_o_paratrooper = "CUP_O_RU_Soldier_LAT_EMR"; // Paratrooper + +// Enemy vehicles used by secondary objectives. +KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_RU"; // UAZ +KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_RU"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_O_Mi8_RU"; // Mi-8MTV3 +KPLIB_o_transportTruck = "CUP_O_Kamaz_RU"; // Kamaz 5350 +KPLIB_o_transportTruckAmmo = "CUP_O_Kamaz_Open_RU"; // Kamaz 5350 (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Kamaz_Refuel_RU"; // Kamaz 5350 (Fuel) +KPLIB_o_ammoTruck = "CUP_O_Kamaz_Reammo_RU"; // Kamaz 5350 (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierRU"; // Flag + +/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. +Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ + +/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. +Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ +KPLIB_o_militiaInfantry = [ + "CUP_O_RU_Soldier_Saiga", // Rifleman (Saiga) + "CUP_O_RU_Soldier_Saiga", // Rifleman (Saiga) + "CUP_O_RU_Soldier", // Rifleman + "CUP_O_RU_Soldier", // Rifleman + "CUP_O_RU_Soldier_AT", // Rifleman (RPG-7) + "CUP_O_RU_Soldier_AR", // Automatic Rifleman + "CUP_O_RU_Soldier_Marksman", // Marksman (SVD) + "CUP_O_RU_Medic", // Medic + "CUP_O_RU_Engineer" // Engineer +]; + +// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. +KPLIB_o_militiaVehicles = [ + "CUP_O_UAZ_MG_RU" // UAZ (DShKM) +]; + +// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). +KPLIB_o_armyVehicles = [ + "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) + "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) + "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) + "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) + "CUP_O_BTR80_CAMO_RU", // BTR-80 (Camo) + "CUP_O_BTR80_GREEN_RU", // BTR-80 (Green) + "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Camo) + "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Green) + "CUP_O_BTR90_RU", // BTR-90 + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_BMP3_RU", // BMP-3 + "CUP_O_2S6_RU", // 2S6 Tunguska + "CUP_O_2S6_RU", // 2S6 Tunguska + "CUP_O_T72_RU", // T-72 + "CUP_O_T72_RU", // T-72 + "CUP_O_T72_RU", // T-72 + "CUP_O_T90_RU", // T-90A + "CUP_O_T90_RU", // T-90A + "CUP_O_T90_RU" // T-90A +]; + +// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). +KPLIB_o_armyVehiclesLight = [ + "CUP_O_UAZ_MG_RU", // UAZ (DShKM) + "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) + "CUP_O_MTLB_pk_WDL_RU", // MT-LB LV (Camo) + "CUP_O_BRDM2_RU", // BRDM-2 + "CUP_O_Ural_ZU23_RU", // Ural (ZU-23) + "CUP_O_BTR60_RU", // BTR-60PB (Camo) + "CUP_O_BTR60_RU", // BTR-60PB (Camo) + "CUP_O_BMP2_RU" // BMP-2 +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehicles = [ + "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) + "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) + "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) + "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) + "CUP_O_BTR80_CAMO_RU", // BTR-80 (Camo) + "CUP_O_BTR80_GREEN_RU", // BTR-80 (Green) + "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Camo) + "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Green) + "CUP_O_BTR90_RU", // BTR-90 + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_BMP3_RU", // BMP-3 + "CUP_O_2S6_RU", // 2S6 Tunguska + "CUP_O_2S6_RU", // 2S6 Tunguska + "CUP_O_T72_RU", // T-72 + "CUP_O_T72_RU", // T-72 + "CUP_O_T72_RU", // T-72 + "CUP_O_T90_RU", // T-90A + "CUP_O_T90_RU", // T-90A + "CUP_O_T90_RU", // T-90A + "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V + "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P + "CUP_O_Mi8_RU", // Mi-8MTV3 + "CUP_O_Ka52_RU", // Ka-52 + "CUP_O_Ka50_DL_RU" // Ka-50 Black Shark +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehiclesLight = [ + "CUP_O_UAZ_MG_RU", // UAZ (DShKM) + "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) + "CUP_O_MTLB_pk_WDL_RU", // MT-LB LV (Camo) + "CUP_O_BRDM2_RU", // BRDM-2 + "CUP_O_Ural_ZU23_RU", // Ural (ZU-23) + "CUP_O_BTR60_RU", // BTR-60PB (Camo) + "CUP_O_BTR60_RU", // BTR-60PB (Camo) + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) + "CUP_O_Mi8_RU" // Mi-8MTV3 +]; + +/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. +If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ +KPLIB_o_troopTransports = [ + "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) + "CUP_O_Mi8_RU", // Mi-8MTV3 + "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V + "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P + "CUP_O_BMP2_RU", // BMP-2 + "CUP_O_BTR60_RU", // BTR-60PB (Camo) + "CUP_O_BTR80_CAMO_RU", // BTR-80 (Camo) + "CUP_O_BTR80_GREEN_RU", // BTR-80 (Green) + "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Camo) + "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Green) + "CUP_O_BTR90_RU", // BTR-90 + "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) + "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) + "CUP_O_MTLB_pk_WDL_RU" // MT-LB LV (Camo) +]; + +// Enemy rotary-wings that will need to spawn in flight. +KPLIB_o_helicopters = [ + "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V + "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P + "CUP_O_Mi8_RU", // Mi-8MTV3 + "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) + "CUP_O_Ka52_RU", // Ka-52 + "CUP_O_Ka50_DL_RU" // Ka-50 Black Shark +]; + +// Enemy fixed-wings that will need to spawn in the air. +KPLIB_o_planes = [ + "CUP_O_Su25_Dyn_RU", // Su-25T Frogfoot + "CUP_O_SU34_RU" // Su-34 +]; diff --git a/Missionframework/presets/enemies/cup_baf_desert.sqf b/Missionframework/presets/enemies/cup_baf_desert.sqf new file mode 100644 index 000000000..4d3608985 --- /dev/null +++ b/Missionframework/presets/enemies/cup_baf_desert.sqf @@ -0,0 +1,178 @@ +/* + File: cup_bad_desert.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-16 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP BAF Desert enemy preset. + + Needed Mods: + - CUP Units + - CUP Vehicles + - CUP Weapons + + Optional Mods: + - None +*/ + +// Enemy infantry classes +KPLIB_o_officer = "CUP_B_BAF_Soldier_Officer_DDPM"; // Officer +KPLIB_o_squadLeader = "CUP_B_BAF_Soldier_SquadLeader_DDPM"; // Squad Leader +KPLIB_o_teamLeader = "CUP_B_BAF_Soldier_TeamLeader_DDPM"; // Team Leader +KPLIB_o_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DDPM"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_B_BAF_Soldier_Rifleman_DDPM"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_B_BAF_Soldier_RiflemanLAT_DDPM"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_B_BAF_Soldier_Grenadier_DDPM"; // Grenadier +KPLIB_o_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DDPM"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_B_BAF_Soldier_HeavyGunner_DDPM"; // Heavy Gunner +KPLIB_o_marksman = "CUP_B_BAF_Soldier_Marksman_DDPM"; // Marksman +KPLIB_o_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DDPM"; // Sharpshooter +KPLIB_o_sniper = "CUP_B_BAF_Sniper_AS50_DDPM"; // Sniper +KPLIB_o_atSpecialist = "CUP_B_BAF_Soldier_AT_DDPM"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_B_BAF_Soldier_AA_DDPM"; // AA Specialist +KPLIB_o_medic = "CUP_B_BAF_Soldier_Medic_DDPM"; // Medic +KPLIB_o_engineer = "CUP_B_BAF_Soldier_Engineer_DDPM"; // Engineer +KPLIB_o_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DDPM"; // Paratrooper + +// Enemy vehicles used by secondary objectives. +KPLIB_o_mrap = "CUP_B_Ridgeback_LMG_GB_D"; // Ridgeback PPV LMG Woodland +KPLIB_o_mrapArmed = "CUP_B_Ridgeback_HMG_GB_D"; // Ridgeback PPV HMG Woodland +KPLIB_o_transportHeli = "CUP_B_CH47F_GB"; // Chinook HC-4 +KPLIB_o_transportTruck = "CUP_B_MTVR_BAF_DES"; // MTVR +KPLIB_o_transportTruckAmmo = "CUP_B_MTVR_BAF_DES"; // MTVR -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_B_MTVR_Refuel_BAF_DES"; // MTVR (Refuel) +KPLIB_o_ammoTruck = "CUP_B_MTVR_Ammo_BAF_DES"; // MTVR (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "Flag_UK_F"; // Flag + +/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. +Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ + +/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. +Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ +KPLIB_o_militiaInfantry = [ + "CUP_B_BAF_Soldier_TeamLeader_MTP", // Team Leader + "CUP_B_BAF_Soldier_Medic_MTP", // Combat Life Saver + "CUP_B_BAF_Soldier_RiflemanLAT_MTP", // Rifleman (Light AT) + "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) + "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) + "CUP_B_BAF_Soldier_RiflemanLite_MTP" // Rifleman (Light) +]; + +// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. +KPLIB_o_militiaVehicles = [ + "CUP_B_LR_MG_GB_D" // Land Rover 110 (M2) Woodland +]; + +// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). +KPLIB_o_armyVehicles = [ + "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland + "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) + "CUP_B_BAF_Coyote_GMG_D", // Coyote GMG (Woodland) + "CUP_B_Wolfhound_LMG_GB_D", // Wolfhound TSV LMG Woodland + "CUP_B_Wolfhound_HMG_GB_D", // Wolfhound TSV HMG Woodland + "CUP_B_Wolfhound_GMG_GB_D", // Wolfhound TSV GMG Woodland + "CUP_B_Mastiff_LMG_GB_D", // Mastiff PPV LMG Woodland + "CUP_B_Mastiff_HMG_GB_D", // Mastiff PPV HMG Woodland + "CUP_B_Mastiff_GMG_GB_D", // Mastiff PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_MCV80_GB_D", // MCV-80 Warrior (Woodland) + "CUP_B_MCV80_GB_D_SLAT", // MCV-80 Warrior (SLAT - Woodland) + "CUP_B_FV510_GB_D", // FV510 Warrior (Woodland) + "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT - Woodland) + "CUP_B_Challenger2_2CD_BAF", // FV4034 Challenger 2 (Two Color Woodland) + "CUP_B_Challenger2_Desert_BAF" // FV4034 Challenger 2 (Woodland) +]; + +// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). +KPLIB_o_armyVehiclesLight = [ + "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland + "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland + "CUP_B_Jackal2_GMG_GB_D", // Jackal 2 GMG Woodland + "CUP_B_Ridgeback_LMG_GB_D", // Ridgeback PPV LMG Woodland + "CUP_B_Ridgeback_HMG_GB_D", // Ridgeback PPV HMG Woodland + "CUP_B_Ridgeback_GMG_GB_D", // Ridgeback PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_D", // FV432 Bulldog L7A2 [Woodland] + "CUP_B_FV432_Bulldog_GB_D" // FV432 Bulldog L7A2 [Woodland] +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehicles = [ + "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland + "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) + "CUP_B_BAF_Coyote_GMG_D", // Coyote GMG (Woodland) + "CUP_B_Wolfhound_LMG_GB_D", // Wolfhound TSV LMG Woodland + "CUP_B_Wolfhound_HMG_GB_D", // Wolfhound TSV HMG Woodland + "CUP_B_Wolfhound_GMG_GB_D", // Wolfhound TSV GMG Woodland + "CUP_B_Mastiff_LMG_GB_D", // Mastiff PPV LMG Woodland + "CUP_B_Mastiff_HMG_GB_D", // Mastiff PPV HMG Woodland + "CUP_B_Mastiff_GMG_GB_D", // Mastiff PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_MCV80_GB_D", // MCV-80 Warrior (Woodland) + "CUP_B_MCV80_GB_D_SLAT", // MCV-80 Warrior (SLAT - Woodland) + "CUP_B_FV510_GB_D", // FV510 Warrior (Woodland) + "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT - Woodland) + "CUP_B_Challenger2_2CD_BAF", // FV4034 Challenger 2 (Two Color Woodland) + "CUP_B_Challenger2_Desert_BAF", // FV4034 Challenger 2 (Woodland) + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehiclesLight = [ + "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland + "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland + "CUP_B_Jackal2_GMG_GB_D", // Jackal 2 GMG Woodland + "CUP_B_Ridgeback_LMG_GB_D", // Ridgeback PPV LMG Woodland + "CUP_B_Ridgeback_HMG_GB_D", // Ridgeback PPV HMG Woodland + "CUP_B_Ridgeback_GMG_GB_D", // Ridgeback PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_D", // FV432 Bulldog L7A2 [Woodland] + "CUP_B_FV432_Bulldog_GB_D", // FV432 Bulldog L7A2 [Woodland] + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. +If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ +KPLIB_o_troopTransports = [ + "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) + "CUP_B_BAF_Coyote_GMG_D", // Coyote GMG (Woodland) + "CUP_B_Mastiff_LMG_GB_D", // Mastiff PPV LMG Woodland + "CUP_B_Mastiff_HMG_GB_D", // Mastiff PPV HMG Woodland + "CUP_B_Mastiff_GMG_GB_D", // Mastiff PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland + "CUP_B_Jackal2_GMG_GB_D", // Jackal 2 GMG Woodland + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +// Enemy rotary-wings that will need to spawn in flight. +KPLIB_o_helicopters = [ + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +// Enemy fixed-wings that will need to spawn in the air. +KPLIB_o_planes = [ + "CUP_B_F35B_BAF", // F-35B Lightning II + "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) + "CUP_B_GR9_DYN_GB" // Harrier GR.9 +]; diff --git a/Missionframework/presets/enemies/cup_baf_woodland.sqf b/Missionframework/presets/enemies/cup_baf_woodland.sqf new file mode 100644 index 000000000..4100c1cb8 --- /dev/null +++ b/Missionframework/presets/enemies/cup_baf_woodland.sqf @@ -0,0 +1,178 @@ +/* + File: cup_baf_woodland.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-16 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP BAF Woodland enemy preset. + + Needed Mods: + - CUP Units + - CUP Vehicles + - CUP Weapons + + Optional Mods: + - None +*/ + +// Enemy infantry classes +KPLIB_o_officer = "CUP_B_BAF_Soldier_Officer_DPM"; // Officer +KPLIB_o_squadLeader = "CUP_B_BAF_Soldier_SquadLeader_DPM"; // Squad Leader +KPLIB_o_teamLeader = "CUP_B_BAF_Soldier_TeamLeader_DPM"; // Team Leader +KPLIB_o_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DPM"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_B_BAF_Soldier_Rifleman_DPM"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_B_BAF_Soldier_RiflemanLAT_DPM"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_B_BAF_Soldier_Grenadier_DPM"; // Grenadier +KPLIB_o_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DPM"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_B_BAF_Soldier_HeavyGunner_DPM"; // Heavy Gunner +KPLIB_o_marksman = "CUP_B_BAF_Soldier_Marksman_DPM"; // Marksman +KPLIB_o_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DPM"; // Sharpshooter +KPLIB_o_sniper = "CUP_B_BAF_Sniper_AS50_DPM"; // Sniper +KPLIB_o_atSpecialist = "CUP_B_BAF_Soldier_AT_DPM"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_B_BAF_Soldier_AA_DPM"; // AA Specialist +KPLIB_o_medic = "CUP_B_BAF_Soldier_Medic_DPM"; // Medic +KPLIB_o_engineer = "CUP_B_BAF_Soldier_Engineer_DPM"; // Engineer +KPLIB_o_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DPM"; // Paratrooper + +// Enemy vehicles used by secondary objectives. +KPLIB_o_mrap = "CUP_B_Ridgeback_LMG_GB_W"; // Ridgeback PPV LMG Woodland +KPLIB_o_mrapArmed = "CUP_B_Ridgeback_HMG_GB_W"; // Ridgeback PPV HMG Woodland +KPLIB_o_transportHeli = "CUP_B_CH47F_GB"; // Chinook HC-4 +KPLIB_o_transportTruck = "CUP_B_MTVR_BAF_WOOD"; // MTVR +KPLIB_o_transportTruckAmmo = "CUP_B_MTVR_BAF_WOOD"; // MTVR -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_B_MTVR_Refuel_BAF_WOOD"; // MTVR (Refuel) +KPLIB_o_ammoTruck = "CUP_B_MTVR_Ammo_BAF_WOOD"; // MTVR (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "Flag_UK_F"; // Flag + +/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. +Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ + +/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. +Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ +KPLIB_o_militiaInfantry = [ + "CUP_B_BAF_Soldier_TeamLeader_MTP", // Team Leader + "CUP_B_BAF_Soldier_Medic_MTP", // Combat Life Saver + "CUP_B_BAF_Soldier_RiflemanLAT_MTP", // Rifleman (Light AT) + "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) + "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) + "CUP_B_BAF_Soldier_RiflemanLite_MTP" // Rifleman (Light) +]; + +// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. +KPLIB_o_militiaVehicles = [ + "CUP_B_LR_MG_GB_W" // Land Rover 110 (M2) Woodland +]; + +// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). +KPLIB_o_armyVehicles = [ + "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland + "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) + "CUP_B_BAF_Coyote_GMG_W", // Coyote GMG (Woodland) + "CUP_B_Wolfhound_LMG_GB_W", // Wolfhound TSV LMG Woodland + "CUP_B_Wolfhound_HMG_GB_W", // Wolfhound TSV HMG Woodland + "CUP_B_Wolfhound_GMG_GB_W", // Wolfhound TSV GMG Woodland + "CUP_B_Mastiff_LMG_GB_W", // Mastiff PPV LMG Woodland + "CUP_B_Mastiff_HMG_GB_W", // Mastiff PPV HMG Woodland + "CUP_B_Mastiff_GMG_GB_W", // Mastiff PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_MCV80_GB_W", // MCV-80 Warrior (Woodland) + "CUP_B_MCV80_GB_W_SLAT", // MCV-80 Warrior (SLAT - Woodland) + "CUP_B_FV510_GB_W", // FV510 Warrior (Woodland) + "CUP_B_FV510_GB_W_SLAT", // FV510 Warrior (SLAT - Woodland) + "CUP_B_Challenger2_2CW_BAF", // FV4034 Challenger 2 (Two Color Woodland) + "CUP_B_Challenger2_Woodland_BAF" // FV4034 Challenger 2 (Woodland) +]; + +// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). +KPLIB_o_armyVehiclesLight = [ + "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland + "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland + "CUP_B_Jackal2_GMG_GB_W", // Jackal 2 GMG Woodland + "CUP_B_Ridgeback_LMG_GB_W", // Ridgeback PPV LMG Woodland + "CUP_B_Ridgeback_HMG_GB_W", // Ridgeback PPV HMG Woodland + "CUP_B_Ridgeback_GMG_GB_W", // Ridgeback PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_W", // FV432 Bulldog L7A2 [Woodland] + "CUP_B_FV432_Bulldog_GB_W" // FV432 Bulldog L7A2 [Woodland] +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehicles = [ + "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland + "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) + "CUP_B_BAF_Coyote_GMG_W", // Coyote GMG (Woodland) + "CUP_B_Wolfhound_LMG_GB_W", // Wolfhound TSV LMG Woodland + "CUP_B_Wolfhound_HMG_GB_W", // Wolfhound TSV HMG Woodland + "CUP_B_Wolfhound_GMG_GB_W", // Wolfhound TSV GMG Woodland + "CUP_B_Mastiff_LMG_GB_W", // Mastiff PPV LMG Woodland + "CUP_B_Mastiff_HMG_GB_W", // Mastiff PPV HMG Woodland + "CUP_B_Mastiff_GMG_GB_W", // Mastiff PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_MCV80_GB_W", // MCV-80 Warrior (Woodland) + "CUP_B_MCV80_GB_W_SLAT", // MCV-80 Warrior (SLAT - Woodland) + "CUP_B_FV510_GB_W", // FV510 Warrior (Woodland) + "CUP_B_FV510_GB_W_SLAT", // FV510 Warrior (SLAT - Woodland) + "CUP_B_Challenger2_2CW_BAF", // FV4034 Challenger 2 (Two Color Woodland) + "CUP_B_Challenger2_Woodland_BAF", // FV4034 Challenger 2 (Woodland) + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehiclesLight = [ + "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland + "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland + "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland + "CUP_B_Jackal2_GMG_GB_W", // Jackal 2 GMG Woodland + "CUP_B_Ridgeback_LMG_GB_W", // Ridgeback PPV LMG Woodland + "CUP_B_Ridgeback_HMG_GB_W", // Ridgeback PPV HMG Woodland + "CUP_B_Ridgeback_GMG_GB_W", // Ridgeback PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_W", // FV432 Bulldog L7A2 [Woodland] + "CUP_B_FV432_Bulldog_GB_W", // FV432 Bulldog L7A2 [Woodland] + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. +If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ +KPLIB_o_troopTransports = [ + "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) + "CUP_B_BAF_Coyote_GMG_W", // Coyote GMG (Woodland) + "CUP_B_Mastiff_LMG_GB_W", // Mastiff PPV LMG Woodland + "CUP_B_Mastiff_HMG_GB_W", // Mastiff PPV HMG Woodland + "CUP_B_Mastiff_GMG_GB_W", // Mastiff PPV GMG Woodland + "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] + "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland + "CUP_B_Jackal2_GMG_GB_W", // Jackal 2 GMG Woodland + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +// Enemy rotary-wings that will need to spawn in flight. +KPLIB_o_helicopters = [ + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_AW159_GB", // AW159 Wildcat (Green) + "CUP_B_CH47F_GB", // Chinook HC-4 + "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) +]; + +// Enemy fixed-wings that will need to spawn in the air. +KPLIB_o_planes = [ + "CUP_B_F35B_BAF", // F-35B Lightning II + "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) + "CUP_B_GR9_DYN_GB" // Harrier GR.9 +]; diff --git a/Missionframework/presets/enemies/cup_cdf.sqf b/Missionframework/presets/enemies/cup_cdf.sqf new file mode 100644 index 000000000..d475075bb --- /dev/null +++ b/Missionframework/presets/enemies/cup_cdf.sqf @@ -0,0 +1,164 @@ +/* + File: cup_cdf.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-06 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP CDF enemy preset. + + Needed Mods: + - CUP Units + - CUP Vehicles + - CUP Weapons + + Optional Mods: + - None +*/ + +// Enemy infantry classes +KPLIB_o_officer = "CUP_B_CDF_Commander_FST"; // Officer +KPLIB_o_squadLeader = "CUP_B_CDF_Officer_FST"; // Squad Leader +KPLIB_o_teamLeader = "CUP_B_CDF_Soldier_TL_FST"; // Team Leader +KPLIB_o_sentry = "CUP_B_CDF_Militia_FST"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_B_CDF_Soldier_FST"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_B_CDF_Soldier_RPG18_FST"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_B_CDF_Soldier_GL_FST"; // Grenadier +KPLIB_o_machinegunner = "CUP_B_CDF_Soldier_AR_FST"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_B_CDF_Soldier_MG_FST"; // Heavy Gunner +KPLIB_o_marksman = "CUP_B_CDF_Soldier_Marksman_FST"; // Marksman +KPLIB_o_sharpshooter = "CUP_B_CDF_Soldier_Marksman_FST"; // Sharpshooter +KPLIB_o_sniper = "CUP_B_CDF_Sniper_FST"; // Sniper +KPLIB_o_atSpecialist = "CUP_B_CDF_Soldier_LAT_FST"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_B_CDF_Soldier_AA_FST"; // AA Specialist +KPLIB_o_medic = "CUP_B_CDF_Medic_FST"; // Medic +KPLIB_o_engineer = "CUP_B_CDF_Engineer_FST"; // Engineer +KPLIB_o_paratrooper = "CUP_B_CDF_Soldier_RPG18_FST"; // Paratrooper + +// Enemy vehicles used by secondary objectives. +KPLIB_o_mrap = "CUP_B_UAZ_Unarmed_CDF"; // UAZ +KPLIB_o_mrapArmed = "CUP_B_UAZ_MG_CDF"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_B_Mi17_CDF"; // Mi-8MT +KPLIB_o_transportTruck = "CUP_B_Ural_CDF"; // Ural +KPLIB_o_transportTruckAmmo = "CUP_B_Ural_Open_CDF"; // Ural (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_B_Kamaz_Refuel_CDF"; // Kamaz 5350 (Fuel) +KPLIB_o_ammoTruck = "CUP_B_Kamaz_Reammo_CDF"; // Kamaz 5350 (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierCDF"; // Flag + +/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. +Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ + +/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. +Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ +KPLIB_o_militiaInfantry = [ + "CUP_B_CDF_Soldier_TL_FST", // Team Leader + "CUP_B_CDF_Militia_FST", // Militia + "CUP_B_CDF_Militia_FST", // Militia + "CUP_B_CDF_Militia_FST", // Militia + "CUP_B_CDF_Militia_FST", // Militia + "CUP_B_CDF_Militia_FST" // Militia +]; + +// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. +KPLIB_o_militiaVehicles = [ + "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) + "CUP_B_UAZ_AGS30_CDF" // UAZ (AGS-30) +]; + +// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). +KPLIB_o_armyVehicles = [ + "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) + "CUP_B_UAZ_AA_CDF", // UAZ (AA) + "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) + "CUP_B_UAZ_SPG9_CDF", // UAZ (SPG-9) + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_BTR80_CDF", // BTR-80 + "CUP_B_BTR80_CDF", // BTR-80 + "CUP_B_BTR80A_CDF", // BTR-80A + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_ZSU23_Afghan_CDF", // ZSU-23-4 Afghanski + "CUP_B_ZSU23_CDF", // ZSU-23-4 + "CUP_B_T72_CDF", // T-72 + "CUP_B_T72_CDF" // T-72 +]; + +// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). +KPLIB_o_armyVehiclesLight = [ + "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) + "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) + "CUP_B_MTLB_pk_CDF", // MT-LB LV + "CUP_B_MTLB_pk_CDF", // MT-LB LV + "CUP_B_BRDM2_CDF", // BRDM-2 + "CUP_B_BRDM2_CDF", // BRDM-2 + "CUP_B_Ural_ZU23_CDF", // Ural (ZU-23) + "CUP_B_BTR60_CDF" // BTR-60PB +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehicles = [ + "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) + "CUP_B_UAZ_AA_CDF", // UAZ (AA) + "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) + "CUP_B_UAZ_SPG9_CDF", // UAZ (SPG-9) + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_BTR80_CDF", // BTR-80 + "CUP_B_BTR80_CDF", // BTR-80 + "CUP_B_BTR80A_CDF", // BTR-80A + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_ZSU23_Afghan_CDF", // ZSU-23-4 Afghanski + "CUP_B_ZSU23_CDF", // ZSU-23-4 + "CUP_B_T72_CDF", // T-72 + "CUP_B_T72_CDF", // T-72 + "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D + "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D + "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D + "CUP_B_Mi17_CDF" // Mi-8MT +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehiclesLight = [ + "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) + "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) + "CUP_B_MTLB_pk_CDF", // MT-LB LV + "CUP_B_MTLB_pk_CDF", // MT-LB LV + "CUP_B_Ural_ZU23_CDF", // Ural (ZU-23) + "CUP_B_Ural_ZU23_CDF", // Ural (ZU-23) + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_Mi17_CDF" // Mi-8MT +]; + +/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. +If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ +KPLIB_o_troopTransports = [ + "CUP_B_BTR60_CDF", // BTR-60PB + "CUP_B_MTLB_pk_CDF", // MT-LB LV + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_BTR80_CDF", // BTR-80 + "CUP_B_BTR80A_CDF", // BTR-80A + "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D + "CUP_B_Mi17_CDF" // Mi-8MT +]; + +// Enemy rotary-wings that will need to spawn in flight. +KPLIB_o_helicopters = [ + "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D + "CUP_B_Mi17_CDF" // Mi-8MT +]; + +// Enemy fixed-wings that will need to spawn in the air. +KPLIB_o_planes = [ + "CUP_B_SU34_CDF", // Su-34 + "CUP_B_Su25_Dyn_CDF" // Su-25 Frogfoot +]; diff --git a/Missionframework/presets/enemies/cup_chdkz.sqf b/Missionframework/presets/enemies/cup_chdkz.sqf new file mode 100644 index 000000000..d3d6e5166 --- /dev/null +++ b/Missionframework/presets/enemies/cup_chdkz.sqf @@ -0,0 +1,160 @@ +/* + File: cup_chdkz.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-20 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP ChDKZ enemy preset. + + Needed Mods: + - CUP Units + - CUP Vehicles + - CUP Weapons + + Optional Mods: + - None +*/ + +// Enemy infantry classes +KPLIB_o_officer = "CUP_O_INS_Story_Lopotev"; // Officer +KPLIB_o_squadLeader = "CUP_O_INS_Commander"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_INS_Officer"; // Team Leader +KPLIB_o_sentry = "CUP_O_INS_Soldier"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_INS_Soldier_AK74"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_INS_Soldier_Exp"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_INS_Soldier_GL"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_INS_Soldier"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_INS_Soldier_MG"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_INS_Woodlander2"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_INS_Villager3"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_INS_Sniper"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_INS_Soldier_AT"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_INS_Soldier_AA"; // AA Specialist +KPLIB_o_medic = "CUP_O_INS_Medic"; // Medic +KPLIB_o_engineer = "CUP_O_INS_Soldier_Engineer"; // Engineer +KPLIB_o_paratrooper = "CUP_O_INS_Saboteur"; // Paratrooper + +// Enemy vehicles used by secondary objectives. +KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_CHDKZ"; // UAZ +KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_CHDKZ"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_O_Mi8_CHDKZ"; // Mi-8MT +KPLIB_o_transportTruck = "CUP_O_Ural_CHDKZ"; // Ural +KPLIB_o_transportTruckAmmo = "CUP_O_Ural_Open_CHDKZ"; // Ural (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Ural_Refuel_CHDKZ"; // Ural (Refuel) +KPLIB_o_ammoTruck = "CUP_O_Ural_Reammo_CHDKZ"; // Ural (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierINS"; // Flag + +/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. +Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ + +/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. +Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ +KPLIB_o_militiaInfantry = [ + "CUP_O_INS_Villager3", // Farmer + "CUP_O_INS_Woodlander3", // Forester + "CUP_O_INS_Woodlander2", // Gamekeeper + "CUP_O_INS_Worker2", // Local + "CUP_O_INS_Villager4", // Villager + "CUP_O_INS_Woodlander1" // Woodman +]; + +// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. +KPLIB_o_militiaVehicles = [ + "CUP_O_Datsun_PK_Random" // Datsun 620 Pickup (PK) Woodland +]; + +// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). +KPLIB_o_armyVehicles = [ + "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) + "CUP_O_UAZ_AA_CHDKZ", // UAZ (AA) + "CUP_O_UAZ_AGS30_CHDKZ", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_CHDKZ", // UAZ (SPG-9) + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR80_CHDKZ", // BTR-80 + "CUP_O_BTR80A_CHDKZ", // BTR-80A + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_ZSU23_Afghan_ChDKZ", // ZSU-23-4 Afghanski + "CUP_O_ZSU23_ChDKZ", // ZSU-23-4 + "CUP_O_T55_CHDKZ", // T-55 + "CUP_O_T55_CHDKZ", // T-55 + "CUP_O_T55_CHDKZ", // T-55 + "CUP_O_T72_CHDKZ", // T-72 + "CUP_O_T72_CHDKZ" // T-72 +]; + +// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). +KPLIB_o_armyVehiclesLight = [ + "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) + "CUP_O_Datsun_AA_Random", // Datsun 620 Pickup (AA) + "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV + "CUP_O_BRDM2_CHDKZ", // BRDM-2 + "CUP_O_Ural_ZU23_CHDKZ", // Ural (ZU-23) + "CUP_O_BTR60_CHDKZ" // BTR-60PB +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehicles = [ + "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) + "CUP_O_UAZ_AA_CHDKZ", // UAZ (AA) + "CUP_O_UAZ_AGS30_CHDKZ", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_CHDKZ", // UAZ (SPG-9) + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR80_CHDKZ", // BTR-80 + "CUP_O_BTR80A_CHDKZ", // BTR-80A + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_ZSU23_Afghan_ChDKZ", // ZSU-23-4 Afghanski + "CUP_O_ZSU23_ChDKZ", // ZSU-23-4 + "CUP_O_T55_CHDKZ", // T-55 + "CUP_O_T55_CHDKZ", // T-55 + "CUP_O_T55_CHDKZ", // T-55 + "CUP_O_T72_CHDKZ", // T-72 + "CUP_O_T72_CHDKZ", // T-72 + "CUP_O_Mi8_CHDKZ", // Mi-8MT + "CUP_O_Mi8_CHDKZ" // Mi-8MT +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehiclesLight = [ + "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) + "CUP_O_Datsun_AA_Random", // Datsun 620 Pickup (AA) + "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV + "CUP_O_BRDM2_CHDKZ", // BRDM-2 + "CUP_O_Ural_ZU23_CHDKZ", // Ural (ZU-23) + "CUP_O_T55_CHDKZ", // T-55 + "CUP_O_BTR60_CHDKZ" // BTR-60PB +]; + +/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. +If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ +KPLIB_o_troopTransports = [ + "CUP_O_BTR60_CHDKZ", // BTR-60PB + "CUP_O_BTR80_CHDKZ", // BTR-80 + "CUP_O_BTR80A_CHDKZ", // BTR-80A + "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_Mi8_CHDKZ" // Mi-8MT +]; + +// Enemy rotary-wings that will need to spawn in flight. +KPLIB_o_helicopters = [ + "CUP_O_Mi8_CHDKZ" // Mi-8MT +]; + +// Enemy fixed-wings that will need to spawn in the air. +KPLIB_o_planes = [ + "CUP_O_Su25_Dyn_RU" // Su-25T Frogfoot +]; diff --git a/Missionframework/presets/enemies/cup_sla.sqf b/Missionframework/presets/enemies/cup_sla.sqf new file mode 100644 index 000000000..8a032cebc --- /dev/null +++ b/Missionframework/presets/enemies/cup_sla.sqf @@ -0,0 +1,178 @@ +/* + File: cup_sla.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP SLA enemy preset. + + Needed Mods: + - CUP Units + - CUP Vehicles + - CUP Weapons + + Optional Mods: + - None +*/ + +// Enemy infantry classes +KPLIB_o_officer = "CUP_O_sla_Officer"; // Officer +KPLIB_o_squadLeader = "CUP_O_sla_Soldier_SL"; // Squad Leader +KPLIB_o_teamLeader = "CUP_O_sla_Soldier_SL"; // Team Leader +KPLIB_o_sentry = "CUP_O_sla_Soldier"; // Rifleman (Lite) +KPLIB_o_rifleman = "CUP_O_SLA_Soldier_Backpack"; // Rifleman +KPLIB_o_riflemanLAT = "CUP_O_sla_Soldier_AT"; // Rifleman (LAT) +KPLIB_o_grenadier = "CUP_O_sla_Soldier_GL"; // Grenadier +KPLIB_o_machinegunner = "CUP_O_sla_Soldier_AR"; // Autorifleman +KPLIB_o_heavyGunner = "CUP_O_sla_Soldier_MG"; // Heavy Gunner +KPLIB_o_marksman = "CUP_O_sla_Sniper"; // Marksman +KPLIB_o_sharpshooter = "CUP_O_SLA_Sniper_SVD_Night"; // Sharpshooter +KPLIB_o_sniper = "CUP_O_sla_Sniper_KSVK"; // Sniper +KPLIB_o_atSpecialist = "CUP_O_sla_Soldier_HAT"; // AT Specialist +KPLIB_o_aaSpecialist = "CUP_O_sla_Soldier_AA"; // AA Specialist +KPLIB_o_medic = "CUP_O_sla_Medic"; // Medic +KPLIB_o_engineer = "CUP_O_sla_Engineer"; // Engineer +KPLIB_o_paratrooper = "CUP_O_sla_Soldier_LAT"; // Paratrooper + +// Enemy vehicles used by secondary objectives. +KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_SLA"; // UAZ +KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_SLA"; // UAZ (DShKM) +KPLIB_o_transportHeli = "CUP_O_Mi8_SLA_1"; // Mi-8MT +KPLIB_o_transportTruck = "CUP_O_Ural_SLA"; // Ural +KPLIB_o_transportTruckAmmo = "CUP_O_Ural_Open_SLA"; // Ural (Open) -> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "CUP_O_Ural_Refuel_SLA"; // Ural (Refuel) +KPLIB_o_ammoTruck = "CUP_O_Ural_Reammo_SLA"; // Ural (Ammo) +KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container +KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container +KPLIB_o_flag = "FlagCarrierNorth"; // Flag + +/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. +Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ + +/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. +Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ +KPLIB_o_militiaInfantry = [ + "CUP_O_sla_Soldier_militia", // Militiaman + "CUP_O_sla_Soldier_militia", // Militiaman + "CUP_O_sla_Soldier_LAT_militia", // Militiaman (RPG-18) + "CUP_O_sla_Soldier_AA_militia", // AA Specialist + "CUP_O_sla_Soldier_AT_militia", // Militiaman (RPG-7) + "CUP_O_sla_Soldier_AR_militia", // Militia Automatic Rifleman + "CUP_O_sla_Soldier_GL_militia", // Militia Grenadier + "CUP_O_sla_Medic_militia", // Militia Medic + "CUP_O_sla_Engineer_militia" // Militia Engineer +]; + +// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. +KPLIB_o_militiaVehicles = [ + "CUP_O_UAZ_MG_SLA" // UAZ (DShKM) +]; + +// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). +KPLIB_o_armyVehicles = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR80_SLA", // BTR-80 + "CUP_O_BTR80A_SLA", // BTR-80A + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_ZSU23_SLA", // ZSU-23-4 + "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski + "CUP_O_T55_SLA", // T-55 + "CUP_O_T55_SLA", // T-55 + "CUP_O_T72_SLA", // T-72 + "CUP_O_T72_SLA" // T-72 +]; + +// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). +KPLIB_o_armyVehiclesLight = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_MTLB_pk_SLA" // MT-LB LV +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehicles = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR80_SLA", // BTR-80 + "CUP_O_BTR80A_SLA", // BTR-80A + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_ZSU23_SLA", // ZSU-23-4 + "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski + "CUP_O_T55_SLA", // T-55 + "CUP_O_T55_SLA", // T-55 + "CUP_O_T72_SLA", // T-72 + "CUP_O_T72_SLA", // T-72 + "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark + "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D + "CUP_O_Mi8_SLA_2", // Mi-8MTV3 + "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) + "CUP_O_UH1H_gunship_SLA" // UH-1H (Gunship) +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehiclesLight = [ + "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) + "CUP_O_UAZ_AA_SLA", // UAZ (AA) + "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) + "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_MTLB_pk_SLA", // MT-LB LV + "CUP_O_Mi8_SLA_1", // Mi-8MT + "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) + "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) + "CUP_O_UH1H_SLA" // UH-1H +]; + +/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. +If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ +KPLIB_o_troopTransports = [ + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D + "CUP_O_Mi8_SLA_2", // Mi-8MTV3 + "CUP_O_BTR60_SLA", // BTR-60PB + "CUP_O_BTR80_SLA", // BTR-80 + "CUP_O_BTR80A_SLA", // BTR-80A + "CUP_O_MTLB_pk_SLA", // MT-LB LV + "CUP_O_Mi8_SLA_1", // Mi-8MT + "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) + "CUP_O_UH1H_SLA" // UH-1H +]; + +// Enemy rotary-wings that will need to spawn in flight. +KPLIB_o_helicopters = [ + "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark + "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D + "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) + "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) + "CUP_O_UH1H_SLA", // UH-1H + "CUP_O_Mi8_SLA_1", // Mi-8MT + "CUP_O_Mi8_SLA_2" // Mi-8MTV3 +]; + +// Enemy fixed-wings that will need to spawn in the air. +KPLIB_o_planes = [ + "CUP_O_Su25_Dyn_SLA", // Su-25 Frogfoot + "CUP_O_SU34_SLA" // Su-34 +]; diff --git a/Missionframework/presets/enemies/sla.sqf b/Missionframework/presets/enemies/sla.sqf new file mode 100644 index 000000000..0f975f25a --- /dev/null +++ b/Missionframework/presets/enemies/sla.sqf @@ -0,0 +1,154 @@ +/* + File: sla.sqf + Author: PSYKO-nz - https://github.com/PSYKO-nz + Date: 2018-02-19 + Last Update: 2020-05-15 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Sahrani Liberation Army enemy preset. + + Needed Mods: + - Project OPFOR + - RHS AFRF + - RHS GREF + - RHS USAF + + Optional Mods: + - None +*/ + +// Enemy infantry classes +KPLIB_o_officer = "LOP_SLA_Infantry_Officer"; +KPLIB_o_squadLeader = "LOP_SLA_Infantry_SL"; +KPLIB_o_teamLeader = "LOP_SLA_Infantry_TL"; +KPLIB_o_sentry = "LOP_SLA_Infantry_Rifleman"; +KPLIB_o_rifleman = "LOP_SLA_Infantry_Rifleman_2"; +KPLIB_o_riflemanLAT = "LOP_SLA_Infantry_AT"; +KPLIB_o_grenadier = "LOP_SLA_Infantry_GL"; +KPLIB_o_machinegunner = "LOP_SLA_Infantry_MG"; +KPLIB_o_heavyGunner = "LOP_SLA_Infantry_MG"; +KPLIB_o_marksman = "LOP_SLA_Infantry_Marksman"; +KPLIB_o_sharpshooter = "LOP_SLA_Infantry_Marksman"; +KPLIB_o_sniper = "LOP_SLA_Infantry_Marksman"; +KPLIB_o_atSpecialist = "LOP_SLA_Infantry_AT"; +KPLIB_o_aaSpecialist = "LOP_SLA_Infantry_AA"; +KPLIB_o_medic = "LOP_SLA_Infantry_Corpsman"; +KPLIB_o_engineer = "LOP_SLA_Infantry_Engineer"; +KPLIB_o_paratrooper = "LOP_SLA_Infantry_Rifleman"; + +// Enemy vehicles used by secondary objectives. +KPLIB_o_mrap = "LOP_SLA_UAZ"; +KPLIB_o_mrapArmed = "LOP_SLA_UAZ_DshKM"; +KPLIB_o_transportHeli = "LOP_SLA_Mi8MT_Cargo"; +KPLIB_o_transportTruck = "LOP_SLA_Ural"; +KPLIB_o_transportTruckAmmo = "LOP_SLA_Ural_open"; //-> Has to be able to transport resource crates! +KPLIB_o_fuelTruck = "rhs_gaz66_ammo_vmf"; +KPLIB_o_ammoTruck = "rhs_gaz66_ammo_vmf"; +KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; +KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; +KPLIB_o_flag = "lop_Flag_sla_F"; + +/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. +Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ + +/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. +Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ +KPLIB_o_militiaInfantry = [ + "LOP_SLA_Infantry_Rifleman", + "LOP_SLA_Infantry_Rifleman_2", + "LOP_SLA_Infantry_GL", + "LOP_SLA_Infantry_Officer", + "LOP_SLA_Infantry_TL", + "LOP_SLA_Infantry_SL", + "LOP_SLA_Infantry_AA", + "LOP_SLA_Infantry_AT", + "LOP_SLA_Infantry_Marksman", + "LOP_SLA_Infantry_Corpsman", + "LOP_SLA_Infantry_Engineer" +]; + +// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. +KPLIB_o_militiaVehicles = [ + "LOP_SLA_UAZ_SPG", + "LOP_SLA_UAZ_DshKM", + "LOP_SLA_UAZ_AGS", + "LOP_SLA_UAZ", + "LOP_SLA_UAZ_Open" +]; + +// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). +KPLIB_o_armyVehicles = [ + "LOP_SLA_UAZ_SPG", + "LOP_SLA_UAZ_DshKM", + "LOP_SLA_UAZ_AGS", + "LOP_SLA_BMP2D", + "LOP_SLA_BMP2", + "LOP_SLA_BMP1D", + "LOP_SLA_BMP1", + "LOP_SLA_BTR60", + "LOP_SLA_BTR70", + "LOP_SLA_ZSU234", + "LOP_SLA_T72BB", + "LOP_SLA_T72BA" +]; + +// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). +KPLIB_o_armyVehiclesLight = [ + "LOP_SLA_UAZ_SPG", + "LOP_SLA_UAZ_DshKM", + "LOP_SLA_UAZ_AGS", + "LOP_SLA_BTR60", + "LOP_SLA_BMP2" +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehicles = [ + "LOP_SLA_UAZ_SPG", + "LOP_SLA_UAZ_DshKM", + "LOP_SLA_UAZ_AGS", + "LOP_SLA_Ural_open", + "LOP_SLA_Ural", + "LOP_SLA_BTR60", + "LOP_SLA_BMP1", + "LOP_SLA_ZSU234", + "LOP_SLA_T72BA", + "LOP_SLA_T72BB", + "LOP_SLA_Mi8MTV3_FAB", + "LOP_SLA_Mi8MT_Cargo", + "LOP_SLA_Mi8MTV3_UPK23" +]; + +// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). +KPLIB_o_battleGrpVehiclesLight = [ + "LOP_SLA_UAZ_DshKM", + "LOP_SLA_UAZ_AGS", + "LOP_SLA_Ural", + "LOP_SLA_BTR70", + "LOP_SLA_BMP1D", + "LOP_SLA_BMP2D", + "LOP_SLA_ZSU234", + "LOP_SLA_Mi8MTV3_UPK23", + "LOP_SLA_Mi8MT_Cargo" +]; + + +/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. +If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ +KPLIB_o_troopTransports = [ + "LOP_SLA_Ural_open", + "LOP_SLA_Ural", + "LOP_SLA_Mi8MTV3_FAB", + "LOP_SLA_Mi8MT_Cargo", + "LOP_SLA_Mi8MTV3_UPK23" +]; + +// Enemy rotary-wings that will need to spawn in flight. +KPLIB_o_helicopters = [ + "LOP_SLA_Mi8MTV3_FAB", + "LOP_SLA_Mi8MT_Cargo", + "LOP_SLA_Mi8MTV3_UPK23" +]; + +// Enemy fixed-wings that will need to spawn in the air. +KPLIB_o_planes = []; diff --git a/Missionframework/presets/players/cup_acr_desert.sqf b/Missionframework/presets/players/cup_acr_desert.sqf new file mode 100644 index 000000000..27d402559 --- /dev/null +++ b/Missionframework/presets/players/cup_acr_desert.sqf @@ -0,0 +1,330 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - Qinetix's Titus +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "CUP_B_T810_Repair_CZ_DES"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_D"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_CZ_Crew_DES"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_CZ_Pilot_DES"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_DES"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_CZ_Soldier_DES",15,0,0], // Rifleman + ["CUP_B_CZ_Soldier_backpack_DES",20,0,0], // Rifleman (Backpack) + ["CUP_B_CZ_Soldier_RPG_DES",30,0,0], // Rifleman (RPG) + ["CUP_B_CZ_Soldier_805_GL_DES",25,0,0], // Grenadier + ["CUP_B_CZ_Soldier_AR_DES",25,0,0], // Automatic Rifleman + ["CUP_B_CZ_Soldier_MG_DES",35,0,0], // Machinegunner + ["CUP_B_CZ_Soldier_Marksman_DES",30,0,0], // Marksman (SVD) + ["CUP_B_CZ_Soldier_AT_DES",50,10,0], // Rifleman (AT) + ["B_soldier_AA_F",50,10,0], // AA Specialist + ["CUP_B_CZ_Medic_DES",30,0,0], // Medic + ["CUP_B_CZ_Engineer_DES",30,0,0], // Engineer + ["CUP_B_CZ_ExplosiveSpecialist_DES",30,0,0], // Explosive Specialist + ["CUP_B_CZ_SpecOps_Scout_DES",20,0,0], // SF Scout + ["CUP_B_CZ_SpecOps_Exp_DES",30,0,0], // SF Saboteur + ["CUP_B_CZ_SpecOps_Recon_DES",30,0,0], // SF Recon + ["CUP_B_CZ_SpecOps_DES",40,0,0], // SF Rifleman + ["CUP_B_CZ_SpecOps_MG_DES",30,0,0], // SF Machinegunner + ["CUP_B_CZ_SpecOps_TL_DES",30,0,0], // SF Team Leader + ["CUP_B_CZ_Sniper_DES",70,5,0], // Sniper + ["CUP_B_CZ_Spotter_DES",20,0,0], // Spotter + ["CUP_B_CZ_Crew_DES",10,0,0], // Crewman + ["CUP_B_CZ_Soldier_DES",20,0,0], // Para Trooper + ["CUP_B_CZ_Pilot_DES",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_UAZ_Unarmed_ACR",100,0,50], // UAZ + ["CUP_B_UAZ_Open_ACR",100,0,50], // UAZ (Open) + ["CUP_B_UAZ_MG_ACR",100,40,50], // UAZ (DShKM) + ["CUP_B_UAZ_AGS30_ACR",100,60,50], // UAZ (AGS-30) + ["CUP_B_UAZ_SPG9_ACR",100,80,50], // UAZ (SPG-9) + ["CUP_B_UAZ_METIS_ACR",100,100,50], // UAZ (Metis-M) + ["CUP_B_LR_Transport_CZ_D",200,0,50], // Land Rover 110 (Transport) Desert + ["CUP_B_LR_MG_CZ_D",200,40,50], // Land Rover 110 (M2) Desert + ["CUP_B_LR_Special_CZ_D",250,100,50], // Land Rover 110 (Special) Desert + ["CUP_B_HMMWV_Ambulance_ACR",225,0,50], // HMMWV (Ambulance) + ["CUP_B_HMMWV_DSHKM_GPK_ACR",225,60,50], // HMMWV M1114 DSHKM + ["CUP_B_HMMWV_M2_GPK_ACR",225,60,50], // HMMWV M1114 M2 + ["CUP_B_HMMWV_AGS_GPK_ACR",225,80,50], // HMMWV M1114 AGS + ["CUP_B_Dingo_CZ_Des",250,40,100], // Dingo 2 (MG) (Desert) + ["CUP_B_Dingo_GL_CZ_Des",250,60,100], // Dingo 2 (GL) (Desert) + ["QIN_Titus_DES",350,0,50], // Nexter Titus + ["QIN_Titus_arx20_DES",350,225,50], // Nexter Titus ARX20 + ["CUP_B_T810_Unarmed_CZ_DES",125,0,75], // Tatra T810 (Covered) + ["CUP_B_T810_Armed_CZ_DES",125,60,75] // Tatra T810 (MG/Covered) +]; + +heavy_vehicles = [ + ["CUP_B_BRDM2_HQ_CZ_Des",200,25,200], // BRDM-2 (HQ) (Desert) + ["CUP_B_BRDM2_CZ_Des",200,200,200], // BRDM-2 (Desert) + ["I_APC_Wheeled_03_cannon_F",500,400,300], // Pandur II + ["CUP_I_BMP1_TK_GUE",300,300,200], // BVP-1 + ["CUP_B_BMP2_CZ_Des",400,350,200], // BVP-2 + ["CUP_B_BMP2_AMB_CZ_Des",350,0,200], // BVP-2 Ambulance + ["B_APC_Tracked_01_AA_F",500,450,400], // IFV-6a Cheetah + ["CUP_O_T72_RU",600,500,400], // T-72 + ["CUP_B_T72_CZ",800,500,450] // T-72M4CZ +]; + +air_vehicles = [ + ["CUP_B_Mi171Sh_ACR",700,600,500], // Mi-171Sh (Rockets) + ["CUP_B_Mi35_Dynamic_CZ",850,1000,550], // Mi-35 + ["CUP_B_Mi35_Dynamic_CZ_Dark",850,1000,550], // Mi-35 (Dark) + ["CUP_B_Mi35_Dynamic_CZ_Ram",850,1000,550], // Mi-35 (Ram) + ["CUP_B_Mi35_Dynamic_CZ_Tiger",850,1000,550], // Mi-35 (Tiger) + ["CUP_B_L39_CZ_GREY",1200,1250,650], // L-39ZA (Grey) + ["I_Plane_Fighter_03_dynamicLoadout_F",1200,1250,550], // L-159 Alca + ["I_Plane_Fighter_04_F",1500,1400,800] // JAS 39 Gripen +]; + +static_vehicles = [ + ["CUP_B_DSHKM_ACR",25,40,0], // DShKM + ["CUP_B_AGS_ACR",35,60,0], // AGS-30 + ["CUP_B_2b14_82mm_ACR",80,150,0], // Podnos 2B14 + ["CUP_B_RBS70_ACR",100,200,0] // RBS 70 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["FlagCarrierCzechRepublic_EP1",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["CUP_B_TowingTractor_CZ",50,0,25], // Towing Tractor + ["CUP_B_T810_Repair_CZ_DES",325,0,75], // Tatra T810 (Repair) + ["CUP_B_T810_Refuel_CZ_DES",125,0,275], // Tatra T810 (Fuel) + ["CUP_B_T810_Reammo_CZ_DES",125,200,75], // Tatra T810 (Ammo) + ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_CZ_Soldier_SL_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_RPG_DES", + "CUP_B_CZ_Soldier_805_GL_DES", + "CUP_B_CZ_Soldier_AR_DES", + "CUP_B_CZ_Soldier_AR_DES", + "CUP_B_CZ_Soldier_Marksman_DES", + "CUP_B_CZ_Medic_DES", + "CUP_B_CZ_Engineer_DES" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_CZ_Soldier_SL_DES", + "CUP_B_CZ_Soldier_RPG_DES", + "CUP_B_CZ_Soldier_RPG_DES", + "CUP_B_CZ_Soldier_805_GL_DES", + "CUP_B_CZ_Soldier_AR_DES", + "CUP_B_CZ_Soldier_AR_DES", + "CUP_B_CZ_Soldier_MG_DES", + "CUP_B_CZ_Soldier_Marksman_DES", + "CUP_B_CZ_Medic_DES", + "CUP_B_CZ_Engineer_DES" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_CZ_Soldier_SL_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_AT_DES", + "CUP_B_CZ_Soldier_AT_DES", + "CUP_B_CZ_Soldier_AT_DES", + "CUP_B_CZ_Medic_DES", + "CUP_B_CZ_Engineer_DES" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_CZ_Soldier_SL_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "B_soldier_AA_F", + "B_soldier_AA_F", + "B_soldier_AA_F", + "CUP_B_CZ_Medic_DES", + "CUP_B_CZ_Engineer_DES" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_CZ_SpecOps_TL_DES", + "CUP_B_CZ_SpecOps_Recon_DES", + "CUP_B_CZ_SpecOps_Recon_DES", + "CUP_B_CZ_Soldier_RPG_DES", + "CUP_B_CZ_SpecOps_MG_DES", + "CUP_B_CZ_SpecOps_MG_DES", + "CUP_B_CZ_SpecOps_GL_DES", + "CUP_B_CZ_SpecOps_GL_DES", + "CUP_B_CZ_Medic_DES", + "CUP_B_CZ_Engineer_DES" +]; + +// Paratroopers squad (The units of this squad will automatically get parachutes on build) +blufor_squad_para = [ + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES", + "CUP_B_CZ_Soldier_DES" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_B_Dingo_CZ_Des", // Dingo 2 (MG) (Desert) + "CUP_B_Dingo_GL_CZ_Des", // Dingo 2 (GL) (Desert) + "QIN_Titus_WDL", // Nexter Titus + "QIN_Titus_arx20_WDL", // Nexter Titus ARX20 + "I_APC_Wheeled_03_cannon_F", // Pandur II + "CUP_B_BMP2_CZ_Des", // BVP-2 + "B_APC_Tracked_01_AA_F", // IFV-6a Cheetah + "CUP_B_T72_CZ", // T-72M4CZ + "CUP_B_L39_CZ_GREY", // L-39ZA (Grey) + "I_Plane_Fighter_03_dynamicLoadout_F", // L-159 Alca + "I_Plane_Fighter_04_F" // JAS 39 Gripen +]; diff --git a/Missionframework/presets/players/cup_acr_woodland.sqf b/Missionframework/presets/players/cup_acr_woodland.sqf new file mode 100644 index 000000000..9ebab113b --- /dev/null +++ b/Missionframework/presets/players/cup_acr_woodland.sqf @@ -0,0 +1,328 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - Qinetix's Titus +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "CUP_B_T810_Repair_CZ_WDL"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_W"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_CZ_Crew_WDL"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_CZ_Pilot_WDL"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_WDL"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_CZ_Soldier_WDL",15,0,0], // Rifleman + ["CUP_B_CZ_Soldier_backpack_WDL",20,0,0], // Rifleman (Backpack) + ["CUP_B_CZ_Soldier_RPG_WDL",30,0,0], // Rifleman (RPG) + ["CUP_B_CZ_Soldier_805_GL_WDL",25,0,0], // Grenadier + ["CUP_B_CZ_Soldier_AR_WDL",25,0,0], // Automatic Rifleman + ["CUP_B_CZ_Soldier_MG_WDL",35,0,0], // Machinegunner + ["CUP_B_CZ_Soldier_Marksman_WDL",30,0,0], // Marksman (SVD) + ["CUP_B_CZ_Soldier_AT_WDL",50,10,0], // Rifleman (AT) + ["B_soldier_AA_F",50,10,0], // AA Specialist + ["CUP_B_CZ_Medic_WDL",30,0,0], // Medic + ["CUP_B_CZ_Engineer_WDL",30,0,0], // Engineer + ["CUP_B_CZ_ExplosiveSpecialist_WDL",30,0,0], // Explosive Specialist + ["CUP_B_CZ_SpecOps_Scout_WDL",20,0,0], // SF Scout + ["CUP_B_CZ_SpecOps_Exp_WDL",30,0,0], // SF Saboteur + ["CUP_B_CZ_SpecOps_Recon_WDL",30,0,0], // SF Recon + ["CUP_B_CZ_SpecOps_WDL",40,0,0], // SF Rifleman + ["CUP_B_CZ_SpecOps_MG_WDL",30,0,0], // SF Machinegunner + ["CUP_B_CZ_SpecOps_TL_WDL",30,0,0], // SF Team Leader + ["CUP_B_CZ_Sniper_WDL",70,5,0], // Sniper + ["CUP_B_CZ_Spotter_WDL",20,0,0], // Spotter + ["CUP_B_CZ_Crew_WDL",10,0,0], // Crewman + ["CUP_B_CZ_Soldier_WDL",20,0,0], // Para Trooper + ["CUP_B_CZ_Pilot_WDL",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_UAZ_Unarmed_ACR",100,0,50], // UAZ + ["CUP_B_UAZ_Open_ACR",100,0,50], // UAZ (Open) + ["CUP_B_UAZ_MG_ACR",100,40,50], // UAZ (DShKM) + ["CUP_B_UAZ_AGS30_ACR",100,60,50], // UAZ (AGS-30) + ["CUP_B_UAZ_SPG9_ACR",100,80,50], // UAZ (SPG-9) + ["CUP_B_UAZ_METIS_ACR",100,100,50], // UAZ (Metis-M) + ["CUP_B_LR_Transport_CZ_W",200,0,50], // Land Rover 110 (Transport) Woodland + ["CUP_B_LR_MG_CZ_W",200,40,50], // Land Rover 110 (M2) Woodland + ["CUP_B_LR_Special_CZ_W",250,100,50], // Land Rover 110 (Special) Woodland + ["CUP_B_Dingo_CZ_Wdl",250,40,100], // Dingo 2 (MG) (Woodland) + ["CUP_B_Dingo_GL_CZ_Wdl",250,60,100], // Dingo 2 (GL) (Woodland) + ["QIN_Titus_WDL",350,0,50], // Nexter Titus + ["QIN_Titus_arx20_WDL",350,225,50], // Nexter Titus ARX20 + ["CUP_B_T810_Unarmed_CZ_WDL",125,0,75], // Tatra T810 (Covered) + ["CUP_B_T810_Armed_CZ_WDL",125,60,75] // Tatra T810 (MG/Covered) +]; + +heavy_vehicles = [ + ["CUP_B_BRDM2_HQ_CZ",200,25,200], // BRDM-2 (HQ) + ["CUP_B_BRDM2_CZ",200,200,200], // BRDM-2 + ["CUP_B_RM70_CZ",300,750,175], // RM-70 + ["I_APC_Wheeled_03_cannon_F",500,400,300], // Pandur II + ["CUP_I_BMP1_TK_GUE",300,300,200], // BVP-1 + ["CUP_B_BMP2_CZ",400,350,200], // BVP-2 + ["CUP_B_BMP2_AMB_CZ",350,0,200], // BVP-2 Ambulance + ["B_APC_Tracked_01_AA_F",500,450,400], // IFV-6a Cheetah + ["CUP_O_T72_RU",600,500,400], // T72 + ["CUP_B_T72_CZ",800,500,450] // T-72M4CZ +]; + +air_vehicles = [ + ["CUP_B_Mi171Sh_ACR",700,600,500], // Mi-171Sh (Rockets) + ["CUP_B_Mi35_Dynamic_CZ",850,1000,550], // Mi-35 + ["CUP_B_Mi35_Dynamic_CZ_Dark",850,1000,550], // Mi-35 (Dark) + ["CUP_B_Mi35_Dynamic_CZ_Ram",850,1000,550], // Mi-35 (Ram) + ["CUP_B_Mi35_Dynamic_CZ_Tiger",850,1000,550], // Mi-35 (Tiger) + ["CUP_B_L39_CZ_GREY",1200,1250,650], // L-39ZA (Grey) + ["I_Plane_Fighter_03_dynamicLoadout_F",1200,1250,550], // L-159 Alca + ["I_Plane_Fighter_04_F",1500,1400,800] // JAS 39 Gripen +]; + +static_vehicles = [ + ["CUP_B_DSHKM_ACR",25,40,0], // DShKM + ["CUP_B_AGS_ACR",35,60,0], // AGS-30 + ["CUP_B_2b14_82mm_ACR",80,150,0], // Podnos 2B14 + ["CUP_B_RBS70_ACR",100,200,0] // RBS 70 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["FlagCarrierCzechRepublic_EP1",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["CUP_B_TowingTractor_CZ",50,0,25], // Towing Tractor + ["CUP_B_T810_Repair_CZ_WDL",325,0,75], // Tatra T810 (Repair) + ["CUP_B_T810_Refuel_CZ_WDL",125,0,275], // Tatra T810 (Fuel) + ["CUP_B_T810_Reammo_CZ_WDL",125,200,75], // Tatra T810 (Ammo) + ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_CZ_Soldier_SL_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_RPG_WDL", + "CUP_B_CZ_Soldier_805_GL_WDL", + "CUP_B_CZ_Soldier_AR_WDL", + "CUP_B_CZ_Soldier_AR_WDL", + "CUP_B_CZ_Soldier_Marksman_WDL", + "CUP_B_CZ_Medic_WDL", + "CUP_B_CZ_Engineer_WDL" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_CZ_Soldier_SL_WDL", + "CUP_B_CZ_Soldier_RPG_WDL", + "CUP_B_CZ_Soldier_RPG_WDL", + "CUP_B_CZ_Soldier_805_GL_WDL", + "CUP_B_CZ_Soldier_AR_WDL", + "CUP_B_CZ_Soldier_AR_WDL", + "CUP_B_CZ_Soldier_MG_WDL", + "CUP_B_CZ_Soldier_Marksman_WDL", + "CUP_B_CZ_Medic_WDL", + "CUP_B_CZ_Engineer_WDL" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_CZ_Soldier_SL_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_AT_WDL", + "CUP_B_CZ_Soldier_AT_WDL", + "CUP_B_CZ_Soldier_AT_WDL", + "CUP_B_CZ_Medic_WDL", + "CUP_B_CZ_Engineer_WDL" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_CZ_Soldier_SL_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "B_soldier_AA_F", + "B_soldier_AA_F", + "B_soldier_AA_F", + "CUP_B_CZ_Medic_WDL", + "CUP_B_CZ_Engineer_WDL" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_CZ_SpecOps_TL_WDL", + "CUP_B_CZ_SpecOps_Recon_WDL", + "CUP_B_CZ_SpecOps_Recon_WDL", + "CUP_B_CZ_Soldier_RPG_WDL", + "CUP_B_CZ_SpecOps_MG_WDL", + "CUP_B_CZ_SpecOps_MG_WDL", + "CUP_B_CZ_SpecOps_GL_WDL", + "CUP_B_CZ_SpecOps_GL_WDL", + "CUP_B_CZ_Medic_WDL", + "CUP_B_CZ_Engineer_WDL" +]; + +// Paratroopers squad (The units of this squad will automatically get parachutes on build) +blufor_squad_para = [ + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL", + "CUP_B_CZ_Soldier_WDL" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_B_Dingo_CZ_Wdl", // Dingo 2 (MG) (Woodland) + "CUP_B_Dingo_GL_CZ_Wdl", // Dingo 2 (GL) (Woodland) + "QIN_Titus_WDL", // Nexter Titus + "QIN_Titus_arx20_WDL", // Nexter Titus ARX20 + "CUP_B_RM70_CZ", // RM-70 + "I_APC_Wheeled_03_cannon_F", // Pandur II + "CUP_B_BMP2_CZ", // BVP-2 + "B_APC_Tracked_01_AA_F", // IFV-6a Cheetah + "CUP_B_T72_CZ", // T-72M4CZ + "CUP_B_L39_CZ_GREY", // L-39ZA (Grey) + "I_Plane_Fighter_03_dynamicLoadout_F", // L-159 Alca + "I_Plane_Fighter_04_F" // JAS 39 Gripen +]; diff --git a/Missionframework/presets/players/cup_baf_desert.sqf b/Missionframework/presets/players/cup_baf_desert.sqf new file mode 100644 index 000000000..1364d77f6 --- /dev/null +++ b/Missionframework/presets/players/cup_baf_desert.sqf @@ -0,0 +1,333 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - None +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_LR_Ambulance_GB_D"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_BAF_Soldier_Crew_DDPM"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DDPM"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_BAF_DES"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_BAF_Soldier_RiflemanLite_DDPM",15,0,0], // Rifleman (Light) + ["CUP_B_BAF_Soldier_Rifleman_DDPM",20,0,0], // Rifleman + ["CUP_B_BAF_Soldier_RiflemanAT_DDPM",30,0,0], // Rifleman (AT) + ["CUP_B_BAF_Soldier_Grenadier_DDPM",25,0,0], // Grenadier + ["CUP_B_BAF_Soldier_AutoRifleman_DDPM",25,0,0], // Autorifleman + ["CUP_B_BAF_Soldier_HeavyGunner_DDPM",35,0,0], // Heavygunner + ["CUP_B_BAF_Soldier_Marksman_DDPM",30,0,0], // Marksman + ["CUP_B_BAF_Soldier_SharpShooter_DDPM",40,0,0], // Sharpshooter + ["CUP_B_BAF_Soldier_AT_DDPM",50,10,0], // AT Specialist + ["CUP_B_BAF_Soldier_AA_DDPM",50,10,0], // AA Specialist + ["CUP_B_BAF_Soldier_Medic_DDPM",30,0,0], // Combat Life Saver + ["CUP_B_BAF_Soldier_Engineer_DDPM",30,0,0], // Engineer + ["CUP_B_BAF_Soldier_Explosive_DDPM",30,0,0], // Explosives Specialist + ["CUP_B_BAF_Soldier_Rifleman_MTP",20,0,0], // Recon Scout + ["CUP_B_BAF_Soldier_RiflemanAT_MTP",30,0,0], // Recon Scout (AT) + ["CUP_B_BAF_Soldier_Marksman_MTP",30,0,0], // Recon Marksman + ["CUP_B_BAF_Soldier_SharpShooter_MTP",40,0,0], // Recon Sharpshooter + ["CUP_B_BAF_Soldier_Medic_MTP",30,0,0], // Recon Paramedic + ["CUP_B_BAF_Soldier_Explosive_MTP",30,0,0], // Recon Demolition Expert + ["CUP_B_BAF_Sniper_AS50_TWS_DDPM",70,5,0], // Sniper + ["CUP_B_BAF_Sniper_AS50_DDPM",70,5,0], // Sniper (Arid) + ["CUP_B_BAF_Sniper_DDPM",70,5,0], // Sniper (Lush) + ["CUP_B_BAF_Spotter_DDPM",20,0,0], // Spotter + ["CUP_B_BAF_Soldier_Crew_DDPM",10,0,0], // Crewman + ["CUP_B_BAF_Soldier_Paratrooper_DDPM",20,0,0], // Para Trooper + ["CUP_B_BAF_Soldier_Helicrew_DDPM",10,0,0], // Helicopter Crew + ["CUP_B_BAF_Soldier_Helipilot_DDPM",10,0,0], // Helicopter Pilot + ["CUP_B_BAF_Soldier_Pilot_DDPM",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_LR_Transport_GB_D",75,0,50], // Land Rover 110 Transport + ["CUP_B_LR_MG_GB_D",75,50,50], // Land Rover 110 (M2) + ["CUP_B_LR_Special_M2_GB_D",100,80,50], // Land Rover 110 (M2 Special) + ["CUP_B_LR_Special_GMG_GB_D",100,100,50], // Land Rover 110 (GMG Special) + ["CUP_B_BAF_Coyote_L2A1_D",200,40,50], // Coyote L2A1 + ["CUP_B_BAF_Coyote_GMG_D",200,60,50], // Coyote GMG + ["CUP_B_Mastiff_LMG_GB_D",250,20,150], // Mastiff PPV LMG + ["CUP_B_Mastiff_HMG_GB_D",250,40,150], // Mastiff PPV HMG + ["CUP_B_Mastiff_GMG_GB_D",250,60,150], // Mastiff PPV GMG + ["CUP_B_Wolfhound_LMG_GB_D",275,20,150], // Wolfhound TSV LMG + ["CUP_B_Wolfhound_HMG_GB_D",275,40,150], // Wolfhound TSV HMG + ["CUP_B_Wolfhound_GMG_GB_D",275,60,150], // Wolfhound TSV GMG + ["CUP_B_MTVR_BAF_DES",125,0,75] // MTVR Transport +]; + +heavy_vehicles = [ + ["CUP_B_FV432_Bulldog_GB_D",300,100,150], // FV432 Bulldog M240 + ["CUP_B_FV432_Bulldog_GB_D_RWS",300,250,150], // FV432 Bulldog M2 RWS + ["CUP_B_MCV80_GB_D",300,450,275], // MCV-80 Warrior + ["CUP_B_MCV80_GB_D_SLAT",400,450,275], // MCV-80 Warrior (SLAT) + ["CUP_B_FV510_GB_D",350,550,275], // FV510 Warrior + ["CUP_B_FV510_GB_D_SLAT",450,550,275], // FV510 Warrior (SLAT) + ["CUP_B_Challenger2_Desert_BAF",500,800,450], // FV4034 Challenger 2 + ["CUP_B_Challenger2_2CD_BAF",500,800,450] // FV4034 Challenger 2 (Two-Color Desert) +]; + +air_vehicles = [ + ["CUP_B_AW159_Unarmed_RN_Blackcat",225,0,125], // AW159 Wildcat (Black Cat, Unarmed) + ["CUP_B_AW159_Unarmed_GB",225,0,125], // AW159 Wildcat (Green, Unarmed) + ["CUP_B_AW159_Unarmed_RN_Grey",225,0,125], // AW159 Wildcat (Grey, Unarmed) + ["CUP_B_AW159_RN_Blackcat",350,400,125], // AW159 Wildcat (Black Cat) + ["CUP_B_AW159_GB",350,400,125], // AW159 Wildcat (Green) + ["CUP_B_AW159_RN_Grey",350,400,125], // AW159 Wildcat (Grey) + ["CUP_B_AH1_DL_BAF",750,600,325], // AH1 + ["CUP_B_GR9_DYN_GB",1000,1200,600], // Harrier GR.9 + ["CUP_B_F35B_BAF",1500,1750,450], // F-35B Lightning II + ["CUP_B_F35B_Stealth_BAF",1500,1750,450] // F-35B Lightning II (Stealth) +]; + +static_vehicles = [ + ["CUP_B_L111A1_BAF_DDPM",25,40,0], // L111A1 Machine Gun + ["CUP_B_L111A1_MiniTripod_BAF_DDPM",25,40,0], // L111A1 Minitripod + ["CUP_WV_B_CRAM",500,500,0], // C-RAM + ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS + ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS + ["B_Mortar_01_F",80,150,0], // Mk6 Mortar + ["CUP_B_L16A2_BAF_DDPM",80,150,0] // L16A2 81mm Mortar +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["Flag_UK_F",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["CUP_B_TowingTractor_GB",50,0,25], // Towing Tractor + ["CUP_B_MTVR_Repair_BAF_DES",425,0,75], // MTVR Repair + ["CUP_B_MTVR_Refuel_BAF_DES",125,0,375], // MTVR Refuel + ["CUP_B_MTVR_Ammo_BAF_DES",125,300,75], // MTVR Ammo + ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_BAF_Soldier_TeamLeader_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM", + "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", + "CUP_B_BAF_Soldier_Grenadier_DDPM", + "CUP_B_BAF_Soldier_AutoRifleman_DDPM", + "CUP_B_BAF_Soldier_AutoRifleman_DDPM", + "CUP_B_BAF_Soldier_Marksman_DDPM", + "CUP_B_BAF_Soldier_Medic_DDPM", + "CUP_B_BAF_Soldier_Engineer_DDPM" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_BAF_Soldier_TeamLeader_DDPM", + "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", + "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", + "CUP_B_BAF_Soldier_Grenadier_DDPM", + "CUP_B_BAF_Soldier_AutoRifleman_DDPM", + "CUP_B_BAF_Soldier_AutoRifleman_DDPM", + "CUP_B_BAF_Soldier_HeavyGunner_DDPM", + "CUP_B_BAF_Soldier_SharpShooter_DDPM", + "CUP_B_BAF_Soldier_Medic_DDPM", + "CUP_B_BAF_Soldier_Engineer_DDPM" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_BAF_Soldier_TeamLeader_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM", + "CUP_B_BAF_Soldier_AT_DDPM", + "CUP_B_BAF_Soldier_AT_DDPM", + "CUP_B_BAF_Soldier_AT_DDPM", + "CUP_B_BAF_Soldier_Medic_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_BAF_Soldier_TeamLeader_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM", + "CUP_B_BAF_Soldier_AA_DDPM", + "CUP_B_BAF_Soldier_AA_DDPM", + "CUP_B_BAF_Soldier_AA_DDPM", + "CUP_B_BAF_Soldier_Medic_DDPM", + "CUP_B_BAF_Soldier_Rifleman_DDPM" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_BAF_Soldier_TeamLeader_MTP", + "CUP_B_BAF_Soldier_Rifleman_MTP", + "CUP_B_BAF_Soldier_Rifleman_MTP", + "CUP_B_BAF_Soldier_RiflemanLAT_MTP", + "CUP_B_BAF_Soldier_Marksman_MTP", + "CUP_B_BAF_Soldier_Marksman_MTP", + "CUP_B_BAF_Soldier_SharpShooter_MTP", + "CUP_B_BAF_Soldier_SharpShooter_MTP", + "CUP_B_BAF_Soldier_Medic_MTP", + "CUP_B_BAF_Soldier_Explosive_MTP" +]; + +// Paratroopers squad (The units of this squad will automatically get parachutes on build) +blufor_squad_para = [ + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM", + "CUP_B_BAF_Soldier_Paratrooper_DDPM" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_B_MCV80_GB_D_SLAT", // MCV-80 Warrior (SLAT) + "CUP_B_FV510_GB_D", // FV510 Warrior + "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT) + "CUP_B_Challenger2_Desert_BAF", // FV4034 Challenger 2 + "CUP_B_Challenger2_2CD_BAF", // FV4034 Challenger 2 (Two-Color Desert) + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_F35B_BAF", // F-35B Lightning II + "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) + "CUP_WV_B_CRAM", // C-RAM + "CUP_WV_B_SS_Launcher", // Mk-29 GMLS + "CUP_WV_B_RAM_Launcher" // Mk-49 GMLS +]; diff --git a/Missionframework/presets/players/cup_baf_woodland.sqf b/Missionframework/presets/players/cup_baf_woodland.sqf new file mode 100644 index 000000000..10f9c11ca --- /dev/null +++ b/Missionframework/presets/players/cup_baf_woodland.sqf @@ -0,0 +1,337 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - None +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_FV432_GB_Ambulance"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_BAF_Soldier_Crew_DPM"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DPM"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_BAF_WOOD"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_BAF_Soldier_RiflemanLite_DPM",15,0,0], // Rifleman (Light) + ["CUP_B_BAF_Soldier_Rifleman_DPM",20,0,0], // Rifleman + ["CUP_B_BAF_Soldier_RiflemanAT_DPM",30,0,0], // Rifleman (AT) + ["CUP_B_BAF_Soldier_Grenadier_DPM",25,0,0], // Grenadier + ["CUP_B_BAF_Soldier_AutoRifleman_DPM",25,0,0], // Autorifleman + ["CUP_B_BAF_Soldier_HeavyGunner_DPM",35,0,0], // Heavygunner + ["CUP_B_BAF_Soldier_Marksman_DPM",30,0,0], // Marksman + ["CUP_B_BAF_Soldier_SharpShooter_DPM",40,0,0], // Sharpshooter + ["CUP_B_BAF_Soldier_AT_DPM",50,10,0], // AT Specialist + ["CUP_B_BAF_Soldier_AA_DPM",50,10,0], // AA Specialist + ["CUP_B_BAF_Soldier_Medic_DPM",30,0,0], // Combat Life Saver + ["CUP_B_BAF_Soldier_Engineer_DPM",30,0,0], // Engineer + ["CUP_B_BAF_Soldier_Explosive_DPM",30,0,0], // Explosives Specialist + ["CUP_B_BAF_Soldier_Rifleman_MTP",20,0,0], // Recon Scout + ["CUP_B_BAF_Soldier_RiflemanAT_MTP",30,0,0], // Recon Scout (AT) + ["CUP_B_BAF_Soldier_Marksman_MTP",30,0,0], // Recon Marksman + ["CUP_B_BAF_Soldier_SharpShooter_MTP",40,0,0], // Recon Sharpshooter + ["CUP_B_BAF_Soldier_Medic_MTP",30,0,0], // Recon Paramedic + ["CUP_B_BAF_Soldier_Explosive_MTP",30,0,0], // Recon Demolition Expert + ["CUP_B_BAF_Sniper_AS50_TWS_DPM",70,5,0], // Sniper + ["CUP_B_BAF_Sniper_AS50_DPM",70,5,0], // Sniper (Arid) + ["CUP_B_BAF_Sniper_DPM",70,5,0], // Sniper (Lush) + ["CUP_B_BAF_Spotter_DPM",20,0,0], // Spotter + ["CUP_B_BAF_Soldier_Crew_DPM",10,0,0], // Crewman + ["CUP_B_BAF_Soldier_Paratrooper_DPM",20,0,0], // Para Trooper + ["CUP_B_BAF_Soldier_Helicrew_DPM",10,0,0], // Helicopter Crew + ["CUP_B_BAF_Soldier_Helipilot_DPM",10,0,0], // Helicopter Pilot + ["CUP_B_BAF_Soldier_Pilot_DPM",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_LR_Transport_GB_W",75,0,50], // Land Rover 110 (Transport) Woodland + ["CUP_B_LR_Ambulance_GB_W",75,0,50], // Land Rover 110 (Ambulance) Woodland + ["CUP_B_LR_MG_GB_W",75,50,50], // Land Rover 110 (M2) Woodland + ["CUP_B_LR_Special_M2_GB_W",100,80,50], // Land Rover 110 (M2 Special) Woodland + ["CUP_B_LR_Special_GMG_GB_W",100,100,50], // Land Rover 110 (GMG Special) Woodland + ["CUP_B_BAF_Coyote_L2A1_W",200,40,50], // Coyote L2A1 Woodland + ["CUP_B_BAF_Coyote_GMG_W",200,60,50], // Coyote GMG Woodland + ["CUP_B_Mastiff_LMG_GB_W",250,20,150], // Mastiff PPV LMG Woodland + ["CUP_B_Mastiff_HMG_GB_W",250,40,150], // Mastiff PPV HMG Woodland + ["CUP_B_Mastiff_GMG_GB_W",250,60,150], // Mastiff PPV GMG Woodland + ["CUP_B_Wolfhound_LMG_GB_W",275,20,150], // Wolfhound TSV LMG Woodland + ["CUP_B_Wolfhound_HMG_GB_W",275,40,150], // Wolfhound TSV HMG Woodland + ["CUP_B_Wolfhound_GMG_GB_W",275,60,150], // Wolfhound TSV GMG Woodland + ["CUP_B_MTVR_BAF_WOOD",125,0,75] // MTVR Transport +]; + +heavy_vehicles = [ + ["CUP_B_FV432_Bulldog_GB_W",300,100,150], // FV432 Bulldog M240 [Woodland] + ["CUP_B_FV432_Bulldog_GB_W_RWS",300,250,150], // FV432 Bulldog M2 RWS [Woodland] + ["CUP_B_FV432_Mortar",350,500,150], // FV432 Mortar + ["CUP_B_MCV80_GB_W",300,450,275], // MCV-80 Warrior (Woodland) + ["CUP_B_MCV80_GB_W_SLAT",400,450,275], // MCV-80 Warrior (SLAT - Woodland) + ["CUP_B_FV510_GB_W",350,550,275], // FV510 Warrior (Woodland) + ["CUP_B_FV510_GB_W_SLAT",450,550,275], // FV510 Warrior (SLAT - Woodland) + ["CUP_B_Challenger2_Woodland_BAF",500,800,450], // FV4034 Challenger 2 (Woodland) + ["CUP_B_Challenger2_2CW_BAF",500,800,450] // FV4034 Challenger 2 (Two-Color Woodland) +]; + +air_vehicles = [ + ["CUP_B_AW159_Unarmed_RN_Blackcat",225,0,125], // AW159 Wildcat (Black Cat, Unarmed) + ["CUP_B_AW159_Unarmed_GB",225,0,125], // AW159 Wildcat (Green, Unarmed) + ["CUP_B_AW159_Unarmed_RN_Grey",225,0,125], // AW159 Wildcat (Grey, Unarmed) + ["CUP_B_AW159_RN_Blackcat",350,400,125], // AW159 Wildcat (Black Cat) + ["CUP_B_AW159_GB",350,400,125], // AW159 Wildcat (Green) + ["CUP_B_AW159_RN_Grey",350,400,125], // AW159 Wildcat (Grey) + ["CUP_B_AH1_DL_BAF",750,600,325], // AH1 + ["CUP_B_GR9_DYN_GB",1000,1200,600], // Harrier GR.9 + ["CUP_B_F35B_BAF",1500,1750,450], // F-35B Lightning II + ["CUP_B_F35B_Stealth_BAF",1500,1750,450] // F-35B Lightning II (Stealth) +]; + +static_vehicles = [ + ["CUP_B_L111A1_BAF_DPM",25,40,0], // L111A1 Machine Gun + ["CUP_B_L111A1_MiniTripod_BAF_DPM",25,40,0], // L111A1 Minitripod + ["CUP_WV_B_CRAM",500,500,0], // C-RAM + ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS + ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS + ["B_Mortar_01_F",80,150,0], // Mk6 Mortar + ["CUP_B_L16A2_BAF_DPM",80,150,0] // L16A2 81mm Mortar +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["Flag_UK_F",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["CUP_B_MK10_GB",100,0,50], // LCU Mk.10 + ["CUP_B_TowingTractor_GB",50,0,25], // Towing Tractor + ["CUP_B_MTVR_Repair_BAF_WOOD",425,0,75], // MTVR Repair + ["CUP_B_MTVR_Refuel_BAF_WOOD",125,0,375], // MTVR Refuel + ["CUP_B_MTVR_Ammo_BAF_WOOD",125,300,75], // MTVR Ammo + ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_BAF_Soldier_TeamLeader_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM", + "CUP_B_BAF_Soldier_RiflemanLAT_DPM", + "CUP_B_BAF_Soldier_Grenadier_DPM", + "CUP_B_BAF_Soldier_AutoRifleman_DPM", + "CUP_B_BAF_Soldier_AutoRifleman_DPM", + "CUP_B_BAF_Soldier_Marksman_DPM", + "CUP_B_BAF_Soldier_Medic_DPM", + "CUP_B_BAF_Soldier_Engineer_DPM" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_BAF_Soldier_TeamLeader_DPM", + "CUP_B_BAF_Soldier_RiflemanLAT_DPM", + "CUP_B_BAF_Soldier_RiflemanLAT_DPM", + "CUP_B_BAF_Soldier_Grenadier_DPM", + "CUP_B_BAF_Soldier_AutoRifleman_DPM", + "CUP_B_BAF_Soldier_AutoRifleman_DPM", + "CUP_B_BAF_Soldier_HeavyGunner_DPM", + "CUP_B_BAF_Soldier_SharpShooter_DPM", + "CUP_B_BAF_Soldier_Medic_DPM", + "CUP_B_BAF_Soldier_Engineer_DPM" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_BAF_Soldier_TeamLeader_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM", + "CUP_B_BAF_Soldier_AT_DPM", + "CUP_B_BAF_Soldier_AT_DPM", + "CUP_B_BAF_Soldier_AT_DPM", + "CUP_B_BAF_Soldier_Medic_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_BAF_Soldier_TeamLeader_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM", + "CUP_B_BAF_Soldier_AA_DPM", + "CUP_B_BAF_Soldier_AA_DPM", + "CUP_B_BAF_Soldier_AA_DPM", + "CUP_B_BAF_Soldier_Medic_DPM", + "CUP_B_BAF_Soldier_Rifleman_DPM" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_BAF_Soldier_TeamLeader_MTP", + "CUP_B_BAF_Soldier_Rifleman_MTP", + "CUP_B_BAF_Soldier_Rifleman_MTP", + "CUP_B_BAF_Soldier_RiflemanLAT_MTP", + "CUP_B_BAF_Soldier_Marksman_MTP", + "CUP_B_BAF_Soldier_Marksman_MTP", + "CUP_B_BAF_Soldier_SharpShooter_MTP", + "CUP_B_BAF_Soldier_SharpShooter_MTP", + "CUP_B_BAF_Soldier_Medic_MTP", + "CUP_B_BAF_Soldier_Explosive_MTP" +]; + +// Paratroopers squad. +blufor_squad_para = [ + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM", + "CUP_B_BAF_Soldier_Paratrooper_DPM" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_B_MCV80_GB_W_SLAT", // MCV-80 Warrior (SLAT - Woodland) + "CUP_B_FV432_Mortar", // FV432 Mortar + "CUP_B_FV510_GB_W", // FV510 Warrior (Woodland) + "CUP_B_FV510_GB_W_SLAT", // FV510 Warrior (SLAT - Woodland) + "CUP_B_Challenger2_Woodland_BAF", // FV4034 Challenger 2 (Woodland) + "CUP_B_Challenger2_2CW_BAF", // FV4034 Challenger 2 (Two-Color Woodland) + "CUP_B_AH1_DL_BAF", // AH1 + "CUP_B_F35B_BAF", // F-35B Lightning II + "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) + "CUP_WV_B_CRAM", // C-RAM + "CUP_WV_B_SS_Launcher", // Mk-29 GMLS + "CUP_WV_B_RAM_Launcher" // Mk-49 GMLS +]; diff --git a/Missionframework/presets/players/cup_cdf.sqf b/Missionframework/presets/players/cup_cdf.sqf new file mode 100644 index 000000000..2f72bca81 --- /dev/null +++ b/Missionframework/presets/players/cup_cdf.sqf @@ -0,0 +1,327 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - None +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_BMP2_AMB_CDF"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_MI6A_CDF"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_CDF_Crew_FST"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_CDF_Pilot_FST"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera bas +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_Ural_Open_CDF"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_CDF_Soldier_FST",20,0,0], // Rifleman + ["CUP_B_CDF_Soldier_RPG18_FST",30,0,0], // Rifleman (RPG-18) + ["CUP_B_CDF_Soldier_GL_FST",25,0,0], // Grenadier + ["CUP_B_CDF_Soldier_AR_FST",25,0,0], // Automatic Rifleman + ["CUP_B_CDF_Soldier_MG_FST",35,0,0], // Machinegunner + ["CUP_B_CDF_Soldier_AMG_FST",35,0,0], // Asst. Machinegunner + ["CUP_B_CDF_Soldier_Marksman_FST",30,0,0], // Marksman + ["CUP_B_CDF_Soldier_LAT_FST",50,25,0], // AT Specialist + ["CUP_B_CDF_Soldier_AAT_FST",50,10,0], // Asst. AT Specialist + ["CUP_B_CDF_Soldier_AA_FST",50,10,0], // AA Specialist + ["CUP_B_CDF_Medic_FST",30,0,0], // Medic + ["CUP_B_CDF_Engineer_FST",30,0,0], // Engineer + ["CUP_B_CDF_Soldier_MNT",20,0,0], // Rifleman + ["CUP_B_CDF_Soldier_RPG18_MNT",30,0,0], // Rifleman (RPG-18 - TTsko Mountain) + ["CUP_B_CDF_Soldier_Marksman_MNT",30,0,0], // Marksman + ["CUP_B_CDF_Sniper_MNT",40,0,0], // Sniper + ["CUP_B_CDF_Medic_MNT",30,0,0], // Medic + ["CUP_B_CDF_Engineer_MNT",30,0,0], // Engineer + ["CUP_B_CDF_Sniper_FST",70,5,0], // Sniper + ["CUP_B_CDF_Spotter_FST",20,0,0], // Spotter + ["CUP_B_CDF_Crew_FST",10,0,0], // Crewman + ["CUP_B_CDF_Pilot_FST",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_S1203_Ambulance_CDF",75,0,50], // Škoda S1203 (Ambulance) + ["CUP_B_UAZ_Unarmed_CDF",75,0,50], // UAZ + ["CUP_B_UAZ_MG_CDF",100,60,50], // UAZ (DShKM) + ["CUP_B_UAZ_AGS30_CDF",100,80,50], // UAZ (AGS-30) + ["CUP_B_UAZ_SPG9_CDF",100,100,50], // UAZ (SPG-9) + ["CUP_B_UAZ_METIS_CDF",100,120,50], // UAZ (Metis-M) + ["CUP_B_UAZ_AA_CDF",100,160,50], // UAZ (AA) + ["CUP_B_Ural_ZU23_CDF",150,300,100], // Ural (ZU-23) + ["CUP_B_BM21_CDF",225,750,100], // BM-21 + ["CUP_B_Kamaz_CDF",125,0,75], // Kamaz 5350 + ["CUP_B_Kamaz_Open_CDF",125,0,75], // Kamaz 5350 (Open) + ["CUP_B_Ural_Open_CDF",125,0,75], // Ural (Open) + ["CUP_B_Ural_CDF",125,0,75] // Ural +]; + +heavy_vehicles = [ + ["CUP_B_BRDM2_CDF",200,200,125], // BRDM-2 + ["CUP_B_BRDM2_ATGM_CDF",200,400,125], // BRDM-2 (ATGM) + ["CUP_B_BTR60_CDF",300,200,125], // BTR-60PB + ["CUP_B_BTR80_CDF",400,200,150], // BTR-80 + ["CUP_B_BTR80A_CDF",450,300,150], // BTR-80A + ["CUP_B_MTLB_pk_CDF",150,50,100], // MT-LB LV + ["CUP_B_BMP2_CDF",500,400,200], // BMP-2 + ["CUP_B_ZSU23_Afghan_CDF",350,350,200], // ZSU-23-4 Afghanski + ["CUP_B_ZSU23_CDF",450,350,200], // ZSU-23-4 + ["CUP_B_T72_CDF",600,500,250] // T-72 +]; + +air_vehicles = [ + ["CUP_B_Mi17_CDF",300,100,300], // Mi-8MT + ["CUP_B_Pchela1T_CDF",100,0,50], // Pchela-1T + ["CUP_B_Mi24_D_Dynamic_CDF",700,600,300], // Mi-24D + ["CUP_B_Su25_Dyn_CDF",1000,800,400], // Su-25 Frogfoot + ["CUP_B_SU34_CDF",1200,1000,500] // Su-34 +]; + +static_vehicles = [ + ["CUP_B_DSHKM_CDF",25,40,0], // DShKM + ["CUP_B_DSHkM_MiniTripod_CDF",25,40,0], // DShKM Minitripod + ["CUP_B_AGS_CDF",25,60,0], // AGS-30 + ["CUP_B_SPG9_CDF",50,100,0], // SPG-9 + ["CUP_B_Igla_AA_pod_CDF",100,200,0], // Igla AA Pod + ["CUP_B_ZU23_CDF",100,300,0], // ZU-23 + ["B_Mortar_01_F",80,150,0], // Mk6 Mortar + ["CUP_B_2b14_82mm_CDF",80,150,0], // Podnos 2B14 + ["CUP_B_D30_AT_CDF",100,200,0], // D-30 AT + ["CUP_B_D30_CDF",200,250,0] // D-30 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["FlagCarrierCDFEnsign_EP1",0,0,0], + ["FlagCarrierCDF",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["CUP_B_Tractor_CDF",50,0,75], // Towing Tractor + ["CUP_B_Kamaz_Repair_CDF",425,0,75], // Kamaz 5350 (Repair) + ["CUP_B_Kamaz_Refuel_CDF",125,0,375], // Kamaz 5350 (Fuel) + ["CUP_B_Kamaz_Reammo_CDF",125,300,75], // Kamaz 5350 (Ammo) + ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_CDF_Soldier_TL_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_RPG18_FST", + "CUP_B_CDF_Soldier_GL_FST", + "CUP_B_CDF_Soldier_AR_FST", + "CUP_B_CDF_Soldier_AR_FST", + "CUP_B_CDF_Soldier_Marksman_FST", + "CUP_B_CDF_Medic_FST", + "CUP_B_CDF_Engineer_FST" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_CDF_Soldier_TL_FST", + "CUP_B_CDF_Soldier_RPG18_FST", + "CUP_B_CDF_Soldier_RPG18_FST", + "CUP_B_CDF_Soldier_GL_FST", + "CUP_B_CDF_Soldier_AR_FST", + "CUP_B_CDF_Soldier_AR_FST", + "CUP_B_CDF_Soldier_MG_FST", + "CUP_B_CDF_Soldier_Marksman_FST", + "CUP_B_CDF_Medic_FST", + "CUP_B_CDF_Engineer_FST" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_CDF_Soldier_TL_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_LAT_FST", + "CUP_B_CDF_Soldier_LAT_FST", + "CUP_B_CDF_Soldier_AAT_FST", + "CUP_B_CDF_Medic_FST", + "CUP_B_CDF_Soldier_FST" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_CDF_Soldier_TL_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_AA_FST", + "CUP_B_CDF_Soldier_AA_FST", + "CUP_B_CDF_Soldier_AA_FST", + "CUP_B_CDF_Medic_FST", + "CUP_B_CDF_Soldier_FST" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_CDF_Soldier_TL_MNT", + "CUP_B_CDF_SOldier_MNT", + "CUP_B_CDF_Soldier_GL_MNT", + "CUP_B_CDF_Soldier_MG_MNT", + "CUP_B_CDF_Soldier_LAT_MNT", + "CUP_B_CDF_Soldier_RPG18_MNT", + "CUP_B_CDF_Soldier_MArksman_MNT", + "CUP_B_CDF_Sniper_MNT", + "CUP_B_CDF_Medic_MNT", + "CUP_B_CDF_Engineer_MNT" +]; + +// Paratroopers squad. +blufor_squad_para = [ + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST", + "CUP_B_CDF_Soldier_FST" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_B_BTR60_CDF", // BTR-60 PB + "CUP_B_BM21_CDF", // BM-21 + "CUP_B_BMP2_CDF", // BMP-2 + "CUP_B_ZSU23_Afghan_CDF", // ZSU-23-4 Afghanski + "CUP_B_ZSU23_CDF", // ZSU-23-4 + "CUP_B_T72_CDF", // T-72 + "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D + "CUP_B_Su25_Dyn_CDF", // Su-25 Frogfoot + "CUP_B_SU34_CDF", // Su-34 + "CUP_B_D30_CDF" // D-30 +]; diff --git a/Missionframework/presets/players/cup_chdkz.sqf b/Missionframework/presets/players/cup_chdkz.sqf new file mode 100644 index 000000000..2fffdec72 --- /dev/null +++ b/Missionframework/presets/players/cup_chdkz.sqf @@ -0,0 +1,317 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - None +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "CUP_O_BMP_HQ_CHDKZ"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_O_BMP2_AMB_CHDKZ"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_O_MI6A_CHDKZ"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_O_INS_Crew"; // This defines the crew for vehicles. +pilot_classname = "CUP_O_INS_Pilot"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_O_Mi8_medevac_CHDKZ"; // These are the little birds which spawn on the Freedom or at Chimera bas +KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_O_Ural_Open_CHDKZ"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_O_INS_Soldier",20,0,0], // Rifleman + ["CUP_O_INS_Soldier_LAT",30,0,0], // Rifleman (RPG-18) + ["CUP_O_INS_Soldier_GL",25,0,0], // Grenadier + ["CUP_O_INS_Soldier_AR",25,0,0], // Autorifleman + ["CUP_O_INS_Soldier_MG",35,0,0], // Machine Gunner + ["CUP_O_INS_Soldier_Ammo",35,0,0], // Ammo Bearer + ["CUP_O_INS_Soldier_AT",50,25,0], // AT Specialist + ["CUP_O_INS_Soldier_AA",50,10,0], // AA Specialist + ["CUP_O_INS_Medic",30,0,0], // Medic + ["CUP_O_INS_Soldier_Engineer",30,0,0], // Engineer + ["CUP_O_INS_Villager3",10,0,0], // Farmer + ["CUP_O_INS_Woodlander3",10,0,0], // Forester + ["CUP_O_INS_Woodlander2",10,0,0], // Gamekeeper + ["CUP_O_INS_Worker2",10,0,0], // Local + ["CUP_O_INS_Villager4",10,0,0], // Villager + ["CUP_O_INS_Woodlander1",10,0,0], // Woodman + ["CUP_O_INS_Sniper",70,5,0], // Sniper + ["CUP_O_INS_Crew",10,0,0], // Crewman + ["CUP_O_INS_Pilot",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_O_Datsun_4seat",50,0,25], // Datsun 620 Pickup Woodland + ["CUP_O_Datsun_PK",50,10,25], // Datsun 620 Pickup (PK) + ["CUP_O_Datsun_AA",75,150,25], // Datsun 620 Pickup (AA) + ["CUP_O_UAZ_Unarmed_CHDKZ",100,0,50], // UAZ + ["CUP_O_UAZ_MG_CHDKZ",125,60,50], // UAZ (DShKM) + ["CUP_O_UAZ_AGS30_CHDKZ",125,80,50], // UAZ (AGS-30) + ["CUP_O_UAZ_SPG9_CHDKZ",125,100,50], // UAZ (SPG-9) + ["CUP_O_UAZ_METIS_CHDKZ",150,120,50], // UAZ (Metis-M) + ["CUP_O_UAZ_AA_CHDKZ",200,160,50], // UAZ (AA) + ["CUP_O_Ural_ZU23_CHDKZ",250,300,100], // Ural (ZU-23) + ["CUP_O_BM21_CHDKZ",300,750,100], // BM-21 + ["CUP_O_Ural_Open_CHDKZ",150,0,75], // Ural (Open) + ["CUP_O_Ural_CHDKZ",150,0,75] // Ural +]; + +heavy_vehicles = [ + ["CUP_O_BRDM2_CHDKZ",200,200,150], // BRDM-2 + ["CUP_O_BRDM2_ATGM_CHDKZ",200,400,150], // BRDM-2 (ATGM) + ["CUP_O_BTR60_CHDKZ",300,200,200], // BTR-60PB + ["CUP_O_BTR80_CHDKZ",400,300,200], // BTR-80 + ["CUP_O_BTR80A_CHDKZ",425,500,200], // BTR-80A + ["CUP_O_MTLB_pk_CHDKZ",175,50,100], // MT-LB LV + ["CUP_O_BMP2_CHDKZ",500,600,200], // BMP-2 + ["CUP_O_ZSU23_Afghan_CHDKZ",350,500,200], // ZSU-23-4 Afghanski + ["CUP_O_ZSU23_CHDKZ",500,500,200], // ZSU-23-4 + ["CUP_O_T55_CHDKZ",500,350,250], // T-55 + ["CUP_O_T72_CHDKZ",700,500,300] // T-72 +]; + +air_vehicles = [ + ["CUP_O_Mi8_CHDKZ",400,100,400] // Mi-8MT +]; + +static_vehicles = [ + ["CUP_O_DSHKM_ChDKZ",25,40,0], // DShKM + ["CUP_O_DSHkM_MiniTripod_ChDKZ",25,40,0], // DShKM Minitripod + ["CUP_O_AGS_ChDKZ",25,60,0], // AGS-30 + ["CUP_O_SPG9_ChDKZ",50,100,0], // SPG-9 + ["CUP_O_Igla_AA_pod_ChDKZ",100,200,0], // Igla AA Pod + ["CUP_O_ZU23_ChDKZ",100,300,0], // ZU-23 + ["CUP_O_2b14_82mm_ChDKZ",80,150,0], // Podnos 2B14 + ["CUP_O_D30_AT_ChDKZ",100,200,0], // D-30 AT + ["CUP_O_D30_ChDKZ",200,250,0] // D-30 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["FlagCarrierINS",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["CUP_O_Tractor_Old_CHDKZ",50,0,75], // Towing Tractor + ["CUP_O_Ural_Repair_CHDKZ",425,0,75], // Ural (Repair) + ["CUP_O_Ural_Refuel_CHDKZ",125,0,375], // Ural (Refuel) + ["CUP_O_Ural_Reammo_CHDKZ",125,300,75], // Ural (Ammo) + ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_O_INS_Officer", + "CUP_O_INS_Woodlander3", + "CUP_O_INS_Worker2", + "CUP_O_INS_Woodlander1", + "CUP_O_INS_Soldier_GL", + "CUP_O_INS_Soldier_AR", + "CUP_O_INS_Woodlander2", + "CUP_O_INS_Villager3", + "CUP_O_INS_Medic", + "CUP_O_INS_Soldier_LAT" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_O_INS_Officer", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_GL", + "CUP_O_INS_Soldier_AR", + "CUP_O_INS_Soldier_AR", + "CUP_O_INS_Soldier_MG", + "CUP_O_INS_Sniper", + "CUP_O_INS_Medic", + "CUP_O_INS_Soldier_Engineer" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_O_INS_Officer", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_AT", + "CUP_O_INS_Soldier_AT", + "CUP_O_INS_Soldier_AT", + "CUP_O_INS_Medic", + "CUP_O_INS_Soldier_Engineer" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_O_INS_Officer", + "CUP_O_INS_Soldier", + "CUP_O_INS_Soldier", + "CUP_O_INS_Soldier_AA", + "CUP_O_INS_Soldier_AA", + "CUP_O_INS_Soldier_AA", + "CUP_O_INS_Medic", + "CUP_O_INS_Soldier_Engineer" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_O_RUS_Soldier_TL", + "CUP_O_RUS_SpecOps_Scout", + "CUP_O_RUS_SpecOps_Night", + "CUP_O_RUS_SpecOps_Night", + "CUP_O_RUS_Soldier_GL", + "CUP_O_RUS_Soldier_GL", + "CUP_O_RUS_Soldier_Marksman", + "CUP_O_RUS_SpecOps", + "CUP_O_RUS_Saboteur" +]; + +// Paratroopers squad. +blufor_squad_para = [ + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT", + "CUP_O_INS_Soldier_LAT" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_O_BTR60_CHDKZ", // BTR-60 PB + "CUP_O_BM21_CHDKZ", // BM-21 + "CUP_O_BMP2_CHDKZ", // BMP-2 + "CUP_O_ZSU23_Afghan_CHDKZ", // ZSU-23-4 Afghanski + "CUP_O_ZSU23_CHDKZ", // ZSU-23-4 + "CUP_O_T72_CHDKZ", // T-72 + "CUP_O_BTR80_CHDKZ", // BTR-80 + "CUP_O_BTR80A_CHDKZ", // BTR-80A + "CUP_O_BRDM2_ATGM_CHDKZ", // BRDM-2 (ATGM) + "CUP_O_D30_ChDKZ" // D-30 +]; diff --git a/Missionframework/presets/players/cup_sla.sqf b/Missionframework/presets/players/cup_sla.sqf new file mode 100644 index 000000000..0c352a5ec --- /dev/null +++ b/Missionframework/presets/players/cup_sla.sqf @@ -0,0 +1,327 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - None +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "CUP_O_BMP_HQ_sla"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_O_BMP2_AMB_sla"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_O_Mi8_SLA_1"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_O_sla_Crew"; // This defines the crew for vehicles. +pilot_classname = "CUP_O_sla_Pilot"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_O_UH1H_slick_SLA"; // These are the little birds which spawn on the Freedom or at Chimera bas +KPLIB_boat_classname = "CUP_O_PBX_SLA"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_O_Ural_Open_SLA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_O_sla_Soldier",15,0,0], // Rifleman + ["CUP_O_SLA_Soldier_Backpack",20,0,0], // Rifleman (Backpack) + ["CUP_O_sla_Soldier_AT",30,0,0], // Rifleman (RPG-7) + ["CUP_O_sla_Soldier_GL",25,0,0], // Grenadier + ["CUP_O_sla_Soldier_AR",25,0,0], // Autorifleman + ["CUP_O_sla_Soldier_MG",35,0,0], // Machinegunner + ["CUP_O_sla_Soldier_HAT",50,10,0], // AT Specialist + ["CUP_O_sla_Soldier_AA",50,10,0], // AA Specialist + ["CUP_O_sla_Medic",30,0,0], // Medic + ["CUP_O_sla_Engineer",30,0,0], // Engineer + ["CUP_O_sla_SpecOps_TL",20,0,0], // Especas Team Leader + ["CUP_O_sla_SpecOps_LAT",30,0,0], // Especas (RPG18) + ["CUP_O_sla_SpecOps_MG",40,0,0], // Especas Machinegunner + ["CUP_O_sla_SpecOps",30,0,0], // Especas Commando + ["CUP_O_sla_SpecOps_Demo",30,0,0], // Especas (Demolitions) + ["CUP_O_sla_Sniper",70,5,0], // Sniper + ["CUP_O_SLA_Sniper_SVD_Night",70,5,0], // Sniper (Night) + ["CUP_O_sla_Sniper_KSVK",70,5,0], // Sniper (KSVK) + ["CUP_O_sla_Soldier_AKS_Night",70,5,0], // Soldier (AKS-74 Night) + ["CUP_O_SLA_Spotter",20,0,0], // Spotter + ["CUP_O_sla_Crew",10,0,0], // Crewman + ["CUP_O_sla_Pilot",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_O_UAZ_Unarmed_SLA",100,0,50], // UAZ + ["CUP_O_UAZ_MG_SLA",125,60,50], // UAZ (DShKM) + ["CUP_O_UAZ_AGS30_SLA",125,80,50], // UAZ (AGS-30) + ["CUP_O_UAZ_SPG9_SLA",125,100,50], // UAZ (SPG-9) + ["CUP_O_UAZ_METIS_SLA",150,120,50], // UAZ (Metis-M) + ["CUP_O_UAZ_AA_SLA",200,160,50], // UAZ (AA) + ["CUP_O_Ural_ZU23_SLA",250,300,100], // Ural (ZU-23) + ["CUP_O_BM21_SLA",300,750,100], // BM-21 + ["CUP_O_Ural_Open_SLA",150,0,75], // Ural (Open) + ["CUP_O_Ural_SLA",150,0,75] // Ural +]; + +heavy_vehicles = [ + ["CUP_O_BRDM2_SLA",200,200,150], // BRDM-2 + ["CUP_O_BRDM2_ATGM_SLA",200,400,150], // BRDM-2 (ATGM) + ["CUP_O_BTR60_SLA",300,200,200], // BTR-60PB + ["CUP_O_BTR80_SLA",400,300,200], // BTR-80 + ["CUP_O_BTR80A_SLA",425,500,200], // BTR-80A + ["CUP_O_MTLB_pk_SLA",175,50,100], // MT-LB LV + ["CUP_O_BMP2_SLA",500,600,200], // BMP-2 + ["CUP_O_ZSU23_Afghan_SLA",350,500,200], // ZSU-23-4 Afghanski + ["CUP_O_ZSU23_SLA",500,500,200], // ZSU-23-4 + ["CUP_O_T55_SLA",500,350,250], // T-55 + ["CUP_O_T72_SLA",700,500,300] // T-72 +]; + +air_vehicles = [ + ["CUP_O_UH1H_armed_SLA",400,250,250], // UH-1H (Armed) + ["CUP_O_UH1H_gunship_SLA",500,350,250], // UH-1H (Gunship) + ["CUP_O_Mi8_SLA_2",500,350,300], // Mi-8MTV3 + ["CUP_O_Mi24_D_Dynamic_SLA",600,650,300], // Mi-24D + ["CUP_O_Ka50_DL_SLA",800,750,350], // Ka-50 Black Shark + ["CUP_O_Su25_Dyn_SLA",1000,850,400], // Su-25 Frogfoot + ["CUP_O_SU34_SLA",1200,1000,500] // Su-34 +]; + +static_vehicles = [ + ["CUP_O_DSHKM_SLA",25,40,0], // DShKM + ["CUP_O_DSHkM_MiniTripod_SLA",25,40,0], // DShKM Minitripod + ["CUP_O_AGS_SLA",25,60,0], // AGS-30 + ["CUP_O_SPG9_SLA",50,100,0], // SPG-9 + ["CUP_O_Igla_AA_pod_SLA",100,200,0], // Igla AA Pod + ["CUP_O_ZU23_SLA",100,300,0], // ZU-23 + ["CUP_O_2b14_82mm_SLA",80,150,0], // Podnos 2B14 + ["CUP_O_D30_AT_SLA",100,200,0], // D-30 AT + ["CUP_O_D30_SLA",200,250,0] // D-30 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["FlagCarrierINS",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["CUP_O_LCVP_SLA",100,100,50], // LCVP + ["CUP_O_LCVP_VIV_SLA",100,100,50], // LCVP (VIV) + ["CUP_O_Tractor_SLA",50,0,75], // Towing Tractor + ["CUP_O_Ural_Repair_SLA",425,0,75], // Ural (Repair) + ["CUP_O_Ural_Refuel_SLA",125,0,375], // Ural (Refuel) + ["CUP_O_Ural_Reammo_SLA",125,300,75], // Ural (Ammo) + ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_O_sla_Soldier_SL", + "CUP_O_sla_Soldier", + "CUP_O_sla_Soldier", + "CUP_O_sla_Soldier_LAT", + "CUP_O_sla_Soldier_GL", + "CUP_O_sla_Soldier_AR", + "CUP_O_sla_Soldier_AR", + "CUP_O_sla_Sniper", + "CUP_O_sla_Medic", + "CUP_O_sla_Engineer" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_O_sla_Soldier_SL", + "CUP_O_sla_Soldier_LAT", + "CUP_O_sla_Soldier_LAT", + "CUP_O_sla_Soldier_GL", + "CUP_O_sla_Soldier_AR", + "CUP_O_sla_Soldier_AR", + "CUP_O_sla_Soldier_MG", + "CUP_O_sla_Sniper", + "CUP_O_sla_Medic", + "CUP_O_sla_Engineer" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_O_sla_Soldier_SL", + "CUP_O_sla_Soldier_AAT", + "CUP_O_sla_Soldier_AAT", + "CUP_O_sla_Soldier_AT", + "CUP_O_sla_Soldier_AT", + "CUP_O_sla_Soldier_HAT", + "CUP_O_sla_Medic", + "CUP_O_sla_Engineer" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_O_sla_Soldier_SL", + "CUP_O_sla_Soldier_Backpack", + "CUP_O_sla_Soldier_Backpack", + "CUP_O_sla_Soldier_AA", + "CUP_O_sla_Soldier_AA", + "CUP_O_sla_Soldier_AA", + "CUP_O_sla_Medic", + "CUP_O_sla_Engineer" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_O_sla_SpecOps_TL", + "CUP_O_sla_SpecOps", + "CUP_O_sla_SpecOps_Demo", + "CUP_O_sla_SpecOps", + "CUP_O_sla_SpecOps_LAT", + "CUP_O_sla_SpecOps_LAT", + "CUP_O_sla_SpecOps_MG" +]; + +// Paratroopers squad. +blufor_squad_para = [ + "CUP_O_sla_Officer_urban", + "CUP_O_sla_Officer_urban", + "CUP_O_sla_Officer_urban", + "CUP_O_sla_Officer_urban", + "CUP_O_sla_Officer_urban", + "CUP_O_sla_Officer_urban", + "CUP_O_sla_Soldier_LAT_urban", + "CUP_O_sla_Soldier_LAT_urban", + "CUP_O_sla_Soldier_LAT_urban", + "CUP_O_sla_Soldier_LAT_urban" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_O_BTR60_SLA", // BTR-60 PB + "CUP_O_BM21_SLA", // BM-21 + "CUP_O_BMP2_SLA", // BMP-2 + "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski + "CUP_O_ZSU23_SLA", // ZSU-23-4 + "CUP_O_T72_SLA", // T-72 + "CUP_O_BTR80_SLA", // BTR-80 + "CUP_O_BTR80A_SLA", // BTR-80A + "CUP_O_BRDM2_ATGM_SLA", // BRDM-2 (ATGM) + "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D + "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark + "CUP_O_Su25_Dyn_SLA", // Su-25 Frogfoot + "CUP_O_SU34_SLA", // Su-34 + "CUP_O_D30_SLA" // D-30 +]; diff --git a/Missionframework/presets/players/cup_usa_desert.sqf b/Missionframework/presets/players/cup_usa_desert.sqf new file mode 100644 index 000000000..387181995 --- /dev/null +++ b/Missionframework/presets/players/cup_usa_desert.sqf @@ -0,0 +1,378 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - USAF Main Pack + - USAF Fighters Pack + - USAF Utility Pack +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_US_Soldier",20,0,0], // Rifleman + ["CUP_B_US_Soldier_LAT",30,0,0], // Rifleman (AT) + ["CUP_B_US_Soldier_GL",25,0,0], // Grenadier + ["CUP_B_US_Soldier_AR",25,0,0], // Automatic Rifleman + ["CUP_B_US_Soldier_MG",35,0,0], // Machinegunner + ["CUP_B_US_Soldier_Marksman",30,0,0], // Marksman + ["CUP_B_US_Soldier_AT",50,25,0], // AT Specialist + ["CUP_B_US_Soldier_HAT",50,10,0], // AT Specialist (Javelin) + ["CUP_B_US_Soldier_AA",50,10,0], // AA Specialist + ["CUP_B_US_Medic",30,0,0], // Medic + ["CUP_B_US_Engineer",30,0,0], // Engineer + ["CUP_B_US_SpecOps_MG",30,0,0], // Machinegunner + ["CUP_B_US_SpecOps",20,0,0], // Operator + ["CUP_B_US_SpecOps_M",30,0,0], // Marksman + ["CUP_B_US_SpecOps_TL",40,0,0], // Team Leader + ["CUP_B_US_SpecOps_Medic",30,0,0], // Medic + ["CUP_B_US_Sniper",70,5,0], // Sniper + ["CUP_B_US_Sniper_M107",70,5,0], // Sniper (M107) + ["CUP_B_US_Spotter",20,0,0], // Spotter + ["CUP_B_US_Crew",10,0,0], // Crewman + ["CUP_B_US_Pilot",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) + ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 + ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 + ["CUP_B_HMMWV_TOW_USA",75,100,50], // HMMWV TOW + ["CUP_B_HMMWV_SOV_M2_USA",100,80,50], // HMMWV SOV (M2) + ["CUP_B_HMMWV_SOV_USA",100,100,50], // HMMWV SOV (Mk19) + ["CUP_B_HMMWV_Avenger_USA",200,350,125], // HMMWV Avenger + ["CUP_B_RG31_M2_USA",150,75,100], // RG-31 Nyala M2 + ["CUP_B_RG31_M2_GC_USA",225,75,100], // RG-31 Nyala M2 GC + ["CUP_B_RG31E_M2_USA",200,75,100], // RG-31 Mk5E M2 + ["CUP_B_RG31_Mk19_USA",150,100,100], // RG-31 Mk.19 + ["CUP_B_MTVR_USA",125,0,75] // MTVR +]; + +heavy_vehicles = [ + ["CUP_B_M1126_ICV_M2_Desert_Slat",200,150,125], // M1126 ICV M2 CROWS (Desert - Slat) + ["CUP_B_M1126_ICV_MK19_Desert_Slat",200,200,125], // M1126 ICV MK19 CROWS (Desert - Slat) + ["CUP_B_M1128_MGS_Desert_Slat",200,500,125], // M1128 MGS (Desert - Slat) + ["CUP_B_M1135_ATGMV_Desert_Slat",200,300,125], // M1135 ATGMV (Desert - Slat) + ["CUP_B_M6LineBacker_USA_D",350,450,150], // M6 Linebacker (Desert) + ["CUP_B_M7Bradley_USA_D",300,300,150], // M7 Bradley (Desert) + ["CUP_B_M2Bradley_USA_D",300,400,150], // M2A2 Bradley IFV (Desert) + ["CUP_B_M2A3Bradley_USA_D",400,400,150], // M2A3 ERA Bradley IFV (Desert) + ["CUP_B_M1A1_DES_US_Army",500,500,200], // M1A1 Abrams (Desert) + ["CUP_B_M1A2_TUSK_MG_DES_US_Army",600,550,225], // M1A2 Abrams TUSK (Desert) + ["CUP_B_M1129_MC_MK19_Desert_Slat",600,800,300], // M1129 MC MK19 CROWS (Desert - Slat) + ["CUP_B_M270_HE_USA",600,1250,300], // M270 MLRS (HE) + ["CUP_B_M270_DPICM_USA",800,1750,400] // M270 MLRS (DPICM) +]; + +air_vehicles = [ + ["CUP_B_UH60M_Unarmed_FFV_MEV_US",300,0,200], // UH-60M MEDVAC (Unarmed/FFV) + ["CUP_B_UH60M_US",300,25,200], // UH-60M + ["CUP_B_UH60M_FFV_US",300,50,200], // UH-60M (FFV) + ["USAF_C130J",200,0,250], // C-130J Super Hercules + ["USAF_C130J_Cargo",200,0,250], // C-130J Super Hercules (Cargo) + ["USAF_C17",500,0,400], // C-17 Globemaster III + ["usaf_kc135",600,0,2500], // KC-135 Stratotanker + ["CUP_B_AH6M_USA",200,100,100], // AH-6M + ["CUP_B_MH60L_DAP_2x_US",400,250,225], // MH-60L DAP (2 Stores) + ["CUP_B_MH60L_DAP_4x_US",400,500,225], // MH-60L DAP (4 Stores) + ["CUP_B_AH64_DL_USA",500,600,300], // AH-64 + ["CUP_B_AH64D_DL_USA",700,600,200], // AH-64D + ["CUP_B_AH6X_USA",300,0,100], // AH-6X Littlebird ULB + ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk + ["USAF_MQ9",500,750,200], // MQ-9 Reaper + ["CUP_B_A10_DYN_USA",1000,800,400], // A-10A Thunderbolt II + ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II + ["USAF_F22",1800,2000,500], // F-22A Raptor + ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) + ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) + ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) + ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II + ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) + ["CUP_B_AH6X_USA",300,0,100] // AH-6X Littlebird ULB +]; + +static_vehicles = [ + ["CUP_B_M2StaticMG_US",25,40,0], // M2 Machine Gun + ["CUP_B_M2StaticMG_MiniTripod_US",25,40,0], // M2 Minitripod + ["CUP_B_TOW_TriPod_US",50,100,0], // TOW Tripod + ["CUP_WV_B_CRAM",500,500,0], // C-RAM + ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS + ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS + ["B_Mortar_01_F",80,150,0], // Mk6 Mortar + ["CUP_B_M252_US",80,150,0], // M252 81mm Mortar + ["CUP_B_M119_US",100,200,0] // M119 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["Flag_US_F",0,0,0], + ["FlagCarrierUSArmy_EP1",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) + ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) + ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) + ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) + ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) + ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) + ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) + ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) + ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) + ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) + ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) + ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) + ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) + ["CUP_B_TowingTractor_USA",50,0,75], // Towing Tractor + ["CUP_B_MTVR_Repair_USA",425,0,75], // MTVR Repair + ["CUP_B_MTVR_Refuel_USA",125,0,375], // MTVR Refuel + ["CUP_B_MTVR_Ammo_USA",125,300,75], // MTVR Ammo + ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier_LAT", + "CUP_B_US_Soldier_GL", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_Marksman", + "CUP_B_US_Medic", + "CUP_B_US_Engineer" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier_LAT", + "CUP_B_US_Soldier_LAT", + "CUP_B_US_Soldier_GL", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_MG", + "CUP_B_US_Soldier_Marksman", + "CUP_B_US_Medic", + "CUP_B_US_Engineer" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier_HAT", + "CUP_B_US_Soldier_AT", + "CUP_B_US_Soldier_AT", + "CUP_B_US_Medic", + "CUP_B_US_Soldier" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier_AA", + "CUP_B_US_Soldier_AA", + "CUP_B_US_Soldier_AA", + "CUP_B_US_Medic", + "CUP_B_US_Soldier" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_US_SpecOps_TL", + "CUP_B_US_SpecOps", + "CUP_B_US_SpecOps_Assault", + "CUP_B_US_SpecOps_MG", + "CUP_B_US_SpecOps_JTAC", + "CUP_B_US_SpecOps_M14", + "CUP_B_US_SpecOps_M", + "CUP_B_US_SpecOps_M", + "CUP_B_US_SpecOps_Medic", + "CUP_B_US_SpecOps_UAV" +]; + +// Paratroopers squad (The units of this squad will automatically get parachutes on build) +blufor_squad_para = [ + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_WV_B_CRAM", // C-RAM + "CUP_WV_B_SS_Launcher", // Mk-29 GMLS + "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS + "CUP_B_A10_DYN_USA", // A-10A Thunderbolt II + "USAF_MQ9", // MQ-9 Reaper + "USAF_A10", // A-10C Thunderbolt II + "USAF_F22", // F-22A Raptor + "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) + "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) + "USAF_F22_Heavy", // F-22A Raptor (Heavy) + "USAF_F35A_STEALTH", // F-35A Lightning II + "USAF_F35A", // F-35A Lightning II (Heavy) + "CUP_B_AH64D_DL_USA", // AH-64D + "CUP_B_MH60L_DAP_2x_US", // MH-60L DAP (2 Stores) + "CUP_B_MH60L_DAP_4x_US", // MH-60L DAP (4 Stores) + "CUP_B_M1A1_DES_US_Army", // M1A1 Abrams (Desert) + "CUP_B_M1A2_TUSK_MG_DES_US_Army", // M1A2 Abrams TUSK (Desert) + "CUP_B_M270_HE_USA", // M270 MLRS (HE) + "CUP_B_M270_DPICM_USA", // M270 MLRS (DPICM) + "CUP_B_M6LineBacker_USA_D", // M6 Linebacker (Desert) + "CUP_B_M1128_MGS_Desert_Slat", // M1128 MGS (Desert - Slat) + "CUP_B_M1135_ATGMV_Desert_Slat", // M1135 ATGMV (Desert - Slat) + "CUP_B_M1129_MC_MK19_Desert_Slat", // M1129 MC MK19 CROWS (Desert - Slat) + "CUP_B_M2A3Bradley_USA_D", // M2A3 ERA Bradley IFV (Desert) + "CUP_B_M119_US", // M119 + "CUP_B_RG31E_M2_USA", // RG-31 Mk5E M2 + "CUP_B_RG31_Mk19_USA" // RG-31 Mk.19 +]; diff --git a/Missionframework/presets/players/cup_usa_woodland.sqf b/Missionframework/presets/players/cup_usa_woodland.sqf new file mode 100644 index 000000000..c052ce2b6 --- /dev/null +++ b/Missionframework/presets/players/cup_usa_woodland.sqf @@ -0,0 +1,381 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - USAF Main Pack + - USAF Fighters Pack + - USAF Utility Pack +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_US_Soldier",20,0,0], // Rifleman + ["CUP_B_US_Soldier_LAT",30,0,0], // Rifleman (AT) + ["CUP_B_US_Soldier_GL",25,0,0], // Grenadier + ["CUP_B_US_Soldier_AR",25,0,0], // Automatic Rifleman + ["CUP_B_US_Soldier_MG",35,0,0], // Machinegunner + ["CUP_B_US_Soldier_Marksman",30,0,0], // Marksman + ["CUP_B_US_Soldier_AT",50,25,0], // AT Specialist + ["CUP_B_US_Soldier_HAT",50,10,0], // AT Specialist (Javelin) + ["CUP_B_US_Soldier_AA",50,10,0], // AA Specialist + ["CUP_B_US_Medic",30,0,0], // Medic + ["CUP_B_US_Engineer",30,0,0], // Engineer + ["CUP_B_US_SpecOps_MG",30,0,0], // Machinegunner + ["CUP_B_US_SpecOps",20,0,0], // Operator + ["CUP_B_US_SpecOps_M",30,0,0], // Marksman + ["CUP_B_US_SpecOps_TL",40,0,0], // Team Leader + ["CUP_B_US_SpecOps_Medic",30,0,0], // Medic + ["CUP_B_US_Sniper",70,5,0], // Sniper + ["CUP_B_US_Sniper_M107",70,5,0], // Sniper (M107) + ["CUP_B_US_Spotter",20,0,0], // Spotter + ["CUP_B_US_Crew",10,0,0], // Crewman + ["CUP_B_US_Pilot",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) + ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 + ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 + ["CUP_B_HMMWV_TOW_USA",75,100,50], // HMMWV TOW + ["CUP_B_HMMWV_SOV_M2_USA",100,80,50], // HMMWV SOV (M2) + ["CUP_B_HMMWV_SOV_USA",100,100,50], // HMMWV SOV (Mk19) + ["CUP_B_HMMWV_Avenger_USA",200,350,125], // HMMWV Avenger + ["CUP_B_RG31_M2_OD_USA",150,75,100], // RG-31 Nyala M2 + ["CUP_B_RG31_M2_OD_GC_USA",225,75,100], // RG-31 Nyala M2 GC + ["CUP_B_RG31E_M2_OD_USA",200,75,100], // RG-31 Mk5E M2 + ["CUP_B_RG31_Mk19_OD_USA",150,100,100], // RG-31 Mk.19 + ["CUP_B_MTVR_USA",125,0,75] // MTVR +]; + +heavy_vehicles = [ + ["CUP_B_M1126_ICV_M2_Woodland_Slat",200,150,125], // M1126 ICV M2 CROWS (Woodland - Slat) + ["CUP_B_M1126_ICV_MK19_Woodland_Slat",200,200,125], // M1126 ICV MK19 CROWS (Woodland - Slat) + ["CUP_B_M1128_MGS_Woodland_Slat",200,500,125], // M1128 MGS (Woodland - Slat) + ["CUP_B_M1135_ATGMV_Woodland_Slat",200,300,125], // M1135 ATGMV (Woodland - Slat) + ["CUP_B_M163_USA",250,600,200], // M163A1 VADS + ["CUP_B_M6LineBacker_USA_W",350,450,150], // M6 Linebacker (Woodland) + ["CUP_B_M7Bradley_USA_W",300,300,150], // M7 Bradley (Woodland) + ["CUP_B_M2Bradley_USA_W",300,400,150], // M2A2 Bradley IFV (Woodland) + ["CUP_B_M2A3Bradley_USA_W",400,400,150], // M2A3 ERA Bradley IFV (Woodland) + ["CUP_B_M1A1_Woodland_US_Army",500,500,200], // M1A1 Abrams (Woodland) + ["CUP_B_M1A2_TUSK_MG_US_Army",600,550,225], // M1A2 Abrams TUSK (Woodland) + ["CUP_B_M1129_MC_MK19_Woodland_Slat",600,800,400], // M1129 MC MK19 CROWS (Woodland - Slat) + ["CUP_B_M270_HE_USA",600,1250,300], // M270 MLRS (HE) + ["CUP_B_M270_DPICM_USA",800,1750,400] // M270 MLRS (DPICM) +]; + +air_vehicles = [ + ["CUP_B_UH60M_Unarmed_FFV_MEV_US",300,0,200], // UH-60M MEDVAC (Unarmed/FFV) + ["CUP_B_UH60M_US",300,25,200], // UH-60M + ["CUP_B_UH60M_FFV_US",300,50,200], // UH-60M (FFV) + ["USAF_C130J",200,0,250], // C-130J Super Hercules + ["USAF_C130J_Cargo",200,0,250], // C-130J Super Hercules (Cargo) + ["USAF_C17",500,0,400], // C-17 Globemaster III + ["usaf_kc135",600,0,2500], // KC-135 Stratotanker + ["CUP_B_AH6M_USA",200,100,100], // AH-6M + ["CUP_B_MH60L_DAP_2x_US",400,250,225], // MH-60L DAP (2 Stores) + ["CUP_B_MH60L_DAP_4x_US",400,500,225], // MH-60L DAP (4 Stores) + ["CUP_B_AH64_DL_USA",500,600,300], // AH-64 + ["CUP_B_AH64D_DL_USA",700,600,200], // AH-64D + ["CUP_B_AH6X_USA",300,0,100], // AH-6X Littlebird ULB + ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk + ["USAF_MQ9",500,750,200], // MQ-9 Reaper + ["CUP_B_AC47_Spooky_USA",600,300,400], // AC-47D Spooky + ["CUP_B_A10_DYN_USA",1000,800,400], // A-10A Thunderbolt II + ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II + ["USAF_F22",1800,2000,500], // F-22A Raptor + ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) + ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) + ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) + ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II + ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) + ["CUP_B_AH6X_USA",300,0,100] // AH-6X Littlebird ULB +]; + +static_vehicles = [ + ["CUP_B_M2StaticMG_US",25,40,0], // M2 Machine Gun + ["CUP_B_M2StaticMG_MiniTripod_US",25,40,0], // M2 Minitripod + ["CUP_B_TOW_TriPod_US",50,100,0], // TOW Tripod + ["CUP_WV_B_CRAM",500,500,0], // C-RAM + ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS + ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS + ["B_Mortar_01_F",80,150,0], // Mk6 Mortar + ["CUP_B_M252_US",80,150,0], // M252 81mm Mortar + ["CUP_B_M119_US",100,200,0] // M119 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["Flag_US_F",0,0,0], + ["FlagCarrierUSArmy_EP1",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) + ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) + ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) + ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) + ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) + ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) + ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) + ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) + ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) + ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) + ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) + ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) + ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) + ["CUP_B_TowingTractor_USA",50,0,75], // Towing Tractor + ["CUP_B_MTVR_Repair_USMC",425,0,75], // MTVR Repair + ["CUP_B_MTVR_Refuel_USMC",125,0,375], // MTVR Refuel + ["CUP_B_MTVR_Ammo_USMC",125,300,75], // MTVR Ammo + ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier_LAT", + "CUP_B_US_Soldier_GL", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_Marksman", + "CUP_B_US_Medic", + "CUP_B_US_Engineer" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier_LAT", + "CUP_B_US_Soldier_LAT", + "CUP_B_US_Soldier_GL", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_AR", + "CUP_B_US_Soldier_MG", + "CUP_B_US_Soldier_Marksman", + "CUP_B_US_Medic", + "CUP_B_US_Engineer" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier_HAT", + "CUP_B_US_Soldier_AT", + "CUP_B_US_Soldier_AT", + "CUP_B_US_Medic", + "CUP_B_US_Soldier" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_US_Soldier_SL", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier_AA", + "CUP_B_US_Soldier_AA", + "CUP_B_US_Soldier_AA", + "CUP_B_US_Medic", + "CUP_B_US_Soldier" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_US_SpecOps_TL", + "CUP_B_US_SpecOps", + "CUP_B_US_SpecOps_Assault", + "CUP_B_US_SpecOps_MG", + "CUP_B_US_SpecOps_JTAC", + "CUP_B_US_SpecOps_M14", + "CUP_B_US_SpecOps_M", + "CUP_B_US_SpecOps_M", + "CUP_B_US_SpecOps_Medic", + "CUP_B_US_SpecOps_UAV" +]; + +// Paratroopers squad (The units of this squad will automatically get parachutes on build) +blufor_squad_para = [ + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier", + "CUP_B_US_Soldier" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_WV_B_CRAM", // C-RAM + "CUP_WV_B_SS_Launcher", // Mk-29 GMLS + "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS + "CUP_B_A10_DYN_USA", // A-10A Thunderbolt II + "USAF_MQ9", // MQ-9 Reaper + "USAF_A10", // A-10C Thunderbolt II + "USAF_F22", // F-22A Raptor + "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) + "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) + "USAF_F22_Heavy", // F-22A Raptor (Heavy) + "USAF_F35A_STEALTH", // F-35A Lightning II + "USAF_F35A", // F-35A Lightning II (Heavy) + "CUP_B_AH64D_DL_USA", // AH-64D + "CUP_B_MH60L_DAP_2x_US", // MH-60L DAP (2 Stores) + "CUP_B_MH60L_DAP_4x_US", // MH-60L DAP (4 Stores) + "CUP_B_M1A1_Woodland_US_Army", // M1A1 Abrams (Woodland) + "CUP_B_M1A2_TUSK_MG_US_Army", // M1A2 Abrams TUSK (Woodland) + "CUP_B_M270_HE_USA", // M270 MLRS (HE) + "CUP_B_M270_DPICM_USA", // M270 MLRS (DPICM) + "CUP_B_M6LineBacker_USA_W", // M6 Linebacker (Woodland) + "CUP_B_M163_USA", // M163A1 VADS + "CUP_B_M1128_MGS_Woodland_Slat", // M1128 MGS (Woodland - Slat) + "CUP_B_M1135_ATGMV_Woodland_Slat", // M1135 ATGMV (Woodland - Slat) + "CUP_B_M1129_MC_MK19_Woodland_Slat", // M1129 MC MK19 CROWS (Woodland - Slat) + "CUP_B_M2A3Bradley_USA_W", // M2A3 ERA Bradley IFV (Woodland) + "CUP_B_M119_US", // M119 + "CUP_B_RG31E_M2_USA", // RG-31 Mk5E M2 + "CUP_B_RG31_Mk19_USA" // RG-31 Mk.19 +]; diff --git a/Missionframework/presets/players/cup_usmc_desert.sqf b/Missionframework/presets/players/cup_usmc_desert.sqf new file mode 100644 index 000000000..758276c6a --- /dev/null +++ b/Missionframework/presets/players/cup_usmc_desert.sqf @@ -0,0 +1,374 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - USAF Main Pack + - USAF Fighters Pack + - USAF Utility Pack +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_USMC_Crewman_FROG_DES"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_USMC_Soldier_FROG_DES",20,0,0], // Rifleman + ["CUP_B_USMC_Soldier_LAT_FROG_DES",30,0,0], // Rifleman (M136) + ["CUP_B_USMC_Soldier_GL_FROG_DES",25,0,0], // Grenadier + ["CUP_B_USMC_Soldier_AR_FROG_DES",25,0,0], // Automatic Rifleman + ["CUP_B_USMC_Soldier_MG_FROG_DES",35,0,0], // Machinegunner + ["CUP_B_USMC_Soldier_Marksman_FROG_DES",30,0,0], // Designated Marksman + ["CUP_B_USMC_Soldier_HAT_FROG_DES",50,25,0], // AT Specialist (Javelin) + ["CUP_B_USMC_Soldier_AT_FROG_DES",50,10,0], // AT Specialist (SMAW) + ["CUP_B_USMC_Soldier_AA_FROG_DES",50,10,0], // AA Specialist (Stinger) + ["CUP_B_USMC_Soldier_Medic_FROG_DES",30,0,0], // Corpsman + ["CUP_B_USMC_Soldier_Engineer_FROG_DES",30,0,0], // Engineer + ["CUP_B_FR_Soldier_Exp_DES",30,0,0], // Force Recon Demolitions Specialist + ["CUP_B_FR_Soldier_Assault_DES",20,0,0], // Force Recon Assault Rifleman + ["CUP_B_FR_Soldier_Marksman_DES",30,0,0], // Force Recon Marksman + ["CUP_B_FR_Soldier_TL_DES",40,0,0], // Force Recon Team Leader + ["CUP_B_FR_Medic_DES",30,0,0], // Force Recon Corpsman + ["CUP_B_USMC_Soldier_M40A3",70,5,0], // Sniper M40A3 + ["CUP_B_USMC_Soldier_M107",70,5,0], // Sniper M107 + ["CUP_B_USMC_Spotter",20,0,0], // Spotter + ["CUP_B_USMC_Crewman_FROG_DES",10,0,0], // Crewman + ["CUP_B_USMC_Pilot",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_M1030_USMC",50,0,25], // M1030 + ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) + ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 + ["CUP_B_HMMWV_TOW_USA",75,100,50], // HMMWV TOW + ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 + ["CUP_B_HMMWV_Avenger_USA",100,125,125], // HMMWV Avenger + ["CUP_B_RG31_M2_OD_USA",100,50,50], // RG-31 M2 + ["CUP_B_RG31E_M2_OD_USA",100,50,50], // RG-31 Mk5E M2 + ["CUP_B_RG31_Mk19_OD_USA",100,80,50], // RG-31 Mk.19 + ["CUP_B_MTVR_USA",125,0,75], // MTVR + ["CUP_B_RHIB_USMC",150,100,100], // RHIB + ["CUP_B_RHIB2Turret_USMC",250,200,100] // RHIB (Mk19) +]; + +heavy_vehicles = [ + ["CUP_B_LAV25_desert_USMC",200,175,125], // LAV-25A1 (Desert) + ["CUP_B_LAV25M240_desert_USMC",200,200,125], // LAV-25A1 (M240) (Desert) + ["CUP_B_LAV25_HQ_desert_USMC",200,50,125], // LAV-C2 (Desert) + ["CUP_B_AAV_Unarmed_USMC",300,0,150], // AAVC7/A1 (Command) + ["CUP_B_AAV_USMC",300,150,150], // AAVP7/A1 + ["CUP_B_M60A3_TTS_USMC",400,350,200], // M60A3 TTS + ["CUP_B_M1A1_DES_USMC",500,500,200], // M1A1 Abrams (Desert) + ["CUP_B_M1A2_TUSK_MG_DES_USMC",600,550,225], // M1A2 Abrams TUSK (Desert) + ["CUP_B_M270_HE_USMC",600,1250,300], // M270 MLRS (HE) + ["CUP_B_M270_DPICM_USMC",800,1750,400] // M270 MLRS (DPICM) +]; + +air_vehicles = [ + ["CUP_B_UH1Y_MEV_USMC",200,0,100], // UH-1Y Venom (MEDVAC) + ["CUP_B_UH1Y_Gunship_Dynamic_USMC",200,100,100], // UH-1Y Venom (Gunship) + ["CUP_B_MH60S_FFV_USMC",250,25,200], // MH-60S Seahawk (FFV) + ["CUP_B_UH60S_USN",250,50,200], // MH-60S Seahawk (M3M) + ["CUP_B_C130J_USMC",200,0,250], // C-130J + ["CUP_B_C130J_Cargo_USMC",200,0,250], // C-130J (VIV) + ["USAF_C17",500,0,400], // C-17 Globemaster III + ["usaf_kc135",600,0,2500], // KC-135 Stratotanker + ["CUP_B_AH1Z_Dynamic_USMC",500,500,200], // AH-1Z + ["CUP_B_MH60L_DAP_2x_USN",450,400,250], // MH-60S Knighthawk (ESSS x2) + ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk + ["CUP_B_USMC_DYN_MQ9",500,500,200], // MQ-9 Reaper + ["CUP_B_AV8B_DYN_USMC",1000,800,400], // AV-8B Harrier II + ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II + ["USAF_F22",1800,2000,500], // F-22A Raptor + ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) + ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) + ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) + ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II + ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) + ["CUP_B_F35B_Stealth_USMC",2500,2000,750], // F-35B Lightning II (Stealth) + ["CUP_B_F35B_USMC",2500,2250,750], // F-35B Lightning II + ["CUP_B_MV22_USMC_RAMPGUN",750,100,500], // MV-22B Osprey (Ramp Gun) + ["CUP_B_MV22_USMC",750,0,500], // MV-22B Osprey + ["CUP_B_MV22_VIV_USMC",750,0,500] // MV-22B Osprey (VIV) +]; + +static_vehicles = [ + ["CUP_B_M2StaticMG_USMC",25,40,0], // M2 Machine Gun + ["CUP_B_M2StaticMG_MiniTripod_USMC",25,40,0], // M2 Minitripod + ["CUP_B_TOW_TriPod_USMC",50,100,0], // TOW Tripod + ["CUP_WV_B_CRAM",500,500,0], // C-RAM + ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS + ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS + ["B_Mortar_01_F",80,150,0], // Mk6 Mortar + ["CUP_B_M252_USMC",80,150,0], // M252 81mm Mortar + ["CUP_B_M119_USMC",100,200,0] // M119 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["Flag_US_F",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) + ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) + ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) + ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) + ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) + ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) + ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) + ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) + ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) + ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) + ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) + ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) + ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) + ["CUP_B_LCU1600_USMC",250,0,175], // LCU-1610 + ["CUP_B_TowingTractor_USMC",50,0,75], // Towing Tractor + ["CUP_B_MTVR_Repair_USA",425,0,75], // MTVR Repair + ["CUP_B_MTVR_Refuel_USA",125,0,375], // MTVR Refuel + ["CUP_B_MTVR_Ammo_USA",125,300,75], // MTVR Ammo + ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_USMC_Soldier_SL_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_LAT_FROG_DES", + "CUP_B_USMC_Soldier_GL_FROG_DES", + "CUP_B_USMC_Soldier_AR_FROG_DES", + "CUP_B_USMC_Soldier_AR_FROG_DES", + "CUP_B_USMC_Soldier_Marksman_FROG_DES", + "CUP_B_USMC_Medic_FROG_DES", + "CUP_B_USMC_Engineer_FROG_DES" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_USMC_Soldier_SL_FROG_DES", + "CUP_B_USMC_Soldier_LAT_FROG_DES", + "CUP_B_USMC_Soldier_LAT_FROG_DES", + "CUP_B_USMC_Soldier_GL_FROG_DES", + "CUP_B_USMC_Soldier_AR_FROG_DES", + "CUP_B_USMC_Soldier_AR_FROG_DES", + "CUP_B_USMC_Soldier_MG_FROG_DES", + "CUP_B_USMC_Soldier_Marksman_FROG_DES", + "CUP_B_USMC_Medic_FROG_DES", + "CUP_B_USMC_Engineer_FROG_DES" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_USMC_Soldier_SL_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_HAT_FROG_DES", + "CUP_B_USMC_Soldier_AT_FROG_DES", + "CUP_B_USMC_Soldier_AT_FROG_DES", + "CUP_B_USMC_Medic_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_USMC_Soldier_SL_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_AA_FROG_DES", + "CUP_B_USMC_Soldier_AA_FROG_DES", + "CUP_B_USMC_Soldier_AA_FROG_DES", + "CUP_B_USMC_Medic_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_FR_Soldier_TL_DES", + "CUP_B_FR_Soldier_Assault_DES", + "CUP_B_FR_Soldier_Assault_DES", + "CUP_B_FR_Soldier_AR_DES", + "CUP_B_FR_Soldier_Operator_DES", + "CUP_B_FR_Saboteur_DES", + "CUP_B_FR_Soldier_Marksman_DES", + "CUP_B_FR_Soldier_Marksman_DES", + "CUP_B_FR_Medic_DES", + "CUP_B_FR_Soldier_Exp_DES" +]; + +// Paratroopers squad (The units of this squad will automatically get parachutes on build) +blufor_squad_para = [ + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES", + "CUP_B_USMC_Soldier_FROG_DES" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_B_F35B_USMC", // F-35B Lightning II + "CUP_WV_B_CRAM", // C-RAM + "CUP_WV_B_SS_Launcher", // Mk-29 GMLS + "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS + "CUP_B_F35B_Stealth_USMC", // F-35B Lightning II (Stealth) + "CUP_B_AV8B_DYN_USMC", // AV-8B Harrier II + "USAF_A10", // A-10C Thunderbolt II + "USAF_F22", // F-22A Raptor + "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) + "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) + "USAF_F22_Heavy", // F-22A Raptor (Heavy) + "USAF_F35A_STEALTH", // F-35A Lightning II + "USAF_F35A", // F-35A Lightning II (Heavy) + "CUP_B_AH1Z_Dynamic_USMC", // AH-1Z + "CUP_B_MH60L_DAP_2x_USN", // MH-60S Knighthawk (ESSS x2) + "CUP_B_M1A1_DES_USMC", // M1A1 Abrams (Desert) + "CUP_B_M1A2_TUSK_MG_DES_USMC", // M1A2 Abrams TUSK (Desert) + "CUP_B_M270_HE_USMC", // M270 MLRS (HE) + "CUP_B_M270_DPICM_USMC", // M270 MLRS (DPICM) + "CUP_B_LAV25M240_desert_USMC", // LAV-25A1 (M240) (Desert) + "CUP_B_HMMWV_TOW_USA", // HMMWV TOW + "CUP_B_RG31_M2_USA", // RG-31 M2 + "CUP_B_RG31E_M2_USA", // RG-31 Mk5E M2 + "CUP_B_RG31_Mk19_USA", // RG-31 Mk.19 + "CUP_B_LAV25_desert_USMC" // LAV-25A1 (Desert) +]; diff --git a/Missionframework/presets/players/cup_usmc_woodland.sqf b/Missionframework/presets/players/cup_usmc_woodland.sqf new file mode 100644 index 000000000..b68a1343e --- /dev/null +++ b/Missionframework/presets/players/cup_usmc_woodland.sqf @@ -0,0 +1,375 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - USAF Main Pack + - USAF Fighters Pack + - USAF Utility Pack +*/ + +/* + --- Support classnames --- + Each of these should be unique. + The same classnames for different purposes may cause various unpredictable issues with player actions. + Or not, just don't try! +*/ +FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USMC"; // This is the mobile respawn (and medical) truck. +huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. +crewman_classname = "CUP_B_USMC_Crewman_FROG_WDL"; // This defines the crew for vehicles. +pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. +KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. +KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_truck_classname = "CUP_B_MTVR_USMC"; // These are the trucks which are used in the logistic convoy system. +KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. + +/* + --- Friendly classnames --- + Each array below represents one of the 7 pages within the build menu. + Format: ["vehicle_classname",supplies,ammunition,fuel], + Example: ["B_APC_Tracked_01_AA_F",300,150,150], + The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. + IMPORTANT: The last element inside each array must have no comma at the end! +*/ +infantry_units = [ + ["CUP_B_USMC_Soldier_FROG_WDL",20,0,0], // Rifleman + ["CUP_B_USMC_Soldier_LAT_FROG_WDL",30,0,0], // Rifleman (M136) + ["CUP_B_USMC_Soldier_GL_FROG_WDL",25,0,0], // Grenadier + ["CUP_B_USMC_Soldier_AR_FROG_WDL",25,0,0], // Automatic Rifleman + ["CUP_B_USMC_Soldier_MG_FROG_WDL",35,0,0], // Machinegunner + ["CUP_B_USMC_Soldier_Marksman_FROG_WDL",30,0,0], // Designated Marksman + ["CUP_B_USMC_Soldier_HAT_FROG_WDL",50,25,0], // AT Specialist (Javelin) + ["CUP_B_USMC_Soldier_AT_FROG_WDL",50,10,0], // AT Specialist (SMAW) + ["CUP_B_USMC_Soldier_AA_FROG_WDL",50,10,0], // AA Specialist (Stinger) + ["CUP_B_USMC_Soldier_Medic_FROG_WDL",30,0,0], // Corpsman + ["CUP_B_USMC_Soldier_Engineer_FROG_WDL",30,0,0], // Engineer + ["CUP_B_FR_Soldier_Exp_WDL",30,0,0], // Force Recon Demolitions Specialist + ["CUP_B_FR_Soldier_Assault",20,0,0], // Force Recon Assault Rifleman + ["CUP_B_FR_Soldier_Marksman_WDL",30,0,0], // Force Recon Marksman + ["CUP_B_FR_Soldier_TL",40,0,0], // Force Recon Team Leader + ["CUP_B_FR_Medic_WDL",30,0,0], // Force Recon Corpsman + ["CUP_B_USMC_Soldier_M40A3",70,5,0], // Sniper M40A3 + ["CUP_B_USMC_Soldier_M107",70,5,0], // Sniper M107 + ["CUP_B_USMC_Spotter",20,0,0], // Spotter + ["CUP_B_USMC_Crewman_FROG_WDL",10,0,0], // Crewman + ["CUP_B_USMC_Pilot",10,0,0] // Pilot +]; + +light_vehicles = [ + ["CUP_B_M1030_USMC",50,0,25], // M1030 + ["CUP_B_HMMWV_Unarmed_USMC",75,0,50], // HMMWV (Unarmed) + ["CUP_B_HMMWV_M1114_USMC",75,30,50], // HMMWV M240 + ["CUP_B_HMMWV_M2_USMC",75,60,50], // HMMWV M2 + ["CUP_B_HMMWV_TOW_USMC",75,100,50], // HMMWV TOW + ["CUP_B_HMMWV_MK19_USMC",75,80,50], // HMMWV MK19 + ["CUP_B_HMMWV_Avenger_USMC",100,125,125], // HMMWV Avenger + ["CUP_B_RG31_M2_OD_USMC",100,50,50], // RG-31 M2 + ["CUP_B_RG31E_M2_OD_USMC",100,50,50], // RG-31 Mk5E M2 + ["CUP_B_RG31_Mk19_OD_USMC",100,80,50], // RG-31 Mk.19 + ["CUP_B_MTVR_USMC",125,0,75], // MTVR + ["CUP_B_RHIB_USMC",150,100,100], // RHIB + ["CUP_B_RHIB2Turret_USMC",250,200,100] // RHIB (Mk19) +]; + +heavy_vehicles = [ + ["CUP_B_LAV25_green",200,175,125], // LAV-25A1 (Olive) + ["CUP_B_LAV25M240_green",200,200,125], // LAV-25A1 (M240) (Olive) + ["CUP_B_LAV25_HQ_green",200,50,125], // LAV-C2 (Olive) + ["CUP_B_AAV_Unarmed_USMC",300,0,150], // AAVC7/A1 (Command) + ["CUP_B_AAV_USMC",300,150,150], // AAVP7/A1 + ["CUP_B_M60A3_TTS_USMC",400,350,200], // M60A3 TTS + ["CUP_B_M1A1_Woodland_USMC",500,500,200], // M1A1 Abrams (Woodland) + ["CUP_B_M1A2_TUSK_MG_USMC",600,550,225], // M1A2 Abrams TUSK (Woodland) + ["CUP_B_M270_HE_USMC",600,1250,300], // M270 MLRS (HE) + ["CUP_B_M270_DPICM_USMC",800,1750,400] // M270 MLRS (DPICM) +]; + +air_vehicles = [ + ["CUP_B_UH1Y_MEV_USMC",200,0,100], // UH-1Y Venom (MEDVAC) + ["CUP_B_UH1Y_Gunship_Dynamic_USMC",200,100,100], // UH-1Y Venom (Gunship) + ["CUP_B_MH60S_FFV_USMC",250,25,200], // MH-60S Seahawk (FFV) + ["CUP_B_UH60S_USN",250,50,200], // MH-60S Seahawk (M3M) + ["USAF_C130J",200,0,250], // C-130J Super Hercules + ["USAF_C130J_Cargo",200,0,250], // C-130J Super Hercules (Cargo) + ["USAF_C17",500,0,400], // C-17 Globemaster III + ["usaf_kc135",600,0,2500], // KC-135 Stratotanker + ["CUP_B_AH1Z_Dynamic_USMC",500,500,200], // AH-1Z + ["CUP_B_MH60L_DAP_2x_USN",450,400,250], // MH-60S Knighthawk (ESSS x2) + ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk + ["CUP_B_USMC_DYN_MQ9",500,500,200], // MQ-9 Reaper + ["CUP_B_AV8B_DYN_USMC",1000,800,400], // AV-8B Harrier II + ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II + ["USAF_F22",1800,2000,500], // F-22A Raptor + ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) + ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) + ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) + ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II + ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) + ["CUP_B_F35B_Stealth_USMC",2500,2000,750], // F-35B Lightning II (Stealth) + ["CUP_B_F35B_USMC",2500,2250,750], // F-35B Lightning II + ["CUP_B_MV22_USMC_RAMPGUN",750,100,500], // MV-22B Osprey (Ramp Gun) + ["CUP_B_MV22_USMC",750,0,500], // MV-22B Osprey + ["CUP_B_MV22_VIV_USMC",750,0,500] // MV-22B Osprey (VIV) +]; + +static_vehicles = [ + ["CUP_B_M2StaticMG_USMC",25,40,0], // M2 Machine Gun + ["CUP_B_M2StaticMG_MiniTripod_USMC",25,40,0], // M2 Minitripod + ["CUP_B_TOW_TriPod_USMC",50,100,0], // TOW Tripod + ["CUP_WV_B_CRAM",500,500,0], // C-RAM + ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS + ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS + ["B_Mortar_01_F",80,150,0], // Mk6 Mortar + ["CUP_B_M252_USMC",80,150,0], // M252 81mm Mortar + ["CUP_B_M119_USMC",100,200,0] // M119 +]; + +buildings = [ + ["Land_Cargo_House_V1_F",0,0,0], + ["Land_Cargo_Patrol_V1_F",0,0,0], + ["Land_Cargo_Tower_V1_F",0,0,0], + ["Flag_NATO_F",0,0,0], + ["Flag_US_F",0,0,0], + ["Flag_White_F",0,0,0], + ["Land_Medevac_house_V1_F",0,0,0], + ["Land_Medevac_HQ_V1_F",0,0,0], + ["Flag_RedCrystal_F",0,0,0], + ["CamoNet_BLUFOR_F",0,0,0], + ["CamoNet_BLUFOR_open_F",0,0,0], + ["CamoNet_BLUFOR_big_F",0,0,0], + ["Land_PortableLight_single_F",0,0,0], + ["Land_PortableLight_double_F",0,0,0], + ["Land_LampSolar_F",0,0,0], + ["Land_LampHalogen_F",0,0,0], + ["Land_LampStreet_small_F",0,0,0], + ["Land_LampAirport_F",0,0,0], + ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! + ["PortableHelipadLight_01_blue_F",0,0,0], + ["PortableHelipadLight_01_green_F",0,0,0], + ["PortableHelipadLight_01_red_F",0,0,0], + ["Land_CampingChair_V1_F",0,0,0], + ["Land_CampingChair_V2_F",0,0,0], + ["Land_CampingTable_F",0,0,0], + ["MapBoard_altis_F",0,0,0], + ["MapBoard_stratis_F",0,0,0], + ["MapBoard_seismic_F",0,0,0], + ["Land_Pallet_MilBoxes_F",0,0,0], + ["Land_PaperBox_open_empty_F",0,0,0], + ["Land_PaperBox_open_full_F",0,0,0], + ["Land_PaperBox_closed_F",0,0,0], + ["Land_DieselGroundPowerUnit_01_F",0,0,0], + ["Land_ToolTrolley_02_F",0,0,0], + ["Land_WeldingTrolley_01_F",0,0,0], + ["Land_Workbench_01_F",0,0,0], + ["Land_GasTank_01_blue_F",0,0,0], + ["Land_GasTank_01_khaki_F",0,0,0], + ["Land_GasTank_01_yellow_F",0,0,0], + ["Land_GasTank_02_F",0,0,0], + ["Land_BarrelWater_F",0,0,0], + ["Land_BarrelWater_grey_F",0,0,0], + ["Land_WaterBarrel_F",0,0,0], + ["Land_WaterTank_F",0,0,0], + ["Land_BagFence_Round_F",0,0,0], + ["Land_BagFence_Short_F",0,0,0], + ["Land_BagFence_Long_F",0,0,0], + ["Land_BagFence_Corner_F",0,0,0], + ["Land_BagFence_End_F",0,0,0], + ["Land_BagBunker_Small_F",0,0,0], + ["Land_BagBunker_Large_F",0,0,0], + ["Land_BagBunker_Tower_F",0,0,0], + ["Land_HBarrier_1_F",0,0,0], + ["Land_HBarrier_3_F",0,0,0], + ["Land_HBarrier_5_F",0,0,0], + ["Land_HBarrier_Big_F",0,0,0], + ["Land_HBarrierWall4_F",0,0,0], + ["Land_HBarrierWall6_F",0,0,0], + ["Land_HBarrierWall_corner_F",0,0,0], + ["Land_HBarrierWall_corridor_F",0,0,0], + ["Land_HBarrierTower_F",0,0,0], + ["Land_CncBarrierMedium_F",0,0,0], + ["Land_CncBarrierMedium4_F",0,0,0], + ["Land_Concrete_SmallWall_4m_F",0,0,0], + ["Land_Concrete_SmallWall_8m_F",0,0,0], + ["Land_CncShelter_F",0,0,0], + ["Land_CncWall1_F",0,0,0], + ["Land_CncWall4_F",0,0,0], + ["Land_Sign_WarningMilitaryArea_F",0,0,0], + ["Land_Sign_WarningMilAreaSmall_F",0,0,0], + ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], + ["Land_Razorwire_F",0,0,0], + ["Land_ClutterCutter_large_F",0,0,0] +]; + +support_vehicles = [ + [Arsenal_typename,100,200,0], + [Respawn_truck_typename,200,0,100], + [FOB_box_typename,300,500,0], + [FOB_truck_typename,300,500,75], + [KPLIB_small_storage_building,0,0,0], + [KPLIB_large_storage_building,0,0,0], + [KPLIB_recycle_building,250,0,0], + [KPLIB_air_vehicle_building,1000,0,0], + [KPLIB_heli_slot_building,250,0,0], + [KPLIB_plane_slot_building,500,0,0], + ["ACE_medicalSupplyCrate_advanced",50,0,0], + ["ACE_Box_82mm_Mo_HE",50,40,0], + ["ACE_Box_82mm_Mo_Smoke",50,10,0], + ["ACE_Box_82mm_Mo_Illum",50,10,0], + ["ACE_Wheel",10,0,0], + ["ACE_Track",10,0,0], + ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) + ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) + ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) + ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) + ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) + ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) + ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) + ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) + ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) + ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) + ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) + ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) + ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) + ["CUP_B_LCU1600_USMC",250,0,175], // LCU-1610 + ["CUP_B_TowingTractor_USMC",50,0,75], // Towing Tractor + ["CUP_B_MTVR_Repair_USMC",425,0,75], // MTVR Repair + ["CUP_B_MTVR_Refuel_USMC",125,0,375], // MTVR Refuel + ["CUP_B_MTVR_Ammo_USMC",125,300,75], // MTVR Ammo + ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair + ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel + ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo +]; + +/* + --- Squads --- + Pre-made squads for the commander build menu. + These shouldn't exceed 10 members. +*/ + +// Light infantry squad. +blufor_squad_inf_light = [ + "CUP_B_USMC_Soldier_SL_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_LAT_FROG_WDL", + "CUP_B_USMC_Soldier_GL_FROG_WDL", + "CUP_B_USMC_Soldier_AR_FROG_WDL", + "CUP_B_USMC_Soldier_AR_FROG_WDL", + "CUP_B_USMC_Soldier_Marksman_FROG_WDL", + "CUP_B_USMC_Medic_FROG_WDL", + "CUP_B_USMC_Engineer_FROG_WDL" +]; + +// Heavy infantry squad. +blufor_squad_inf = [ + "CUP_B_USMC_Soldier_SL_FROG_WDL", + "CUP_B_USMC_Soldier_LAT_FROG_WDL", + "CUP_B_USMC_Soldier_LAT_FROG_WDL", + "CUP_B_USMC_Soldier_GL_FROG_WDL", + "CUP_B_USMC_Soldier_AR_FROG_WDL", + "CUP_B_USMC_Soldier_AR_FROG_WDL", + "CUP_B_USMC_Soldier_MG_FROG_WDL", + "CUP_B_USMC_Soldier_Marksman_FROG_WDL", + "CUP_B_USMC_Medic_FROG_WDL", + "CUP_B_USMC_Engineer_FROG_WDL" +]; + +// AT specialists squad. +blufor_squad_at = [ + "CUP_B_USMC_Soldier_SL_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_HAT_FROG_WDL", + "CUP_B_USMC_Soldier_AT_FROG_WDL", + "CUP_B_USMC_Soldier_AT_FROG_WDL", + "CUP_B_USMC_Medic_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL" +]; + +// AA specialists squad. +blufor_squad_aa = [ + "CUP_B_USMC_Soldier_SL_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_AA_FROG_WDL", + "CUP_B_USMC_Soldier_AA_FROG_WDL", + "CUP_B_USMC_Soldier_AA_FROG_WDL", + "CUP_B_USMC_Medic_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL" +]; + +// Force recon squad. +blufor_squad_recon = [ + "CUP_B_FR_Soldier_TL_WDL", + "CUP_B_FR_Soldier_Assault_WDL", + "CUP_B_FR_Soldier_Assault_WDL", + "CUP_B_FR_Soldier_AR_WDL", + "CUP_B_FR_Soldier_Operator_WDL", + "CUP_B_FR_Saboteur_WDL", + "CUP_B_FR_Soldier_Marksman_WDL", + "CUP_B_FR_Soldier_Marksman_WDL", + "CUP_B_FR_Medic_WDL", + "CUP_B_FR_Soldier_Exp_WDL" +]; + +// Paratroopers squad (The units of this squad will automatically get parachutes on build) +blufor_squad_para = [ + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL", + "CUP_B_USMC_Soldier_FROG_WDL" +]; + +/* + --- Elite vehicles --- + Classnames below have to be unlocked by capturing military bases. + Which base locks a vehicle is randomized on the first start of the campaign. +*/ +elite_vehicles = [ + "CUP_B_F35B_USMC", // F-35B Lightning II + "CUP_WV_B_CRAM", // C-RAM + "CUP_WV_B_SS_Launcher", // Mk-29 GMLS + "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS + "CUP_B_F35B_Stealth_USMC", // F-35B Lightning II (Stealth) + "CUP_B_AV8B_DYN_USMC", // AV-8B Harrier II + "USAF_A10", // A-10C Thunderbolt II + "USAF_F22", // F-22A Raptor + "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) + "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) + "USAF_F22_Heavy", // F-22A Raptor (Heavy) + "USAF_F35A_STEALTH", // F-35A Lightning II + "USAF_F35A", // F-35A Lightning II (Heavy) + "CUP_B_AH1Z_Dynamic_USMC", // AH-1Z + "CUP_B_MH60L_DAP_2x_USN", // MH-60S Knighthawk (ESSS x2) + "CUP_B_M1A1_Woodland_USMC", // M1A1 Abrams (Woodland) + "CUP_B_M1A2_TUSK_MG_USMC", // M1A2 Abrams TUSK (Woodland) + "CUP_B_M270_HE_USMC", // M270 MLRS (HE) + "CUP_B_M270_DPICM_USMC", // M270 MLRS (DPICM) + "CUP_B_LAV25M240_green", // LAV-25A1 (M240) (Olive) + "CUP_B_HMMWV_TOW_USMC", // HMMWV TOW + "CUP_B_RG31_M2_USMC", // RG-31 M2 + "CUP_B_RG31E_M2_USMC", // RG-31 Mk5E M2 + "CUP_B_RG31_Mk19_USMC", // RG-31 Mk.19 + "CUP_B_LAV25_green" // LAV-25A1 (Olive) +]; diff --git a/Missionframework/presets/resistance/cup_napa.sqf b/Missionframework/presets/resistance/cup_napa.sqf new file mode 100644 index 000000000..5fc884507 --- /dev/null +++ b/Missionframework/presets/resistance/cup_napa.sqf @@ -0,0 +1,214 @@ +/* + Needed Mods: + - CUP Weapons + - CUP Vehicles + - CUP Units + + Optional Mods: + - None +*/ + +/* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation +Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ +KPLIB_guerilla_units = [ + "CUP_I_GUE_Soldier_AR", + "CUP_I_GUE_Engineer", + "CUP_I_GUE_Commander", + "CUP_I_GUE_Medic", + "CUP_I_GUE_Soldier_AKS74", + "CUP_I_GUE_Soldier_LAT", + "CUP_I_GUE_Sniper", + "CUP_I_GUE_Officer" +]; + +// Armed vehicles +KPLIB_guerilla_vehicles = [ + "CUP_I_Datsun_PK_Random", + "CUP_I_Datsun_PK_Random", + "CUP_I_Datsun_PK_Random", + "CUP_I_BMP2_NAPA", + "CUP_I_BRDM2_NAPA", + "CUP_I_BRDM2_NAPA", + "CUP_I_MTLB_pk_NAPA", + "CUP_I_MTLB_pk_NAPA", + "CUP_I_T34_NAPA", + "CUP_I_T34_NAPA", + "CUP_I_T55_NAPA", + "CUP_I_T72_NAPA" +]; + +/* Guerilla Equipment +There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ + +/* Weapons - You've to add the weapons as array like +["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] +You can leave optic and tripod empty with "" */ +KPLIB_guerilla_weapons_1 = [ + ["CUP_srifle_CZ550","CUP_5x_22_LR_17_HMR_M",10,"",""], + ["CUP_srifle_CZ550_rail","CUP_5x_22_LR_17_HMR_M",10,"optic_mrco",""], + ["CUP_srifle_LeeEnfield","CUP_10x_303_M",10,"",""], + ["CUP_srifle_LeeEnfield_rail","CUP_10x_303_M",10,"cup_optic_sb_11_4x20_pm","cup_bipod_harris_1a2_I"], + ["CUP_glaunch_M79","CUP_1Rnd_HEDP_M203",16,"",""], + ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""] +]; + +KPLIB_guerilla_weapons_2 = [ + ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], + ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], + ["CUP_arifle_AKM","CUP_30Rnd_762x39_AK47_M",4,"cup_optic_pso_1_ak_open",""], + ["CUP_arifle_AK47_GL_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], + ["CUP_arifle_RPK74","CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M",3,"optic_ACO_grn","bipod_01_F_blk"], + ["CUP_smg_SA61","CUP_50Rnd_B_765x17_Ball_M",5,"",""] +]; + +KPLIB_guerilla_weapons_3 = [ + ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], + ["CUP_arifle_AK74M","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], + ["CUP_arifle_AK74M_GL","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], + ["CUP_arifle_RPK74M_railed","CUP_60Rnd_545x39_AK74M_M",3,"cup_optic_zddot",""], + ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], + ["CUP_lmg_Pecheneg","CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M",2,"optic_MRCO",""], + ["CUP_srifle_SVD","CUP_10Rnd_762x54_SVD_M",12,"cup_optic_pso_3_open",""], + ["CUP_srifle_SVD_wdl","CUP_10Rnd_762x54_SVD_M",12,"cup_optic_pso_3_open",""] +]; + +// Uniforms +KPLIB_guerilla_uniforms_1 = [ + "CUP_U_I_Villager_03", + "CUP_U_I_Woodlander03", + "CUP_U_I_Woodlander_02", + "CUP_U_I_Worker_02", + "CUP_U_I_Villager_04", + "CUP_U_I_Woodlander_01", + "CUP_U_C_Woodlander_04", + "CUP_U_C_Citizen_04", + "CUP_U_C_Citizen_01" + +]; + +KPLIB_guerilla_uniforms_2 = [ + "CUP_I_B_PMC_Unit_20", + "CUP_I_B_PMC_Unit_19", + "CUP_I_B_PMC_Unit_11", + "CUP_I_B_PMC_Unit_10", + "CUP_I_B_PMC_Unit_9", + "CUP_I_B_PMC_Unit_12", + "CUP_I_B_PMC_Unit_16", + "CUP_I_B_PMC_Unit_22" +]; + +KPLIB_guerilla_uniforms_3 = [ + "CUP_U_I_GUE_Flecktarn2", + "CUP_U_I_GUE_Flecktarn3", + "CUP_U_I_GUE_Flecktarn", + "CUP_U_I_Gillie_Top", + "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_I_C_Soldier_Camo_F" +]; + +// Vests +KPLIB_guerilla_vests_1 = [ + "CUP_V_I_Guerilla_Jacket", + "V_LegStrapBag_coyote_F", + "V_LegStrapBag_olive_F", + "V_LegStrapBag_black_F", + "V_Pocketed_coyote_F", + "V_Pocketed_olive_F", + "V_Pocketed_black_F", + "V_BandollierB_cbr", + "V_BandollierB_rgr", + "V_BandollierB_khk", + "V_BandollierB_oli", + "V_BandollierB_blk", + "V_BandollierB_ghex_F" +]; + +KPLIB_guerilla_vests_2 = [ + "V_TacVestIR_blk", + "V_Chestrig_rgr", + "V_Chestrig_khk", + "V_Chestrig_oli", + "V_Chestrig_blk", + "V_HarnessO_brn", + "V_HarnessO_gry", + "V_HarnessO_ghex_F", + "V_HarnessOGL_brn", + "V_HarnessOGL_gry", + "V_HarnessOGL_ghex_F" +]; + +KPLIB_guerilla_vests_3 = [ + "V_TacVest_oli", + "CUP_V_RUS_Smersh_2", + "CUP_V_I_Carrier_Belt", + "CUP_V_B_PASGT_OD", + "CUP_V_B_GER_Carrier_Rig", + "CUP_V_B_GER_Carrier_Vest_2", + "V_TacChestrig_oli_F" +]; + +// Headgear +KPLIB_guerilla_headgear_1 = [ + "", + "", + "", + "", + "CUP_H_C_Ushanka_02", + "CUP_H_C_Ushanka_03", + "CUP_H_C_Ushanka_04", + "CUP_H_C_Ushanka_01", + "CUP_H_C_Beret_03", + "CUP_H_C_Beret_02", + "CUP_H_C_Beret_01", + "CUP_H_C_Beret_04", + "CUP_H_C_Beanie_01", + "CUP_H_C_Beanie_02", + "CUP_H_C_Beanie_03", + "CUP_H_C_Beanie_04" +]; + +KPLIB_guerilla_headgear_2 = [ + "H_Bandanna_blu", + "H_Bandanna_sand", + "H_Bandanna_gry", + "H_Bandanna_camo", + "H_Bandanna_cbr", + "H_Bandanna_sgg", + "H_Bandanna_khk", + "CUP_H_C_Ushanka_02", + "CUP_H_C_Ushanka_03", + "CUP_H_C_Ushanka_04", + "CUP_H_C_Ushanka_01", + "H_PASGT_basic_black_F", + "H_PASGT_basic_olive_F", + "H_Cap_blk_Raven", + "H_MilCap_dgtl" +]; + +KPLIB_guerilla_headgear_3 = [ + "H_Shemag_olive", + "H_Shemag_olive_hs", + "H_Shemag_olive", + "H_Booniehat_khk", + "H_Booniehat_oli", + "CUP_H_Ger_Boonie_Flecktarn", + "H_PASGT_basic_olive_F", + "CUP_H_GER_LWH_Flecktarn" +]; + +// Facegear. Applies for tier 2 and 3. +KPLIB_guerilla_facegear = [ + "", + "", + "", + "G_Bandanna_shades", + "G_Bandanna_beast", + "G_Bandanna_tan", + "G_Bandanna_khk", + "G_Bandanna_oli", + "G_Bandanna_aviator", + "G_Bandanna_blk" +]; diff --git a/Missionframework/presets/resistance/racs.sqf b/Missionframework/presets/resistance/racs.sqf new file mode 100644 index 000000000..193825807 --- /dev/null +++ b/Missionframework/presets/resistance/racs.sqf @@ -0,0 +1,201 @@ +/* + Needed Mods: + - Project OPFOR + + Optional Mods: + - None +*/ + +/* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation +Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ +KPLIB_guerilla_units = [ + "LOP_RACS_Infantry_MG", + "LOP_RACS_Infantry_Engineer", + "LOP_RACS_Infantry_TL", + "LOP_RACS_Infantry_Corpsman", + "LOP_RACS_Infantry_Rifleman", + "LOP_RACS_Infantry_AT", + "LOP_RACS_Infantry_Marksman", + "LOP_RACS_Infantry_SL" +]; + +// Armed vehicles +KPLIB_guerilla_vehicles = [ + "LOP_RACS_Landrover_M2", + "LOP_RACS_Offroad_M2" +]; + +/* Guerilla Equipment +There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ + +/* Weapons - You've to add the weapons as array like +["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] +You can leave optic and tripod empty with "" */ +KPLIB_guerilla_weapons_1 = [ + ["rhs_weap_Izh","rhsgref_1Rnd_00Buck",20,"",""], + ["rhs_weap_m38","rhsgref_5rnd_762x54_m38",6,"",""], + ["rhs_weap_m38_rail","rhsgref_5rnd_762x54_m38",6,"",""], + ["rhs_weap_kar98k","rhsgref_5rnd_792x57_kar98k",6,"",""], + ["rhs_weap_mosin_sbr","rhsgref_5rnd_762x54_m38",6,"",""], + ["rhs_weap_makarov_pm","rhs_mag_9x18_8_57N181S",5,"",""] +]; + +KPLIB_guerilla_weapons_2 = [ + ["rhs_weap_ak74","rhs_30rnd_545x39_AK",3,"",""], + ["rhs_weap_akm","rhs_30rnd_762x39mm",3,"",""], + ["rhs_weap_akms","rhs_30rnd_762x39mm",3,"",""], + ["rhs_weap_aks74u","rhs_30rnd_545x39_AK",3,"",""], + ["rhs_weap_pp2000","rhs_mag_9x19mm_7n21_20",4,"",""], + ["rhs_weap_svds","rhs_10rnd_762x54mmR_7N1",3,"rhs_acc_pso1m2",""] +]; + +KPLIB_guerilla_weapons_3 = [ + ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"rhs_acc_pkas",""], + ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"rhs_acc_ekp8_02",""], + ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_pkas",""], + ["rhs_weap_asval_grip","rhs_20rnd_9x39mm_SP5",5,"rhs_acc_pkas",""], + ["rhs_weap_pkm","rhs_100Rnd_762x54mmR",2,"",""], + ["rhs_weap_pkp","rhs_100Rnd_762x54mmR",2,"rhs_acc_pkas",""], + ["rhs_weap_svdp","rhs_10rnd_762x54mmR_7N1",5,"rhs_acc_pso1m21",""], + ["rhs_weap_aks74un","rhs_30rnd_545x39_AK",4,"rhs_acc_ekp8_02",""] +]; + +// Uniforms +KPLIB_guerilla_uniforms_1 = [ + "LOP_U_RACS_Fatigue_01", + "LOP_U_RACS_Fatigue_01_slv" +]; + +KPLIB_guerilla_uniforms_2 = [ + "LOP_U_RACS_Fatigue_01", + "LOP_U_RACS_Fatigue_01_slv" +]; + +KPLIB_guerilla_uniforms_3 = [ + "LOP_U_RACS_Fatigue_01", + "LOP_U_RACS_Fatigue_01_slv" +]; + +// Vests +KPLIB_guerilla_vests_1 = [ + "V_LegStrapBag_coyote_F", + "V_LegStrapBag_olive_F", + "V_LegStrapBag_black_F", + "V_Pocketed_coyote_F", + "V_Pocketed_olive_F", + "V_Pocketed_black_F", + "V_BandollierB_cbr", + "V_BandollierB_rgr", + "V_BandollierB_khk", + "V_BandollierB_oli", + "V_BandollierB_blk", + "V_BandollierB_ghex_F", + "rhs_vest_commander", + "rhs_vest_pistol_holder", + "V_Rangemaster_belt", + "rhs_6sh46" +]; + +KPLIB_guerilla_vests_2 = [ + "V_Chestrig_rgr", + "V_Chestrig_khk", + "V_Chestrig_oli", + "V_Chestrig_blk", + "V_HarnessO_brn", + "V_HarnessO_gry", + "V_HarnessO_ghex_F", + "V_HarnessOGL_brn", + "V_HarnessOGL_gry", + "V_HarnessOGL_ghex_F", + "rhsgref_alice_webbing", + "V_TacChestrig_grn_F", + "V_TacChestrig_cbr_F", + "V_TacChestrig_oli_F" +]; + +KPLIB_guerilla_vests_3 = [ + "V_TacVest_brn", + "V_TacVest_khk", + "V_TacVest_oli", + "V_TacVest_blk", + "V_I_G_resistanceLeader_F", + "V_TacVest_camo", + "rhs_vydra_3m", + "rhsgref_6b23_khaki_medic", + "rhsgref_6b23_khaki_nco", + "rhsgref_6b23_khaki_officer", + "rhsgref_6b23_khaki_rifleman", + "rhsgref_6b23_khaki_sniper", + "rhsgref_6b23_khaki" +]; + +// Headgear +KPLIB_guerilla_headgear_1 = [ + "", + "", + "", + "", + "", + "LOP_H_6B27M_RACS", + "LOP_H_6B27M_ess_RACS" + +]; + +KPLIB_guerilla_headgear_2 = [ + "H_Bandanna_blu", + "H_Bandanna_sand", + "H_Bandanna_gry", + "H_Bandanna_camo", + "H_Bandanna_cbr", + "H_Bandanna_sgg", + "H_Bandanna_khk", + "rhsgref_fieldcap_ttsko_digi", + "rhsgref_fieldcap_ttsko_forest", + "rhsgref_fieldcap_ttsko_mountain", + "rhsgref_fieldcap_ttsko_urban", + "", + "", + "", + "", + "LOP_H_6B27M_RACS", + "LOP_H_6B27M_ess_RACS" +]; + +KPLIB_guerilla_headgear_3 = [ + "H_ShemagOpen_khk", + "H_ShemagOpen_tan", + "H_Shemag_olive", + "H_Booniehat_khk", + "H_Booniehat_oli", + "rhsgref_M56", + "H_Watchcap_blk", + "rhs_ssh68", + "rhsgref_ssh68_emr", + "rhs_tsh4", + "H_Beret_blk", + "H_Watchcap_camo", + "H_Watchcap_khk", + "", + "", + "", + "", + "LOP_H_6B27M_RACS", + "LOP_H_6B27M_ess_RACS" +]; + +// Facegear. Applies for tier 2 and 3. +KPLIB_guerilla_facegear = [ + "", + "", + "", + "G_Bandanna_shades", + "G_Bandanna_beast", + "G_Bandanna_tan", + "G_Bandanna_khk", + "G_Bandanna_oli", + "G_Bandanna_aviator", + "G_Bandanna_blk", + "rhs_balaclava", + "rhs_balaclava1_olive", + "rhs_scarf" +]; From de8a5f1fa7e86b6461b39402b05cccf3eec9d86a Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:26:24 +0200 Subject: [PATCH 012/115] Delete CUP_AFRF_MSV.sqf --- .../presets/enemies/CUP_AFRF_MSV.sqf | 189 ------------------ 1 file changed, 189 deletions(-) delete mode 100644 Missionframework/presets/enemies/CUP_AFRF_MSV.sqf diff --git a/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf b/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf deleted file mode 100644 index 66bdb2ec6..000000000 --- a/Missionframework/presets/enemies/CUP_AFRF_MSV.sqf +++ /dev/null @@ -1,189 +0,0 @@ -/* - File: cup_afrf_msv.sqf - Author: Eogos - https://github.com/Eogos - Date: 2019-07-20 - Last Update: 2020-05-15 - License: MIT License - http://www.opensource.org/licenses/MIT - - Description: - CUP AFRF MSV enemy preset. - - Needed Mods: - - CUP Units - - CUP Vehicles - - CUP Weapons - - Optional Mods: - - None -*/ - -// Enemy infantry classes -KPLIB_o_officer = "CUP_O_RU_Officer_EMR"; // Officer -KPLIB_o_squadLeader = "CUP_O_RU_Soldier_SL_EMR"; // Squad Leader -KPLIB_o_teamLeader = "CUP_O_RU_Soldier_TL_EMR"; // Team Leader -KPLIB_o_sentry = "CUP_O_RU_Soldier_Saiga_EMR"; // Rifleman (Lite) -KPLIB_o_rifleman = "CUP_O_RU_Soldier_EMR"; // Rifleman -KPLIB_o_riflemanLAT = "CUP_O_RU_Soldier_AT_EMR"; // Rifleman (LAT) -KPLIB_o_grenadier = "CUP_O_RU_Soldier_GL_EMR"; // Grenadier -KPLIB_o_machinegunner = "CUP_O_RU_Soldier_AR_EMR"; // Autorifleman -KPLIB_o_heavyGunner = "CUP_O_RU_Soldier_MG_EMR"; // Heavy Gunner -KPLIB_o_marksman = "CUP_O_RU_Soldier_Marksman_EMR"; // Marksman -KPLIB_o_sharpshooter = "CUP_O_RU_Sniper_EMR"; // Sharpshooter -KPLIB_o_sniper = "CUP_O_RU_Sniper_KSVK_EMR"; // Sniper -KPLIB_o_atSpecialist = "CUP_O_RU_Soldier_HAT_EMR"; // AT Specialist -KPLIB_o_aaSpecialist = "CUP_O_RU_Soldier_AA_EMR"; // AA Specialist -KPLIB_o_medic = "CUP_O_RU_Medic_EMR"; // Medic -KPLIB_o_engineer = "CUP_O_RU_Engineer_EMR"; // Engineer -KPLIB_o_paratrooper = "CUP_O_RU_Soldier_LAT_EMR"; // Paratrooper - -// Enemy vehicles used by secondary objectives. -KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_RU"; // UAZ -KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_RU"; // UAZ (DShKM) -KPLIB_o_transportHeli = "CUP_O_Mi8_RU"; // Mi-8MTV3 -KPLIB_o_transportTruck = "CUP_O_Kamaz_RU"; // Kamaz 5350 -KPLIB_o_transportTruckAmmo = "CUP_O_Kamaz_Open_RU"; // Kamaz 5350 (Open) -> Has to be able to transport resource crates! -KPLIB_o_fuelTruck = "CUP_O_Kamaz_Refuel_RU"; // Kamaz 5350 (Fuel) -KPLIB_o_ammoTruck = "CUP_O_Kamaz_Reammo_RU"; // Kamaz 5350 (Ammo) -KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -KPLIB_o_flag = "FlagCarrierRU"; // Flag - -/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. -Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ - -/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. -Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -KPLIB_o_militiaInfantry = [ - "CUP_O_RU_Soldier_Saiga", // Rifleman (Saiga) - "CUP_O_RU_Soldier_Saiga", // Rifleman (Saiga) - "CUP_O_RU_Soldier", // Rifleman - "CUP_O_RU_Soldier", // Rifleman - "CUP_O_RU_Soldier_AT", // Rifleman (RPG-7) - "CUP_O_RU_Soldier_AR", // Automatic Rifleman - "CUP_O_RU_Soldier_Marksman", // Marksman (SVD) - "CUP_O_RU_Medic", // Medic - "CUP_O_RU_Engineer" // Engineer -]; - -// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -KPLIB_o_militiaVehicles = [ - "CUP_O_UAZ_MG_RU" // UAZ (DShKM) -]; - -// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -KPLIB_o_armyVehicles = [ - "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) - "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) - "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) - "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) - "CUP_O_BTR80_CAMO_RU", // BTR-80 (Camo) - "CUP_O_BTR80_GREEN_RU", // BTR-80 (Green) - "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Camo) - "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Green) - "CUP_O_BTR90_RU", // BTR-90 - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_BMP3_RU", // BMP-3 - "CUP_O_2S6_RU", // 2S6 Tunguska - "CUP_O_2S6_RU", // 2S6 Tunguska - "CUP_O_T72_RU", // T-72 - "CUP_O_T72_RU", // T-72 - "CUP_O_T72_RU", // T-72 - "CUP_O_T90_RU", // T-90A - "CUP_O_T90_RU", // T-90A - "CUP_O_T90_RU" // T-90A -]; - -// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -KPLIB_o_armyVehiclesLight = [ - "CUP_O_UAZ_MG_RU", // UAZ (DShKM) - "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) - "CUP_O_MTLB_pk_WDL_RU", // MT-LB LV (Camo) - "CUP_O_BRDM2_RU", // BRDM-2 - "CUP_O_Ural_ZU23_RU", // Ural (ZU-23) - "CUP_O_BTR60_RU", // BTR-60PB (Camo) - "CUP_O_BTR60_RU", // BTR-60PB (Camo) - "CUP_O_BMP2_RU" // BMP-2 -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehicles = [ - "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) - "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) - "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) - "CUP_O_GAZ_Vodnik_BPPU_RU", // GAZ Vodnik (BPPU) - "CUP_O_BTR80_CAMO_RU", // BTR-80 (Camo) - "CUP_O_BTR80_GREEN_RU", // BTR-80 (Green) - "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Camo) - "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Green) - "CUP_O_BTR90_RU", // BTR-90 - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_BMP3_RU", // BMP-3 - "CUP_O_2S6_RU", // 2S6 Tunguska - "CUP_O_2S6_RU", // 2S6 Tunguska - "CUP_O_T72_RU", // T-72 - "CUP_O_T72_RU", // T-72 - "CUP_O_T72_RU", // T-72 - "CUP_O_T90_RU", // T-90A - "CUP_O_T90_RU", // T-90A - "CUP_O_T90_RU", // T-90A - "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V - "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P - "CUP_O_Mi8_RU", // Mi-8MTV3 - "CUP_O_Ka52_RU", // Ka-52 - "CUP_O_Ka50_DL_RU" // Ka-50 Black Shark -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehiclesLight = [ - "CUP_O_UAZ_MG_RU", // UAZ (DShKM) - "CUP_O_UAZ_AGS30_RU", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_RU", // UAZ (SPG-9) - "CUP_O_MTLB_pk_WDL_RU", // MT-LB LV (Camo) - "CUP_O_BRDM2_RU", // BRDM-2 - "CUP_O_Ural_ZU23_RU", // Ural (ZU-23) - "CUP_O_BTR60_RU", // BTR-60PB (Camo) - "CUP_O_BTR60_RU", // BTR-60PB (Camo) - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) - "CUP_O_Mi8_RU" // Mi-8MTV3 -]; - -/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. -If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -KPLIB_o_troopTransports = [ - "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) - "CUP_O_Mi8_RU", // Mi-8MTV3 - "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V - "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P - "CUP_O_BMP2_RU", // BMP-2 - "CUP_O_BTR60_RU", // BTR-60PB (Camo) - "CUP_O_BTR80_CAMO_RU", // BTR-80 (Camo) - "CUP_O_BTR80_GREEN_RU", // BTR-80 (Green) - "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Camo) - "CUP_O_BTR80A_CAMO_RU", // BTR-80A (Green) - "CUP_O_BTR90_RU", // BTR-90 - "CUP_O_GAZ_Vodnik_PK_RU", // GAZ Vodnik (2x PKM) - "CUP_O_GAZ_Vodnik_AGS_RU", // GAZ Vodnik (AGS-30/PKM) - "CUP_O_MTLB_pk_WDL_RU" // MT-LB LV (Camo) -]; - -// Enemy rotary-wings that will need to spawn in flight. -KPLIB_o_helicopters = [ - "CUP_O_Mi24_V_Dynamic_RU", // Mi-24V - "CUP_O_Mi24_P_Dynamic_RU", // Mi-24P - "CUP_O_Mi8_RU", // Mi-8MTV3 - "CUP_O_Ka60_Grey_RU", // Ka-60 Kasatka Grey (Rockets) - "CUP_O_Ka52_RU", // Ka-52 - "CUP_O_Ka50_DL_RU" // Ka-50 Black Shark -]; - -// Enemy fixed-wings that will need to spawn in the air. -KPLIB_o_planes = [ - "CUP_O_Su25_Dyn_RU", // Su-25T Frogfoot - "CUP_O_SU34_RU" // Su-34 -]; From 2e28bc20b8e385b0101fcb5ba5c8022a90de1405 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:27:13 +0200 Subject: [PATCH 013/115] Delete CUP_BAF_Desert.sqf --- .../presets/enemies/CUP_BAF_Desert.sqf | 178 ------------------ 1 file changed, 178 deletions(-) delete mode 100644 Missionframework/presets/enemies/CUP_BAF_Desert.sqf diff --git a/Missionframework/presets/enemies/CUP_BAF_Desert.sqf b/Missionframework/presets/enemies/CUP_BAF_Desert.sqf deleted file mode 100644 index 4d3608985..000000000 --- a/Missionframework/presets/enemies/CUP_BAF_Desert.sqf +++ /dev/null @@ -1,178 +0,0 @@ -/* - File: cup_bad_desert.sqf - Author: Eogos - https://github.com/Eogos - Date: 2020-04-16 - Last Update: 2020-05-15 - License: MIT License - http://www.opensource.org/licenses/MIT - - Description: - CUP BAF Desert enemy preset. - - Needed Mods: - - CUP Units - - CUP Vehicles - - CUP Weapons - - Optional Mods: - - None -*/ - -// Enemy infantry classes -KPLIB_o_officer = "CUP_B_BAF_Soldier_Officer_DDPM"; // Officer -KPLIB_o_squadLeader = "CUP_B_BAF_Soldier_SquadLeader_DDPM"; // Squad Leader -KPLIB_o_teamLeader = "CUP_B_BAF_Soldier_TeamLeader_DDPM"; // Team Leader -KPLIB_o_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DDPM"; // Rifleman (Lite) -KPLIB_o_rifleman = "CUP_B_BAF_Soldier_Rifleman_DDPM"; // Rifleman -KPLIB_o_riflemanLAT = "CUP_B_BAF_Soldier_RiflemanLAT_DDPM"; // Rifleman (LAT) -KPLIB_o_grenadier = "CUP_B_BAF_Soldier_Grenadier_DDPM"; // Grenadier -KPLIB_o_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DDPM"; // Autorifleman -KPLIB_o_heavyGunner = "CUP_B_BAF_Soldier_HeavyGunner_DDPM"; // Heavy Gunner -KPLIB_o_marksman = "CUP_B_BAF_Soldier_Marksman_DDPM"; // Marksman -KPLIB_o_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DDPM"; // Sharpshooter -KPLIB_o_sniper = "CUP_B_BAF_Sniper_AS50_DDPM"; // Sniper -KPLIB_o_atSpecialist = "CUP_B_BAF_Soldier_AT_DDPM"; // AT Specialist -KPLIB_o_aaSpecialist = "CUP_B_BAF_Soldier_AA_DDPM"; // AA Specialist -KPLIB_o_medic = "CUP_B_BAF_Soldier_Medic_DDPM"; // Medic -KPLIB_o_engineer = "CUP_B_BAF_Soldier_Engineer_DDPM"; // Engineer -KPLIB_o_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DDPM"; // Paratrooper - -// Enemy vehicles used by secondary objectives. -KPLIB_o_mrap = "CUP_B_Ridgeback_LMG_GB_D"; // Ridgeback PPV LMG Woodland -KPLIB_o_mrapArmed = "CUP_B_Ridgeback_HMG_GB_D"; // Ridgeback PPV HMG Woodland -KPLIB_o_transportHeli = "CUP_B_CH47F_GB"; // Chinook HC-4 -KPLIB_o_transportTruck = "CUP_B_MTVR_BAF_DES"; // MTVR -KPLIB_o_transportTruckAmmo = "CUP_B_MTVR_BAF_DES"; // MTVR -> Has to be able to transport resource crates! -KPLIB_o_fuelTruck = "CUP_B_MTVR_Refuel_BAF_DES"; // MTVR (Refuel) -KPLIB_o_ammoTruck = "CUP_B_MTVR_Ammo_BAF_DES"; // MTVR (Ammo) -KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -KPLIB_o_flag = "Flag_UK_F"; // Flag - -/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. -Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ - -/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. -Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -KPLIB_o_militiaInfantry = [ - "CUP_B_BAF_Soldier_TeamLeader_MTP", // Team Leader - "CUP_B_BAF_Soldier_Medic_MTP", // Combat Life Saver - "CUP_B_BAF_Soldier_RiflemanLAT_MTP", // Rifleman (Light AT) - "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) - "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) - "CUP_B_BAF_Soldier_RiflemanLite_MTP" // Rifleman (Light) -]; - -// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -KPLIB_o_militiaVehicles = [ - "CUP_B_LR_MG_GB_D" // Land Rover 110 (M2) Woodland -]; - -// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -KPLIB_o_armyVehicles = [ - "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland - "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) - "CUP_B_BAF_Coyote_GMG_D", // Coyote GMG (Woodland) - "CUP_B_Wolfhound_LMG_GB_D", // Wolfhound TSV LMG Woodland - "CUP_B_Wolfhound_HMG_GB_D", // Wolfhound TSV HMG Woodland - "CUP_B_Wolfhound_GMG_GB_D", // Wolfhound TSV GMG Woodland - "CUP_B_Mastiff_LMG_GB_D", // Mastiff PPV LMG Woodland - "CUP_B_Mastiff_HMG_GB_D", // Mastiff PPV HMG Woodland - "CUP_B_Mastiff_GMG_GB_D", // Mastiff PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_MCV80_GB_D", // MCV-80 Warrior (Woodland) - "CUP_B_MCV80_GB_D_SLAT", // MCV-80 Warrior (SLAT - Woodland) - "CUP_B_FV510_GB_D", // FV510 Warrior (Woodland) - "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT - Woodland) - "CUP_B_Challenger2_2CD_BAF", // FV4034 Challenger 2 (Two Color Woodland) - "CUP_B_Challenger2_Desert_BAF" // FV4034 Challenger 2 (Woodland) -]; - -// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -KPLIB_o_armyVehiclesLight = [ - "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland - "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland - "CUP_B_Jackal2_GMG_GB_D", // Jackal 2 GMG Woodland - "CUP_B_Ridgeback_LMG_GB_D", // Ridgeback PPV LMG Woodland - "CUP_B_Ridgeback_HMG_GB_D", // Ridgeback PPV HMG Woodland - "CUP_B_Ridgeback_GMG_GB_D", // Ridgeback PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_D", // FV432 Bulldog L7A2 [Woodland] - "CUP_B_FV432_Bulldog_GB_D" // FV432 Bulldog L7A2 [Woodland] -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehicles = [ - "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland - "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) - "CUP_B_BAF_Coyote_GMG_D", // Coyote GMG (Woodland) - "CUP_B_Wolfhound_LMG_GB_D", // Wolfhound TSV LMG Woodland - "CUP_B_Wolfhound_HMG_GB_D", // Wolfhound TSV HMG Woodland - "CUP_B_Wolfhound_GMG_GB_D", // Wolfhound TSV GMG Woodland - "CUP_B_Mastiff_LMG_GB_D", // Mastiff PPV LMG Woodland - "CUP_B_Mastiff_HMG_GB_D", // Mastiff PPV HMG Woodland - "CUP_B_Mastiff_GMG_GB_D", // Mastiff PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_MCV80_GB_D", // MCV-80 Warrior (Woodland) - "CUP_B_MCV80_GB_D_SLAT", // MCV-80 Warrior (SLAT - Woodland) - "CUP_B_FV510_GB_D", // FV510 Warrior (Woodland) - "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT - Woodland) - "CUP_B_Challenger2_2CD_BAF", // FV4034 Challenger 2 (Two Color Woodland) - "CUP_B_Challenger2_Desert_BAF", // FV4034 Challenger 2 (Woodland) - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehiclesLight = [ - "CUP_B_LR_Special_M2_GB_D", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_D", // Land Rover 110 (GMG Special) Woodland - "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland - "CUP_B_Jackal2_GMG_GB_D", // Jackal 2 GMG Woodland - "CUP_B_Ridgeback_LMG_GB_D", // Ridgeback PPV LMG Woodland - "CUP_B_Ridgeback_HMG_GB_D", // Ridgeback PPV HMG Woodland - "CUP_B_Ridgeback_GMG_GB_D", // Ridgeback PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_D", // FV432 Bulldog L7A2 [Woodland] - "CUP_B_FV432_Bulldog_GB_D", // FV432 Bulldog L7A2 [Woodland] - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. -If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -KPLIB_o_troopTransports = [ - "CUP_B_BAF_Coyote_L2A1_D", // Coyote L2A1 (Woodland) - "CUP_B_BAF_Coyote_GMG_D", // Coyote GMG (Woodland) - "CUP_B_Mastiff_LMG_GB_D", // Mastiff PPV LMG Woodland - "CUP_B_Mastiff_HMG_GB_D", // Mastiff PPV HMG Woodland - "CUP_B_Mastiff_GMG_GB_D", // Mastiff PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_D_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_Jackal2_L2A1_GB_D", // Jackal 2 L2A1 Woodland - "CUP_B_Jackal2_GMG_GB_D", // Jackal 2 GMG Woodland - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -// Enemy rotary-wings that will need to spawn in flight. -KPLIB_o_helicopters = [ - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -// Enemy fixed-wings that will need to spawn in the air. -KPLIB_o_planes = [ - "CUP_B_F35B_BAF", // F-35B Lightning II - "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) - "CUP_B_GR9_DYN_GB" // Harrier GR.9 -]; From 253d3fb5257158a40c71e74502e45f8522ff7b44 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:27:20 +0200 Subject: [PATCH 014/115] Delete CUP_BAF_Woodland.sqf --- .../presets/enemies/CUP_BAF_Woodland.sqf | 178 ------------------ 1 file changed, 178 deletions(-) delete mode 100644 Missionframework/presets/enemies/CUP_BAF_Woodland.sqf diff --git a/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf b/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf deleted file mode 100644 index 4100c1cb8..000000000 --- a/Missionframework/presets/enemies/CUP_BAF_Woodland.sqf +++ /dev/null @@ -1,178 +0,0 @@ -/* - File: cup_baf_woodland.sqf - Author: Eogos - https://github.com/Eogos - Date: 2020-04-16 - Last Update: 2020-05-15 - License: MIT License - http://www.opensource.org/licenses/MIT - - Description: - CUP BAF Woodland enemy preset. - - Needed Mods: - - CUP Units - - CUP Vehicles - - CUP Weapons - - Optional Mods: - - None -*/ - -// Enemy infantry classes -KPLIB_o_officer = "CUP_B_BAF_Soldier_Officer_DPM"; // Officer -KPLIB_o_squadLeader = "CUP_B_BAF_Soldier_SquadLeader_DPM"; // Squad Leader -KPLIB_o_teamLeader = "CUP_B_BAF_Soldier_TeamLeader_DPM"; // Team Leader -KPLIB_o_sentry = "CUP_B_BAF_Soldier_RiflemanLite_DPM"; // Rifleman (Lite) -KPLIB_o_rifleman = "CUP_B_BAF_Soldier_Rifleman_DPM"; // Rifleman -KPLIB_o_riflemanLAT = "CUP_B_BAF_Soldier_RiflemanLAT_DPM"; // Rifleman (LAT) -KPLIB_o_grenadier = "CUP_B_BAF_Soldier_Grenadier_DPM"; // Grenadier -KPLIB_o_machinegunner = "CUP_B_BAF_Soldier_AutoRifleman_DPM"; // Autorifleman -KPLIB_o_heavyGunner = "CUP_B_BAF_Soldier_HeavyGunner_DPM"; // Heavy Gunner -KPLIB_o_marksman = "CUP_B_BAF_Soldier_Marksman_DPM"; // Marksman -KPLIB_o_sharpshooter = "CUP_B_BAF_Soldier_SharpShooter_DPM"; // Sharpshooter -KPLIB_o_sniper = "CUP_B_BAF_Sniper_AS50_DPM"; // Sniper -KPLIB_o_atSpecialist = "CUP_B_BAF_Soldier_AT_DPM"; // AT Specialist -KPLIB_o_aaSpecialist = "CUP_B_BAF_Soldier_AA_DPM"; // AA Specialist -KPLIB_o_medic = "CUP_B_BAF_Soldier_Medic_DPM"; // Medic -KPLIB_o_engineer = "CUP_B_BAF_Soldier_Engineer_DPM"; // Engineer -KPLIB_o_paratrooper = "CUP_B_BAF_Soldier_Paratrooper_DPM"; // Paratrooper - -// Enemy vehicles used by secondary objectives. -KPLIB_o_mrap = "CUP_B_Ridgeback_LMG_GB_W"; // Ridgeback PPV LMG Woodland -KPLIB_o_mrapArmed = "CUP_B_Ridgeback_HMG_GB_W"; // Ridgeback PPV HMG Woodland -KPLIB_o_transportHeli = "CUP_B_CH47F_GB"; // Chinook HC-4 -KPLIB_o_transportTruck = "CUP_B_MTVR_BAF_WOOD"; // MTVR -KPLIB_o_transportTruckAmmo = "CUP_B_MTVR_BAF_WOOD"; // MTVR -> Has to be able to transport resource crates! -KPLIB_o_fuelTruck = "CUP_B_MTVR_Refuel_BAF_WOOD"; // MTVR (Refuel) -KPLIB_o_ammoTruck = "CUP_B_MTVR_Ammo_BAF_WOOD"; // MTVR (Ammo) -KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -KPLIB_o_flag = "Flag_UK_F"; // Flag - -/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. -Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ - -/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. -Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -KPLIB_o_militiaInfantry = [ - "CUP_B_BAF_Soldier_TeamLeader_MTP", // Team Leader - "CUP_B_BAF_Soldier_Medic_MTP", // Combat Life Saver - "CUP_B_BAF_Soldier_RiflemanLAT_MTP", // Rifleman (Light AT) - "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) - "CUP_B_BAF_Soldier_RiflemanLite_MTP", // Rifleman (Light) - "CUP_B_BAF_Soldier_RiflemanLite_MTP" // Rifleman (Light) -]; - -// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -KPLIB_o_militiaVehicles = [ - "CUP_B_LR_MG_GB_W" // Land Rover 110 (M2) Woodland -]; - -// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -KPLIB_o_armyVehicles = [ - "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland - "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) - "CUP_B_BAF_Coyote_GMG_W", // Coyote GMG (Woodland) - "CUP_B_Wolfhound_LMG_GB_W", // Wolfhound TSV LMG Woodland - "CUP_B_Wolfhound_HMG_GB_W", // Wolfhound TSV HMG Woodland - "CUP_B_Wolfhound_GMG_GB_W", // Wolfhound TSV GMG Woodland - "CUP_B_Mastiff_LMG_GB_W", // Mastiff PPV LMG Woodland - "CUP_B_Mastiff_HMG_GB_W", // Mastiff PPV HMG Woodland - "CUP_B_Mastiff_GMG_GB_W", // Mastiff PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_MCV80_GB_W", // MCV-80 Warrior (Woodland) - "CUP_B_MCV80_GB_W_SLAT", // MCV-80 Warrior (SLAT - Woodland) - "CUP_B_FV510_GB_W", // FV510 Warrior (Woodland) - "CUP_B_FV510_GB_W_SLAT", // FV510 Warrior (SLAT - Woodland) - "CUP_B_Challenger2_2CW_BAF", // FV4034 Challenger 2 (Two Color Woodland) - "CUP_B_Challenger2_Woodland_BAF" // FV4034 Challenger 2 (Woodland) -]; - -// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -KPLIB_o_armyVehiclesLight = [ - "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland - "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland - "CUP_B_Jackal2_GMG_GB_W", // Jackal 2 GMG Woodland - "CUP_B_Ridgeback_LMG_GB_W", // Ridgeback PPV LMG Woodland - "CUP_B_Ridgeback_HMG_GB_W", // Ridgeback PPV HMG Woodland - "CUP_B_Ridgeback_GMG_GB_W", // Ridgeback PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_W", // FV432 Bulldog L7A2 [Woodland] - "CUP_B_FV432_Bulldog_GB_W" // FV432 Bulldog L7A2 [Woodland] -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehicles = [ - "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland - "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) - "CUP_B_BAF_Coyote_GMG_W", // Coyote GMG (Woodland) - "CUP_B_Wolfhound_LMG_GB_W", // Wolfhound TSV LMG Woodland - "CUP_B_Wolfhound_HMG_GB_W", // Wolfhound TSV HMG Woodland - "CUP_B_Wolfhound_GMG_GB_W", // Wolfhound TSV GMG Woodland - "CUP_B_Mastiff_LMG_GB_W", // Mastiff PPV LMG Woodland - "CUP_B_Mastiff_HMG_GB_W", // Mastiff PPV HMG Woodland - "CUP_B_Mastiff_GMG_GB_W", // Mastiff PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_MCV80_GB_W", // MCV-80 Warrior (Woodland) - "CUP_B_MCV80_GB_W_SLAT", // MCV-80 Warrior (SLAT - Woodland) - "CUP_B_FV510_GB_W", // FV510 Warrior (Woodland) - "CUP_B_FV510_GB_W_SLAT", // FV510 Warrior (SLAT - Woodland) - "CUP_B_Challenger2_2CW_BAF", // FV4034 Challenger 2 (Two Color Woodland) - "CUP_B_Challenger2_Woodland_BAF", // FV4034 Challenger 2 (Woodland) - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehiclesLight = [ - "CUP_B_LR_Special_M2_GB_W", // Land Rover 110 (M2 Special) Woodland - "CUP_B_LR_Special_GMG_GB_W", // Land Rover 110 (GMG Special) Woodland - "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland - "CUP_B_Jackal2_GMG_GB_W", // Jackal 2 GMG Woodland - "CUP_B_Ridgeback_LMG_GB_W", // Ridgeback PPV LMG Woodland - "CUP_B_Ridgeback_HMG_GB_W", // Ridgeback PPV HMG Woodland - "CUP_B_Ridgeback_GMG_GB_W", // Ridgeback PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_W", // FV432 Bulldog L7A2 [Woodland] - "CUP_B_FV432_Bulldog_GB_W", // FV432 Bulldog L7A2 [Woodland] - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. -If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -KPLIB_o_troopTransports = [ - "CUP_B_BAF_Coyote_L2A1_W", // Coyote L2A1 (Woodland) - "CUP_B_BAF_Coyote_GMG_W", // Coyote GMG (Woodland) - "CUP_B_Mastiff_LMG_GB_W", // Mastiff PPV LMG Woodland - "CUP_B_Mastiff_HMG_GB_W", // Mastiff PPV HMG Woodland - "CUP_B_Mastiff_GMG_GB_W", // Mastiff PPV GMG Woodland - "CUP_B_FV432_Bulldog_GB_W_RWS", // FV432 Bulldog L111A1 RWS [Woodland] - "CUP_B_Jackal2_L2A1_GB_W", // Jackal 2 L2A1 Woodland - "CUP_B_Jackal2_GMG_GB_W", // Jackal 2 GMG Woodland - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -// Enemy rotary-wings that will need to spawn in flight. -KPLIB_o_helicopters = [ - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_AW159_GB", // AW159 Wildcat (Green) - "CUP_B_CH47F_GB", // Chinook HC-4 - "CUP_B_Merlin_HC3A_Armed_GB" // Merlin HC3A (Armed) -]; - -// Enemy fixed-wings that will need to spawn in the air. -KPLIB_o_planes = [ - "CUP_B_F35B_BAF", // F-35B Lightning II - "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) - "CUP_B_GR9_DYN_GB" // Harrier GR.9 -]; From e1fabd99aba7609e65784f1a75f523031c95f69e Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:27:28 +0200 Subject: [PATCH 015/115] Delete CUP_CDF.sqf --- Missionframework/presets/enemies/CUP_CDF.sqf | 164 ------------------- 1 file changed, 164 deletions(-) delete mode 100644 Missionframework/presets/enemies/CUP_CDF.sqf diff --git a/Missionframework/presets/enemies/CUP_CDF.sqf b/Missionframework/presets/enemies/CUP_CDF.sqf deleted file mode 100644 index d475075bb..000000000 --- a/Missionframework/presets/enemies/CUP_CDF.sqf +++ /dev/null @@ -1,164 +0,0 @@ -/* - File: cup_cdf.sqf - Author: Eogos - https://github.com/Eogos - Date: 2020-04-06 - Last Update: 2020-05-15 - License: MIT License - http://www.opensource.org/licenses/MIT - - Description: - CUP CDF enemy preset. - - Needed Mods: - - CUP Units - - CUP Vehicles - - CUP Weapons - - Optional Mods: - - None -*/ - -// Enemy infantry classes -KPLIB_o_officer = "CUP_B_CDF_Commander_FST"; // Officer -KPLIB_o_squadLeader = "CUP_B_CDF_Officer_FST"; // Squad Leader -KPLIB_o_teamLeader = "CUP_B_CDF_Soldier_TL_FST"; // Team Leader -KPLIB_o_sentry = "CUP_B_CDF_Militia_FST"; // Rifleman (Lite) -KPLIB_o_rifleman = "CUP_B_CDF_Soldier_FST"; // Rifleman -KPLIB_o_riflemanLAT = "CUP_B_CDF_Soldier_RPG18_FST"; // Rifleman (LAT) -KPLIB_o_grenadier = "CUP_B_CDF_Soldier_GL_FST"; // Grenadier -KPLIB_o_machinegunner = "CUP_B_CDF_Soldier_AR_FST"; // Autorifleman -KPLIB_o_heavyGunner = "CUP_B_CDF_Soldier_MG_FST"; // Heavy Gunner -KPLIB_o_marksman = "CUP_B_CDF_Soldier_Marksman_FST"; // Marksman -KPLIB_o_sharpshooter = "CUP_B_CDF_Soldier_Marksman_FST"; // Sharpshooter -KPLIB_o_sniper = "CUP_B_CDF_Sniper_FST"; // Sniper -KPLIB_o_atSpecialist = "CUP_B_CDF_Soldier_LAT_FST"; // AT Specialist -KPLIB_o_aaSpecialist = "CUP_B_CDF_Soldier_AA_FST"; // AA Specialist -KPLIB_o_medic = "CUP_B_CDF_Medic_FST"; // Medic -KPLIB_o_engineer = "CUP_B_CDF_Engineer_FST"; // Engineer -KPLIB_o_paratrooper = "CUP_B_CDF_Soldier_RPG18_FST"; // Paratrooper - -// Enemy vehicles used by secondary objectives. -KPLIB_o_mrap = "CUP_B_UAZ_Unarmed_CDF"; // UAZ -KPLIB_o_mrapArmed = "CUP_B_UAZ_MG_CDF"; // UAZ (DShKM) -KPLIB_o_transportHeli = "CUP_B_Mi17_CDF"; // Mi-8MT -KPLIB_o_transportTruck = "CUP_B_Ural_CDF"; // Ural -KPLIB_o_transportTruckAmmo = "CUP_B_Ural_Open_CDF"; // Ural (Open) -> Has to be able to transport resource crates! -KPLIB_o_fuelTruck = "CUP_B_Kamaz_Refuel_CDF"; // Kamaz 5350 (Fuel) -KPLIB_o_ammoTruck = "CUP_B_Kamaz_Reammo_CDF"; // Kamaz 5350 (Ammo) -KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -KPLIB_o_flag = "FlagCarrierCDF"; // Flag - -/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. -Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ - -/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. -Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -KPLIB_o_militiaInfantry = [ - "CUP_B_CDF_Soldier_TL_FST", // Team Leader - "CUP_B_CDF_Militia_FST", // Militia - "CUP_B_CDF_Militia_FST", // Militia - "CUP_B_CDF_Militia_FST", // Militia - "CUP_B_CDF_Militia_FST", // Militia - "CUP_B_CDF_Militia_FST" // Militia -]; - -// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -KPLIB_o_militiaVehicles = [ - "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) - "CUP_B_UAZ_AGS30_CDF" // UAZ (AGS-30) -]; - -// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -KPLIB_o_armyVehicles = [ - "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) - "CUP_B_UAZ_AA_CDF", // UAZ (AA) - "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) - "CUP_B_UAZ_SPG9_CDF", // UAZ (SPG-9) - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_BTR80_CDF", // BTR-80 - "CUP_B_BTR80_CDF", // BTR-80 - "CUP_B_BTR80A_CDF", // BTR-80A - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_ZSU23_Afghan_CDF", // ZSU-23-4 Afghanski - "CUP_B_ZSU23_CDF", // ZSU-23-4 - "CUP_B_T72_CDF", // T-72 - "CUP_B_T72_CDF" // T-72 -]; - -// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -KPLIB_o_armyVehiclesLight = [ - "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) - "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) - "CUP_B_MTLB_pk_CDF", // MT-LB LV - "CUP_B_MTLB_pk_CDF", // MT-LB LV - "CUP_B_BRDM2_CDF", // BRDM-2 - "CUP_B_BRDM2_CDF", // BRDM-2 - "CUP_B_Ural_ZU23_CDF", // Ural (ZU-23) - "CUP_B_BTR60_CDF" // BTR-60PB -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehicles = [ - "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) - "CUP_B_UAZ_AA_CDF", // UAZ (AA) - "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) - "CUP_B_UAZ_SPG9_CDF", // UAZ (SPG-9) - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_BTR80_CDF", // BTR-80 - "CUP_B_BTR80_CDF", // BTR-80 - "CUP_B_BTR80A_CDF", // BTR-80A - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_ZSU23_Afghan_CDF", // ZSU-23-4 Afghanski - "CUP_B_ZSU23_CDF", // ZSU-23-4 - "CUP_B_T72_CDF", // T-72 - "CUP_B_T72_CDF", // T-72 - "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D - "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D - "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D - "CUP_B_Mi17_CDF" // Mi-8MT -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehiclesLight = [ - "CUP_B_UAZ_MG_CDF", // UAZ (DShKM) - "CUP_B_UAZ_AGS30_CDF", // UAZ (AGS-30) - "CUP_B_MTLB_pk_CDF", // MT-LB LV - "CUP_B_MTLB_pk_CDF", // MT-LB LV - "CUP_B_Ural_ZU23_CDF", // Ural (ZU-23) - "CUP_B_Ural_ZU23_CDF", // Ural (ZU-23) - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_Mi17_CDF" // Mi-8MT -]; - -/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. -If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -KPLIB_o_troopTransports = [ - "CUP_B_BTR60_CDF", // BTR-60PB - "CUP_B_MTLB_pk_CDF", // MT-LB LV - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_BTR80_CDF", // BTR-80 - "CUP_B_BTR80A_CDF", // BTR-80A - "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D - "CUP_B_Mi17_CDF" // Mi-8MT -]; - -// Enemy rotary-wings that will need to spawn in flight. -KPLIB_o_helicopters = [ - "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D - "CUP_B_Mi17_CDF" // Mi-8MT -]; - -// Enemy fixed-wings that will need to spawn in the air. -KPLIB_o_planes = [ - "CUP_B_SU34_CDF", // Su-34 - "CUP_B_Su25_Dyn_CDF" // Su-25 Frogfoot -]; From 64b33233e54502fbc31530501cc0e99c7ed360db Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:27:35 +0200 Subject: [PATCH 016/115] Delete CUP_ChDKZ.sqf --- .../presets/enemies/CUP_ChDKZ.sqf | 160 ------------------ 1 file changed, 160 deletions(-) delete mode 100644 Missionframework/presets/enemies/CUP_ChDKZ.sqf diff --git a/Missionframework/presets/enemies/CUP_ChDKZ.sqf b/Missionframework/presets/enemies/CUP_ChDKZ.sqf deleted file mode 100644 index d3d6e5166..000000000 --- a/Missionframework/presets/enemies/CUP_ChDKZ.sqf +++ /dev/null @@ -1,160 +0,0 @@ -/* - File: cup_chdkz.sqf - Author: Eogos - https://github.com/Eogos - Date: 2019-07-20 - Last Update: 2020-05-15 - License: MIT License - http://www.opensource.org/licenses/MIT - - Description: - CUP ChDKZ enemy preset. - - Needed Mods: - - CUP Units - - CUP Vehicles - - CUP Weapons - - Optional Mods: - - None -*/ - -// Enemy infantry classes -KPLIB_o_officer = "CUP_O_INS_Story_Lopotev"; // Officer -KPLIB_o_squadLeader = "CUP_O_INS_Commander"; // Squad Leader -KPLIB_o_teamLeader = "CUP_O_INS_Officer"; // Team Leader -KPLIB_o_sentry = "CUP_O_INS_Soldier"; // Rifleman (Lite) -KPLIB_o_rifleman = "CUP_O_INS_Soldier_AK74"; // Rifleman -KPLIB_o_riflemanLAT = "CUP_O_INS_Soldier_Exp"; // Rifleman (LAT) -KPLIB_o_grenadier = "CUP_O_INS_Soldier_GL"; // Grenadier -KPLIB_o_machinegunner = "CUP_O_INS_Soldier"; // Autorifleman -KPLIB_o_heavyGunner = "CUP_O_INS_Soldier_MG"; // Heavy Gunner -KPLIB_o_marksman = "CUP_O_INS_Woodlander2"; // Marksman -KPLIB_o_sharpshooter = "CUP_O_INS_Villager3"; // Sharpshooter -KPLIB_o_sniper = "CUP_O_INS_Sniper"; // Sniper -KPLIB_o_atSpecialist = "CUP_O_INS_Soldier_AT"; // AT Specialist -KPLIB_o_aaSpecialist = "CUP_O_INS_Soldier_AA"; // AA Specialist -KPLIB_o_medic = "CUP_O_INS_Medic"; // Medic -KPLIB_o_engineer = "CUP_O_INS_Soldier_Engineer"; // Engineer -KPLIB_o_paratrooper = "CUP_O_INS_Saboteur"; // Paratrooper - -// Enemy vehicles used by secondary objectives. -KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_CHDKZ"; // UAZ -KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_CHDKZ"; // UAZ (DShKM) -KPLIB_o_transportHeli = "CUP_O_Mi8_CHDKZ"; // Mi-8MT -KPLIB_o_transportTruck = "CUP_O_Ural_CHDKZ"; // Ural -KPLIB_o_transportTruckAmmo = "CUP_O_Ural_Open_CHDKZ"; // Ural (Open) -> Has to be able to transport resource crates! -KPLIB_o_fuelTruck = "CUP_O_Ural_Refuel_CHDKZ"; // Ural (Refuel) -KPLIB_o_ammoTruck = "CUP_O_Ural_Reammo_CHDKZ"; // Ural (Ammo) -KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -KPLIB_o_flag = "FlagCarrierINS"; // Flag - -/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. -Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ - -/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. -Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -KPLIB_o_militiaInfantry = [ - "CUP_O_INS_Villager3", // Farmer - "CUP_O_INS_Woodlander3", // Forester - "CUP_O_INS_Woodlander2", // Gamekeeper - "CUP_O_INS_Worker2", // Local - "CUP_O_INS_Villager4", // Villager - "CUP_O_INS_Woodlander1" // Woodman -]; - -// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -KPLIB_o_militiaVehicles = [ - "CUP_O_Datsun_PK_Random" // Datsun 620 Pickup (PK) Woodland -]; - -// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -KPLIB_o_armyVehicles = [ - "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) - "CUP_O_UAZ_AA_CHDKZ", // UAZ (AA) - "CUP_O_UAZ_AGS30_CHDKZ", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_CHDKZ", // UAZ (SPG-9) - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR80_CHDKZ", // BTR-80 - "CUP_O_BTR80A_CHDKZ", // BTR-80A - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_ZSU23_Afghan_ChDKZ", // ZSU-23-4 Afghanski - "CUP_O_ZSU23_ChDKZ", // ZSU-23-4 - "CUP_O_T55_CHDKZ", // T-55 - "CUP_O_T55_CHDKZ", // T-55 - "CUP_O_T55_CHDKZ", // T-55 - "CUP_O_T72_CHDKZ", // T-72 - "CUP_O_T72_CHDKZ" // T-72 -]; - -// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -KPLIB_o_armyVehiclesLight = [ - "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) - "CUP_O_Datsun_AA_Random", // Datsun 620 Pickup (AA) - "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV - "CUP_O_BRDM2_CHDKZ", // BRDM-2 - "CUP_O_Ural_ZU23_CHDKZ", // Ural (ZU-23) - "CUP_O_BTR60_CHDKZ" // BTR-60PB -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehicles = [ - "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) - "CUP_O_UAZ_AA_CHDKZ", // UAZ (AA) - "CUP_O_UAZ_AGS30_CHDKZ", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_CHDKZ", // UAZ (SPG-9) - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR80_CHDKZ", // BTR-80 - "CUP_O_BTR80A_CHDKZ", // BTR-80A - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_ZSU23_Afghan_ChDKZ", // ZSU-23-4 Afghanski - "CUP_O_ZSU23_ChDKZ", // ZSU-23-4 - "CUP_O_T55_CHDKZ", // T-55 - "CUP_O_T55_CHDKZ", // T-55 - "CUP_O_T55_CHDKZ", // T-55 - "CUP_O_T72_CHDKZ", // T-72 - "CUP_O_T72_CHDKZ", // T-72 - "CUP_O_Mi8_CHDKZ", // Mi-8MT - "CUP_O_Mi8_CHDKZ" // Mi-8MT -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehiclesLight = [ - "CUP_O_UAZ_MG_CHDKZ", // UAZ (DShKM) - "CUP_O_Datsun_AA_Random", // Datsun 620 Pickup (AA) - "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV - "CUP_O_BRDM2_CHDKZ", // BRDM-2 - "CUP_O_Ural_ZU23_CHDKZ", // Ural (ZU-23) - "CUP_O_T55_CHDKZ", // T-55 - "CUP_O_BTR60_CHDKZ" // BTR-60PB -]; - -/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. -If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -KPLIB_o_troopTransports = [ - "CUP_O_BTR60_CHDKZ", // BTR-60PB - "CUP_O_BTR80_CHDKZ", // BTR-80 - "CUP_O_BTR80A_CHDKZ", // BTR-80A - "CUP_O_MTLB_pk_ChDKZ", // MT-LB LV - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_Mi8_CHDKZ" // Mi-8MT -]; - -// Enemy rotary-wings that will need to spawn in flight. -KPLIB_o_helicopters = [ - "CUP_O_Mi8_CHDKZ" // Mi-8MT -]; - -// Enemy fixed-wings that will need to spawn in the air. -KPLIB_o_planes = [ - "CUP_O_Su25_Dyn_RU" // Su-25T Frogfoot -]; From d4ec65332773caa398c2c8310e15203eb24f4bf4 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:27:42 +0200 Subject: [PATCH 017/115] Delete CUP_SLA.sqf --- Missionframework/presets/enemies/CUP_SLA.sqf | 178 ------------------- 1 file changed, 178 deletions(-) delete mode 100644 Missionframework/presets/enemies/CUP_SLA.sqf diff --git a/Missionframework/presets/enemies/CUP_SLA.sqf b/Missionframework/presets/enemies/CUP_SLA.sqf deleted file mode 100644 index 8a032cebc..000000000 --- a/Missionframework/presets/enemies/CUP_SLA.sqf +++ /dev/null @@ -1,178 +0,0 @@ -/* - File: cup_sla.sqf - Author: Eogos - https://github.com/Eogos - Date: 2019-07-15 - Last Update: 2020-05-15 - License: MIT License - http://www.opensource.org/licenses/MIT - - Description: - CUP SLA enemy preset. - - Needed Mods: - - CUP Units - - CUP Vehicles - - CUP Weapons - - Optional Mods: - - None -*/ - -// Enemy infantry classes -KPLIB_o_officer = "CUP_O_sla_Officer"; // Officer -KPLIB_o_squadLeader = "CUP_O_sla_Soldier_SL"; // Squad Leader -KPLIB_o_teamLeader = "CUP_O_sla_Soldier_SL"; // Team Leader -KPLIB_o_sentry = "CUP_O_sla_Soldier"; // Rifleman (Lite) -KPLIB_o_rifleman = "CUP_O_SLA_Soldier_Backpack"; // Rifleman -KPLIB_o_riflemanLAT = "CUP_O_sla_Soldier_AT"; // Rifleman (LAT) -KPLIB_o_grenadier = "CUP_O_sla_Soldier_GL"; // Grenadier -KPLIB_o_machinegunner = "CUP_O_sla_Soldier_AR"; // Autorifleman -KPLIB_o_heavyGunner = "CUP_O_sla_Soldier_MG"; // Heavy Gunner -KPLIB_o_marksman = "CUP_O_sla_Sniper"; // Marksman -KPLIB_o_sharpshooter = "CUP_O_SLA_Sniper_SVD_Night"; // Sharpshooter -KPLIB_o_sniper = "CUP_O_sla_Sniper_KSVK"; // Sniper -KPLIB_o_atSpecialist = "CUP_O_sla_Soldier_HAT"; // AT Specialist -KPLIB_o_aaSpecialist = "CUP_O_sla_Soldier_AA"; // AA Specialist -KPLIB_o_medic = "CUP_O_sla_Medic"; // Medic -KPLIB_o_engineer = "CUP_O_sla_Engineer"; // Engineer -KPLIB_o_paratrooper = "CUP_O_sla_Soldier_LAT"; // Paratrooper - -// Enemy vehicles used by secondary objectives. -KPLIB_o_mrap = "CUP_O_UAZ_Unarmed_SLA"; // UAZ -KPLIB_o_mrapArmed = "CUP_O_UAZ_MG_SLA"; // UAZ (DShKM) -KPLIB_o_transportHeli = "CUP_O_Mi8_SLA_1"; // Mi-8MT -KPLIB_o_transportTruck = "CUP_O_Ural_SLA"; // Ural -KPLIB_o_transportTruckAmmo = "CUP_O_Ural_Open_SLA"; // Ural (Open) -> Has to be able to transport resource crates! -KPLIB_o_fuelTruck = "CUP_O_Ural_Refuel_SLA"; // Ural (Refuel) -KPLIB_o_ammoTruck = "CUP_O_Ural_Reammo_SLA"; // Ural (Ammo) -KPLIB_o_fuelContainer = "B_Slingload_01_Fuel_F"; // Huron Fuel Container -KPLIB_o_ammoContainer = "B_Slingload_01_Ammo_F"; // Huron Ammo Container -KPLIB_o_flag = "FlagCarrierNorth"; // Flag - -/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. -Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ - -/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. -Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -KPLIB_o_militiaInfantry = [ - "CUP_O_sla_Soldier_militia", // Militiaman - "CUP_O_sla_Soldier_militia", // Militiaman - "CUP_O_sla_Soldier_LAT_militia", // Militiaman (RPG-18) - "CUP_O_sla_Soldier_AA_militia", // AA Specialist - "CUP_O_sla_Soldier_AT_militia", // Militiaman (RPG-7) - "CUP_O_sla_Soldier_AR_militia", // Militia Automatic Rifleman - "CUP_O_sla_Soldier_GL_militia", // Militia Grenadier - "CUP_O_sla_Medic_militia", // Militia Medic - "CUP_O_sla_Engineer_militia" // Militia Engineer -]; - -// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -KPLIB_o_militiaVehicles = [ - "CUP_O_UAZ_MG_SLA" // UAZ (DShKM) -]; - -// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -KPLIB_o_armyVehicles = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR80_SLA", // BTR-80 - "CUP_O_BTR80A_SLA", // BTR-80A - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_ZSU23_SLA", // ZSU-23-4 - "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski - "CUP_O_T55_SLA", // T-55 - "CUP_O_T55_SLA", // T-55 - "CUP_O_T72_SLA", // T-72 - "CUP_O_T72_SLA" // T-72 -]; - -// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -KPLIB_o_armyVehiclesLight = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_MTLB_pk_SLA" // MT-LB LV -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehicles = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_AGS30_SLA", // UAZ (AGS-30) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR80_SLA", // BTR-80 - "CUP_O_BTR80A_SLA", // BTR-80A - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_ZSU23_SLA", // ZSU-23-4 - "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski - "CUP_O_T55_SLA", // T-55 - "CUP_O_T55_SLA", // T-55 - "CUP_O_T72_SLA", // T-72 - "CUP_O_T72_SLA", // T-72 - "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark - "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D - "CUP_O_Mi8_SLA_2", // Mi-8MTV3 - "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) - "CUP_O_UH1H_gunship_SLA" // UH-1H (Gunship) -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehiclesLight = [ - "CUP_O_UAZ_MG_SLA", // UAZ (DShKM) - "CUP_O_UAZ_AA_SLA", // UAZ (AA) - "CUP_O_UAZ_SPG9_SLA", // UAZ (SPG-9) - "CUP_O_Ural_ZU23_SLA", // Ural (ZU-23) - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_MTLB_pk_SLA", // MT-LB LV - "CUP_O_Mi8_SLA_1", // Mi-8MT - "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) - "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) - "CUP_O_UH1H_SLA" // UH-1H -]; - -/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. -If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -KPLIB_o_troopTransports = [ - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D - "CUP_O_Mi8_SLA_2", // Mi-8MTV3 - "CUP_O_BTR60_SLA", // BTR-60PB - "CUP_O_BTR80_SLA", // BTR-80 - "CUP_O_BTR80A_SLA", // BTR-80A - "CUP_O_MTLB_pk_SLA", // MT-LB LV - "CUP_O_Mi8_SLA_1", // Mi-8MT - "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) - "CUP_O_UH1H_SLA" // UH-1H -]; - -// Enemy rotary-wings that will need to spawn in flight. -KPLIB_o_helicopters = [ - "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark - "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D - "CUP_O_UH1H_gunship_SLA", // UH-1H (Gunship) - "CUP_O_UH1H_armed_SLA", // UH-1H (Armed) - "CUP_O_UH1H_SLA", // UH-1H - "CUP_O_Mi8_SLA_1", // Mi-8MT - "CUP_O_Mi8_SLA_2" // Mi-8MTV3 -]; - -// Enemy fixed-wings that will need to spawn in the air. -KPLIB_o_planes = [ - "CUP_O_Su25_Dyn_SLA", // Su-25 Frogfoot - "CUP_O_SU34_SLA" // Su-34 -]; From c71dcf30f47667a796800ca0342e19acd315616d Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:27:49 +0200 Subject: [PATCH 018/115] Delete SLA.sqf --- Missionframework/presets/enemies/SLA.sqf | 154 ----------------------- 1 file changed, 154 deletions(-) delete mode 100644 Missionframework/presets/enemies/SLA.sqf diff --git a/Missionframework/presets/enemies/SLA.sqf b/Missionframework/presets/enemies/SLA.sqf deleted file mode 100644 index 0f975f25a..000000000 --- a/Missionframework/presets/enemies/SLA.sqf +++ /dev/null @@ -1,154 +0,0 @@ -/* - File: sla.sqf - Author: PSYKO-nz - https://github.com/PSYKO-nz - Date: 2018-02-19 - Last Update: 2020-05-15 - License: MIT License - http://www.opensource.org/licenses/MIT - - Description: - Sahrani Liberation Army enemy preset. - - Needed Mods: - - Project OPFOR - - RHS AFRF - - RHS GREF - - RHS USAF - - Optional Mods: - - None -*/ - -// Enemy infantry classes -KPLIB_o_officer = "LOP_SLA_Infantry_Officer"; -KPLIB_o_squadLeader = "LOP_SLA_Infantry_SL"; -KPLIB_o_teamLeader = "LOP_SLA_Infantry_TL"; -KPLIB_o_sentry = "LOP_SLA_Infantry_Rifleman"; -KPLIB_o_rifleman = "LOP_SLA_Infantry_Rifleman_2"; -KPLIB_o_riflemanLAT = "LOP_SLA_Infantry_AT"; -KPLIB_o_grenadier = "LOP_SLA_Infantry_GL"; -KPLIB_o_machinegunner = "LOP_SLA_Infantry_MG"; -KPLIB_o_heavyGunner = "LOP_SLA_Infantry_MG"; -KPLIB_o_marksman = "LOP_SLA_Infantry_Marksman"; -KPLIB_o_sharpshooter = "LOP_SLA_Infantry_Marksman"; -KPLIB_o_sniper = "LOP_SLA_Infantry_Marksman"; -KPLIB_o_atSpecialist = "LOP_SLA_Infantry_AT"; -KPLIB_o_aaSpecialist = "LOP_SLA_Infantry_AA"; -KPLIB_o_medic = "LOP_SLA_Infantry_Corpsman"; -KPLIB_o_engineer = "LOP_SLA_Infantry_Engineer"; -KPLIB_o_paratrooper = "LOP_SLA_Infantry_Rifleman"; - -// Enemy vehicles used by secondary objectives. -KPLIB_o_mrap = "LOP_SLA_UAZ"; -KPLIB_o_mrapArmed = "LOP_SLA_UAZ_DshKM"; -KPLIB_o_transportHeli = "LOP_SLA_Mi8MT_Cargo"; -KPLIB_o_transportTruck = "LOP_SLA_Ural"; -KPLIB_o_transportTruckAmmo = "LOP_SLA_Ural_open"; //-> Has to be able to transport resource crates! -KPLIB_o_fuelTruck = "rhs_gaz66_ammo_vmf"; -KPLIB_o_ammoTruck = "rhs_gaz66_ammo_vmf"; -KPLIB_o_fuelContainer = "Land_Pod_Heli_Transport_04_fuel_F"; -KPLIB_o_ammoContainer = "Land_Pod_Heli_Transport_04_ammo_F"; -KPLIB_o_flag = "lop_Flag_sla_F"; - -/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance. -Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */ - -/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders. -Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */ -KPLIB_o_militiaInfantry = [ - "LOP_SLA_Infantry_Rifleman", - "LOP_SLA_Infantry_Rifleman_2", - "LOP_SLA_Infantry_GL", - "LOP_SLA_Infantry_Officer", - "LOP_SLA_Infantry_TL", - "LOP_SLA_Infantry_SL", - "LOP_SLA_Infantry_AA", - "LOP_SLA_Infantry_AT", - "LOP_SLA_Infantry_Marksman", - "LOP_SLA_Infantry_Corpsman", - "LOP_SLA_Infantry_Engineer" -]; - -// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. -KPLIB_o_militiaVehicles = [ - "LOP_SLA_UAZ_SPG", - "LOP_SLA_UAZ_DshKM", - "LOP_SLA_UAZ_AGS", - "LOP_SLA_UAZ", - "LOP_SLA_UAZ_Open" -]; - -// All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). -KPLIB_o_armyVehicles = [ - "LOP_SLA_UAZ_SPG", - "LOP_SLA_UAZ_DshKM", - "LOP_SLA_UAZ_AGS", - "LOP_SLA_BMP2D", - "LOP_SLA_BMP2", - "LOP_SLA_BMP1D", - "LOP_SLA_BMP1", - "LOP_SLA_BTR60", - "LOP_SLA_BTR70", - "LOP_SLA_ZSU234", - "LOP_SLA_T72BB", - "LOP_SLA_T72BA" -]; - -// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). -KPLIB_o_armyVehiclesLight = [ - "LOP_SLA_UAZ_SPG", - "LOP_SLA_UAZ_DshKM", - "LOP_SLA_UAZ_AGS", - "LOP_SLA_BTR60", - "LOP_SLA_BMP2" -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehicles = [ - "LOP_SLA_UAZ_SPG", - "LOP_SLA_UAZ_DshKM", - "LOP_SLA_UAZ_AGS", - "LOP_SLA_Ural_open", - "LOP_SLA_Ural", - "LOP_SLA_BTR60", - "LOP_SLA_BMP1", - "LOP_SLA_ZSU234", - "LOP_SLA_T72BA", - "LOP_SLA_T72BB", - "LOP_SLA_Mi8MTV3_FAB", - "LOP_SLA_Mi8MT_Cargo", - "LOP_SLA_Mi8MTV3_UPK23" -]; - -// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels). -KPLIB_o_battleGrpVehiclesLight = [ - "LOP_SLA_UAZ_DshKM", - "LOP_SLA_UAZ_AGS", - "LOP_SLA_Ural", - "LOP_SLA_BTR70", - "LOP_SLA_BMP1D", - "LOP_SLA_BMP2D", - "LOP_SLA_ZSU234", - "LOP_SLA_Mi8MTV3_UPK23", - "LOP_SLA_Mi8MT_Cargo" -]; - - -/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers. -If something in this array can't hold all 8 soldiers then buggy behaviours may occur. */ -KPLIB_o_troopTransports = [ - "LOP_SLA_Ural_open", - "LOP_SLA_Ural", - "LOP_SLA_Mi8MTV3_FAB", - "LOP_SLA_Mi8MT_Cargo", - "LOP_SLA_Mi8MTV3_UPK23" -]; - -// Enemy rotary-wings that will need to spawn in flight. -KPLIB_o_helicopters = [ - "LOP_SLA_Mi8MTV3_FAB", - "LOP_SLA_Mi8MT_Cargo", - "LOP_SLA_Mi8MTV3_UPK23" -]; - -// Enemy fixed-wings that will need to spawn in the air. -KPLIB_o_planes = []; From 90eaa28c45c21cd754bc0a3a12735d6885f69b0d Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:28:01 +0200 Subject: [PATCH 019/115] Delete CUP_ACR_Desert.sqf --- .../presets/players/CUP_ACR_Desert.sqf | 330 ------------------ 1 file changed, 330 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_ACR_Desert.sqf diff --git a/Missionframework/presets/players/CUP_ACR_Desert.sqf b/Missionframework/presets/players/CUP_ACR_Desert.sqf deleted file mode 100644 index 27d402559..000000000 --- a/Missionframework/presets/players/CUP_ACR_Desert.sqf +++ /dev/null @@ -1,330 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - Qinetix's Titus -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_T810_Repair_CZ_DES"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_D"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_CZ_Crew_DES"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_CZ_Pilot_DES"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_DES"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_CZ_Soldier_DES",15,0,0], // Rifleman - ["CUP_B_CZ_Soldier_backpack_DES",20,0,0], // Rifleman (Backpack) - ["CUP_B_CZ_Soldier_RPG_DES",30,0,0], // Rifleman (RPG) - ["CUP_B_CZ_Soldier_805_GL_DES",25,0,0], // Grenadier - ["CUP_B_CZ_Soldier_AR_DES",25,0,0], // Automatic Rifleman - ["CUP_B_CZ_Soldier_MG_DES",35,0,0], // Machinegunner - ["CUP_B_CZ_Soldier_Marksman_DES",30,0,0], // Marksman (SVD) - ["CUP_B_CZ_Soldier_AT_DES",50,10,0], // Rifleman (AT) - ["B_soldier_AA_F",50,10,0], // AA Specialist - ["CUP_B_CZ_Medic_DES",30,0,0], // Medic - ["CUP_B_CZ_Engineer_DES",30,0,0], // Engineer - ["CUP_B_CZ_ExplosiveSpecialist_DES",30,0,0], // Explosive Specialist - ["CUP_B_CZ_SpecOps_Scout_DES",20,0,0], // SF Scout - ["CUP_B_CZ_SpecOps_Exp_DES",30,0,0], // SF Saboteur - ["CUP_B_CZ_SpecOps_Recon_DES",30,0,0], // SF Recon - ["CUP_B_CZ_SpecOps_DES",40,0,0], // SF Rifleman - ["CUP_B_CZ_SpecOps_MG_DES",30,0,0], // SF Machinegunner - ["CUP_B_CZ_SpecOps_TL_DES",30,0,0], // SF Team Leader - ["CUP_B_CZ_Sniper_DES",70,5,0], // Sniper - ["CUP_B_CZ_Spotter_DES",20,0,0], // Spotter - ["CUP_B_CZ_Crew_DES",10,0,0], // Crewman - ["CUP_B_CZ_Soldier_DES",20,0,0], // Para Trooper - ["CUP_B_CZ_Pilot_DES",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_UAZ_Unarmed_ACR",100,0,50], // UAZ - ["CUP_B_UAZ_Open_ACR",100,0,50], // UAZ (Open) - ["CUP_B_UAZ_MG_ACR",100,40,50], // UAZ (DShKM) - ["CUP_B_UAZ_AGS30_ACR",100,60,50], // UAZ (AGS-30) - ["CUP_B_UAZ_SPG9_ACR",100,80,50], // UAZ (SPG-9) - ["CUP_B_UAZ_METIS_ACR",100,100,50], // UAZ (Metis-M) - ["CUP_B_LR_Transport_CZ_D",200,0,50], // Land Rover 110 (Transport) Desert - ["CUP_B_LR_MG_CZ_D",200,40,50], // Land Rover 110 (M2) Desert - ["CUP_B_LR_Special_CZ_D",250,100,50], // Land Rover 110 (Special) Desert - ["CUP_B_HMMWV_Ambulance_ACR",225,0,50], // HMMWV (Ambulance) - ["CUP_B_HMMWV_DSHKM_GPK_ACR",225,60,50], // HMMWV M1114 DSHKM - ["CUP_B_HMMWV_M2_GPK_ACR",225,60,50], // HMMWV M1114 M2 - ["CUP_B_HMMWV_AGS_GPK_ACR",225,80,50], // HMMWV M1114 AGS - ["CUP_B_Dingo_CZ_Des",250,40,100], // Dingo 2 (MG) (Desert) - ["CUP_B_Dingo_GL_CZ_Des",250,60,100], // Dingo 2 (GL) (Desert) - ["QIN_Titus_DES",350,0,50], // Nexter Titus - ["QIN_Titus_arx20_DES",350,225,50], // Nexter Titus ARX20 - ["CUP_B_T810_Unarmed_CZ_DES",125,0,75], // Tatra T810 (Covered) - ["CUP_B_T810_Armed_CZ_DES",125,60,75] // Tatra T810 (MG/Covered) -]; - -heavy_vehicles = [ - ["CUP_B_BRDM2_HQ_CZ_Des",200,25,200], // BRDM-2 (HQ) (Desert) - ["CUP_B_BRDM2_CZ_Des",200,200,200], // BRDM-2 (Desert) - ["I_APC_Wheeled_03_cannon_F",500,400,300], // Pandur II - ["CUP_I_BMP1_TK_GUE",300,300,200], // BVP-1 - ["CUP_B_BMP2_CZ_Des",400,350,200], // BVP-2 - ["CUP_B_BMP2_AMB_CZ_Des",350,0,200], // BVP-2 Ambulance - ["B_APC_Tracked_01_AA_F",500,450,400], // IFV-6a Cheetah - ["CUP_O_T72_RU",600,500,400], // T-72 - ["CUP_B_T72_CZ",800,500,450] // T-72M4CZ -]; - -air_vehicles = [ - ["CUP_B_Mi171Sh_ACR",700,600,500], // Mi-171Sh (Rockets) - ["CUP_B_Mi35_Dynamic_CZ",850,1000,550], // Mi-35 - ["CUP_B_Mi35_Dynamic_CZ_Dark",850,1000,550], // Mi-35 (Dark) - ["CUP_B_Mi35_Dynamic_CZ_Ram",850,1000,550], // Mi-35 (Ram) - ["CUP_B_Mi35_Dynamic_CZ_Tiger",850,1000,550], // Mi-35 (Tiger) - ["CUP_B_L39_CZ_GREY",1200,1250,650], // L-39ZA (Grey) - ["I_Plane_Fighter_03_dynamicLoadout_F",1200,1250,550], // L-159 Alca - ["I_Plane_Fighter_04_F",1500,1400,800] // JAS 39 Gripen -]; - -static_vehicles = [ - ["CUP_B_DSHKM_ACR",25,40,0], // DShKM - ["CUP_B_AGS_ACR",35,60,0], // AGS-30 - ["CUP_B_2b14_82mm_ACR",80,150,0], // Podnos 2B14 - ["CUP_B_RBS70_ACR",100,200,0] // RBS 70 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["FlagCarrierCzechRepublic_EP1",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["CUP_B_TowingTractor_CZ",50,0,25], // Towing Tractor - ["CUP_B_T810_Repair_CZ_DES",325,0,75], // Tatra T810 (Repair) - ["CUP_B_T810_Refuel_CZ_DES",125,0,275], // Tatra T810 (Fuel) - ["CUP_B_T810_Reammo_CZ_DES",125,200,75], // Tatra T810 (Ammo) - ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_CZ_Soldier_SL_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_RPG_DES", - "CUP_B_CZ_Soldier_805_GL_DES", - "CUP_B_CZ_Soldier_AR_DES", - "CUP_B_CZ_Soldier_AR_DES", - "CUP_B_CZ_Soldier_Marksman_DES", - "CUP_B_CZ_Medic_DES", - "CUP_B_CZ_Engineer_DES" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_CZ_Soldier_SL_DES", - "CUP_B_CZ_Soldier_RPG_DES", - "CUP_B_CZ_Soldier_RPG_DES", - "CUP_B_CZ_Soldier_805_GL_DES", - "CUP_B_CZ_Soldier_AR_DES", - "CUP_B_CZ_Soldier_AR_DES", - "CUP_B_CZ_Soldier_MG_DES", - "CUP_B_CZ_Soldier_Marksman_DES", - "CUP_B_CZ_Medic_DES", - "CUP_B_CZ_Engineer_DES" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_CZ_Soldier_SL_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_AT_DES", - "CUP_B_CZ_Soldier_AT_DES", - "CUP_B_CZ_Soldier_AT_DES", - "CUP_B_CZ_Medic_DES", - "CUP_B_CZ_Engineer_DES" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_CZ_Soldier_SL_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "B_soldier_AA_F", - "B_soldier_AA_F", - "B_soldier_AA_F", - "CUP_B_CZ_Medic_DES", - "CUP_B_CZ_Engineer_DES" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_CZ_SpecOps_TL_DES", - "CUP_B_CZ_SpecOps_Recon_DES", - "CUP_B_CZ_SpecOps_Recon_DES", - "CUP_B_CZ_Soldier_RPG_DES", - "CUP_B_CZ_SpecOps_MG_DES", - "CUP_B_CZ_SpecOps_MG_DES", - "CUP_B_CZ_SpecOps_GL_DES", - "CUP_B_CZ_SpecOps_GL_DES", - "CUP_B_CZ_Medic_DES", - "CUP_B_CZ_Engineer_DES" -]; - -// Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES", - "CUP_B_CZ_Soldier_DES" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_B_Dingo_CZ_Des", // Dingo 2 (MG) (Desert) - "CUP_B_Dingo_GL_CZ_Des", // Dingo 2 (GL) (Desert) - "QIN_Titus_WDL", // Nexter Titus - "QIN_Titus_arx20_WDL", // Nexter Titus ARX20 - "I_APC_Wheeled_03_cannon_F", // Pandur II - "CUP_B_BMP2_CZ_Des", // BVP-2 - "B_APC_Tracked_01_AA_F", // IFV-6a Cheetah - "CUP_B_T72_CZ", // T-72M4CZ - "CUP_B_L39_CZ_GREY", // L-39ZA (Grey) - "I_Plane_Fighter_03_dynamicLoadout_F", // L-159 Alca - "I_Plane_Fighter_04_F" // JAS 39 Gripen -]; From 7ceccfe55e1ec660584f84c1895204e9293cfa4a Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:28:17 +0200 Subject: [PATCH 020/115] Delete CUP_ACR_Woodland.sqf --- .../presets/players/CUP_ACR_Woodland.sqf | 328 ------------------ 1 file changed, 328 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_ACR_Woodland.sqf diff --git a/Missionframework/presets/players/CUP_ACR_Woodland.sqf b/Missionframework/presets/players/CUP_ACR_Woodland.sqf deleted file mode 100644 index 9ebab113b..000000000 --- a/Missionframework/presets/players/CUP_ACR_Woodland.sqf +++ /dev/null @@ -1,328 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - Qinetix's Titus -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_T810_Repair_CZ_WDL"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_W"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_CZ_Crew_WDL"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_CZ_Pilot_WDL"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_WDL"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_CZ_Soldier_WDL",15,0,0], // Rifleman - ["CUP_B_CZ_Soldier_backpack_WDL",20,0,0], // Rifleman (Backpack) - ["CUP_B_CZ_Soldier_RPG_WDL",30,0,0], // Rifleman (RPG) - ["CUP_B_CZ_Soldier_805_GL_WDL",25,0,0], // Grenadier - ["CUP_B_CZ_Soldier_AR_WDL",25,0,0], // Automatic Rifleman - ["CUP_B_CZ_Soldier_MG_WDL",35,0,0], // Machinegunner - ["CUP_B_CZ_Soldier_Marksman_WDL",30,0,0], // Marksman (SVD) - ["CUP_B_CZ_Soldier_AT_WDL",50,10,0], // Rifleman (AT) - ["B_soldier_AA_F",50,10,0], // AA Specialist - ["CUP_B_CZ_Medic_WDL",30,0,0], // Medic - ["CUP_B_CZ_Engineer_WDL",30,0,0], // Engineer - ["CUP_B_CZ_ExplosiveSpecialist_WDL",30,0,0], // Explosive Specialist - ["CUP_B_CZ_SpecOps_Scout_WDL",20,0,0], // SF Scout - ["CUP_B_CZ_SpecOps_Exp_WDL",30,0,0], // SF Saboteur - ["CUP_B_CZ_SpecOps_Recon_WDL",30,0,0], // SF Recon - ["CUP_B_CZ_SpecOps_WDL",40,0,0], // SF Rifleman - ["CUP_B_CZ_SpecOps_MG_WDL",30,0,0], // SF Machinegunner - ["CUP_B_CZ_SpecOps_TL_WDL",30,0,0], // SF Team Leader - ["CUP_B_CZ_Sniper_WDL",70,5,0], // Sniper - ["CUP_B_CZ_Spotter_WDL",20,0,0], // Spotter - ["CUP_B_CZ_Crew_WDL",10,0,0], // Crewman - ["CUP_B_CZ_Soldier_WDL",20,0,0], // Para Trooper - ["CUP_B_CZ_Pilot_WDL",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_UAZ_Unarmed_ACR",100,0,50], // UAZ - ["CUP_B_UAZ_Open_ACR",100,0,50], // UAZ (Open) - ["CUP_B_UAZ_MG_ACR",100,40,50], // UAZ (DShKM) - ["CUP_B_UAZ_AGS30_ACR",100,60,50], // UAZ (AGS-30) - ["CUP_B_UAZ_SPG9_ACR",100,80,50], // UAZ (SPG-9) - ["CUP_B_UAZ_METIS_ACR",100,100,50], // UAZ (Metis-M) - ["CUP_B_LR_Transport_CZ_W",200,0,50], // Land Rover 110 (Transport) Woodland - ["CUP_B_LR_MG_CZ_W",200,40,50], // Land Rover 110 (M2) Woodland - ["CUP_B_LR_Special_CZ_W",250,100,50], // Land Rover 110 (Special) Woodland - ["CUP_B_Dingo_CZ_Wdl",250,40,100], // Dingo 2 (MG) (Woodland) - ["CUP_B_Dingo_GL_CZ_Wdl",250,60,100], // Dingo 2 (GL) (Woodland) - ["QIN_Titus_WDL",350,0,50], // Nexter Titus - ["QIN_Titus_arx20_WDL",350,225,50], // Nexter Titus ARX20 - ["CUP_B_T810_Unarmed_CZ_WDL",125,0,75], // Tatra T810 (Covered) - ["CUP_B_T810_Armed_CZ_WDL",125,60,75] // Tatra T810 (MG/Covered) -]; - -heavy_vehicles = [ - ["CUP_B_BRDM2_HQ_CZ",200,25,200], // BRDM-2 (HQ) - ["CUP_B_BRDM2_CZ",200,200,200], // BRDM-2 - ["CUP_B_RM70_CZ",300,750,175], // RM-70 - ["I_APC_Wheeled_03_cannon_F",500,400,300], // Pandur II - ["CUP_I_BMP1_TK_GUE",300,300,200], // BVP-1 - ["CUP_B_BMP2_CZ",400,350,200], // BVP-2 - ["CUP_B_BMP2_AMB_CZ",350,0,200], // BVP-2 Ambulance - ["B_APC_Tracked_01_AA_F",500,450,400], // IFV-6a Cheetah - ["CUP_O_T72_RU",600,500,400], // T72 - ["CUP_B_T72_CZ",800,500,450] // T-72M4CZ -]; - -air_vehicles = [ - ["CUP_B_Mi171Sh_ACR",700,600,500], // Mi-171Sh (Rockets) - ["CUP_B_Mi35_Dynamic_CZ",850,1000,550], // Mi-35 - ["CUP_B_Mi35_Dynamic_CZ_Dark",850,1000,550], // Mi-35 (Dark) - ["CUP_B_Mi35_Dynamic_CZ_Ram",850,1000,550], // Mi-35 (Ram) - ["CUP_B_Mi35_Dynamic_CZ_Tiger",850,1000,550], // Mi-35 (Tiger) - ["CUP_B_L39_CZ_GREY",1200,1250,650], // L-39ZA (Grey) - ["I_Plane_Fighter_03_dynamicLoadout_F",1200,1250,550], // L-159 Alca - ["I_Plane_Fighter_04_F",1500,1400,800] // JAS 39 Gripen -]; - -static_vehicles = [ - ["CUP_B_DSHKM_ACR",25,40,0], // DShKM - ["CUP_B_AGS_ACR",35,60,0], // AGS-30 - ["CUP_B_2b14_82mm_ACR",80,150,0], // Podnos 2B14 - ["CUP_B_RBS70_ACR",100,200,0] // RBS 70 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["FlagCarrierCzechRepublic_EP1",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["CUP_B_TowingTractor_CZ",50,0,25], // Towing Tractor - ["CUP_B_T810_Repair_CZ_WDL",325,0,75], // Tatra T810 (Repair) - ["CUP_B_T810_Refuel_CZ_WDL",125,0,275], // Tatra T810 (Fuel) - ["CUP_B_T810_Reammo_CZ_WDL",125,200,75], // Tatra T810 (Ammo) - ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_CZ_Soldier_SL_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_RPG_WDL", - "CUP_B_CZ_Soldier_805_GL_WDL", - "CUP_B_CZ_Soldier_AR_WDL", - "CUP_B_CZ_Soldier_AR_WDL", - "CUP_B_CZ_Soldier_Marksman_WDL", - "CUP_B_CZ_Medic_WDL", - "CUP_B_CZ_Engineer_WDL" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_CZ_Soldier_SL_WDL", - "CUP_B_CZ_Soldier_RPG_WDL", - "CUP_B_CZ_Soldier_RPG_WDL", - "CUP_B_CZ_Soldier_805_GL_WDL", - "CUP_B_CZ_Soldier_AR_WDL", - "CUP_B_CZ_Soldier_AR_WDL", - "CUP_B_CZ_Soldier_MG_WDL", - "CUP_B_CZ_Soldier_Marksman_WDL", - "CUP_B_CZ_Medic_WDL", - "CUP_B_CZ_Engineer_WDL" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_CZ_Soldier_SL_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_AT_WDL", - "CUP_B_CZ_Soldier_AT_WDL", - "CUP_B_CZ_Soldier_AT_WDL", - "CUP_B_CZ_Medic_WDL", - "CUP_B_CZ_Engineer_WDL" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_CZ_Soldier_SL_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "B_soldier_AA_F", - "B_soldier_AA_F", - "B_soldier_AA_F", - "CUP_B_CZ_Medic_WDL", - "CUP_B_CZ_Engineer_WDL" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_CZ_SpecOps_TL_WDL", - "CUP_B_CZ_SpecOps_Recon_WDL", - "CUP_B_CZ_SpecOps_Recon_WDL", - "CUP_B_CZ_Soldier_RPG_WDL", - "CUP_B_CZ_SpecOps_MG_WDL", - "CUP_B_CZ_SpecOps_MG_WDL", - "CUP_B_CZ_SpecOps_GL_WDL", - "CUP_B_CZ_SpecOps_GL_WDL", - "CUP_B_CZ_Medic_WDL", - "CUP_B_CZ_Engineer_WDL" -]; - -// Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL", - "CUP_B_CZ_Soldier_WDL" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_B_Dingo_CZ_Wdl", // Dingo 2 (MG) (Woodland) - "CUP_B_Dingo_GL_CZ_Wdl", // Dingo 2 (GL) (Woodland) - "QIN_Titus_WDL", // Nexter Titus - "QIN_Titus_arx20_WDL", // Nexter Titus ARX20 - "CUP_B_RM70_CZ", // RM-70 - "I_APC_Wheeled_03_cannon_F", // Pandur II - "CUP_B_BMP2_CZ", // BVP-2 - "B_APC_Tracked_01_AA_F", // IFV-6a Cheetah - "CUP_B_T72_CZ", // T-72M4CZ - "CUP_B_L39_CZ_GREY", // L-39ZA (Grey) - "I_Plane_Fighter_03_dynamicLoadout_F", // L-159 Alca - "I_Plane_Fighter_04_F" // JAS 39 Gripen -]; From dd34b313217ae76d6bd261592feca7595890ec66 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:28:24 +0200 Subject: [PATCH 021/115] Delete CUP_BAF_Desert.sqf --- .../presets/players/CUP_BAF_Desert.sqf | 333 ------------------ 1 file changed, 333 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_BAF_Desert.sqf diff --git a/Missionframework/presets/players/CUP_BAF_Desert.sqf b/Missionframework/presets/players/CUP_BAF_Desert.sqf deleted file mode 100644 index 1364d77f6..000000000 --- a/Missionframework/presets/players/CUP_BAF_Desert.sqf +++ /dev/null @@ -1,333 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - None -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_LR_Ambulance_GB_D"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_BAF_Soldier_Crew_DDPM"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DDPM"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_BAF_DES"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_BAF_Soldier_RiflemanLite_DDPM",15,0,0], // Rifleman (Light) - ["CUP_B_BAF_Soldier_Rifleman_DDPM",20,0,0], // Rifleman - ["CUP_B_BAF_Soldier_RiflemanAT_DDPM",30,0,0], // Rifleman (AT) - ["CUP_B_BAF_Soldier_Grenadier_DDPM",25,0,0], // Grenadier - ["CUP_B_BAF_Soldier_AutoRifleman_DDPM",25,0,0], // Autorifleman - ["CUP_B_BAF_Soldier_HeavyGunner_DDPM",35,0,0], // Heavygunner - ["CUP_B_BAF_Soldier_Marksman_DDPM",30,0,0], // Marksman - ["CUP_B_BAF_Soldier_SharpShooter_DDPM",40,0,0], // Sharpshooter - ["CUP_B_BAF_Soldier_AT_DDPM",50,10,0], // AT Specialist - ["CUP_B_BAF_Soldier_AA_DDPM",50,10,0], // AA Specialist - ["CUP_B_BAF_Soldier_Medic_DDPM",30,0,0], // Combat Life Saver - ["CUP_B_BAF_Soldier_Engineer_DDPM",30,0,0], // Engineer - ["CUP_B_BAF_Soldier_Explosive_DDPM",30,0,0], // Explosives Specialist - ["CUP_B_BAF_Soldier_Rifleman_MTP",20,0,0], // Recon Scout - ["CUP_B_BAF_Soldier_RiflemanAT_MTP",30,0,0], // Recon Scout (AT) - ["CUP_B_BAF_Soldier_Marksman_MTP",30,0,0], // Recon Marksman - ["CUP_B_BAF_Soldier_SharpShooter_MTP",40,0,0], // Recon Sharpshooter - ["CUP_B_BAF_Soldier_Medic_MTP",30,0,0], // Recon Paramedic - ["CUP_B_BAF_Soldier_Explosive_MTP",30,0,0], // Recon Demolition Expert - ["CUP_B_BAF_Sniper_AS50_TWS_DDPM",70,5,0], // Sniper - ["CUP_B_BAF_Sniper_AS50_DDPM",70,5,0], // Sniper (Arid) - ["CUP_B_BAF_Sniper_DDPM",70,5,0], // Sniper (Lush) - ["CUP_B_BAF_Spotter_DDPM",20,0,0], // Spotter - ["CUP_B_BAF_Soldier_Crew_DDPM",10,0,0], // Crewman - ["CUP_B_BAF_Soldier_Paratrooper_DDPM",20,0,0], // Para Trooper - ["CUP_B_BAF_Soldier_Helicrew_DDPM",10,0,0], // Helicopter Crew - ["CUP_B_BAF_Soldier_Helipilot_DDPM",10,0,0], // Helicopter Pilot - ["CUP_B_BAF_Soldier_Pilot_DDPM",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_LR_Transport_GB_D",75,0,50], // Land Rover 110 Transport - ["CUP_B_LR_MG_GB_D",75,50,50], // Land Rover 110 (M2) - ["CUP_B_LR_Special_M2_GB_D",100,80,50], // Land Rover 110 (M2 Special) - ["CUP_B_LR_Special_GMG_GB_D",100,100,50], // Land Rover 110 (GMG Special) - ["CUP_B_BAF_Coyote_L2A1_D",200,40,50], // Coyote L2A1 - ["CUP_B_BAF_Coyote_GMG_D",200,60,50], // Coyote GMG - ["CUP_B_Mastiff_LMG_GB_D",250,20,150], // Mastiff PPV LMG - ["CUP_B_Mastiff_HMG_GB_D",250,40,150], // Mastiff PPV HMG - ["CUP_B_Mastiff_GMG_GB_D",250,60,150], // Mastiff PPV GMG - ["CUP_B_Wolfhound_LMG_GB_D",275,20,150], // Wolfhound TSV LMG - ["CUP_B_Wolfhound_HMG_GB_D",275,40,150], // Wolfhound TSV HMG - ["CUP_B_Wolfhound_GMG_GB_D",275,60,150], // Wolfhound TSV GMG - ["CUP_B_MTVR_BAF_DES",125,0,75] // MTVR Transport -]; - -heavy_vehicles = [ - ["CUP_B_FV432_Bulldog_GB_D",300,100,150], // FV432 Bulldog M240 - ["CUP_B_FV432_Bulldog_GB_D_RWS",300,250,150], // FV432 Bulldog M2 RWS - ["CUP_B_MCV80_GB_D",300,450,275], // MCV-80 Warrior - ["CUP_B_MCV80_GB_D_SLAT",400,450,275], // MCV-80 Warrior (SLAT) - ["CUP_B_FV510_GB_D",350,550,275], // FV510 Warrior - ["CUP_B_FV510_GB_D_SLAT",450,550,275], // FV510 Warrior (SLAT) - ["CUP_B_Challenger2_Desert_BAF",500,800,450], // FV4034 Challenger 2 - ["CUP_B_Challenger2_2CD_BAF",500,800,450] // FV4034 Challenger 2 (Two-Color Desert) -]; - -air_vehicles = [ - ["CUP_B_AW159_Unarmed_RN_Blackcat",225,0,125], // AW159 Wildcat (Black Cat, Unarmed) - ["CUP_B_AW159_Unarmed_GB",225,0,125], // AW159 Wildcat (Green, Unarmed) - ["CUP_B_AW159_Unarmed_RN_Grey",225,0,125], // AW159 Wildcat (Grey, Unarmed) - ["CUP_B_AW159_RN_Blackcat",350,400,125], // AW159 Wildcat (Black Cat) - ["CUP_B_AW159_GB",350,400,125], // AW159 Wildcat (Green) - ["CUP_B_AW159_RN_Grey",350,400,125], // AW159 Wildcat (Grey) - ["CUP_B_AH1_DL_BAF",750,600,325], // AH1 - ["CUP_B_GR9_DYN_GB",1000,1200,600], // Harrier GR.9 - ["CUP_B_F35B_BAF",1500,1750,450], // F-35B Lightning II - ["CUP_B_F35B_Stealth_BAF",1500,1750,450] // F-35B Lightning II (Stealth) -]; - -static_vehicles = [ - ["CUP_B_L111A1_BAF_DDPM",25,40,0], // L111A1 Machine Gun - ["CUP_B_L111A1_MiniTripod_BAF_DDPM",25,40,0], // L111A1 Minitripod - ["CUP_WV_B_CRAM",500,500,0], // C-RAM - ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS - ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS - ["B_Mortar_01_F",80,150,0], // Mk6 Mortar - ["CUP_B_L16A2_BAF_DDPM",80,150,0] // L16A2 81mm Mortar -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["Flag_UK_F",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["CUP_B_TowingTractor_GB",50,0,25], // Towing Tractor - ["CUP_B_MTVR_Repair_BAF_DES",425,0,75], // MTVR Repair - ["CUP_B_MTVR_Refuel_BAF_DES",125,0,375], // MTVR Refuel - ["CUP_B_MTVR_Ammo_BAF_DES",125,300,75], // MTVR Ammo - ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_BAF_Soldier_TeamLeader_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM", - "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", - "CUP_B_BAF_Soldier_Grenadier_DDPM", - "CUP_B_BAF_Soldier_AutoRifleman_DDPM", - "CUP_B_BAF_Soldier_AutoRifleman_DDPM", - "CUP_B_BAF_Soldier_Marksman_DDPM", - "CUP_B_BAF_Soldier_Medic_DDPM", - "CUP_B_BAF_Soldier_Engineer_DDPM" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_BAF_Soldier_TeamLeader_DDPM", - "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", - "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", - "CUP_B_BAF_Soldier_Grenadier_DDPM", - "CUP_B_BAF_Soldier_AutoRifleman_DDPM", - "CUP_B_BAF_Soldier_AutoRifleman_DDPM", - "CUP_B_BAF_Soldier_HeavyGunner_DDPM", - "CUP_B_BAF_Soldier_SharpShooter_DDPM", - "CUP_B_BAF_Soldier_Medic_DDPM", - "CUP_B_BAF_Soldier_Engineer_DDPM" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_BAF_Soldier_TeamLeader_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM", - "CUP_B_BAF_Soldier_AT_DDPM", - "CUP_B_BAF_Soldier_AT_DDPM", - "CUP_B_BAF_Soldier_AT_DDPM", - "CUP_B_BAF_Soldier_Medic_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_BAF_Soldier_TeamLeader_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM", - "CUP_B_BAF_Soldier_AA_DDPM", - "CUP_B_BAF_Soldier_AA_DDPM", - "CUP_B_BAF_Soldier_AA_DDPM", - "CUP_B_BAF_Soldier_Medic_DDPM", - "CUP_B_BAF_Soldier_Rifleman_DDPM" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_BAF_Soldier_TeamLeader_MTP", - "CUP_B_BAF_Soldier_Rifleman_MTP", - "CUP_B_BAF_Soldier_Rifleman_MTP", - "CUP_B_BAF_Soldier_RiflemanLAT_MTP", - "CUP_B_BAF_Soldier_Marksman_MTP", - "CUP_B_BAF_Soldier_Marksman_MTP", - "CUP_B_BAF_Soldier_SharpShooter_MTP", - "CUP_B_BAF_Soldier_SharpShooter_MTP", - "CUP_B_BAF_Soldier_Medic_MTP", - "CUP_B_BAF_Soldier_Explosive_MTP" -]; - -// Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM", - "CUP_B_BAF_Soldier_Paratrooper_DDPM" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_B_MCV80_GB_D_SLAT", // MCV-80 Warrior (SLAT) - "CUP_B_FV510_GB_D", // FV510 Warrior - "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT) - "CUP_B_Challenger2_Desert_BAF", // FV4034 Challenger 2 - "CUP_B_Challenger2_2CD_BAF", // FV4034 Challenger 2 (Two-Color Desert) - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_F35B_BAF", // F-35B Lightning II - "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) - "CUP_WV_B_CRAM", // C-RAM - "CUP_WV_B_SS_Launcher", // Mk-29 GMLS - "CUP_WV_B_RAM_Launcher" // Mk-49 GMLS -]; From 0e261f100d0619b2c71b1a8bb9e01ac4513f1aeb Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:28:29 +0200 Subject: [PATCH 022/115] Delete CUP_BAF_Woodland.sqf --- .../presets/players/CUP_BAF_Woodland.sqf | 337 ------------------ 1 file changed, 337 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_BAF_Woodland.sqf diff --git a/Missionframework/presets/players/CUP_BAF_Woodland.sqf b/Missionframework/presets/players/CUP_BAF_Woodland.sqf deleted file mode 100644 index 10f9c11ca..000000000 --- a/Missionframework/presets/players/CUP_BAF_Woodland.sqf +++ /dev/null @@ -1,337 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - None -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_FV432_GB_Ambulance"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_BAF_Soldier_Crew_DPM"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DPM"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_BAF_WOOD"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_BAF_Soldier_RiflemanLite_DPM",15,0,0], // Rifleman (Light) - ["CUP_B_BAF_Soldier_Rifleman_DPM",20,0,0], // Rifleman - ["CUP_B_BAF_Soldier_RiflemanAT_DPM",30,0,0], // Rifleman (AT) - ["CUP_B_BAF_Soldier_Grenadier_DPM",25,0,0], // Grenadier - ["CUP_B_BAF_Soldier_AutoRifleman_DPM",25,0,0], // Autorifleman - ["CUP_B_BAF_Soldier_HeavyGunner_DPM",35,0,0], // Heavygunner - ["CUP_B_BAF_Soldier_Marksman_DPM",30,0,0], // Marksman - ["CUP_B_BAF_Soldier_SharpShooter_DPM",40,0,0], // Sharpshooter - ["CUP_B_BAF_Soldier_AT_DPM",50,10,0], // AT Specialist - ["CUP_B_BAF_Soldier_AA_DPM",50,10,0], // AA Specialist - ["CUP_B_BAF_Soldier_Medic_DPM",30,0,0], // Combat Life Saver - ["CUP_B_BAF_Soldier_Engineer_DPM",30,0,0], // Engineer - ["CUP_B_BAF_Soldier_Explosive_DPM",30,0,0], // Explosives Specialist - ["CUP_B_BAF_Soldier_Rifleman_MTP",20,0,0], // Recon Scout - ["CUP_B_BAF_Soldier_RiflemanAT_MTP",30,0,0], // Recon Scout (AT) - ["CUP_B_BAF_Soldier_Marksman_MTP",30,0,0], // Recon Marksman - ["CUP_B_BAF_Soldier_SharpShooter_MTP",40,0,0], // Recon Sharpshooter - ["CUP_B_BAF_Soldier_Medic_MTP",30,0,0], // Recon Paramedic - ["CUP_B_BAF_Soldier_Explosive_MTP",30,0,0], // Recon Demolition Expert - ["CUP_B_BAF_Sniper_AS50_TWS_DPM",70,5,0], // Sniper - ["CUP_B_BAF_Sniper_AS50_DPM",70,5,0], // Sniper (Arid) - ["CUP_B_BAF_Sniper_DPM",70,5,0], // Sniper (Lush) - ["CUP_B_BAF_Spotter_DPM",20,0,0], // Spotter - ["CUP_B_BAF_Soldier_Crew_DPM",10,0,0], // Crewman - ["CUP_B_BAF_Soldier_Paratrooper_DPM",20,0,0], // Para Trooper - ["CUP_B_BAF_Soldier_Helicrew_DPM",10,0,0], // Helicopter Crew - ["CUP_B_BAF_Soldier_Helipilot_DPM",10,0,0], // Helicopter Pilot - ["CUP_B_BAF_Soldier_Pilot_DPM",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_LR_Transport_GB_W",75,0,50], // Land Rover 110 (Transport) Woodland - ["CUP_B_LR_Ambulance_GB_W",75,0,50], // Land Rover 110 (Ambulance) Woodland - ["CUP_B_LR_MG_GB_W",75,50,50], // Land Rover 110 (M2) Woodland - ["CUP_B_LR_Special_M2_GB_W",100,80,50], // Land Rover 110 (M2 Special) Woodland - ["CUP_B_LR_Special_GMG_GB_W",100,100,50], // Land Rover 110 (GMG Special) Woodland - ["CUP_B_BAF_Coyote_L2A1_W",200,40,50], // Coyote L2A1 Woodland - ["CUP_B_BAF_Coyote_GMG_W",200,60,50], // Coyote GMG Woodland - ["CUP_B_Mastiff_LMG_GB_W",250,20,150], // Mastiff PPV LMG Woodland - ["CUP_B_Mastiff_HMG_GB_W",250,40,150], // Mastiff PPV HMG Woodland - ["CUP_B_Mastiff_GMG_GB_W",250,60,150], // Mastiff PPV GMG Woodland - ["CUP_B_Wolfhound_LMG_GB_W",275,20,150], // Wolfhound TSV LMG Woodland - ["CUP_B_Wolfhound_HMG_GB_W",275,40,150], // Wolfhound TSV HMG Woodland - ["CUP_B_Wolfhound_GMG_GB_W",275,60,150], // Wolfhound TSV GMG Woodland - ["CUP_B_MTVR_BAF_WOOD",125,0,75] // MTVR Transport -]; - -heavy_vehicles = [ - ["CUP_B_FV432_Bulldog_GB_W",300,100,150], // FV432 Bulldog M240 [Woodland] - ["CUP_B_FV432_Bulldog_GB_W_RWS",300,250,150], // FV432 Bulldog M2 RWS [Woodland] - ["CUP_B_FV432_Mortar",350,500,150], // FV432 Mortar - ["CUP_B_MCV80_GB_W",300,450,275], // MCV-80 Warrior (Woodland) - ["CUP_B_MCV80_GB_W_SLAT",400,450,275], // MCV-80 Warrior (SLAT - Woodland) - ["CUP_B_FV510_GB_W",350,550,275], // FV510 Warrior (Woodland) - ["CUP_B_FV510_GB_W_SLAT",450,550,275], // FV510 Warrior (SLAT - Woodland) - ["CUP_B_Challenger2_Woodland_BAF",500,800,450], // FV4034 Challenger 2 (Woodland) - ["CUP_B_Challenger2_2CW_BAF",500,800,450] // FV4034 Challenger 2 (Two-Color Woodland) -]; - -air_vehicles = [ - ["CUP_B_AW159_Unarmed_RN_Blackcat",225,0,125], // AW159 Wildcat (Black Cat, Unarmed) - ["CUP_B_AW159_Unarmed_GB",225,0,125], // AW159 Wildcat (Green, Unarmed) - ["CUP_B_AW159_Unarmed_RN_Grey",225,0,125], // AW159 Wildcat (Grey, Unarmed) - ["CUP_B_AW159_RN_Blackcat",350,400,125], // AW159 Wildcat (Black Cat) - ["CUP_B_AW159_GB",350,400,125], // AW159 Wildcat (Green) - ["CUP_B_AW159_RN_Grey",350,400,125], // AW159 Wildcat (Grey) - ["CUP_B_AH1_DL_BAF",750,600,325], // AH1 - ["CUP_B_GR9_DYN_GB",1000,1200,600], // Harrier GR.9 - ["CUP_B_F35B_BAF",1500,1750,450], // F-35B Lightning II - ["CUP_B_F35B_Stealth_BAF",1500,1750,450] // F-35B Lightning II (Stealth) -]; - -static_vehicles = [ - ["CUP_B_L111A1_BAF_DPM",25,40,0], // L111A1 Machine Gun - ["CUP_B_L111A1_MiniTripod_BAF_DPM",25,40,0], // L111A1 Minitripod - ["CUP_WV_B_CRAM",500,500,0], // C-RAM - ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS - ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS - ["B_Mortar_01_F",80,150,0], // Mk6 Mortar - ["CUP_B_L16A2_BAF_DPM",80,150,0] // L16A2 81mm Mortar -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["Flag_UK_F",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["CUP_B_MK10_GB",100,0,50], // LCU Mk.10 - ["CUP_B_TowingTractor_GB",50,0,25], // Towing Tractor - ["CUP_B_MTVR_Repair_BAF_WOOD",425,0,75], // MTVR Repair - ["CUP_B_MTVR_Refuel_BAF_WOOD",125,0,375], // MTVR Refuel - ["CUP_B_MTVR_Ammo_BAF_WOOD",125,300,75], // MTVR Ammo - ["B_Slingload_01_Repair_F",275,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,200], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,200,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_BAF_Soldier_TeamLeader_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM", - "CUP_B_BAF_Soldier_RiflemanLAT_DPM", - "CUP_B_BAF_Soldier_Grenadier_DPM", - "CUP_B_BAF_Soldier_AutoRifleman_DPM", - "CUP_B_BAF_Soldier_AutoRifleman_DPM", - "CUP_B_BAF_Soldier_Marksman_DPM", - "CUP_B_BAF_Soldier_Medic_DPM", - "CUP_B_BAF_Soldier_Engineer_DPM" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_BAF_Soldier_TeamLeader_DPM", - "CUP_B_BAF_Soldier_RiflemanLAT_DPM", - "CUP_B_BAF_Soldier_RiflemanLAT_DPM", - "CUP_B_BAF_Soldier_Grenadier_DPM", - "CUP_B_BAF_Soldier_AutoRifleman_DPM", - "CUP_B_BAF_Soldier_AutoRifleman_DPM", - "CUP_B_BAF_Soldier_HeavyGunner_DPM", - "CUP_B_BAF_Soldier_SharpShooter_DPM", - "CUP_B_BAF_Soldier_Medic_DPM", - "CUP_B_BAF_Soldier_Engineer_DPM" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_BAF_Soldier_TeamLeader_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM", - "CUP_B_BAF_Soldier_AT_DPM", - "CUP_B_BAF_Soldier_AT_DPM", - "CUP_B_BAF_Soldier_AT_DPM", - "CUP_B_BAF_Soldier_Medic_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_BAF_Soldier_TeamLeader_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM", - "CUP_B_BAF_Soldier_AA_DPM", - "CUP_B_BAF_Soldier_AA_DPM", - "CUP_B_BAF_Soldier_AA_DPM", - "CUP_B_BAF_Soldier_Medic_DPM", - "CUP_B_BAF_Soldier_Rifleman_DPM" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_BAF_Soldier_TeamLeader_MTP", - "CUP_B_BAF_Soldier_Rifleman_MTP", - "CUP_B_BAF_Soldier_Rifleman_MTP", - "CUP_B_BAF_Soldier_RiflemanLAT_MTP", - "CUP_B_BAF_Soldier_Marksman_MTP", - "CUP_B_BAF_Soldier_Marksman_MTP", - "CUP_B_BAF_Soldier_SharpShooter_MTP", - "CUP_B_BAF_Soldier_SharpShooter_MTP", - "CUP_B_BAF_Soldier_Medic_MTP", - "CUP_B_BAF_Soldier_Explosive_MTP" -]; - -// Paratroopers squad. -blufor_squad_para = [ - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM", - "CUP_B_BAF_Soldier_Paratrooper_DPM" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_B_MCV80_GB_W_SLAT", // MCV-80 Warrior (SLAT - Woodland) - "CUP_B_FV432_Mortar", // FV432 Mortar - "CUP_B_FV510_GB_W", // FV510 Warrior (Woodland) - "CUP_B_FV510_GB_W_SLAT", // FV510 Warrior (SLAT - Woodland) - "CUP_B_Challenger2_Woodland_BAF", // FV4034 Challenger 2 (Woodland) - "CUP_B_Challenger2_2CW_BAF", // FV4034 Challenger 2 (Two-Color Woodland) - "CUP_B_AH1_DL_BAF", // AH1 - "CUP_B_F35B_BAF", // F-35B Lightning II - "CUP_B_F35B_Stealth_BAF", // F-35B Lightning II (Stealth) - "CUP_WV_B_CRAM", // C-RAM - "CUP_WV_B_SS_Launcher", // Mk-29 GMLS - "CUP_WV_B_RAM_Launcher" // Mk-49 GMLS -]; From 3e4fa741cef34400721f307dcac198ef5f8c1bef Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:28:45 +0200 Subject: [PATCH 023/115] Delete CUP_CDF.sqf --- Missionframework/presets/players/CUP_CDF.sqf | 327 ------------------- 1 file changed, 327 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_CDF.sqf diff --git a/Missionframework/presets/players/CUP_CDF.sqf b/Missionframework/presets/players/CUP_CDF.sqf deleted file mode 100644 index 2f72bca81..000000000 --- a/Missionframework/presets/players/CUP_CDF.sqf +++ /dev/null @@ -1,327 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - None -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_BMP2_AMB_CDF"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_MI6A_CDF"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_CDF_Crew_FST"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_CDF_Pilot_FST"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera bas -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_Ural_Open_CDF"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_CDF_Soldier_FST",20,0,0], // Rifleman - ["CUP_B_CDF_Soldier_RPG18_FST",30,0,0], // Rifleman (RPG-18) - ["CUP_B_CDF_Soldier_GL_FST",25,0,0], // Grenadier - ["CUP_B_CDF_Soldier_AR_FST",25,0,0], // Automatic Rifleman - ["CUP_B_CDF_Soldier_MG_FST",35,0,0], // Machinegunner - ["CUP_B_CDF_Soldier_AMG_FST",35,0,0], // Asst. Machinegunner - ["CUP_B_CDF_Soldier_Marksman_FST",30,0,0], // Marksman - ["CUP_B_CDF_Soldier_LAT_FST",50,25,0], // AT Specialist - ["CUP_B_CDF_Soldier_AAT_FST",50,10,0], // Asst. AT Specialist - ["CUP_B_CDF_Soldier_AA_FST",50,10,0], // AA Specialist - ["CUP_B_CDF_Medic_FST",30,0,0], // Medic - ["CUP_B_CDF_Engineer_FST",30,0,0], // Engineer - ["CUP_B_CDF_Soldier_MNT",20,0,0], // Rifleman - ["CUP_B_CDF_Soldier_RPG18_MNT",30,0,0], // Rifleman (RPG-18 - TTsko Mountain) - ["CUP_B_CDF_Soldier_Marksman_MNT",30,0,0], // Marksman - ["CUP_B_CDF_Sniper_MNT",40,0,0], // Sniper - ["CUP_B_CDF_Medic_MNT",30,0,0], // Medic - ["CUP_B_CDF_Engineer_MNT",30,0,0], // Engineer - ["CUP_B_CDF_Sniper_FST",70,5,0], // Sniper - ["CUP_B_CDF_Spotter_FST",20,0,0], // Spotter - ["CUP_B_CDF_Crew_FST",10,0,0], // Crewman - ["CUP_B_CDF_Pilot_FST",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_S1203_Ambulance_CDF",75,0,50], // Škoda S1203 (Ambulance) - ["CUP_B_UAZ_Unarmed_CDF",75,0,50], // UAZ - ["CUP_B_UAZ_MG_CDF",100,60,50], // UAZ (DShKM) - ["CUP_B_UAZ_AGS30_CDF",100,80,50], // UAZ (AGS-30) - ["CUP_B_UAZ_SPG9_CDF",100,100,50], // UAZ (SPG-9) - ["CUP_B_UAZ_METIS_CDF",100,120,50], // UAZ (Metis-M) - ["CUP_B_UAZ_AA_CDF",100,160,50], // UAZ (AA) - ["CUP_B_Ural_ZU23_CDF",150,300,100], // Ural (ZU-23) - ["CUP_B_BM21_CDF",225,750,100], // BM-21 - ["CUP_B_Kamaz_CDF",125,0,75], // Kamaz 5350 - ["CUP_B_Kamaz_Open_CDF",125,0,75], // Kamaz 5350 (Open) - ["CUP_B_Ural_Open_CDF",125,0,75], // Ural (Open) - ["CUP_B_Ural_CDF",125,0,75] // Ural -]; - -heavy_vehicles = [ - ["CUP_B_BRDM2_CDF",200,200,125], // BRDM-2 - ["CUP_B_BRDM2_ATGM_CDF",200,400,125], // BRDM-2 (ATGM) - ["CUP_B_BTR60_CDF",300,200,125], // BTR-60PB - ["CUP_B_BTR80_CDF",400,200,150], // BTR-80 - ["CUP_B_BTR80A_CDF",450,300,150], // BTR-80A - ["CUP_B_MTLB_pk_CDF",150,50,100], // MT-LB LV - ["CUP_B_BMP2_CDF",500,400,200], // BMP-2 - ["CUP_B_ZSU23_Afghan_CDF",350,350,200], // ZSU-23-4 Afghanski - ["CUP_B_ZSU23_CDF",450,350,200], // ZSU-23-4 - ["CUP_B_T72_CDF",600,500,250] // T-72 -]; - -air_vehicles = [ - ["CUP_B_Mi17_CDF",300,100,300], // Mi-8MT - ["CUP_B_Pchela1T_CDF",100,0,50], // Pchela-1T - ["CUP_B_Mi24_D_Dynamic_CDF",700,600,300], // Mi-24D - ["CUP_B_Su25_Dyn_CDF",1000,800,400], // Su-25 Frogfoot - ["CUP_B_SU34_CDF",1200,1000,500] // Su-34 -]; - -static_vehicles = [ - ["CUP_B_DSHKM_CDF",25,40,0], // DShKM - ["CUP_B_DSHkM_MiniTripod_CDF",25,40,0], // DShKM Minitripod - ["CUP_B_AGS_CDF",25,60,0], // AGS-30 - ["CUP_B_SPG9_CDF",50,100,0], // SPG-9 - ["CUP_B_Igla_AA_pod_CDF",100,200,0], // Igla AA Pod - ["CUP_B_ZU23_CDF",100,300,0], // ZU-23 - ["B_Mortar_01_F",80,150,0], // Mk6 Mortar - ["CUP_B_2b14_82mm_CDF",80,150,0], // Podnos 2B14 - ["CUP_B_D30_AT_CDF",100,200,0], // D-30 AT - ["CUP_B_D30_CDF",200,250,0] // D-30 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["FlagCarrierCDFEnsign_EP1",0,0,0], - ["FlagCarrierCDF",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["CUP_B_Tractor_CDF",50,0,75], // Towing Tractor - ["CUP_B_Kamaz_Repair_CDF",425,0,75], // Kamaz 5350 (Repair) - ["CUP_B_Kamaz_Refuel_CDF",125,0,375], // Kamaz 5350 (Fuel) - ["CUP_B_Kamaz_Reammo_CDF",125,300,75], // Kamaz 5350 (Ammo) - ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_CDF_Soldier_TL_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_RPG18_FST", - "CUP_B_CDF_Soldier_GL_FST", - "CUP_B_CDF_Soldier_AR_FST", - "CUP_B_CDF_Soldier_AR_FST", - "CUP_B_CDF_Soldier_Marksman_FST", - "CUP_B_CDF_Medic_FST", - "CUP_B_CDF_Engineer_FST" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_CDF_Soldier_TL_FST", - "CUP_B_CDF_Soldier_RPG18_FST", - "CUP_B_CDF_Soldier_RPG18_FST", - "CUP_B_CDF_Soldier_GL_FST", - "CUP_B_CDF_Soldier_AR_FST", - "CUP_B_CDF_Soldier_AR_FST", - "CUP_B_CDF_Soldier_MG_FST", - "CUP_B_CDF_Soldier_Marksman_FST", - "CUP_B_CDF_Medic_FST", - "CUP_B_CDF_Engineer_FST" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_CDF_Soldier_TL_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_LAT_FST", - "CUP_B_CDF_Soldier_LAT_FST", - "CUP_B_CDF_Soldier_AAT_FST", - "CUP_B_CDF_Medic_FST", - "CUP_B_CDF_Soldier_FST" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_CDF_Soldier_TL_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_AA_FST", - "CUP_B_CDF_Soldier_AA_FST", - "CUP_B_CDF_Soldier_AA_FST", - "CUP_B_CDF_Medic_FST", - "CUP_B_CDF_Soldier_FST" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_CDF_Soldier_TL_MNT", - "CUP_B_CDF_SOldier_MNT", - "CUP_B_CDF_Soldier_GL_MNT", - "CUP_B_CDF_Soldier_MG_MNT", - "CUP_B_CDF_Soldier_LAT_MNT", - "CUP_B_CDF_Soldier_RPG18_MNT", - "CUP_B_CDF_Soldier_MArksman_MNT", - "CUP_B_CDF_Sniper_MNT", - "CUP_B_CDF_Medic_MNT", - "CUP_B_CDF_Engineer_MNT" -]; - -// Paratroopers squad. -blufor_squad_para = [ - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST", - "CUP_B_CDF_Soldier_FST" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_B_BTR60_CDF", // BTR-60 PB - "CUP_B_BM21_CDF", // BM-21 - "CUP_B_BMP2_CDF", // BMP-2 - "CUP_B_ZSU23_Afghan_CDF", // ZSU-23-4 Afghanski - "CUP_B_ZSU23_CDF", // ZSU-23-4 - "CUP_B_T72_CDF", // T-72 - "CUP_B_Mi24_D_Dynamic_CDF", // Mi-24D - "CUP_B_Su25_Dyn_CDF", // Su-25 Frogfoot - "CUP_B_SU34_CDF", // Su-34 - "CUP_B_D30_CDF" // D-30 -]; From 7e8bcc8afb8fe4cb5f0b115e83281220259d9607 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:28:50 +0200 Subject: [PATCH 024/115] Delete CUP_ChDKZ.sqf --- .../presets/players/CUP_ChDKZ.sqf | 317 ------------------ 1 file changed, 317 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_ChDKZ.sqf diff --git a/Missionframework/presets/players/CUP_ChDKZ.sqf b/Missionframework/presets/players/CUP_ChDKZ.sqf deleted file mode 100644 index 2fffdec72..000000000 --- a/Missionframework/presets/players/CUP_ChDKZ.sqf +++ /dev/null @@ -1,317 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - None -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_O_BMP_HQ_CHDKZ"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_O_BMP2_AMB_CHDKZ"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_O_MI6A_CHDKZ"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_O_INS_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_O_INS_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_O_Mi8_medevac_CHDKZ"; // These are the little birds which spawn on the Freedom or at Chimera bas -KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_O_Ural_Open_CHDKZ"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_O_INS_Soldier",20,0,0], // Rifleman - ["CUP_O_INS_Soldier_LAT",30,0,0], // Rifleman (RPG-18) - ["CUP_O_INS_Soldier_GL",25,0,0], // Grenadier - ["CUP_O_INS_Soldier_AR",25,0,0], // Autorifleman - ["CUP_O_INS_Soldier_MG",35,0,0], // Machine Gunner - ["CUP_O_INS_Soldier_Ammo",35,0,0], // Ammo Bearer - ["CUP_O_INS_Soldier_AT",50,25,0], // AT Specialist - ["CUP_O_INS_Soldier_AA",50,10,0], // AA Specialist - ["CUP_O_INS_Medic",30,0,0], // Medic - ["CUP_O_INS_Soldier_Engineer",30,0,0], // Engineer - ["CUP_O_INS_Villager3",10,0,0], // Farmer - ["CUP_O_INS_Woodlander3",10,0,0], // Forester - ["CUP_O_INS_Woodlander2",10,0,0], // Gamekeeper - ["CUP_O_INS_Worker2",10,0,0], // Local - ["CUP_O_INS_Villager4",10,0,0], // Villager - ["CUP_O_INS_Woodlander1",10,0,0], // Woodman - ["CUP_O_INS_Sniper",70,5,0], // Sniper - ["CUP_O_INS_Crew",10,0,0], // Crewman - ["CUP_O_INS_Pilot",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_O_Datsun_4seat",50,0,25], // Datsun 620 Pickup Woodland - ["CUP_O_Datsun_PK",50,10,25], // Datsun 620 Pickup (PK) - ["CUP_O_Datsun_AA",75,150,25], // Datsun 620 Pickup (AA) - ["CUP_O_UAZ_Unarmed_CHDKZ",100,0,50], // UAZ - ["CUP_O_UAZ_MG_CHDKZ",125,60,50], // UAZ (DShKM) - ["CUP_O_UAZ_AGS30_CHDKZ",125,80,50], // UAZ (AGS-30) - ["CUP_O_UAZ_SPG9_CHDKZ",125,100,50], // UAZ (SPG-9) - ["CUP_O_UAZ_METIS_CHDKZ",150,120,50], // UAZ (Metis-M) - ["CUP_O_UAZ_AA_CHDKZ",200,160,50], // UAZ (AA) - ["CUP_O_Ural_ZU23_CHDKZ",250,300,100], // Ural (ZU-23) - ["CUP_O_BM21_CHDKZ",300,750,100], // BM-21 - ["CUP_O_Ural_Open_CHDKZ",150,0,75], // Ural (Open) - ["CUP_O_Ural_CHDKZ",150,0,75] // Ural -]; - -heavy_vehicles = [ - ["CUP_O_BRDM2_CHDKZ",200,200,150], // BRDM-2 - ["CUP_O_BRDM2_ATGM_CHDKZ",200,400,150], // BRDM-2 (ATGM) - ["CUP_O_BTR60_CHDKZ",300,200,200], // BTR-60PB - ["CUP_O_BTR80_CHDKZ",400,300,200], // BTR-80 - ["CUP_O_BTR80A_CHDKZ",425,500,200], // BTR-80A - ["CUP_O_MTLB_pk_CHDKZ",175,50,100], // MT-LB LV - ["CUP_O_BMP2_CHDKZ",500,600,200], // BMP-2 - ["CUP_O_ZSU23_Afghan_CHDKZ",350,500,200], // ZSU-23-4 Afghanski - ["CUP_O_ZSU23_CHDKZ",500,500,200], // ZSU-23-4 - ["CUP_O_T55_CHDKZ",500,350,250], // T-55 - ["CUP_O_T72_CHDKZ",700,500,300] // T-72 -]; - -air_vehicles = [ - ["CUP_O_Mi8_CHDKZ",400,100,400] // Mi-8MT -]; - -static_vehicles = [ - ["CUP_O_DSHKM_ChDKZ",25,40,0], // DShKM - ["CUP_O_DSHkM_MiniTripod_ChDKZ",25,40,0], // DShKM Minitripod - ["CUP_O_AGS_ChDKZ",25,60,0], // AGS-30 - ["CUP_O_SPG9_ChDKZ",50,100,0], // SPG-9 - ["CUP_O_Igla_AA_pod_ChDKZ",100,200,0], // Igla AA Pod - ["CUP_O_ZU23_ChDKZ",100,300,0], // ZU-23 - ["CUP_O_2b14_82mm_ChDKZ",80,150,0], // Podnos 2B14 - ["CUP_O_D30_AT_ChDKZ",100,200,0], // D-30 AT - ["CUP_O_D30_ChDKZ",200,250,0] // D-30 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["FlagCarrierINS",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["CUP_O_Tractor_Old_CHDKZ",50,0,75], // Towing Tractor - ["CUP_O_Ural_Repair_CHDKZ",425,0,75], // Ural (Repair) - ["CUP_O_Ural_Refuel_CHDKZ",125,0,375], // Ural (Refuel) - ["CUP_O_Ural_Reammo_CHDKZ",125,300,75], // Ural (Ammo) - ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_O_INS_Officer", - "CUP_O_INS_Woodlander3", - "CUP_O_INS_Worker2", - "CUP_O_INS_Woodlander1", - "CUP_O_INS_Soldier_GL", - "CUP_O_INS_Soldier_AR", - "CUP_O_INS_Woodlander2", - "CUP_O_INS_Villager3", - "CUP_O_INS_Medic", - "CUP_O_INS_Soldier_LAT" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_O_INS_Officer", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_GL", - "CUP_O_INS_Soldier_AR", - "CUP_O_INS_Soldier_AR", - "CUP_O_INS_Soldier_MG", - "CUP_O_INS_Sniper", - "CUP_O_INS_Medic", - "CUP_O_INS_Soldier_Engineer" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_O_INS_Officer", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_AT", - "CUP_O_INS_Soldier_AT", - "CUP_O_INS_Soldier_AT", - "CUP_O_INS_Medic", - "CUP_O_INS_Soldier_Engineer" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_O_INS_Officer", - "CUP_O_INS_Soldier", - "CUP_O_INS_Soldier", - "CUP_O_INS_Soldier_AA", - "CUP_O_INS_Soldier_AA", - "CUP_O_INS_Soldier_AA", - "CUP_O_INS_Medic", - "CUP_O_INS_Soldier_Engineer" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_O_RUS_Soldier_TL", - "CUP_O_RUS_SpecOps_Scout", - "CUP_O_RUS_SpecOps_Night", - "CUP_O_RUS_SpecOps_Night", - "CUP_O_RUS_Soldier_GL", - "CUP_O_RUS_Soldier_GL", - "CUP_O_RUS_Soldier_Marksman", - "CUP_O_RUS_SpecOps", - "CUP_O_RUS_Saboteur" -]; - -// Paratroopers squad. -blufor_squad_para = [ - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT", - "CUP_O_INS_Soldier_LAT" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_O_BTR60_CHDKZ", // BTR-60 PB - "CUP_O_BM21_CHDKZ", // BM-21 - "CUP_O_BMP2_CHDKZ", // BMP-2 - "CUP_O_ZSU23_Afghan_CHDKZ", // ZSU-23-4 Afghanski - "CUP_O_ZSU23_CHDKZ", // ZSU-23-4 - "CUP_O_T72_CHDKZ", // T-72 - "CUP_O_BTR80_CHDKZ", // BTR-80 - "CUP_O_BTR80A_CHDKZ", // BTR-80A - "CUP_O_BRDM2_ATGM_CHDKZ", // BRDM-2 (ATGM) - "CUP_O_D30_ChDKZ" // D-30 -]; From 4c1187e268e3914b5b798a3111555a7b9ce0485c Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:28:56 +0200 Subject: [PATCH 025/115] Delete CUP_SLA.sqf --- Missionframework/presets/players/CUP_SLA.sqf | 327 ------------------- 1 file changed, 327 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_SLA.sqf diff --git a/Missionframework/presets/players/CUP_SLA.sqf b/Missionframework/presets/players/CUP_SLA.sqf deleted file mode 100644 index 0c352a5ec..000000000 --- a/Missionframework/presets/players/CUP_SLA.sqf +++ /dev/null @@ -1,327 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - None -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_O_BMP_HQ_sla"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_O_BMP2_AMB_sla"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_O_Mi8_SLA_1"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_O_sla_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_O_sla_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_O_UH1H_slick_SLA"; // These are the little birds which spawn on the Freedom or at Chimera bas -KPLIB_boat_classname = "CUP_O_PBX_SLA"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_O_Ural_Open_SLA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_O_sla_Soldier",15,0,0], // Rifleman - ["CUP_O_SLA_Soldier_Backpack",20,0,0], // Rifleman (Backpack) - ["CUP_O_sla_Soldier_AT",30,0,0], // Rifleman (RPG-7) - ["CUP_O_sla_Soldier_GL",25,0,0], // Grenadier - ["CUP_O_sla_Soldier_AR",25,0,0], // Autorifleman - ["CUP_O_sla_Soldier_MG",35,0,0], // Machinegunner - ["CUP_O_sla_Soldier_HAT",50,10,0], // AT Specialist - ["CUP_O_sla_Soldier_AA",50,10,0], // AA Specialist - ["CUP_O_sla_Medic",30,0,0], // Medic - ["CUP_O_sla_Engineer",30,0,0], // Engineer - ["CUP_O_sla_SpecOps_TL",20,0,0], // Especas Team Leader - ["CUP_O_sla_SpecOps_LAT",30,0,0], // Especas (RPG18) - ["CUP_O_sla_SpecOps_MG",40,0,0], // Especas Machinegunner - ["CUP_O_sla_SpecOps",30,0,0], // Especas Commando - ["CUP_O_sla_SpecOps_Demo",30,0,0], // Especas (Demolitions) - ["CUP_O_sla_Sniper",70,5,0], // Sniper - ["CUP_O_SLA_Sniper_SVD_Night",70,5,0], // Sniper (Night) - ["CUP_O_sla_Sniper_KSVK",70,5,0], // Sniper (KSVK) - ["CUP_O_sla_Soldier_AKS_Night",70,5,0], // Soldier (AKS-74 Night) - ["CUP_O_SLA_Spotter",20,0,0], // Spotter - ["CUP_O_sla_Crew",10,0,0], // Crewman - ["CUP_O_sla_Pilot",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_O_UAZ_Unarmed_SLA",100,0,50], // UAZ - ["CUP_O_UAZ_MG_SLA",125,60,50], // UAZ (DShKM) - ["CUP_O_UAZ_AGS30_SLA",125,80,50], // UAZ (AGS-30) - ["CUP_O_UAZ_SPG9_SLA",125,100,50], // UAZ (SPG-9) - ["CUP_O_UAZ_METIS_SLA",150,120,50], // UAZ (Metis-M) - ["CUP_O_UAZ_AA_SLA",200,160,50], // UAZ (AA) - ["CUP_O_Ural_ZU23_SLA",250,300,100], // Ural (ZU-23) - ["CUP_O_BM21_SLA",300,750,100], // BM-21 - ["CUP_O_Ural_Open_SLA",150,0,75], // Ural (Open) - ["CUP_O_Ural_SLA",150,0,75] // Ural -]; - -heavy_vehicles = [ - ["CUP_O_BRDM2_SLA",200,200,150], // BRDM-2 - ["CUP_O_BRDM2_ATGM_SLA",200,400,150], // BRDM-2 (ATGM) - ["CUP_O_BTR60_SLA",300,200,200], // BTR-60PB - ["CUP_O_BTR80_SLA",400,300,200], // BTR-80 - ["CUP_O_BTR80A_SLA",425,500,200], // BTR-80A - ["CUP_O_MTLB_pk_SLA",175,50,100], // MT-LB LV - ["CUP_O_BMP2_SLA",500,600,200], // BMP-2 - ["CUP_O_ZSU23_Afghan_SLA",350,500,200], // ZSU-23-4 Afghanski - ["CUP_O_ZSU23_SLA",500,500,200], // ZSU-23-4 - ["CUP_O_T55_SLA",500,350,250], // T-55 - ["CUP_O_T72_SLA",700,500,300] // T-72 -]; - -air_vehicles = [ - ["CUP_O_UH1H_armed_SLA",400,250,250], // UH-1H (Armed) - ["CUP_O_UH1H_gunship_SLA",500,350,250], // UH-1H (Gunship) - ["CUP_O_Mi8_SLA_2",500,350,300], // Mi-8MTV3 - ["CUP_O_Mi24_D_Dynamic_SLA",600,650,300], // Mi-24D - ["CUP_O_Ka50_DL_SLA",800,750,350], // Ka-50 Black Shark - ["CUP_O_Su25_Dyn_SLA",1000,850,400], // Su-25 Frogfoot - ["CUP_O_SU34_SLA",1200,1000,500] // Su-34 -]; - -static_vehicles = [ - ["CUP_O_DSHKM_SLA",25,40,0], // DShKM - ["CUP_O_DSHkM_MiniTripod_SLA",25,40,0], // DShKM Minitripod - ["CUP_O_AGS_SLA",25,60,0], // AGS-30 - ["CUP_O_SPG9_SLA",50,100,0], // SPG-9 - ["CUP_O_Igla_AA_pod_SLA",100,200,0], // Igla AA Pod - ["CUP_O_ZU23_SLA",100,300,0], // ZU-23 - ["CUP_O_2b14_82mm_SLA",80,150,0], // Podnos 2B14 - ["CUP_O_D30_AT_SLA",100,200,0], // D-30 AT - ["CUP_O_D30_SLA",200,250,0] // D-30 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["FlagCarrierINS",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["CUP_O_LCVP_SLA",100,100,50], // LCVP - ["CUP_O_LCVP_VIV_SLA",100,100,50], // LCVP (VIV) - ["CUP_O_Tractor_SLA",50,0,75], // Towing Tractor - ["CUP_O_Ural_Repair_SLA",425,0,75], // Ural (Repair) - ["CUP_O_Ural_Refuel_SLA",125,0,375], // Ural (Refuel) - ["CUP_O_Ural_Reammo_SLA",125,300,75], // Ural (Ammo) - ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_O_sla_Soldier_SL", - "CUP_O_sla_Soldier", - "CUP_O_sla_Soldier", - "CUP_O_sla_Soldier_LAT", - "CUP_O_sla_Soldier_GL", - "CUP_O_sla_Soldier_AR", - "CUP_O_sla_Soldier_AR", - "CUP_O_sla_Sniper", - "CUP_O_sla_Medic", - "CUP_O_sla_Engineer" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_O_sla_Soldier_SL", - "CUP_O_sla_Soldier_LAT", - "CUP_O_sla_Soldier_LAT", - "CUP_O_sla_Soldier_GL", - "CUP_O_sla_Soldier_AR", - "CUP_O_sla_Soldier_AR", - "CUP_O_sla_Soldier_MG", - "CUP_O_sla_Sniper", - "CUP_O_sla_Medic", - "CUP_O_sla_Engineer" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_O_sla_Soldier_SL", - "CUP_O_sla_Soldier_AAT", - "CUP_O_sla_Soldier_AAT", - "CUP_O_sla_Soldier_AT", - "CUP_O_sla_Soldier_AT", - "CUP_O_sla_Soldier_HAT", - "CUP_O_sla_Medic", - "CUP_O_sla_Engineer" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_O_sla_Soldier_SL", - "CUP_O_sla_Soldier_Backpack", - "CUP_O_sla_Soldier_Backpack", - "CUP_O_sla_Soldier_AA", - "CUP_O_sla_Soldier_AA", - "CUP_O_sla_Soldier_AA", - "CUP_O_sla_Medic", - "CUP_O_sla_Engineer" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_O_sla_SpecOps_TL", - "CUP_O_sla_SpecOps", - "CUP_O_sla_SpecOps_Demo", - "CUP_O_sla_SpecOps", - "CUP_O_sla_SpecOps_LAT", - "CUP_O_sla_SpecOps_LAT", - "CUP_O_sla_SpecOps_MG" -]; - -// Paratroopers squad. -blufor_squad_para = [ - "CUP_O_sla_Officer_urban", - "CUP_O_sla_Officer_urban", - "CUP_O_sla_Officer_urban", - "CUP_O_sla_Officer_urban", - "CUP_O_sla_Officer_urban", - "CUP_O_sla_Officer_urban", - "CUP_O_sla_Soldier_LAT_urban", - "CUP_O_sla_Soldier_LAT_urban", - "CUP_O_sla_Soldier_LAT_urban", - "CUP_O_sla_Soldier_LAT_urban" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_O_BTR60_SLA", // BTR-60 PB - "CUP_O_BM21_SLA", // BM-21 - "CUP_O_BMP2_SLA", // BMP-2 - "CUP_O_ZSU23_Afghan_SLA", // ZSU-23-4 Afghanski - "CUP_O_ZSU23_SLA", // ZSU-23-4 - "CUP_O_T72_SLA", // T-72 - "CUP_O_BTR80_SLA", // BTR-80 - "CUP_O_BTR80A_SLA", // BTR-80A - "CUP_O_BRDM2_ATGM_SLA", // BRDM-2 (ATGM) - "CUP_O_Mi24_D_Dynamic_SLA", // Mi-24D - "CUP_O_Ka50_DL_SLA", // Ka-50 Black Shark - "CUP_O_Su25_Dyn_SLA", // Su-25 Frogfoot - "CUP_O_SU34_SLA", // Su-34 - "CUP_O_D30_SLA" // D-30 -]; From 02217a393442188d7f70791eb7bfc076a8b79805 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:29:04 +0200 Subject: [PATCH 026/115] Delete CUP_USA_Desert.sqf --- .../presets/players/CUP_USA_Desert.sqf | 378 ------------------ 1 file changed, 378 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_USA_Desert.sqf diff --git a/Missionframework/presets/players/CUP_USA_Desert.sqf b/Missionframework/presets/players/CUP_USA_Desert.sqf deleted file mode 100644 index 387181995..000000000 --- a/Missionframework/presets/players/CUP_USA_Desert.sqf +++ /dev/null @@ -1,378 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_US_Soldier",20,0,0], // Rifleman - ["CUP_B_US_Soldier_LAT",30,0,0], // Rifleman (AT) - ["CUP_B_US_Soldier_GL",25,0,0], // Grenadier - ["CUP_B_US_Soldier_AR",25,0,0], // Automatic Rifleman - ["CUP_B_US_Soldier_MG",35,0,0], // Machinegunner - ["CUP_B_US_Soldier_Marksman",30,0,0], // Marksman - ["CUP_B_US_Soldier_AT",50,25,0], // AT Specialist - ["CUP_B_US_Soldier_HAT",50,10,0], // AT Specialist (Javelin) - ["CUP_B_US_Soldier_AA",50,10,0], // AA Specialist - ["CUP_B_US_Medic",30,0,0], // Medic - ["CUP_B_US_Engineer",30,0,0], // Engineer - ["CUP_B_US_SpecOps_MG",30,0,0], // Machinegunner - ["CUP_B_US_SpecOps",20,0,0], // Operator - ["CUP_B_US_SpecOps_M",30,0,0], // Marksman - ["CUP_B_US_SpecOps_TL",40,0,0], // Team Leader - ["CUP_B_US_SpecOps_Medic",30,0,0], // Medic - ["CUP_B_US_Sniper",70,5,0], // Sniper - ["CUP_B_US_Sniper_M107",70,5,0], // Sniper (M107) - ["CUP_B_US_Spotter",20,0,0], // Spotter - ["CUP_B_US_Crew",10,0,0], // Crewman - ["CUP_B_US_Pilot",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) - ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 - ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 - ["CUP_B_HMMWV_TOW_USA",75,100,50], // HMMWV TOW - ["CUP_B_HMMWV_SOV_M2_USA",100,80,50], // HMMWV SOV (M2) - ["CUP_B_HMMWV_SOV_USA",100,100,50], // HMMWV SOV (Mk19) - ["CUP_B_HMMWV_Avenger_USA",200,350,125], // HMMWV Avenger - ["CUP_B_RG31_M2_USA",150,75,100], // RG-31 Nyala M2 - ["CUP_B_RG31_M2_GC_USA",225,75,100], // RG-31 Nyala M2 GC - ["CUP_B_RG31E_M2_USA",200,75,100], // RG-31 Mk5E M2 - ["CUP_B_RG31_Mk19_USA",150,100,100], // RG-31 Mk.19 - ["CUP_B_MTVR_USA",125,0,75] // MTVR -]; - -heavy_vehicles = [ - ["CUP_B_M1126_ICV_M2_Desert_Slat",200,150,125], // M1126 ICV M2 CROWS (Desert - Slat) - ["CUP_B_M1126_ICV_MK19_Desert_Slat",200,200,125], // M1126 ICV MK19 CROWS (Desert - Slat) - ["CUP_B_M1128_MGS_Desert_Slat",200,500,125], // M1128 MGS (Desert - Slat) - ["CUP_B_M1135_ATGMV_Desert_Slat",200,300,125], // M1135 ATGMV (Desert - Slat) - ["CUP_B_M6LineBacker_USA_D",350,450,150], // M6 Linebacker (Desert) - ["CUP_B_M7Bradley_USA_D",300,300,150], // M7 Bradley (Desert) - ["CUP_B_M2Bradley_USA_D",300,400,150], // M2A2 Bradley IFV (Desert) - ["CUP_B_M2A3Bradley_USA_D",400,400,150], // M2A3 ERA Bradley IFV (Desert) - ["CUP_B_M1A1_DES_US_Army",500,500,200], // M1A1 Abrams (Desert) - ["CUP_B_M1A2_TUSK_MG_DES_US_Army",600,550,225], // M1A2 Abrams TUSK (Desert) - ["CUP_B_M1129_MC_MK19_Desert_Slat",600,800,300], // M1129 MC MK19 CROWS (Desert - Slat) - ["CUP_B_M270_HE_USA",600,1250,300], // M270 MLRS (HE) - ["CUP_B_M270_DPICM_USA",800,1750,400] // M270 MLRS (DPICM) -]; - -air_vehicles = [ - ["CUP_B_UH60M_Unarmed_FFV_MEV_US",300,0,200], // UH-60M MEDVAC (Unarmed/FFV) - ["CUP_B_UH60M_US",300,25,200], // UH-60M - ["CUP_B_UH60M_FFV_US",300,50,200], // UH-60M (FFV) - ["USAF_C130J",200,0,250], // C-130J Super Hercules - ["USAF_C130J_Cargo",200,0,250], // C-130J Super Hercules (Cargo) - ["USAF_C17",500,0,400], // C-17 Globemaster III - ["usaf_kc135",600,0,2500], // KC-135 Stratotanker - ["CUP_B_AH6M_USA",200,100,100], // AH-6M - ["CUP_B_MH60L_DAP_2x_US",400,250,225], // MH-60L DAP (2 Stores) - ["CUP_B_MH60L_DAP_4x_US",400,500,225], // MH-60L DAP (4 Stores) - ["CUP_B_AH64_DL_USA",500,600,300], // AH-64 - ["CUP_B_AH64D_DL_USA",700,600,200], // AH-64D - ["CUP_B_AH6X_USA",300,0,100], // AH-6X Littlebird ULB - ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk - ["USAF_MQ9",500,750,200], // MQ-9 Reaper - ["CUP_B_A10_DYN_USA",1000,800,400], // A-10A Thunderbolt II - ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II - ["USAF_F22",1800,2000,500], // F-22A Raptor - ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) - ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) - ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) - ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II - ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) - ["CUP_B_AH6X_USA",300,0,100] // AH-6X Littlebird ULB -]; - -static_vehicles = [ - ["CUP_B_M2StaticMG_US",25,40,0], // M2 Machine Gun - ["CUP_B_M2StaticMG_MiniTripod_US",25,40,0], // M2 Minitripod - ["CUP_B_TOW_TriPod_US",50,100,0], // TOW Tripod - ["CUP_WV_B_CRAM",500,500,0], // C-RAM - ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS - ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS - ["B_Mortar_01_F",80,150,0], // Mk6 Mortar - ["CUP_B_M252_US",80,150,0], // M252 81mm Mortar - ["CUP_B_M119_US",100,200,0] // M119 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["Flag_US_F",0,0,0], - ["FlagCarrierUSArmy_EP1",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) - ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) - ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) - ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) - ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) - ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) - ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) - ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) - ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) - ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) - ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) - ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) - ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) - ["CUP_B_TowingTractor_USA",50,0,75], // Towing Tractor - ["CUP_B_MTVR_Repair_USA",425,0,75], // MTVR Repair - ["CUP_B_MTVR_Refuel_USA",125,0,375], // MTVR Refuel - ["CUP_B_MTVR_Ammo_USA",125,300,75], // MTVR Ammo - ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier_LAT", - "CUP_B_US_Soldier_GL", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_Marksman", - "CUP_B_US_Medic", - "CUP_B_US_Engineer" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier_LAT", - "CUP_B_US_Soldier_LAT", - "CUP_B_US_Soldier_GL", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_MG", - "CUP_B_US_Soldier_Marksman", - "CUP_B_US_Medic", - "CUP_B_US_Engineer" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier_HAT", - "CUP_B_US_Soldier_AT", - "CUP_B_US_Soldier_AT", - "CUP_B_US_Medic", - "CUP_B_US_Soldier" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier_AA", - "CUP_B_US_Soldier_AA", - "CUP_B_US_Soldier_AA", - "CUP_B_US_Medic", - "CUP_B_US_Soldier" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_US_SpecOps_TL", - "CUP_B_US_SpecOps", - "CUP_B_US_SpecOps_Assault", - "CUP_B_US_SpecOps_MG", - "CUP_B_US_SpecOps_JTAC", - "CUP_B_US_SpecOps_M14", - "CUP_B_US_SpecOps_M", - "CUP_B_US_SpecOps_M", - "CUP_B_US_SpecOps_Medic", - "CUP_B_US_SpecOps_UAV" -]; - -// Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_WV_B_CRAM", // C-RAM - "CUP_WV_B_SS_Launcher", // Mk-29 GMLS - "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS - "CUP_B_A10_DYN_USA", // A-10A Thunderbolt II - "USAF_MQ9", // MQ-9 Reaper - "USAF_A10", // A-10C Thunderbolt II - "USAF_F22", // F-22A Raptor - "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) - "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) - "USAF_F22_Heavy", // F-22A Raptor (Heavy) - "USAF_F35A_STEALTH", // F-35A Lightning II - "USAF_F35A", // F-35A Lightning II (Heavy) - "CUP_B_AH64D_DL_USA", // AH-64D - "CUP_B_MH60L_DAP_2x_US", // MH-60L DAP (2 Stores) - "CUP_B_MH60L_DAP_4x_US", // MH-60L DAP (4 Stores) - "CUP_B_M1A1_DES_US_Army", // M1A1 Abrams (Desert) - "CUP_B_M1A2_TUSK_MG_DES_US_Army", // M1A2 Abrams TUSK (Desert) - "CUP_B_M270_HE_USA", // M270 MLRS (HE) - "CUP_B_M270_DPICM_USA", // M270 MLRS (DPICM) - "CUP_B_M6LineBacker_USA_D", // M6 Linebacker (Desert) - "CUP_B_M1128_MGS_Desert_Slat", // M1128 MGS (Desert - Slat) - "CUP_B_M1135_ATGMV_Desert_Slat", // M1135 ATGMV (Desert - Slat) - "CUP_B_M1129_MC_MK19_Desert_Slat", // M1129 MC MK19 CROWS (Desert - Slat) - "CUP_B_M2A3Bradley_USA_D", // M2A3 ERA Bradley IFV (Desert) - "CUP_B_M119_US", // M119 - "CUP_B_RG31E_M2_USA", // RG-31 Mk5E M2 - "CUP_B_RG31_Mk19_USA" // RG-31 Mk.19 -]; From c9aff9cb553ae0bd12eeef9abf837141360e8b57 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:29:15 +0200 Subject: [PATCH 027/115] Delete CUP_USA_Woodland.sqf --- .../presets/players/CUP_USA_Woodland.sqf | 381 ------------------ 1 file changed, 381 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_USA_Woodland.sqf diff --git a/Missionframework/presets/players/CUP_USA_Woodland.sqf b/Missionframework/presets/players/CUP_USA_Woodland.sqf deleted file mode 100644 index c052ce2b6..000000000 --- a/Missionframework/presets/players/CUP_USA_Woodland.sqf +++ /dev/null @@ -1,381 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_US_Soldier",20,0,0], // Rifleman - ["CUP_B_US_Soldier_LAT",30,0,0], // Rifleman (AT) - ["CUP_B_US_Soldier_GL",25,0,0], // Grenadier - ["CUP_B_US_Soldier_AR",25,0,0], // Automatic Rifleman - ["CUP_B_US_Soldier_MG",35,0,0], // Machinegunner - ["CUP_B_US_Soldier_Marksman",30,0,0], // Marksman - ["CUP_B_US_Soldier_AT",50,25,0], // AT Specialist - ["CUP_B_US_Soldier_HAT",50,10,0], // AT Specialist (Javelin) - ["CUP_B_US_Soldier_AA",50,10,0], // AA Specialist - ["CUP_B_US_Medic",30,0,0], // Medic - ["CUP_B_US_Engineer",30,0,0], // Engineer - ["CUP_B_US_SpecOps_MG",30,0,0], // Machinegunner - ["CUP_B_US_SpecOps",20,0,0], // Operator - ["CUP_B_US_SpecOps_M",30,0,0], // Marksman - ["CUP_B_US_SpecOps_TL",40,0,0], // Team Leader - ["CUP_B_US_SpecOps_Medic",30,0,0], // Medic - ["CUP_B_US_Sniper",70,5,0], // Sniper - ["CUP_B_US_Sniper_M107",70,5,0], // Sniper (M107) - ["CUP_B_US_Spotter",20,0,0], // Spotter - ["CUP_B_US_Crew",10,0,0], // Crewman - ["CUP_B_US_Pilot",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) - ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 - ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 - ["CUP_B_HMMWV_TOW_USA",75,100,50], // HMMWV TOW - ["CUP_B_HMMWV_SOV_M2_USA",100,80,50], // HMMWV SOV (M2) - ["CUP_B_HMMWV_SOV_USA",100,100,50], // HMMWV SOV (Mk19) - ["CUP_B_HMMWV_Avenger_USA",200,350,125], // HMMWV Avenger - ["CUP_B_RG31_M2_OD_USA",150,75,100], // RG-31 Nyala M2 - ["CUP_B_RG31_M2_OD_GC_USA",225,75,100], // RG-31 Nyala M2 GC - ["CUP_B_RG31E_M2_OD_USA",200,75,100], // RG-31 Mk5E M2 - ["CUP_B_RG31_Mk19_OD_USA",150,100,100], // RG-31 Mk.19 - ["CUP_B_MTVR_USA",125,0,75] // MTVR -]; - -heavy_vehicles = [ - ["CUP_B_M1126_ICV_M2_Woodland_Slat",200,150,125], // M1126 ICV M2 CROWS (Woodland - Slat) - ["CUP_B_M1126_ICV_MK19_Woodland_Slat",200,200,125], // M1126 ICV MK19 CROWS (Woodland - Slat) - ["CUP_B_M1128_MGS_Woodland_Slat",200,500,125], // M1128 MGS (Woodland - Slat) - ["CUP_B_M1135_ATGMV_Woodland_Slat",200,300,125], // M1135 ATGMV (Woodland - Slat) - ["CUP_B_M163_USA",250,600,200], // M163A1 VADS - ["CUP_B_M6LineBacker_USA_W",350,450,150], // M6 Linebacker (Woodland) - ["CUP_B_M7Bradley_USA_W",300,300,150], // M7 Bradley (Woodland) - ["CUP_B_M2Bradley_USA_W",300,400,150], // M2A2 Bradley IFV (Woodland) - ["CUP_B_M2A3Bradley_USA_W",400,400,150], // M2A3 ERA Bradley IFV (Woodland) - ["CUP_B_M1A1_Woodland_US_Army",500,500,200], // M1A1 Abrams (Woodland) - ["CUP_B_M1A2_TUSK_MG_US_Army",600,550,225], // M1A2 Abrams TUSK (Woodland) - ["CUP_B_M1129_MC_MK19_Woodland_Slat",600,800,400], // M1129 MC MK19 CROWS (Woodland - Slat) - ["CUP_B_M270_HE_USA",600,1250,300], // M270 MLRS (HE) - ["CUP_B_M270_DPICM_USA",800,1750,400] // M270 MLRS (DPICM) -]; - -air_vehicles = [ - ["CUP_B_UH60M_Unarmed_FFV_MEV_US",300,0,200], // UH-60M MEDVAC (Unarmed/FFV) - ["CUP_B_UH60M_US",300,25,200], // UH-60M - ["CUP_B_UH60M_FFV_US",300,50,200], // UH-60M (FFV) - ["USAF_C130J",200,0,250], // C-130J Super Hercules - ["USAF_C130J_Cargo",200,0,250], // C-130J Super Hercules (Cargo) - ["USAF_C17",500,0,400], // C-17 Globemaster III - ["usaf_kc135",600,0,2500], // KC-135 Stratotanker - ["CUP_B_AH6M_USA",200,100,100], // AH-6M - ["CUP_B_MH60L_DAP_2x_US",400,250,225], // MH-60L DAP (2 Stores) - ["CUP_B_MH60L_DAP_4x_US",400,500,225], // MH-60L DAP (4 Stores) - ["CUP_B_AH64_DL_USA",500,600,300], // AH-64 - ["CUP_B_AH64D_DL_USA",700,600,200], // AH-64D - ["CUP_B_AH6X_USA",300,0,100], // AH-6X Littlebird ULB - ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk - ["USAF_MQ9",500,750,200], // MQ-9 Reaper - ["CUP_B_AC47_Spooky_USA",600,300,400], // AC-47D Spooky - ["CUP_B_A10_DYN_USA",1000,800,400], // A-10A Thunderbolt II - ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II - ["USAF_F22",1800,2000,500], // F-22A Raptor - ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) - ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) - ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) - ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II - ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) - ["CUP_B_AH6X_USA",300,0,100] // AH-6X Littlebird ULB -]; - -static_vehicles = [ - ["CUP_B_M2StaticMG_US",25,40,0], // M2 Machine Gun - ["CUP_B_M2StaticMG_MiniTripod_US",25,40,0], // M2 Minitripod - ["CUP_B_TOW_TriPod_US",50,100,0], // TOW Tripod - ["CUP_WV_B_CRAM",500,500,0], // C-RAM - ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS - ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS - ["B_Mortar_01_F",80,150,0], // Mk6 Mortar - ["CUP_B_M252_US",80,150,0], // M252 81mm Mortar - ["CUP_B_M119_US",100,200,0] // M119 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["Flag_US_F",0,0,0], - ["FlagCarrierUSArmy_EP1",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) - ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) - ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) - ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) - ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) - ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) - ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) - ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) - ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) - ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) - ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) - ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) - ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) - ["CUP_B_TowingTractor_USA",50,0,75], // Towing Tractor - ["CUP_B_MTVR_Repair_USMC",425,0,75], // MTVR Repair - ["CUP_B_MTVR_Refuel_USMC",125,0,375], // MTVR Refuel - ["CUP_B_MTVR_Ammo_USMC",125,300,75], // MTVR Ammo - ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier_LAT", - "CUP_B_US_Soldier_GL", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_Marksman", - "CUP_B_US_Medic", - "CUP_B_US_Engineer" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier_LAT", - "CUP_B_US_Soldier_LAT", - "CUP_B_US_Soldier_GL", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_AR", - "CUP_B_US_Soldier_MG", - "CUP_B_US_Soldier_Marksman", - "CUP_B_US_Medic", - "CUP_B_US_Engineer" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier_HAT", - "CUP_B_US_Soldier_AT", - "CUP_B_US_Soldier_AT", - "CUP_B_US_Medic", - "CUP_B_US_Soldier" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_US_Soldier_SL", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier_AA", - "CUP_B_US_Soldier_AA", - "CUP_B_US_Soldier_AA", - "CUP_B_US_Medic", - "CUP_B_US_Soldier" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_US_SpecOps_TL", - "CUP_B_US_SpecOps", - "CUP_B_US_SpecOps_Assault", - "CUP_B_US_SpecOps_MG", - "CUP_B_US_SpecOps_JTAC", - "CUP_B_US_SpecOps_M14", - "CUP_B_US_SpecOps_M", - "CUP_B_US_SpecOps_M", - "CUP_B_US_SpecOps_Medic", - "CUP_B_US_SpecOps_UAV" -]; - -// Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier", - "CUP_B_US_Soldier" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_WV_B_CRAM", // C-RAM - "CUP_WV_B_SS_Launcher", // Mk-29 GMLS - "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS - "CUP_B_A10_DYN_USA", // A-10A Thunderbolt II - "USAF_MQ9", // MQ-9 Reaper - "USAF_A10", // A-10C Thunderbolt II - "USAF_F22", // F-22A Raptor - "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) - "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) - "USAF_F22_Heavy", // F-22A Raptor (Heavy) - "USAF_F35A_STEALTH", // F-35A Lightning II - "USAF_F35A", // F-35A Lightning II (Heavy) - "CUP_B_AH64D_DL_USA", // AH-64D - "CUP_B_MH60L_DAP_2x_US", // MH-60L DAP (2 Stores) - "CUP_B_MH60L_DAP_4x_US", // MH-60L DAP (4 Stores) - "CUP_B_M1A1_Woodland_US_Army", // M1A1 Abrams (Woodland) - "CUP_B_M1A2_TUSK_MG_US_Army", // M1A2 Abrams TUSK (Woodland) - "CUP_B_M270_HE_USA", // M270 MLRS (HE) - "CUP_B_M270_DPICM_USA", // M270 MLRS (DPICM) - "CUP_B_M6LineBacker_USA_W", // M6 Linebacker (Woodland) - "CUP_B_M163_USA", // M163A1 VADS - "CUP_B_M1128_MGS_Woodland_Slat", // M1128 MGS (Woodland - Slat) - "CUP_B_M1135_ATGMV_Woodland_Slat", // M1135 ATGMV (Woodland - Slat) - "CUP_B_M1129_MC_MK19_Woodland_Slat", // M1129 MC MK19 CROWS (Woodland - Slat) - "CUP_B_M2A3Bradley_USA_W", // M2A3 ERA Bradley IFV (Woodland) - "CUP_B_M119_US", // M119 - "CUP_B_RG31E_M2_USA", // RG-31 Mk5E M2 - "CUP_B_RG31_Mk19_USA" // RG-31 Mk.19 -]; From facff27ffec9c9ac99b68aaa7e780bbf55f3f25f Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:29:27 +0200 Subject: [PATCH 028/115] Delete CUP_USMC_Desert.sqf --- .../presets/players/CUP_USMC_Desert.sqf | 374 ------------------ 1 file changed, 374 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_USMC_Desert.sqf diff --git a/Missionframework/presets/players/CUP_USMC_Desert.sqf b/Missionframework/presets/players/CUP_USMC_Desert.sqf deleted file mode 100644 index 758276c6a..000000000 --- a/Missionframework/presets/players/CUP_USMC_Desert.sqf +++ /dev/null @@ -1,374 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_USMC_Crewman_FROG_DES"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_USMC_Soldier_FROG_DES",20,0,0], // Rifleman - ["CUP_B_USMC_Soldier_LAT_FROG_DES",30,0,0], // Rifleman (M136) - ["CUP_B_USMC_Soldier_GL_FROG_DES",25,0,0], // Grenadier - ["CUP_B_USMC_Soldier_AR_FROG_DES",25,0,0], // Automatic Rifleman - ["CUP_B_USMC_Soldier_MG_FROG_DES",35,0,0], // Machinegunner - ["CUP_B_USMC_Soldier_Marksman_FROG_DES",30,0,0], // Designated Marksman - ["CUP_B_USMC_Soldier_HAT_FROG_DES",50,25,0], // AT Specialist (Javelin) - ["CUP_B_USMC_Soldier_AT_FROG_DES",50,10,0], // AT Specialist (SMAW) - ["CUP_B_USMC_Soldier_AA_FROG_DES",50,10,0], // AA Specialist (Stinger) - ["CUP_B_USMC_Soldier_Medic_FROG_DES",30,0,0], // Corpsman - ["CUP_B_USMC_Soldier_Engineer_FROG_DES",30,0,0], // Engineer - ["CUP_B_FR_Soldier_Exp_DES",30,0,0], // Force Recon Demolitions Specialist - ["CUP_B_FR_Soldier_Assault_DES",20,0,0], // Force Recon Assault Rifleman - ["CUP_B_FR_Soldier_Marksman_DES",30,0,0], // Force Recon Marksman - ["CUP_B_FR_Soldier_TL_DES",40,0,0], // Force Recon Team Leader - ["CUP_B_FR_Medic_DES",30,0,0], // Force Recon Corpsman - ["CUP_B_USMC_Soldier_M40A3",70,5,0], // Sniper M40A3 - ["CUP_B_USMC_Soldier_M107",70,5,0], // Sniper M107 - ["CUP_B_USMC_Spotter",20,0,0], // Spotter - ["CUP_B_USMC_Crewman_FROG_DES",10,0,0], // Crewman - ["CUP_B_USMC_Pilot",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_M1030_USMC",50,0,25], // M1030 - ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) - ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 - ["CUP_B_HMMWV_TOW_USA",75,100,50], // HMMWV TOW - ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 - ["CUP_B_HMMWV_Avenger_USA",100,125,125], // HMMWV Avenger - ["CUP_B_RG31_M2_OD_USA",100,50,50], // RG-31 M2 - ["CUP_B_RG31E_M2_OD_USA",100,50,50], // RG-31 Mk5E M2 - ["CUP_B_RG31_Mk19_OD_USA",100,80,50], // RG-31 Mk.19 - ["CUP_B_MTVR_USA",125,0,75], // MTVR - ["CUP_B_RHIB_USMC",150,100,100], // RHIB - ["CUP_B_RHIB2Turret_USMC",250,200,100] // RHIB (Mk19) -]; - -heavy_vehicles = [ - ["CUP_B_LAV25_desert_USMC",200,175,125], // LAV-25A1 (Desert) - ["CUP_B_LAV25M240_desert_USMC",200,200,125], // LAV-25A1 (M240) (Desert) - ["CUP_B_LAV25_HQ_desert_USMC",200,50,125], // LAV-C2 (Desert) - ["CUP_B_AAV_Unarmed_USMC",300,0,150], // AAVC7/A1 (Command) - ["CUP_B_AAV_USMC",300,150,150], // AAVP7/A1 - ["CUP_B_M60A3_TTS_USMC",400,350,200], // M60A3 TTS - ["CUP_B_M1A1_DES_USMC",500,500,200], // M1A1 Abrams (Desert) - ["CUP_B_M1A2_TUSK_MG_DES_USMC",600,550,225], // M1A2 Abrams TUSK (Desert) - ["CUP_B_M270_HE_USMC",600,1250,300], // M270 MLRS (HE) - ["CUP_B_M270_DPICM_USMC",800,1750,400] // M270 MLRS (DPICM) -]; - -air_vehicles = [ - ["CUP_B_UH1Y_MEV_USMC",200,0,100], // UH-1Y Venom (MEDVAC) - ["CUP_B_UH1Y_Gunship_Dynamic_USMC",200,100,100], // UH-1Y Venom (Gunship) - ["CUP_B_MH60S_FFV_USMC",250,25,200], // MH-60S Seahawk (FFV) - ["CUP_B_UH60S_USN",250,50,200], // MH-60S Seahawk (M3M) - ["CUP_B_C130J_USMC",200,0,250], // C-130J - ["CUP_B_C130J_Cargo_USMC",200,0,250], // C-130J (VIV) - ["USAF_C17",500,0,400], // C-17 Globemaster III - ["usaf_kc135",600,0,2500], // KC-135 Stratotanker - ["CUP_B_AH1Z_Dynamic_USMC",500,500,200], // AH-1Z - ["CUP_B_MH60L_DAP_2x_USN",450,400,250], // MH-60S Knighthawk (ESSS x2) - ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk - ["CUP_B_USMC_DYN_MQ9",500,500,200], // MQ-9 Reaper - ["CUP_B_AV8B_DYN_USMC",1000,800,400], // AV-8B Harrier II - ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II - ["USAF_F22",1800,2000,500], // F-22A Raptor - ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) - ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) - ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) - ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II - ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) - ["CUP_B_F35B_Stealth_USMC",2500,2000,750], // F-35B Lightning II (Stealth) - ["CUP_B_F35B_USMC",2500,2250,750], // F-35B Lightning II - ["CUP_B_MV22_USMC_RAMPGUN",750,100,500], // MV-22B Osprey (Ramp Gun) - ["CUP_B_MV22_USMC",750,0,500], // MV-22B Osprey - ["CUP_B_MV22_VIV_USMC",750,0,500] // MV-22B Osprey (VIV) -]; - -static_vehicles = [ - ["CUP_B_M2StaticMG_USMC",25,40,0], // M2 Machine Gun - ["CUP_B_M2StaticMG_MiniTripod_USMC",25,40,0], // M2 Minitripod - ["CUP_B_TOW_TriPod_USMC",50,100,0], // TOW Tripod - ["CUP_WV_B_CRAM",500,500,0], // C-RAM - ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS - ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS - ["B_Mortar_01_F",80,150,0], // Mk6 Mortar - ["CUP_B_M252_USMC",80,150,0], // M252 81mm Mortar - ["CUP_B_M119_USMC",100,200,0] // M119 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["Flag_US_F",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) - ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) - ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) - ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) - ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) - ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) - ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) - ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) - ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) - ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) - ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) - ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) - ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) - ["CUP_B_LCU1600_USMC",250,0,175], // LCU-1610 - ["CUP_B_TowingTractor_USMC",50,0,75], // Towing Tractor - ["CUP_B_MTVR_Repair_USA",425,0,75], // MTVR Repair - ["CUP_B_MTVR_Refuel_USA",125,0,375], // MTVR Refuel - ["CUP_B_MTVR_Ammo_USA",125,300,75], // MTVR Ammo - ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_USMC_Soldier_SL_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_LAT_FROG_DES", - "CUP_B_USMC_Soldier_GL_FROG_DES", - "CUP_B_USMC_Soldier_AR_FROG_DES", - "CUP_B_USMC_Soldier_AR_FROG_DES", - "CUP_B_USMC_Soldier_Marksman_FROG_DES", - "CUP_B_USMC_Medic_FROG_DES", - "CUP_B_USMC_Engineer_FROG_DES" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_USMC_Soldier_SL_FROG_DES", - "CUP_B_USMC_Soldier_LAT_FROG_DES", - "CUP_B_USMC_Soldier_LAT_FROG_DES", - "CUP_B_USMC_Soldier_GL_FROG_DES", - "CUP_B_USMC_Soldier_AR_FROG_DES", - "CUP_B_USMC_Soldier_AR_FROG_DES", - "CUP_B_USMC_Soldier_MG_FROG_DES", - "CUP_B_USMC_Soldier_Marksman_FROG_DES", - "CUP_B_USMC_Medic_FROG_DES", - "CUP_B_USMC_Engineer_FROG_DES" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_USMC_Soldier_SL_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_HAT_FROG_DES", - "CUP_B_USMC_Soldier_AT_FROG_DES", - "CUP_B_USMC_Soldier_AT_FROG_DES", - "CUP_B_USMC_Medic_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_USMC_Soldier_SL_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_AA_FROG_DES", - "CUP_B_USMC_Soldier_AA_FROG_DES", - "CUP_B_USMC_Soldier_AA_FROG_DES", - "CUP_B_USMC_Medic_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_FR_Soldier_TL_DES", - "CUP_B_FR_Soldier_Assault_DES", - "CUP_B_FR_Soldier_Assault_DES", - "CUP_B_FR_Soldier_AR_DES", - "CUP_B_FR_Soldier_Operator_DES", - "CUP_B_FR_Saboteur_DES", - "CUP_B_FR_Soldier_Marksman_DES", - "CUP_B_FR_Soldier_Marksman_DES", - "CUP_B_FR_Medic_DES", - "CUP_B_FR_Soldier_Exp_DES" -]; - -// Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES", - "CUP_B_USMC_Soldier_FROG_DES" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_B_F35B_USMC", // F-35B Lightning II - "CUP_WV_B_CRAM", // C-RAM - "CUP_WV_B_SS_Launcher", // Mk-29 GMLS - "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS - "CUP_B_F35B_Stealth_USMC", // F-35B Lightning II (Stealth) - "CUP_B_AV8B_DYN_USMC", // AV-8B Harrier II - "USAF_A10", // A-10C Thunderbolt II - "USAF_F22", // F-22A Raptor - "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) - "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) - "USAF_F22_Heavy", // F-22A Raptor (Heavy) - "USAF_F35A_STEALTH", // F-35A Lightning II - "USAF_F35A", // F-35A Lightning II (Heavy) - "CUP_B_AH1Z_Dynamic_USMC", // AH-1Z - "CUP_B_MH60L_DAP_2x_USN", // MH-60S Knighthawk (ESSS x2) - "CUP_B_M1A1_DES_USMC", // M1A1 Abrams (Desert) - "CUP_B_M1A2_TUSK_MG_DES_USMC", // M1A2 Abrams TUSK (Desert) - "CUP_B_M270_HE_USMC", // M270 MLRS (HE) - "CUP_B_M270_DPICM_USMC", // M270 MLRS (DPICM) - "CUP_B_LAV25M240_desert_USMC", // LAV-25A1 (M240) (Desert) - "CUP_B_HMMWV_TOW_USA", // HMMWV TOW - "CUP_B_RG31_M2_USA", // RG-31 M2 - "CUP_B_RG31E_M2_USA", // RG-31 Mk5E M2 - "CUP_B_RG31_Mk19_USA", // RG-31 Mk.19 - "CUP_B_LAV25_desert_USMC" // LAV-25A1 (Desert) -]; From 20792d1bfc1bc9486e2cdc81164385dcf87b1e8e Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:29:34 +0200 Subject: [PATCH 029/115] Delete CUP_USMC_Woodland.sqf --- .../presets/players/CUP_USMC_Woodland.sqf | 375 ------------------ 1 file changed, 375 deletions(-) delete mode 100644 Missionframework/presets/players/CUP_USMC_Woodland.sqf diff --git a/Missionframework/presets/players/CUP_USMC_Woodland.sqf b/Missionframework/presets/players/CUP_USMC_Woodland.sqf deleted file mode 100644 index b68a1343e..000000000 --- a/Missionframework/presets/players/CUP_USMC_Woodland.sqf +++ /dev/null @@ -1,375 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack -*/ - -/* - --- Support classnames --- - Each of these should be unique. - The same classnames for different purposes may cause various unpredictable issues with player actions. - Or not, just don't try! -*/ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USMC"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_USMC_Crewman_FROG_WDL"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USMC"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. - -/* - --- Friendly classnames --- - Each array below represents one of the 7 pages within the build menu. - Format: ["vehicle_classname",supplies,ammunition,fuel], - Example: ["B_APC_Tracked_01_AA_F",300,150,150], - The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. - IMPORTANT: The last element inside each array must have no comma at the end! -*/ -infantry_units = [ - ["CUP_B_USMC_Soldier_FROG_WDL",20,0,0], // Rifleman - ["CUP_B_USMC_Soldier_LAT_FROG_WDL",30,0,0], // Rifleman (M136) - ["CUP_B_USMC_Soldier_GL_FROG_WDL",25,0,0], // Grenadier - ["CUP_B_USMC_Soldier_AR_FROG_WDL",25,0,0], // Automatic Rifleman - ["CUP_B_USMC_Soldier_MG_FROG_WDL",35,0,0], // Machinegunner - ["CUP_B_USMC_Soldier_Marksman_FROG_WDL",30,0,0], // Designated Marksman - ["CUP_B_USMC_Soldier_HAT_FROG_WDL",50,25,0], // AT Specialist (Javelin) - ["CUP_B_USMC_Soldier_AT_FROG_WDL",50,10,0], // AT Specialist (SMAW) - ["CUP_B_USMC_Soldier_AA_FROG_WDL",50,10,0], // AA Specialist (Stinger) - ["CUP_B_USMC_Soldier_Medic_FROG_WDL",30,0,0], // Corpsman - ["CUP_B_USMC_Soldier_Engineer_FROG_WDL",30,0,0], // Engineer - ["CUP_B_FR_Soldier_Exp_WDL",30,0,0], // Force Recon Demolitions Specialist - ["CUP_B_FR_Soldier_Assault",20,0,0], // Force Recon Assault Rifleman - ["CUP_B_FR_Soldier_Marksman_WDL",30,0,0], // Force Recon Marksman - ["CUP_B_FR_Soldier_TL",40,0,0], // Force Recon Team Leader - ["CUP_B_FR_Medic_WDL",30,0,0], // Force Recon Corpsman - ["CUP_B_USMC_Soldier_M40A3",70,5,0], // Sniper M40A3 - ["CUP_B_USMC_Soldier_M107",70,5,0], // Sniper M107 - ["CUP_B_USMC_Spotter",20,0,0], // Spotter - ["CUP_B_USMC_Crewman_FROG_WDL",10,0,0], // Crewman - ["CUP_B_USMC_Pilot",10,0,0] // Pilot -]; - -light_vehicles = [ - ["CUP_B_M1030_USMC",50,0,25], // M1030 - ["CUP_B_HMMWV_Unarmed_USMC",75,0,50], // HMMWV (Unarmed) - ["CUP_B_HMMWV_M1114_USMC",75,30,50], // HMMWV M240 - ["CUP_B_HMMWV_M2_USMC",75,60,50], // HMMWV M2 - ["CUP_B_HMMWV_TOW_USMC",75,100,50], // HMMWV TOW - ["CUP_B_HMMWV_MK19_USMC",75,80,50], // HMMWV MK19 - ["CUP_B_HMMWV_Avenger_USMC",100,125,125], // HMMWV Avenger - ["CUP_B_RG31_M2_OD_USMC",100,50,50], // RG-31 M2 - ["CUP_B_RG31E_M2_OD_USMC",100,50,50], // RG-31 Mk5E M2 - ["CUP_B_RG31_Mk19_OD_USMC",100,80,50], // RG-31 Mk.19 - ["CUP_B_MTVR_USMC",125,0,75], // MTVR - ["CUP_B_RHIB_USMC",150,100,100], // RHIB - ["CUP_B_RHIB2Turret_USMC",250,200,100] // RHIB (Mk19) -]; - -heavy_vehicles = [ - ["CUP_B_LAV25_green",200,175,125], // LAV-25A1 (Olive) - ["CUP_B_LAV25M240_green",200,200,125], // LAV-25A1 (M240) (Olive) - ["CUP_B_LAV25_HQ_green",200,50,125], // LAV-C2 (Olive) - ["CUP_B_AAV_Unarmed_USMC",300,0,150], // AAVC7/A1 (Command) - ["CUP_B_AAV_USMC",300,150,150], // AAVP7/A1 - ["CUP_B_M60A3_TTS_USMC",400,350,200], // M60A3 TTS - ["CUP_B_M1A1_Woodland_USMC",500,500,200], // M1A1 Abrams (Woodland) - ["CUP_B_M1A2_TUSK_MG_USMC",600,550,225], // M1A2 Abrams TUSK (Woodland) - ["CUP_B_M270_HE_USMC",600,1250,300], // M270 MLRS (HE) - ["CUP_B_M270_DPICM_USMC",800,1750,400] // M270 MLRS (DPICM) -]; - -air_vehicles = [ - ["CUP_B_UH1Y_MEV_USMC",200,0,100], // UH-1Y Venom (MEDVAC) - ["CUP_B_UH1Y_Gunship_Dynamic_USMC",200,100,100], // UH-1Y Venom (Gunship) - ["CUP_B_MH60S_FFV_USMC",250,25,200], // MH-60S Seahawk (FFV) - ["CUP_B_UH60S_USN",250,50,200], // MH-60S Seahawk (M3M) - ["USAF_C130J",200,0,250], // C-130J Super Hercules - ["USAF_C130J_Cargo",200,0,250], // C-130J Super Hercules (Cargo) - ["USAF_C17",500,0,400], // C-17 Globemaster III - ["usaf_kc135",600,0,2500], // KC-135 Stratotanker - ["CUP_B_AH1Z_Dynamic_USMC",500,500,200], // AH-1Z - ["CUP_B_MH60L_DAP_2x_USN",450,400,250], // MH-60S Knighthawk (ESSS x2) - ["USAF_RQ4A",500,0,200], // RQ-4A Global Hawk - ["CUP_B_USMC_DYN_MQ9",500,500,200], // MQ-9 Reaper - ["CUP_B_AV8B_DYN_USMC",1000,800,400], // AV-8B Harrier II - ["USAF_A10",1500,1000,400], // A-10C Thunderbolt II - ["USAF_F22",1800,2000,500], // F-22A Raptor - ["USAF_F22_EWP_AA",1800,2100,500], // F-22A Raptor (EWP-AA) - ["USAF_F22_EWP_AG",1800,2100,500], // F-22A Raptor (EWP-AG) - ["USAF_F22_Heavy",1800,2250,500], // F-22A Raptor (Heavy) - ["USAF_F35A_STEALTH",2250,2000,750], // F-35A Lightning II - ["USAF_F35A",2250,2250,750], // F-35A Lightning II (Heavy) - ["CUP_B_F35B_Stealth_USMC",2500,2000,750], // F-35B Lightning II (Stealth) - ["CUP_B_F35B_USMC",2500,2250,750], // F-35B Lightning II - ["CUP_B_MV22_USMC_RAMPGUN",750,100,500], // MV-22B Osprey (Ramp Gun) - ["CUP_B_MV22_USMC",750,0,500], // MV-22B Osprey - ["CUP_B_MV22_VIV_USMC",750,0,500] // MV-22B Osprey (VIV) -]; - -static_vehicles = [ - ["CUP_B_M2StaticMG_USMC",25,40,0], // M2 Machine Gun - ["CUP_B_M2StaticMG_MiniTripod_USMC",25,40,0], // M2 Minitripod - ["CUP_B_TOW_TriPod_USMC",50,100,0], // TOW Tripod - ["CUP_WV_B_CRAM",500,500,0], // C-RAM - ["CUP_WV_B_SS_Launcher",750,500,0], // Mk-29 GMLS - ["CUP_WV_B_RAM_Launcher",750,750,0], // Mk-49 GMLS - ["B_Mortar_01_F",80,150,0], // Mk6 Mortar - ["CUP_B_M252_USMC",80,150,0], // M252 81mm Mortar - ["CUP_B_M119_USMC",100,200,0] // M119 -]; - -buildings = [ - ["Land_Cargo_House_V1_F",0,0,0], - ["Land_Cargo_Patrol_V1_F",0,0,0], - ["Land_Cargo_Tower_V1_F",0,0,0], - ["Flag_NATO_F",0,0,0], - ["Flag_US_F",0,0,0], - ["Flag_White_F",0,0,0], - ["Land_Medevac_house_V1_F",0,0,0], - ["Land_Medevac_HQ_V1_F",0,0,0], - ["Flag_RedCrystal_F",0,0,0], - ["CamoNet_BLUFOR_F",0,0,0], - ["CamoNet_BLUFOR_open_F",0,0,0], - ["CamoNet_BLUFOR_big_F",0,0,0], - ["Land_PortableLight_single_F",0,0,0], - ["Land_PortableLight_double_F",0,0,0], - ["Land_LampSolar_F",0,0,0], - ["Land_LampHalogen_F",0,0,0], - ["Land_LampStreet_small_F",0,0,0], - ["Land_LampAirport_F",0,0,0], - ["Land_HelipadCircle_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["Land_HelipadRescue_F",0,0,0], // Strictly aesthetic - as in it does not increase helicopter cap! - ["PortableHelipadLight_01_blue_F",0,0,0], - ["PortableHelipadLight_01_green_F",0,0,0], - ["PortableHelipadLight_01_red_F",0,0,0], - ["Land_CampingChair_V1_F",0,0,0], - ["Land_CampingChair_V2_F",0,0,0], - ["Land_CampingTable_F",0,0,0], - ["MapBoard_altis_F",0,0,0], - ["MapBoard_stratis_F",0,0,0], - ["MapBoard_seismic_F",0,0,0], - ["Land_Pallet_MilBoxes_F",0,0,0], - ["Land_PaperBox_open_empty_F",0,0,0], - ["Land_PaperBox_open_full_F",0,0,0], - ["Land_PaperBox_closed_F",0,0,0], - ["Land_DieselGroundPowerUnit_01_F",0,0,0], - ["Land_ToolTrolley_02_F",0,0,0], - ["Land_WeldingTrolley_01_F",0,0,0], - ["Land_Workbench_01_F",0,0,0], - ["Land_GasTank_01_blue_F",0,0,0], - ["Land_GasTank_01_khaki_F",0,0,0], - ["Land_GasTank_01_yellow_F",0,0,0], - ["Land_GasTank_02_F",0,0,0], - ["Land_BarrelWater_F",0,0,0], - ["Land_BarrelWater_grey_F",0,0,0], - ["Land_WaterBarrel_F",0,0,0], - ["Land_WaterTank_F",0,0,0], - ["Land_BagFence_Round_F",0,0,0], - ["Land_BagFence_Short_F",0,0,0], - ["Land_BagFence_Long_F",0,0,0], - ["Land_BagFence_Corner_F",0,0,0], - ["Land_BagFence_End_F",0,0,0], - ["Land_BagBunker_Small_F",0,0,0], - ["Land_BagBunker_Large_F",0,0,0], - ["Land_BagBunker_Tower_F",0,0,0], - ["Land_HBarrier_1_F",0,0,0], - ["Land_HBarrier_3_F",0,0,0], - ["Land_HBarrier_5_F",0,0,0], - ["Land_HBarrier_Big_F",0,0,0], - ["Land_HBarrierWall4_F",0,0,0], - ["Land_HBarrierWall6_F",0,0,0], - ["Land_HBarrierWall_corner_F",0,0,0], - ["Land_HBarrierWall_corridor_F",0,0,0], - ["Land_HBarrierTower_F",0,0,0], - ["Land_CncBarrierMedium_F",0,0,0], - ["Land_CncBarrierMedium4_F",0,0,0], - ["Land_Concrete_SmallWall_4m_F",0,0,0], - ["Land_Concrete_SmallWall_8m_F",0,0,0], - ["Land_CncShelter_F",0,0,0], - ["Land_CncWall1_F",0,0,0], - ["Land_CncWall4_F",0,0,0], - ["Land_Sign_WarningMilitaryArea_F",0,0,0], - ["Land_Sign_WarningMilAreaSmall_F",0,0,0], - ["Land_Sign_WarningMilitaryVehicles_F",0,0,0], - ["Land_Razorwire_F",0,0,0], - ["Land_ClutterCutter_large_F",0,0,0] -]; - -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - ["ACE_medicalSupplyCrate_advanced",50,0,0], - ["ACE_Box_82mm_Mo_HE",50,40,0], - ["ACE_Box_82mm_Mo_Smoke",50,10,0], - ["ACE_Box_82mm_Mo_Illum",50,10,0], - ["ACE_Wheel",10,0,0], - ["ACE_Track",10,0,0], - ["USAF_missileCart_W_AGM114",50,150,0], // Missile Cart (AGM-114) - ["USAF_missileCart_AGMMix",50,150,0], // Missile Cart (AGM-65 Mix) - ["USAF_missileCart_AGM1",50,150,0], // Missile Cart (AGM-65D) - ["USAF_missileCart_AGM2",50,150,0], // Missile Cart (AGM-65E) - ["USAF_missileCart_AGM3",50,150,0], // Missile Cart (AGM-65K) - ["USAF_missileCart_AA1",50,150,0], // Missile Cart (AIM-9M/AIM-120) - ["USAF_missileCart_AA2",50,150,0], // Missile Cart (AIM-9X/AIM-120) - ["USAF_missileCart_GBU12_green",50,150,0], // Missile Cart (GBU12 Green) - ["USAF_missileCart_GBU12_maritime",50,150,0], // Missile Cart (GBU12 Maritime) - ["USAF_missileCart_GBU12",50,150,0], // Missile Cart (GBU12) - ["USAF_missileCart_Gbu31",50,150,0], // Missile Cart (GBU31) - ["USAF_missileCart_GBU39",50,150,0], // Missile Cart (GBU39) - ["USAF_missileCart_Mk82",50,150,0], // Missile Cart (Mk82) - ["CUP_B_LCU1600_USMC",250,0,175], // LCU-1610 - ["CUP_B_TowingTractor_USMC",50,0,75], // Towing Tractor - ["CUP_B_MTVR_Repair_USMC",425,0,75], // MTVR Repair - ["CUP_B_MTVR_Refuel_USMC",125,0,375], // MTVR Refuel - ["CUP_B_MTVR_Ammo_USMC",125,300,75], // MTVR Ammo - ["B_Slingload_01_Repair_F",375,0,0], // Huron Repair - ["B_Slingload_01_Fuel_F",75,0,300], // Huron Fuel - ["B_Slingload_01_Ammo_F",75,300,0] // Huron Ammo -]; - -/* - --- Squads --- - Pre-made squads for the commander build menu. - These shouldn't exceed 10 members. -*/ - -// Light infantry squad. -blufor_squad_inf_light = [ - "CUP_B_USMC_Soldier_SL_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_LAT_FROG_WDL", - "CUP_B_USMC_Soldier_GL_FROG_WDL", - "CUP_B_USMC_Soldier_AR_FROG_WDL", - "CUP_B_USMC_Soldier_AR_FROG_WDL", - "CUP_B_USMC_Soldier_Marksman_FROG_WDL", - "CUP_B_USMC_Medic_FROG_WDL", - "CUP_B_USMC_Engineer_FROG_WDL" -]; - -// Heavy infantry squad. -blufor_squad_inf = [ - "CUP_B_USMC_Soldier_SL_FROG_WDL", - "CUP_B_USMC_Soldier_LAT_FROG_WDL", - "CUP_B_USMC_Soldier_LAT_FROG_WDL", - "CUP_B_USMC_Soldier_GL_FROG_WDL", - "CUP_B_USMC_Soldier_AR_FROG_WDL", - "CUP_B_USMC_Soldier_AR_FROG_WDL", - "CUP_B_USMC_Soldier_MG_FROG_WDL", - "CUP_B_USMC_Soldier_Marksman_FROG_WDL", - "CUP_B_USMC_Medic_FROG_WDL", - "CUP_B_USMC_Engineer_FROG_WDL" -]; - -// AT specialists squad. -blufor_squad_at = [ - "CUP_B_USMC_Soldier_SL_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_HAT_FROG_WDL", - "CUP_B_USMC_Soldier_AT_FROG_WDL", - "CUP_B_USMC_Soldier_AT_FROG_WDL", - "CUP_B_USMC_Medic_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL" -]; - -// AA specialists squad. -blufor_squad_aa = [ - "CUP_B_USMC_Soldier_SL_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_AA_FROG_WDL", - "CUP_B_USMC_Soldier_AA_FROG_WDL", - "CUP_B_USMC_Soldier_AA_FROG_WDL", - "CUP_B_USMC_Medic_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL" -]; - -// Force recon squad. -blufor_squad_recon = [ - "CUP_B_FR_Soldier_TL_WDL", - "CUP_B_FR_Soldier_Assault_WDL", - "CUP_B_FR_Soldier_Assault_WDL", - "CUP_B_FR_Soldier_AR_WDL", - "CUP_B_FR_Soldier_Operator_WDL", - "CUP_B_FR_Saboteur_WDL", - "CUP_B_FR_Soldier_Marksman_WDL", - "CUP_B_FR_Soldier_Marksman_WDL", - "CUP_B_FR_Medic_WDL", - "CUP_B_FR_Soldier_Exp_WDL" -]; - -// Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL", - "CUP_B_USMC_Soldier_FROG_WDL" -]; - -/* - --- Elite vehicles --- - Classnames below have to be unlocked by capturing military bases. - Which base locks a vehicle is randomized on the first start of the campaign. -*/ -elite_vehicles = [ - "CUP_B_F35B_USMC", // F-35B Lightning II - "CUP_WV_B_CRAM", // C-RAM - "CUP_WV_B_SS_Launcher", // Mk-29 GMLS - "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS - "CUP_B_F35B_Stealth_USMC", // F-35B Lightning II (Stealth) - "CUP_B_AV8B_DYN_USMC", // AV-8B Harrier II - "USAF_A10", // A-10C Thunderbolt II - "USAF_F22", // F-22A Raptor - "USAF_F22_EWP_AA", // F-22A Raptor (EWP-AA) - "USAF_F22_EWP_AG", // F-22A Raptor (EWP-AG) - "USAF_F22_Heavy", // F-22A Raptor (Heavy) - "USAF_F35A_STEALTH", // F-35A Lightning II - "USAF_F35A", // F-35A Lightning II (Heavy) - "CUP_B_AH1Z_Dynamic_USMC", // AH-1Z - "CUP_B_MH60L_DAP_2x_USN", // MH-60S Knighthawk (ESSS x2) - "CUP_B_M1A1_Woodland_USMC", // M1A1 Abrams (Woodland) - "CUP_B_M1A2_TUSK_MG_USMC", // M1A2 Abrams TUSK (Woodland) - "CUP_B_M270_HE_USMC", // M270 MLRS (HE) - "CUP_B_M270_DPICM_USMC", // M270 MLRS (DPICM) - "CUP_B_LAV25M240_green", // LAV-25A1 (M240) (Olive) - "CUP_B_HMMWV_TOW_USMC", // HMMWV TOW - "CUP_B_RG31_M2_USMC", // RG-31 M2 - "CUP_B_RG31E_M2_USMC", // RG-31 Mk5E M2 - "CUP_B_RG31_Mk19_USMC", // RG-31 Mk.19 - "CUP_B_LAV25_green" // LAV-25A1 (Olive) -]; From 7198479b0b184741d4ef552ba3d1dcbcf5c9dcf0 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:29:46 +0200 Subject: [PATCH 030/115] Delete CUP_NAPA.sqf --- .../presets/resistance/CUP_NAPA.sqf | 214 ------------------ 1 file changed, 214 deletions(-) delete mode 100644 Missionframework/presets/resistance/CUP_NAPA.sqf diff --git a/Missionframework/presets/resistance/CUP_NAPA.sqf b/Missionframework/presets/resistance/CUP_NAPA.sqf deleted file mode 100644 index 5fc884507..000000000 --- a/Missionframework/presets/resistance/CUP_NAPA.sqf +++ /dev/null @@ -1,214 +0,0 @@ -/* - Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units - - Optional Mods: - - None -*/ - -/* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation -Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ - "CUP_I_GUE_Soldier_AR", - "CUP_I_GUE_Engineer", - "CUP_I_GUE_Commander", - "CUP_I_GUE_Medic", - "CUP_I_GUE_Soldier_AKS74", - "CUP_I_GUE_Soldier_LAT", - "CUP_I_GUE_Sniper", - "CUP_I_GUE_Officer" -]; - -// Armed vehicles -KPLIB_guerilla_vehicles = [ - "CUP_I_Datsun_PK_Random", - "CUP_I_Datsun_PK_Random", - "CUP_I_Datsun_PK_Random", - "CUP_I_BMP2_NAPA", - "CUP_I_BRDM2_NAPA", - "CUP_I_BRDM2_NAPA", - "CUP_I_MTLB_pk_NAPA", - "CUP_I_MTLB_pk_NAPA", - "CUP_I_T34_NAPA", - "CUP_I_T34_NAPA", - "CUP_I_T55_NAPA", - "CUP_I_T72_NAPA" -]; - -/* Guerilla Equipment -There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ - -/* Weapons - You've to add the weapons as array like -["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] -You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ - ["CUP_srifle_CZ550","CUP_5x_22_LR_17_HMR_M",10,"",""], - ["CUP_srifle_CZ550_rail","CUP_5x_22_LR_17_HMR_M",10,"optic_mrco",""], - ["CUP_srifle_LeeEnfield","CUP_10x_303_M",10,"",""], - ["CUP_srifle_LeeEnfield_rail","CUP_10x_303_M",10,"cup_optic_sb_11_4x20_pm","cup_bipod_harris_1a2_I"], - ["CUP_glaunch_M79","CUP_1Rnd_HEDP_M203",16,"",""], - ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""] -]; - -KPLIB_guerilla_weapons_2 = [ - ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], - ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], - ["CUP_arifle_AKM","CUP_30Rnd_762x39_AK47_M",4,"cup_optic_pso_1_ak_open",""], - ["CUP_arifle_AK47_GL_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], - ["CUP_arifle_RPK74","CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M",3,"optic_ACO_grn","bipod_01_F_blk"], - ["CUP_smg_SA61","CUP_50Rnd_B_765x17_Ball_M",5,"",""] -]; - -KPLIB_guerilla_weapons_3 = [ - ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], - ["CUP_arifle_AK74M","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], - ["CUP_arifle_AK74M_GL","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], - ["CUP_arifle_RPK74M_railed","CUP_60Rnd_545x39_AK74M_M",3,"cup_optic_zddot",""], - ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], - ["CUP_lmg_Pecheneg","CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M",2,"optic_MRCO",""], - ["CUP_srifle_SVD","CUP_10Rnd_762x54_SVD_M",12,"cup_optic_pso_3_open",""], - ["CUP_srifle_SVD_wdl","CUP_10Rnd_762x54_SVD_M",12,"cup_optic_pso_3_open",""] -]; - -// Uniforms -KPLIB_guerilla_uniforms_1 = [ - "CUP_U_I_Villager_03", - "CUP_U_I_Woodlander03", - "CUP_U_I_Woodlander_02", - "CUP_U_I_Worker_02", - "CUP_U_I_Villager_04", - "CUP_U_I_Woodlander_01", - "CUP_U_C_Woodlander_04", - "CUP_U_C_Citizen_04", - "CUP_U_C_Citizen_01" - -]; - -KPLIB_guerilla_uniforms_2 = [ - "CUP_I_B_PMC_Unit_20", - "CUP_I_B_PMC_Unit_19", - "CUP_I_B_PMC_Unit_11", - "CUP_I_B_PMC_Unit_10", - "CUP_I_B_PMC_Unit_9", - "CUP_I_B_PMC_Unit_12", - "CUP_I_B_PMC_Unit_16", - "CUP_I_B_PMC_Unit_22" -]; - -KPLIB_guerilla_uniforms_3 = [ - "CUP_U_I_GUE_Flecktarn2", - "CUP_U_I_GUE_Flecktarn3", - "CUP_U_I_GUE_Flecktarn", - "CUP_U_I_Gillie_Top", - "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_I_C_Soldier_Camo_F" -]; - -// Vests -KPLIB_guerilla_vests_1 = [ - "CUP_V_I_Guerilla_Jacket", - "V_LegStrapBag_coyote_F", - "V_LegStrapBag_olive_F", - "V_LegStrapBag_black_F", - "V_Pocketed_coyote_F", - "V_Pocketed_olive_F", - "V_Pocketed_black_F", - "V_BandollierB_cbr", - "V_BandollierB_rgr", - "V_BandollierB_khk", - "V_BandollierB_oli", - "V_BandollierB_blk", - "V_BandollierB_ghex_F" -]; - -KPLIB_guerilla_vests_2 = [ - "V_TacVestIR_blk", - "V_Chestrig_rgr", - "V_Chestrig_khk", - "V_Chestrig_oli", - "V_Chestrig_blk", - "V_HarnessO_brn", - "V_HarnessO_gry", - "V_HarnessO_ghex_F", - "V_HarnessOGL_brn", - "V_HarnessOGL_gry", - "V_HarnessOGL_ghex_F" -]; - -KPLIB_guerilla_vests_3 = [ - "V_TacVest_oli", - "CUP_V_RUS_Smersh_2", - "CUP_V_I_Carrier_Belt", - "CUP_V_B_PASGT_OD", - "CUP_V_B_GER_Carrier_Rig", - "CUP_V_B_GER_Carrier_Vest_2", - "V_TacChestrig_oli_F" -]; - -// Headgear -KPLIB_guerilla_headgear_1 = [ - "", - "", - "", - "", - "CUP_H_C_Ushanka_02", - "CUP_H_C_Ushanka_03", - "CUP_H_C_Ushanka_04", - "CUP_H_C_Ushanka_01", - "CUP_H_C_Beret_03", - "CUP_H_C_Beret_02", - "CUP_H_C_Beret_01", - "CUP_H_C_Beret_04", - "CUP_H_C_Beanie_01", - "CUP_H_C_Beanie_02", - "CUP_H_C_Beanie_03", - "CUP_H_C_Beanie_04" -]; - -KPLIB_guerilla_headgear_2 = [ - "H_Bandanna_blu", - "H_Bandanna_sand", - "H_Bandanna_gry", - "H_Bandanna_camo", - "H_Bandanna_cbr", - "H_Bandanna_sgg", - "H_Bandanna_khk", - "CUP_H_C_Ushanka_02", - "CUP_H_C_Ushanka_03", - "CUP_H_C_Ushanka_04", - "CUP_H_C_Ushanka_01", - "H_PASGT_basic_black_F", - "H_PASGT_basic_olive_F", - "H_Cap_blk_Raven", - "H_MilCap_dgtl" -]; - -KPLIB_guerilla_headgear_3 = [ - "H_Shemag_olive", - "H_Shemag_olive_hs", - "H_Shemag_olive", - "H_Booniehat_khk", - "H_Booniehat_oli", - "CUP_H_Ger_Boonie_Flecktarn", - "H_PASGT_basic_olive_F", - "CUP_H_GER_LWH_Flecktarn" -]; - -// Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ - "", - "", - "", - "G_Bandanna_shades", - "G_Bandanna_beast", - "G_Bandanna_tan", - "G_Bandanna_khk", - "G_Bandanna_oli", - "G_Bandanna_aviator", - "G_Bandanna_blk" -]; From 1de3a3a843e39418bb0a5bb3fc6bd92b2e3b1fb7 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 May 2020 14:29:54 +0200 Subject: [PATCH 031/115] Delete RACS.sqf --- Missionframework/presets/resistance/RACS.sqf | 201 ------------------- 1 file changed, 201 deletions(-) delete mode 100644 Missionframework/presets/resistance/RACS.sqf diff --git a/Missionframework/presets/resistance/RACS.sqf b/Missionframework/presets/resistance/RACS.sqf deleted file mode 100644 index 193825807..000000000 --- a/Missionframework/presets/resistance/RACS.sqf +++ /dev/null @@ -1,201 +0,0 @@ -/* - Needed Mods: - - Project OPFOR - - Optional Mods: - - None -*/ - -/* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation -Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ - "LOP_RACS_Infantry_MG", - "LOP_RACS_Infantry_Engineer", - "LOP_RACS_Infantry_TL", - "LOP_RACS_Infantry_Corpsman", - "LOP_RACS_Infantry_Rifleman", - "LOP_RACS_Infantry_AT", - "LOP_RACS_Infantry_Marksman", - "LOP_RACS_Infantry_SL" -]; - -// Armed vehicles -KPLIB_guerilla_vehicles = [ - "LOP_RACS_Landrover_M2", - "LOP_RACS_Offroad_M2" -]; - -/* Guerilla Equipment -There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ - -/* Weapons - You've to add the weapons as array like -["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] -You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ - ["rhs_weap_Izh","rhsgref_1Rnd_00Buck",20,"",""], - ["rhs_weap_m38","rhsgref_5rnd_762x54_m38",6,"",""], - ["rhs_weap_m38_rail","rhsgref_5rnd_762x54_m38",6,"",""], - ["rhs_weap_kar98k","rhsgref_5rnd_792x57_kar98k",6,"",""], - ["rhs_weap_mosin_sbr","rhsgref_5rnd_762x54_m38",6,"",""], - ["rhs_weap_makarov_pm","rhs_mag_9x18_8_57N181S",5,"",""] -]; - -KPLIB_guerilla_weapons_2 = [ - ["rhs_weap_ak74","rhs_30rnd_545x39_AK",3,"",""], - ["rhs_weap_akm","rhs_30rnd_762x39mm",3,"",""], - ["rhs_weap_akms","rhs_30rnd_762x39mm",3,"",""], - ["rhs_weap_aks74u","rhs_30rnd_545x39_AK",3,"",""], - ["rhs_weap_pp2000","rhs_mag_9x19mm_7n21_20",4,"",""], - ["rhs_weap_svds","rhs_10rnd_762x54mmR_7N1",3,"rhs_acc_pso1m2",""] -]; - -KPLIB_guerilla_weapons_3 = [ - ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"rhs_acc_pkas",""], - ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"rhs_acc_ekp8_02",""], - ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_pkas",""], - ["rhs_weap_asval_grip","rhs_20rnd_9x39mm_SP5",5,"rhs_acc_pkas",""], - ["rhs_weap_pkm","rhs_100Rnd_762x54mmR",2,"",""], - ["rhs_weap_pkp","rhs_100Rnd_762x54mmR",2,"rhs_acc_pkas",""], - ["rhs_weap_svdp","rhs_10rnd_762x54mmR_7N1",5,"rhs_acc_pso1m21",""], - ["rhs_weap_aks74un","rhs_30rnd_545x39_AK",4,"rhs_acc_ekp8_02",""] -]; - -// Uniforms -KPLIB_guerilla_uniforms_1 = [ - "LOP_U_RACS_Fatigue_01", - "LOP_U_RACS_Fatigue_01_slv" -]; - -KPLIB_guerilla_uniforms_2 = [ - "LOP_U_RACS_Fatigue_01", - "LOP_U_RACS_Fatigue_01_slv" -]; - -KPLIB_guerilla_uniforms_3 = [ - "LOP_U_RACS_Fatigue_01", - "LOP_U_RACS_Fatigue_01_slv" -]; - -// Vests -KPLIB_guerilla_vests_1 = [ - "V_LegStrapBag_coyote_F", - "V_LegStrapBag_olive_F", - "V_LegStrapBag_black_F", - "V_Pocketed_coyote_F", - "V_Pocketed_olive_F", - "V_Pocketed_black_F", - "V_BandollierB_cbr", - "V_BandollierB_rgr", - "V_BandollierB_khk", - "V_BandollierB_oli", - "V_BandollierB_blk", - "V_BandollierB_ghex_F", - "rhs_vest_commander", - "rhs_vest_pistol_holder", - "V_Rangemaster_belt", - "rhs_6sh46" -]; - -KPLIB_guerilla_vests_2 = [ - "V_Chestrig_rgr", - "V_Chestrig_khk", - "V_Chestrig_oli", - "V_Chestrig_blk", - "V_HarnessO_brn", - "V_HarnessO_gry", - "V_HarnessO_ghex_F", - "V_HarnessOGL_brn", - "V_HarnessOGL_gry", - "V_HarnessOGL_ghex_F", - "rhsgref_alice_webbing", - "V_TacChestrig_grn_F", - "V_TacChestrig_cbr_F", - "V_TacChestrig_oli_F" -]; - -KPLIB_guerilla_vests_3 = [ - "V_TacVest_brn", - "V_TacVest_khk", - "V_TacVest_oli", - "V_TacVest_blk", - "V_I_G_resistanceLeader_F", - "V_TacVest_camo", - "rhs_vydra_3m", - "rhsgref_6b23_khaki_medic", - "rhsgref_6b23_khaki_nco", - "rhsgref_6b23_khaki_officer", - "rhsgref_6b23_khaki_rifleman", - "rhsgref_6b23_khaki_sniper", - "rhsgref_6b23_khaki" -]; - -// Headgear -KPLIB_guerilla_headgear_1 = [ - "", - "", - "", - "", - "", - "LOP_H_6B27M_RACS", - "LOP_H_6B27M_ess_RACS" - -]; - -KPLIB_guerilla_headgear_2 = [ - "H_Bandanna_blu", - "H_Bandanna_sand", - "H_Bandanna_gry", - "H_Bandanna_camo", - "H_Bandanna_cbr", - "H_Bandanna_sgg", - "H_Bandanna_khk", - "rhsgref_fieldcap_ttsko_digi", - "rhsgref_fieldcap_ttsko_forest", - "rhsgref_fieldcap_ttsko_mountain", - "rhsgref_fieldcap_ttsko_urban", - "", - "", - "", - "", - "LOP_H_6B27M_RACS", - "LOP_H_6B27M_ess_RACS" -]; - -KPLIB_guerilla_headgear_3 = [ - "H_ShemagOpen_khk", - "H_ShemagOpen_tan", - "H_Shemag_olive", - "H_Booniehat_khk", - "H_Booniehat_oli", - "rhsgref_M56", - "H_Watchcap_blk", - "rhs_ssh68", - "rhsgref_ssh68_emr", - "rhs_tsh4", - "H_Beret_blk", - "H_Watchcap_camo", - "H_Watchcap_khk", - "", - "", - "", - "", - "LOP_H_6B27M_RACS", - "LOP_H_6B27M_ess_RACS" -]; - -// Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ - "", - "", - "", - "G_Bandanna_shades", - "G_Bandanna_beast", - "G_Bandanna_tan", - "G_Bandanna_khk", - "G_Bandanna_oli", - "G_Bandanna_aviator", - "G_Bandanna_blk", - "rhs_balaclava", - "rhs_balaclava1_olive", - "rhs_scarf" -]; From 48c594964699b24832fcc7a23a2e1fea6a383d08 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 17 May 2020 09:12:15 +0200 Subject: [PATCH 032/115] Fixed not updating opforCount in FSM closes #788 --- .../scripts/server/sector/fn_sectorMonitor.fsm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm index de3af7837..15e0a0059 100644 --- a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm +++ b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm @@ -170,8 +170,7 @@ class FSM { name = "Get_next_sector"; itemno = 8; - init = /*%FSM*/"_sector = _allSectors deleteAt (floor random (count _allSectors));" \n - "_opforCount = [] call KPLIB_fnc_getOpforCap;"/*%FSM*/; + init = /*%FSM*/"_sector = _allSectors deleteAt (floor random (count _allSectors));"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -182,7 +181,7 @@ class FSM priority = 0.000000; to="Get_adjusted_sector"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"_opforCount < KPLIB_sector_cap"/*%FSM*/; + condition=/*%FSM*/"([] call KPLIB_fnc_getOpforCap) < KPLIB_sector_cap"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -368,4 +367,4 @@ class FSM "Exit_1", }; }; -/*%FSM*/ +/*%FSM*/ \ No newline at end of file From b2f0437c5628a083d507c18bb836b6d45d00dd03 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 17 May 2020 09:17:28 +0200 Subject: [PATCH 033/115] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 447ffb7a4..9c28f7d5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal. * Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset. * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. +* Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. ## 0.96.7 (2020-05-10) * Added: CfgFunctions library created from `shared/functions` and all of these functions optimized. From f86a6b1fddb2fd52ad10dcc3eda1b0c605c449d9 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 17 May 2020 09:18:17 +0200 Subject: [PATCH 034/115] Adjustments after variable name changes --- Missionframework/KPLIB_config.sqf | 14 +------------- Missionframework/init.sqf | 4 +++- Missionframework/scripts/client/init_client.sqf | 1 - .../scripts/server/highcommand/fn_highcommand.fsm | 2 +- Missionframework/scripts/shared/fetch_params.sqf | 9 +++++++++ 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 7d5c97078..4574cc96e 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -2,7 +2,7 @@ File: KPLIB_config.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-16 - Last Update: 2020-05-11 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -378,15 +378,3 @@ Same format as for the commander actions. */ KPLIB_suppMod_whitelist = [ ]; - - -// Adjustments calculation depending on selected mission parameters (shouldn't be edited) -KPLIB_endgame = 0; -KPLIB_respawn_marker = "respawn"; -KPLIB_production_interval = ceil (KPLIB_production_interval / KPLIB_resources_multiplier); -KPLIB_battlegroup_size = KPLIB_battlegroup_size * (sqrt KPLIB_unitcap) * (sqrt KPLIB_csat_aggressivity); -KPLIB_civilians_amount = KPLIB_civilians_amount * KPLIB_civilian_activity; -KPLIB_blufor_cap = (KPLIB_blufor_cap * KPLIB_unitcap) min 100; -KPLIB_sector_cap = KPLIB_sector_cap * KPLIB_unitcap; -KPLIB_battlegroup_cap = KPLIB_battlegroup_cap * KPLIB_unitcap; -KPLIB_patrol_cap = KPLIB_patrol_cap * KPLIB_unitcap; diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index 2dc19ece0..d4b20e5f2 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -1,5 +1,7 @@ KPLIB_init = false; +KPLIB_endgame = 0; +KPLIB_respawn_marker = "respawn"; // Version of the KP Liberation framework KPLIB_version = [0, 96, 7]; @@ -10,10 +12,10 @@ if (isDedicated) then {debug_source = "Server";} else {debug_source = name playe [] call KPLIB_fnc_initSectors; if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; -[] call compile preprocessFileLineNumbers "scripts\shared\fetch_params.sqf"; [] call compile preprocessFileLineNumbers "KPLIB_config.sqf"; [] call compile preprocessFileLineNumbers "KPLIB_transportConfigs.sqf"; [] call compile preprocessFileLineNumbers "KPLIB_classnameLists.sqf"; +[] call compile preprocessFileLineNumbers "scripts\shared\fetch_params.sqf"; [] call compile preprocessFileLineNumbers "presets\init_presets.sqf"; [] call compile preprocessFileLineNumbers "kp_objectInits.sqf"; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index b41dad705..3e1e93d9f 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -23,7 +23,6 @@ if (KPLIB_mapmarkers) then {execVM "scripts\client\markers\huron_marker.sqf";} e execVM "scripts\client\markers\sector_manager.sqf"; execVM "scripts\client\markers\spot_timer.sqf"; execVM "scripts\client\misc\broadcast_squad_colors.sqf"; -execVM "scripts\client\misc\init_arsenal.sqf"; execVM "scripts\client\misc\permissions_warning.sqf"; if (!KPLIB_ace) then {execVM "scripts\client\misc\resupply_manager.sqf";}; execVM "scripts\client\misc\secondary_jip.sqf"; diff --git a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm index c98c0c811..8621effee 100644 --- a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm +++ b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm @@ -127,7 +127,7 @@ class FSM "" \n "// Logging function for the FSM" \n "private _logging = {" \n - " if (KP_liberation_highcommand_debug > 0) then {" \n + " if (KPLIB_highcommand_debug > 0) then {" \n " [format _this, ""HIGHCOMMAND""] call KPLIB_fnc_log;" \n " };" \n "};"/*%FSM*/; diff --git a/Missionframework/scripts/shared/fetch_params.sqf b/Missionframework/scripts/shared/fetch_params.sqf index 34b9c97f1..577676a90 100644 --- a/Missionframework/scripts/shared/fetch_params.sqf +++ b/Missionframework/scripts/shared/fetch_params.sqf @@ -474,3 +474,12 @@ if (!isDedicated && hasInterface) then { player createDiaryRecord ["parameters", ["Active", _text]]; }; + +// Adjustments calculation depending on selected mission parameters (shouldn't be edited) +KPLIB_production_interval = ceil (KPLIB_production_interval / KPLIB_resources_multiplier); +KPLIB_battlegroup_size = KPLIB_battlegroup_size * (sqrt KPLIB_unitcap) * (sqrt KPLIB_csat_aggressivity); +KPLIB_civilians_amount = KPLIB_civilians_amount * KPLIB_civilian_activity; +KPLIB_blufor_cap = (KPLIB_blufor_cap * KPLIB_unitcap) min 100; +KPLIB_sector_cap = KPLIB_sector_cap * KPLIB_unitcap; +KPLIB_battlegroup_cap = KPLIB_battlegroup_cap * KPLIB_unitcap; +KPLIB_patrol_cap = KPLIB_patrol_cap * KPLIB_unitcap; From 8331eb4ea041654056f196dd35682e67458dc623 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 17 May 2020 09:53:41 +0200 Subject: [PATCH 035/115] Renamed sector arrays --- Missionframework/CfgFunctions.hpp | 2 +- .../functions/fn_getBluforRatio.sqf | 6 ++-- .../fn_getNearestBluforObjective.sqf | 6 ++-- .../functions/fn_getNearestSector.sqf | 4 +-- .../functions/fn_getNearestTower.sqf | 4 +-- .../functions/fn_getOpforSpawnPoint.sqf | 10 +++--- Missionframework/functions/fn_getSaveData.sqf | 6 ++-- Missionframework/functions/fn_initSectors.sqf | 32 +++++++++---------- ...gtownActive.sqf => fn_isCapitalActive.sqf} | 10 +++--- .../functions/fn_spawnCivilians.sqf | 4 +-- .../scripts/client/build/do_build_fob.sqf | 6 ++-- .../scripts/client/markers/sector_manager.sqf | 12 +++---- .../remotecall/remote_call_prisonner.sqf | 2 +- .../client/remotecall/remote_call_sector.sqf | 4 +-- .../scripts/client/spawn/redeploy_manager.sqf | 2 +- .../scripts/client/tutorial/fn_tutorial.fsm | 12 +++---- .../scripts/client/ui/cinematic_camera.sqf | 8 ++--- .../scripts/client/ui/ui_manager.sqf | 22 ++++++------- .../scripts/server/ai/building_defence_ai.sqf | 2 +- .../scripts/server/ai/patrol_ai.sqf | 2 +- .../server/asymmetric/asymmetric_loop.sqf | 4 +-- .../asymmetric/random/sector_guerilla.sqf | 2 +- .../scripts/server/base/startgame.sqf | 4 +-- .../server/battlegroup/readiness_increase.sqf | 6 ++-- .../scripts/server/battlegroup/spawn_air.sqf | 2 +- .../server/civinformant/civinfo_loop.sqf | 6 ++-- .../civrep/fnc/f_kp_cr_liberatedSector.sqf | 4 +-- .../scripts/server/civrep/init_buildings.sqf | 4 +-- .../civrep/wounded/civrep_wounded_civs.sqf | 2 +- .../scripts/server/game/save_manager.sqf | 16 +++++----- .../server/game/spawn_radio_towers.sqf | 2 +- .../scripts/server/game/synchronise_eco.sqf | 2 +- .../scripts/server/init_server.sqf | 2 +- .../scripts/server/offloading/group_diag.sqf | 2 +- .../patrols/manage_one_civilian_patrol.sqf | 6 ++-- .../server/patrols/manage_one_patrol.sqf | 6 ++-- .../scripts/server/patrols/manage_patrols.sqf | 4 +-- .../server/patrols/reinforcements_manager.sqf | 10 +++--- .../patrols/reinforcements_resetter.sqf | 2 +- .../server/patrols/send_paratroopers.sqf | 2 +- .../sector_liberated_remote_call.sqf | 20 ++++++------ .../resources/recalculate_resources.sqf | 4 +-- .../sector/attack_in_progress_sector.sqf | 6 ++-- .../server/sector/fn_sectorMonitor.fsm | 18 +++++------ .../scripts/server/sector/ied_manager.sqf | 2 +- .../scripts/server/sector/lose_sectors.sqf | 4 +-- .../server/sector/manage_one_sector.sqf | 24 +++++++------- .../scripts/shared/diagnostics.sqf | 4 +-- .../scripts/shared/fetch_params.sqf | 16 +++++----- .../scripts/shared/kill_manager.sqf | 2 +- 50 files changed, 172 insertions(+), 172 deletions(-) rename Missionframework/functions/{fn_isBigtownActive.sqf => fn_isCapitalActive.sqf} (50%) diff --git a/Missionframework/CfgFunctions.hpp b/Missionframework/CfgFunctions.hpp index f839f27d9..727db8e75 100644 --- a/Missionframework/CfgFunctions.hpp +++ b/Missionframework/CfgFunctions.hpp @@ -62,7 +62,7 @@ class KPLIB { class handlePlacedZeusObject {}; class hasPermission {}; class initSectors {}; - class isBigtownActive {}; + class isCapitalActive {}; class isClassUAV {}; class isRadio {}; class log {}; diff --git a/Missionframework/functions/fn_getBluforRatio.sqf b/Missionframework/functions/fn_getBluforRatio.sqf index ce0f51508..87cf0695e 100644 --- a/Missionframework/functions/fn_getBluforRatio.sqf +++ b/Missionframework/functions/fn_getBluforRatio.sqf @@ -2,7 +2,7 @@ File: fn_getBluforRatio.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,12 +21,12 @@ params [ if (_sector isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_error; -1}; -private _range = [KPLIB_capture_size, KPLIB_capture_size * 1.4] select (_sector in sectors_bigtown); +private _range = [KPLIB_capture_size, KPLIB_capture_size * 1.4] select (_sector in KPLIB_sectors_capital); private _red = [(markerPos _sector), _range, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount; private _blue = [(markerPos _sector), _range, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; if (_blue > 0 || _red > 0) then { _blue / (_blue + _red) } else { - [0, 1] select (_sector in blufor_sectors) + [0, 1] select (_sector in KPLIB_sectors_player) }; diff --git a/Missionframework/functions/fn_getNearestBluforObjective.sqf b/Missionframework/functions/fn_getNearestBluforObjective.sqf index 81b244718..2a25e67ad 100644 --- a/Missionframework/functions/fn_getNearestBluforObjective.sqf +++ b/Missionframework/functions/fn_getNearestBluforObjective.sqf @@ -2,7 +2,7 @@ File: fn_getNearestBluforObjective.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,9 +19,9 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]] ]; -if (KPLIB_all_fobs isEqualTo [] && blufor_sectors isEqualTo []) exitWith {[]}; +if (KPLIB_all_fobs isEqualTo [] && KPLIB_sectors_player isEqualTo []) exitWith {[]}; -private _objectives = KPLIB_all_fobs + (blufor_sectors apply {markerPos _x}); +private _objectives = KPLIB_all_fobs + (KPLIB_sectors_player apply {markerPos _x}); _objectives = _objectives apply {[_x distance2d _pos, _x]}; _objectives sort true; diff --git a/Missionframework/functions/fn_getNearestSector.sqf b/Missionframework/functions/fn_getNearestSector.sqf index 78308dcfb..8d30f0561 100644 --- a/Missionframework/functions/fn_getNearestSector.sqf +++ b/Missionframework/functions/fn_getNearestSector.sqf @@ -2,7 +2,7 @@ File: fn_getNearestSector.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-11 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,7 +21,7 @@ params [ ["_pos", getPos player, [[]], [2, 3]] ]; -private _sectors = sectors_allSectors select {((markerPos _x) distance2d _pos) < _radius}; +private _sectors = KPLIB_sectors_all select {((markerPos _x) distance2d _pos) < _radius}; if (_sectors isEqualTo []) exitWith {""}; diff --git a/Missionframework/functions/fn_getNearestTower.sqf b/Missionframework/functions/fn_getNearestTower.sqf index 0ba2bb7f0..c52413ed7 100644 --- a/Missionframework/functions/fn_getNearestTower.sqf +++ b/Missionframework/functions/fn_getNearestTower.sqf @@ -2,7 +2,7 @@ File: fn_getNearestTower.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,7 +23,7 @@ params [ ["_radius", 1000, [0]] ]; -private _towers = [sectors_tower select {_x in blufor_sectors}, sectors_tower - blufor_sectors] select (_side == KPLIB_side_enemy); +private _towers = [KPLIB_sectors_tower select {_x in KPLIB_sectors_player}, KPLIB_sectors_tower - KPLIB_sectors_player] select (_side == KPLIB_side_enemy); _towers = (_towers apply {[(markerPos _x) distance2d _pos, _x]}) select {(_x select 0) <= _radius}; _towers sort true; diff --git a/Missionframework/functions/fn_getOpforSpawnPoint.sqf b/Missionframework/functions/fn_getOpforSpawnPoint.sqf index 0a983dc62..1e3673fad 100644 --- a/Missionframework/functions/fn_getOpforSpawnPoint.sqf +++ b/Missionframework/functions/fn_getOpforSpawnPoint.sqf @@ -2,7 +2,7 @@ File: fn_getOpforSpawnPoint.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -34,9 +34,9 @@ params [ private _possibleSpawns = []; // Only check for opfor spawn points which aren't used already in the current session -private _spawnsToCheck = sectors_opfor; +private _spawnsToCheck = KPLIB_sectors_spawn; if (!isNil "used_positions") then { - _spawnsToCheck = sectors_opfor - used_positions; + _spawnsToCheck = KPLIB_sectors_spawn - used_positions; }; private ["_valid", "_current", "_distances"]; @@ -56,7 +56,7 @@ private ["_valid", "_current", "_distances"]; _distances = (KPLIB_all_fobs apply {(markerPos _current) distance2d _x}) select {_x < _max}; // Fetch distances to blufor sectors - _distances append ((blufor_sectors apply {(markerPos _current) distance2d (markerPos _x)}) select {_x < _max}); + _distances append ((KPLIB_sectors_player apply {(markerPos _current) distance2d (markerPos _x)}) select {_x < _max}); // Invalid, if all sectors and FOBs are further away than given max distance if (_distances isEqualTo []) then { @@ -72,7 +72,7 @@ private ["_valid", "_current", "_distances"]; // Make sure that there is an opfor sector in sensible range to spawn if (_valid) then { - if ((sectors_allSectors - blufor_sectors) findIf {((markerPos _current) distance2D (markerPos _x)) < 2000} < 0) then { + if ((KPLIB_sectors_all - KPLIB_sectors_player) findIf {((markerPos _current) distance2D (markerPos _x)) < 2000} < 0) then { _valid = false; }; }; diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index a05f69b8c..f61aca607 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -2,7 +2,7 @@ File: fn_getSaveData.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-29 - Last Update: 2020-05-15 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -129,7 +129,7 @@ private ["_supplyValue", "_ammoValue", "_fuelValue"]; [typeOf _x, _x getVariable ["KPLIB_crate_value", 0], getPosATL _x] } ); -} forEach (blufor_sectors select {_x in sectors_factory || _x in sectors_capture}); +} forEach (KPLIB_sectors_player select {_x in KPLIB_sectors_factory || _x in KPLIB_sectors_city}); // Pack all stats in one array private _stats = [ @@ -190,7 +190,7 @@ private _weights = [ _stats, _weights, _aiGroups, - blufor_sectors, + KPLIB_sectors_player, combat_readiness, KPLIB_all_fobs, KPLIB_permissions, diff --git a/Missionframework/functions/fn_initSectors.sqf b/Missionframework/functions/fn_initSectors.sqf index ec78fcf36..68ef89237 100644 --- a/Missionframework/functions/fn_initSectors.sqf +++ b/Missionframework/functions/fn_initSectors.sqf @@ -2,7 +2,7 @@ File: fn_initSectors.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-29 - Last Update: 2020-05-15 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,24 +15,24 @@ Function reached the end [BOOL] */ -sectors_airspawn = []; -sectors_allSectors = []; -sectors_bigtown = []; -sectors_capture = []; -sectors_factory = []; -sectors_military = []; -sectors_opfor = []; -sectors_tower = []; +KPLIB_sectors_airSpawn = []; +KPLIB_sectors_all = []; +KPLIB_sectors_capital = []; +KPLIB_sectors_city = []; +KPLIB_sectors_factory = []; +KPLIB_sectors_military = []; +KPLIB_sectors_spawn = []; +KPLIB_sectors_tower = []; { switch (true) do { - case (_x find "bigtown" == 0): {sectors_bigtown pushBack _x; sectors_allSectors pushBack _x;}; - case (_x find "capture" == 0): {sectors_capture pushBack _x; sectors_allSectors pushBack _x;}; - case (_x find "factory" == 0): {sectors_factory pushBack _x; sectors_allSectors pushBack _x;}; - case (_x find "military" == 0): {sectors_military pushBack _x; sectors_allSectors pushBack _x;}; - case (_x find "KPLIB_o_planesspawn" == 0): {sectors_airspawn pushBack _x;}; - case (_x find "opfor_point" == 0): {sectors_opfor pushBack _x;}; - case (_x find "tower" == 0): {sectors_tower pushBack _x; if (isServer) then {_x setMarkerText format ["%1 %2",markerText _x, mapGridPosition (markerPos _x)];}; sectors_allSectors pushBack _x;}; + case (_x find "bigtown" == 0): {KPLIB_sectors_capital pushBack _x; KPLIB_sectors_all pushBack _x;}; + case (_x find "capture" == 0): {KPLIB_sectors_city pushBack _x; KPLIB_sectors_all pushBack _x;}; + case (_x find "factory" == 0): {KPLIB_sectors_factory pushBack _x; KPLIB_sectors_all pushBack _x;}; + case (_x find "military" == 0): {KPLIB_sectors_military pushBack _x; KPLIB_sectors_all pushBack _x;}; + case (_x find "opfor_airspawn" == 0): {KPLIB_sectors_airSpawn pushBack _x;}; + case (_x find "opfor_point" == 0): {KPLIB_sectors_spawn pushBack _x;}; + case (_x find "tower" == 0): {KPLIB_sectors_tower pushBack _x; if (isServer) then {_x setMarkerText format ["%1 %2",markerText _x, mapGridPosition (markerPos _x)];}; KPLIB_sectors_all pushBack _x;}; }; } forEach allMapMarkers; diff --git a/Missionframework/functions/fn_isBigtownActive.sqf b/Missionframework/functions/fn_isCapitalActive.sqf similarity index 50% rename from Missionframework/functions/fn_isBigtownActive.sqf rename to Missionframework/functions/fn_isCapitalActive.sqf index f6c601a56..ec1a124cc 100644 --- a/Missionframework/functions/fn_isBigtownActive.sqf +++ b/Missionframework/functions/fn_isCapitalActive.sqf @@ -1,18 +1,18 @@ /* - File: fn_isBigtownActive.sqf + File: fn_isCapitalActive.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-11 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: - Checks if a bigtown (capital) is currently activated. + Checks if a capital is currently activated. Parameter(s): NONE Returns: - Bigtown currently activated [BOOL] + Capital currently activated [BOOL] */ -(active_sectors findIf {_x in sectors_bigtown}) != -1 +(KPLIB_sectors_active findIf {_x in KPLIB_sectors_capital}) != -1 diff --git a/Missionframework/functions/fn_spawnCivilians.sqf b/Missionframework/functions/fn_spawnCivilians.sqf index 597e25c76..1b488c142 100644 --- a/Missionframework/functions/fn_spawnCivilians.sqf +++ b/Missionframework/functions/fn_spawnCivilians.sqf @@ -2,7 +2,7 @@ File: fn_spawnCivilians.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -27,7 +27,7 @@ private _sPos = markerPos _sector; // Amount and spread depending if capital or city/factory private _amount = round ((3 + (floor (random 7))) * KPLIB_civilian_activity); private _spread = 1; -if (_sector in sectors_bigtown) then { +if (_sector in KPLIB_sectors_capital) then { _amount = _amount + 10; _spread = 2.5; }; diff --git a/Missionframework/scripts/client/build/do_build_fob.sqf b/Missionframework/scripts/client/build/do_build_fob.sqf index 32b815c19..b7536605c 100644 --- a/Missionframework/scripts/client/build/do_build_fob.sqf +++ b/Missionframework/scripts/client/build/do_build_fob.sqf @@ -25,10 +25,10 @@ while { (_idx < (count KPLIB_all_fobs)) && _clearedtobuildfob } do { _idx = 0; if(_clearedtobuildfob) then { - while { (_idx < (count sectors_allSectors)) && _clearedtobuildsector } do { - if ( player distance (markerPos (sectors_allSectors select _idx)) < _minsectordist ) then { + while { (_idx < (count KPLIB_sectors_all)) && _clearedtobuildsector } do { + if ( player distance (markerPos (KPLIB_sectors_all select _idx)) < _minsectordist ) then { _clearedtobuildsector = false; - _distsector = player distance (markerPos (sectors_allSectors select _idx)); + _distsector = player distance (markerPos (KPLIB_sectors_all select _idx)); }; _idx = _idx + 1; }; diff --git a/Missionframework/scripts/client/markers/sector_manager.sqf b/Missionframework/scripts/client/markers/sector_manager.sqf index 3de7818f5..dc3ef1f51 100644 --- a/Missionframework/scripts/client/markers/sector_manager.sqf +++ b/Missionframework/scripts/client/markers/sector_manager.sqf @@ -1,6 +1,6 @@ waitUntil {!isNil "save_is_loaded"}; waitUntil {!isNil "KPLIB_vehicle_to_military_base_links"}; -waitUntil {!isNil "blufor_sectors"}; +waitUntil {!isNil "KPLIB_sectors_player"}; waitUntil {save_is_loaded}; private _vehicle_unlock_markers = []; @@ -22,15 +22,15 @@ uiSleep 1; while {true} do { waitUntil { uiSleep 1; - count blufor_sectors != _sector_count + count KPLIB_sectors_player != _sector_count }; - {_x setMarkerColorLocal KPLIB_color_enemy;} forEach (sectors_allSectors - blufor_sectors); - {_x setMarkerColorLocal KPLIB_color_friendly;} forEach blufor_sectors; + {_x setMarkerColorLocal KPLIB_color_enemy;} forEach (KPLIB_sectors_all - KPLIB_sectors_player); + {_x setMarkerColorLocal KPLIB_color_friendly;} forEach KPLIB_sectors_player; { _x params ["_marker", "_base"]; - _marker setMarkerColorLocal ([KPLIB_color_enemy, KPLIB_color_friendly] select (_base in blufor_sectors)); + _marker setMarkerColorLocal ([KPLIB_color_enemy, KPLIB_color_friendly] select (_base in KPLIB_sectors_player)); } forEach _vehicle_unlock_markers; - _sector_count = count blufor_sectors; + _sector_count = count KPLIB_sectors_player; }; diff --git a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf index 9575513ed..957193fa4 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf @@ -71,7 +71,7 @@ if (alive _unit) then { while {(count (waypoints _grp)) != 0} do {deleteWaypoint ((waypoints _grp) select 0);}; {_x doFollow leader _grp} foreach units _grp; - _possible_sectors = (sectors_allSectors - blufor_sectors); + _possible_sectors = (KPLIB_sectors_all - KPLIB_sectors_player); if ( count _possible_sectors > 0 ) then { _possible_sectors = [ _possible_sectors , [getpos _unit, 5000] , { (markerPos _x) distance _input0 } , 'ASCEND' ] call BIS_fnc_sortBy; diff --git a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf index 94196f4df..5a47d3a20 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf @@ -26,5 +26,5 @@ if ( _status == 3 ) then { sector_timer = 0; }; -{ _x setMarkerColorLocal KPLIB_color_enemy; } foreach (sectors_allSectors - blufor_sectors); -{ _x setMarkerColorLocal KPLIB_color_friendly; } foreach blufor_sectors; +{ _x setMarkerColorLocal KPLIB_color_enemy; } foreach (KPLIB_sectors_all - KPLIB_sectors_player); +{ _x setMarkerColorLocal KPLIB_color_friendly; } foreach KPLIB_sectors_player; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 5f3ccb1f1..19c235395 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -8,7 +8,7 @@ private _frame_pos = []; KPLIB_force_redeploy = false; waitUntil {!isNil "KPLIB_all_fobs"}; -waitUntil {!isNil "blufor_sectors"}; +waitUntil {!isNil "KPLIB_sectors_player"}; waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; diff --git a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm index 823d3da3a..95d278a55 100644 --- a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm +++ b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm @@ -150,7 +150,7 @@ class FSM "" \n "// Get up to 3 nearest factory sectors" \n "private _sectors = (" \n - " sectors_factory select {((markerPos _x) distance2d player) < 10000}" \n + " KPLIB_sectors_factory select {((markerPos _x) distance2d player) < 10000}" \n ") apply {" \n " [(markerPos _x) distance2d player, _x]" \n "};" \n @@ -187,7 +187,7 @@ class FSM to="Capture_the_sect"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " (_sectors select {_x in active_sectors}) isEqualTo []" \n + " (_sectors select {_x in KPLIB_sectors_active}) isEqualTo []" \n ")"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; @@ -319,10 +319,10 @@ class FSM init = /*%FSM*/"private _fobComplete = {" \n " !(KPLIB_all_fobs isEqualTo [])" \n " ||" \n - " {!(blufor_sectors isEqualTo [])}" \n + " {!(KPLIB_sectors_player isEqualTo [])}" \n "};" \n "private _sectorComplete = {" \n - " !((blufor_sectors arrayIntersect sectors_factory) isEqualTo [])" \n + " !((KPLIB_sectors_player arrayIntersect KPLIB_sectors_factory) isEqualTo [])" \n "};" \n "" \n "private _allConditions = [" \n @@ -793,7 +793,7 @@ class FSM "[""KPLIB_Tasks_Tutorial_Sector_01"", ""SUCCEEDED""] call BIS_fnc_taskSetState;" \n "" \n "// Create task" \n - "private _factory = (_sectors select {_x in active_sectors}) select 0;" \n + "private _factory = (_sectors select {_x in KPLIB_sectors_active}) select 0;" \n "[" \n " allPlayers," \n " [""KPLIB_Tasks_Tutorial_Sector_02"", ""KPLIB_Tasks_Tutorial_Sector""]," \n @@ -815,7 +815,7 @@ class FSM priority = 0.000000; to="Complete_task_and"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"_factory in blufor_sectors"/*%FSM*/; + condition=/*%FSM*/"_factory in KPLIB_sectors_player"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Missionframework/scripts/client/ui/cinematic_camera.sqf b/Missionframework/scripts/client/ui/cinematic_camera.sqf index 13b3a56aa..20d420c49 100644 --- a/Missionframework/scripts/client/ui/cinematic_camera.sqf +++ b/Missionframework/scripts/client/ui/cinematic_camera.sqf @@ -1,4 +1,4 @@ -if ( isNil "active_sectors" ) then { active_sectors = [] }; +if ( isNil "KPLIB_sectors_active" ) then { KPLIB_sectors_active = [] }; if ( isNil "KPLIB_all_fobs" ) then { KPLIB_all_fobs = [] }; cinematic_camera_started = true; @@ -30,13 +30,13 @@ while { cinematic_camera_started } do { }; }; - if ( count active_sectors > 0 ) then { + if ( count KPLIB_sectors_active > 0 ) then { for [ {_idx=0},{_idx < 5},{_idx=_idx+1} ] do { - _positions pushback (markerPos (selectRandom active_sectors)); + _positions pushback (markerPos (selectRandom KPLIB_sectors_active)); }; } else { for [ {_idx=0},{_idx < 5},{_idx=_idx+1} ] do { - _positions pushback (markerPos (selectRandom sectors_allSectors)); + _positions pushback (markerPos (selectRandom KPLIB_sectors_all)); }; }; diff --git a/Missionframework/scripts/client/ui/ui_manager.sqf b/Missionframework/scripts/client/ui/ui_manager.sqf index fd75f773d..b54b530ac 100644 --- a/Missionframework/scripts/client/ui/ui_manager.sqf +++ b/Missionframework/scripts/client/ui/ui_manager.sqf @@ -24,7 +24,7 @@ if (isNil "cinematic_camera_started") then {cinematic_camera_started = false;}; if (isNil "halojumping") then {halojumping = false;}; private _uiticks = 0; -private _active_sectors_hint = false; +private _KPLIB_sectors_active_hint = false; private _attacked_string = ""; private _nearest_active_sector = ""; private _zone_size = 0; @@ -114,21 +114,21 @@ while {true} do { if (_uiticks % 25 == 0) then { - if (!isNil "active_sectors" && ([] call KPLIB_fnc_getOpforCap >= KPLIB_sector_cap)) then { + if (!isNil "KPLIB_sectors_active" && ([] call KPLIB_fnc_getOpforCap >= KPLIB_sector_cap)) then { (_overlay displayCtrl (517)) ctrlShow true; - if (!_active_sectors_hint) then { + if (!_KPLIB_sectors_active_hint) then { hint localize "STR_OVERLOAD_HINT"; - _active_sectors_hint = true; + _KPLIB_sectors_active_hint = true; }; - _active_sectors_string = "" + (localize "STR_ACTIVE_SECTORS") + "
"; + _KPLIB_sectors_active_string = "" + (localize "STR_KPLIB_sectors_active") + "
"; { - _active_sectors_string = [_active_sectors_string, markerText _x, "
"] joinString ""; - } forEach active_sectors; - _active_sectors_string = [_active_sectors_string, ""] joinString ""; - (_overlay displayCtrl (516)) ctrlSetStructuredText parseText _active_sectors_string; + _KPLIB_sectors_active_string = [_KPLIB_sectors_active_string, markerText _x, "
"] joinString ""; + } forEach KPLIB_sectors_active; + _KPLIB_sectors_active_string = [_KPLIB_sectors_active_string, ""] joinString ""; + (_overlay displayCtrl (516)) ctrlSetStructuredText parseText _KPLIB_sectors_active_string; } else { (_overlay displayCtrl (516)) ctrlSetStructuredText parseText " "; @@ -138,7 +138,7 @@ while {true} do { _nearest_active_sector = [KPLIB_sector_size] call KPLIB_fnc_getNearestSector; if ( _nearest_active_sector != "" ) then { _zone_size = KPLIB_capture_size; - if ( _nearest_active_sector in sectors_bigtown ) then { + if ( _nearest_active_sector in KPLIB_sectors_capital ) then { _zone_size = KPLIB_capture_size * 1.4; }; @@ -157,7 +157,7 @@ while {true} do { (_overlay displayCtrl (205)) ctrlSetText (markerText _nearest_active_sector); {(_overlay displayCtrl (_x)) ctrlShow true;} forEach _sectorcontrols; - if (_nearest_active_sector in blufor_sectors) then { + if (_nearest_active_sector in KPLIB_sectors_player) then { (_overlay displayCtrl (205)) ctrlSetTextColor [0,0.3,1.0,1]; } else { (_overlay displayCtrl (205)) ctrlSetTextColor [0.85,0,0,1]; diff --git a/Missionframework/scripts/server/ai/building_defence_ai.sqf b/Missionframework/scripts/server/ai/building_defence_ai.sqf index af74d2034..814cc7e39 100644 --- a/Missionframework/scripts/server/ai/building_defence_ai.sqf +++ b/Missionframework/scripts/server/ai/building_defence_ai.sqf @@ -19,7 +19,7 @@ while {_move_is_disabled && local _unit && alive _unit && !(captive _unit)} do { if (_move_is_disabled && { - (_sector in blufor_sectors) || + (_sector in KPLIB_sectors_player) || {!(_hostiles isEqualTo [])} || {damage _unit > 0.25} } diff --git a/Missionframework/scripts/server/ai/patrol_ai.sqf b/Missionframework/scripts/server/ai/patrol_ai.sqf index d778cdae4..113dd3647 100644 --- a/Missionframework/scripts/server/ai/patrol_ai.sqf +++ b/Missionframework/scripts/server/ai/patrol_ai.sqf @@ -35,7 +35,7 @@ while { count (units _grp) > 0 } do { if ( _patrol_startpos distance (markerpos _x) < 2500) then { _sectors_patrol pushBack _x; }; - } foreach (sectors_allSectors - blufor_sectors); + } foreach (KPLIB_sectors_all - KPLIB_sectors_player); while {(count (waypoints _grp)) != 0} do {deleteWaypoint ((waypoints _grp) select 0);}; {_x doFollow leader _grp} foreach units _grp; diff --git a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf index 7fe1255aa..af568fbe2 100644 --- a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf +++ b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf @@ -10,7 +10,7 @@ while {KPLIB_endgame == 0} do { private _sectors_to_remove = []; { - if (!(_x in blufor_sectors) || (KPLIB_civ_rep > -25)) then { + if (!(_x in KPLIB_sectors_player) || (KPLIB_civ_rep > -25)) then { _sectors_to_remove pushBack _x; }; } forEach KPLIB_asymmetric_sectors; @@ -55,7 +55,7 @@ while {KPLIB_endgame == 0} do { if (!(_units_at_sector > 0) && (_sector in KPLIB_asymmetric_sectors)) then { KPLIB_asymmetric_sectors = KPLIB_asymmetric_sectors - [_sector]; }; - } forEach ((sectors_capture + sectors_bigtown) select {_x in blufor_sectors}); + } forEach ((KPLIB_sectors_city + KPLIB_sectors_capital) select {_x in KPLIB_sectors_player}); }; publicVariable "KPLIB_asymmetric_sectors"; publicVariable "asymm_blocked_sectors"; diff --git a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf index 3edef7597..73e083258 100644 --- a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf +++ b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf @@ -106,7 +106,7 @@ if (((random 100) <= 25) && !(KPLIB_guerilla_vehicles isEqualTo [])) then { _spawnedGroups pushBack _grp; }; -waitUntil {sleep 60; !(_sector in active_sectors)}; +waitUntil {sleep 60; !(_sector in KPLIB_sectors_active)}; sleep 60; diff --git a/Missionframework/scripts/server/base/startgame.sqf b/Missionframework/scripts/server/base/startgame.sqf index a5bf42762..f9fbd3f87 100644 --- a/Missionframework/scripts/server/base/startgame.sqf +++ b/Missionframework/scripts/server/base/startgame.sqf @@ -8,9 +8,9 @@ if (KPLIB_all_fobs isEqualTo []) then { if (KPLIB_build_first_fob) then { // Only accept spawnpoints which are at least 800m away from any sector private _y = ""; - private _validPlaces = sectors_opfor select { + private _validPlaces = KPLIB_sectors_spawn select { _y = _x; - (sectors_allSectors findIf {((markerPos _x) distance2d (markerPos _y)) < 800}) isEqualTo -1 + (KPLIB_sectors_all findIf {((markerPos _x) distance2d (markerPos _y)) < 800}) isEqualTo -1 }; // Spawn first FOB on random valid spawnpoint diff --git a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf index a2ba8a89a..c8efe97e6 100644 --- a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf +++ b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf @@ -1,14 +1,14 @@ waitUntil {!isNil "save_is_loaded" && {save_is_loaded}}; while {true} do { - if ((count blufor_sectors) >= ((count sectors_allSectors) * 0.9)) then { + if ((count KPLIB_sectors_player) >= ((count KPLIB_sectors_all) * 0.9)) then { if (combat_readiness > 0) then { combat_readiness = combat_readiness - 0.25; }; } else { if ( - (combat_readiness < ((count blufor_sectors) * 2) && combat_readiness < 35) - || (combat_readiness < ((count blufor_sectors) * 1.25) && combat_readiness < 60) + (combat_readiness < ((count KPLIB_sectors_player) * 2) && combat_readiness < 35) + || (combat_readiness < ((count KPLIB_sectors_player) * 1.25) && combat_readiness < 60) ) then { combat_readiness = combat_readiness + 0.25; stats_readiness_earned = stats_readiness_earned + 0.25; diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index 1ff33cda0..511a5a5a0 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -7,7 +7,7 @@ private _planes_number = ((floor linearConversion [40, 100, combat_readiness, 1, if (_planes_number < 1) exitWith {}; private _class = selectRandom KPLIB_o_planes; -private _spawnPoint = ([sectors_airspawn, [_first_objective], {(markerPos _x) distance _input0}, "ASCEND"] call BIS_fnc_sortBy) select 0; +private _spawnPoint = ([KPLIB_sectors_airSpawn, [_first_objective], {(markerPos _x) distance _input0}, "ASCEND"] call BIS_fnc_sortBy) select 0; private _spawnPos = []; private _plane = objNull; private _grp = createGroup [KPLIB_side_enemy, true]; diff --git a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf index d09d5a4f1..6398569e5 100644 --- a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf +++ b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf @@ -1,4 +1,4 @@ -waitUntil {sleep 10; ({_x in sectors_capture || _x in sectors_bigtown} count blufor_sectors) > 0}; +waitUntil {sleep 10; ({_x in KPLIB_sectors_city || _x in KPLIB_sectors_capital} count KPLIB_sectors_player) > 0}; if (KPLIB_civinfo_debug > 0) then {[format ["Loop spawned on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; @@ -9,14 +9,14 @@ while {true} do { waitUntil { sleep 10; - ({_x in sectors_capture || _x in sectors_bigtown} count blufor_sectors) > 0 && + ({_x in KPLIB_sectors_city || _x in KPLIB_sectors_capital} count KPLIB_sectors_player) > 0 && KPLIB_civ_rep >= 25 }; if (KPLIB_civinfo_debug > 0) then {["Informant waitUntil passed", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; if ((KPLIB_civinfo_chance >= (random 100)) && KPLIB_endgame == 0) then { - private _sector = selectRandom (blufor_sectors select {_x in sectors_capture || _x in sectors_bigtown}); + private _sector = selectRandom (KPLIB_sectors_player select {_x in KPLIB_sectors_city || _x in KPLIB_sectors_capital}); private _house = (nearestObjects [[((markerPos _sector select 0) - 100 + (random 200)), ((markerPos _sector select 1) - 100 + (random 200))],["House", "Building"], 100]) select 0; private _grp = createGroup [KPLIB_side_civilian, true]; diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf index 227844e23..d9223b09b 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf @@ -1,6 +1,6 @@ params ["_sector"]; -if (_sector in sectors_bigtown || _sector in sectors_capture) then { +if (_sector in KPLIB_sectors_capital || _sector in KPLIB_sectors_city) then { private _penalty = 0; { @@ -15,7 +15,7 @@ if (_sector in sectors_bigtown || _sector in sectors_capture) then { [1, [(_penalty / KPLIB_cr_building_penalty)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; }; - if (_sector in sectors_bigtown) then { + if (_sector in KPLIB_sectors_capital) then { [(2 * KPLIB_cr_sector_gain - _penalty), false] spawn F_cr_changeCR; } else { [(KPLIB_cr_sector_gain - _penalty), false] spawn F_cr_changeCR; diff --git a/Missionframework/scripts/server/civrep/init_buildings.sqf b/Missionframework/scripts/server/civrep/init_buildings.sqf index 7f2fca61d..73c47e32b 100644 --- a/Missionframework/scripts/server/civrep/init_buildings.sqf +++ b/Missionframework/scripts/server/civrep/init_buildings.sqf @@ -24,11 +24,11 @@ KPLIB_cr_sectorbuildings = []; { KPLIB_cr_sectorbuildings pushBack [_x, [_x] call F_cr_getBuildings]; -} forEach sectors_capture; +} forEach KPLIB_sectors_city; { KPLIB_cr_sectorbuildings pushBack [_x, [_x] call F_cr_getBuildings]; -} forEach sectors_bigtown; +} forEach KPLIB_sectors_capital; if (isServer) then {[format ["init_buildings.sqf finished. Time needed: %1 seconds", diag_ticktime - _start], "CIVREP"] call KPLIB_fnc_log;}; if (KPLIB_civrep_debug > 0) then { diff --git a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf index 7c0bb17c8..182993d21 100644 --- a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf +++ b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf @@ -1,6 +1,6 @@ params ["_sector"]; -if (!(_sector in sectors_bigtown) && !(_sector in sectors_capture) && !(_sector in sectors_factory)) exitWith {}; +if (!(_sector in KPLIB_sectors_capital) && !(_sector in KPLIB_sectors_city) && !(_sector in KPLIB_sectors_factory)) exitWith {}; if (KPLIB_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned for %1 on: %2", markerText _sector, debug_source], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index cfd75db5f..120762ec4 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -68,7 +68,7 @@ air_weight = 33; // Enemy weight for anti armor armor_weight = 33; // Blufor sectors -blufor_sectors = []; +KPLIB_sectors_player = []; // Enemy combat readiness (0-100) combat_readiness = 0; // All FOBs @@ -177,7 +177,7 @@ if (!isNil "_saveData") then { _stats = _saveData select 4; _weights = _saveData select 5; _aiGroups = _saveData select 6; - blufor_sectors = _saveData select 7; + KPLIB_sectors_player = _saveData select 7; combat_readiness = _saveData select 8; KPLIB_all_fobs = _saveData select 9; KPLIB_permissions = _saveData select 10; @@ -235,7 +235,7 @@ if (!isNil "_saveData") then { // --- Compatibility for older save data --- ["Save data from version: pre 0.96.5", "SAVE"] call KPLIB_fnc_log; - blufor_sectors = _saveData select 0; + KPLIB_sectors_player = _saveData select 0; KPLIB_all_fobs = _saveData select 1; _objectsToSave = _saveData select 2; _dateTime = _saveData select 3; @@ -502,19 +502,19 @@ if (!isNil "_saveData") then { publicVariable "stats_civilian_vehicles_seized"; publicVariable "stats_ieds_detonated"; -publicVariable "blufor_sectors"; +publicVariable "KPLIB_sectors_player"; publicVariable "KPLIB_all_fobs"; publicVariable "KPLIB_clearances"; // Check for deleted military sectors or deleted classnames in the locked vehicles array -KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {((_x select 0) in elite_vehicles) && ((_x select 1) in sectors_military)}; +KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {((_x select 0) in elite_vehicles) && ((_x select 1) in KPLIB_sectors_military)}; // Remove links for vehicles of possibly removed mods KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {[_x select 0] call KPLIB_fnc_checkClass}; // Check for additions in the locked vehicles array private _lockedVehCount = count KPLIB_vehicle_to_military_base_links; -if ((_lockedVehCount < (count sectors_military)) && (_lockedVehCount < (count elite_vehicles))) then { +if ((_lockedVehCount < (count KPLIB_sectors_military)) && (_lockedVehCount < (count elite_vehicles))) then { private _assignedVehicles = []; private _assignedBases = []; private _nextVehicle = ""; @@ -526,9 +526,9 @@ if ((_lockedVehCount < (count sectors_military)) && (_lockedVehCount < (count el } forEach KPLIB_vehicle_to_military_base_links; // Add new entries, when there are elite vehicles and military sectors are not yet assigned - while {((count _assignedVehicles) < (count elite_vehicles)) && ((count _assignedBases) < (count sectors_military))} do { + while {((count _assignedVehicles) < (count elite_vehicles)) && ((count _assignedBases) < (count KPLIB_sectors_military))} do { _nextVehicle = selectRandom (elite_vehicles - _assignedVehicles); - _nextBase = selectRandom (sectors_military - _assignedBases); + _nextBase = selectRandom (KPLIB_sectors_military - _assignedBases); _assignedVehicles pushBack _nextVehicle; _assignedBases pushBack _nextBase; KPLIB_vehicle_to_military_base_links pushBack [_nextVehicle, _nextBase]; diff --git a/Missionframework/scripts/server/game/spawn_radio_towers.sqf b/Missionframework/scripts/server/game/spawn_radio_towers.sqf index c3809116d..482f2d547 100644 --- a/Missionframework/scripts/server/game/spawn_radio_towers.sqf +++ b/Missionframework/scripts/server/game/spawn_radio_towers.sqf @@ -5,4 +5,4 @@ uiSleep 3; _nextower setpos (markerpos _x); _nextower setVectorUp [0,0,1]; _nextower addEventHandler ["HandleDamage", { 0 }]; -} foreach sectors_tower; +} foreach KPLIB_sectors_tower; diff --git a/Missionframework/scripts/server/game/synchronise_eco.sqf b/Missionframework/scripts/server/game/synchronise_eco.sqf index 7a185f117..256818e6d 100644 --- a/Missionframework/scripts/server/game/synchronise_eco.sqf +++ b/Missionframework/scripts/server/game/synchronise_eco.sqf @@ -10,7 +10,7 @@ if (KPLIB_production_markers isEqualTo []) then { { private _facility = selectRandom [[true,false,false], [false,true,false], [false,false,true]]; KPLIB_production_markers pushBack [_x, _facility select 0, _facility select 1, _facility select 2, markerText _x]; - } forEach sectors_factory; + } forEach KPLIB_sectors_factory; }; private _KPLIB_production_old = [0]; diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index 7cfb0b5ab..1b40b095a 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -33,7 +33,7 @@ manage_one_sector = compile preprocessFileLineNumbers "scripts\server\sector\man wait_to_spawn_sector = compile preprocessFileLineNumbers "scripts\server\sector\wait_to_spawn_sector.sqf"; // Globals -active_sectors = []; publicVariable "active_sectors"; +KPLIB_sectors_active = []; publicVariable "KPLIB_sectors_active"; execVM "scripts\server\base\startgame.sqf"; execVM "scripts\server\base\huron_manager.sqf"; diff --git a/Missionframework/scripts/server/offloading/group_diag.sqf b/Missionframework/scripts/server/offloading/group_diag.sqf index 5985fa448..f33ffc378 100644 --- a/Missionframework/scripts/server/offloading/group_diag.sqf +++ b/Missionframework/scripts/server/offloading/group_diag.sqf @@ -1,4 +1,4 @@ -waitUntil {sleep 1; !isNil "active_sectors"}; +waitUntil {sleep 1; !isNil "KPLIB_sectors_active"}; while {true} do { uiSleep 600; diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index a0a62727c..96298de99 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -6,7 +6,7 @@ _civveh = objNull; sleep (150 + (random 150)); _spawnsector = ""; -if ( isNil "active_sectors" ) then { active_sectors = [] }; +if ( isNil "KPLIB_sectors_active" ) then { KPLIB_sectors_active = [] }; while { KPLIB_endgame == 0 } do { @@ -17,7 +17,7 @@ while { KPLIB_endgame == 0 } do { _usable_sectors pushback _x; } - } foreach ((sectors_bigtown + sectors_capture + sectors_factory) - (active_sectors)); + } foreach ((KPLIB_sectors_capital + KPLIB_sectors_city + KPLIB_sectors_factory) - (KPLIB_sectors_active)); if ( count _usable_sectors > 0 ) then { _spawnsector = selectRandom _usable_sectors; @@ -59,7 +59,7 @@ while { KPLIB_endgame == 0 } do { if ((_patrol_startpos distance (markerpos _x) < 5000) && (count ([markerPos _x, 4000] call KPLIB_fnc_getNearbyPlayers) > 0)) then { _sectors_patrol pushback _x; }; - } foreach (sectors_bigtown + sectors_capture + sectors_factory); + } foreach (KPLIB_sectors_capital + KPLIB_sectors_city + KPLIB_sectors_factory); _sectors_patrol_random = []; _sectorcount = count _sectors_patrol; diff --git a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf index d1dc0f107..f64a300b8 100644 --- a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf @@ -1,11 +1,11 @@ params [ "_minimum_readiness", "_is_infantry" ]; private [ "_headless_client" ]; -waitUntil { !isNil "blufor_sectors" }; +waitUntil { !isNil "KPLIB_sectors_player" }; waitUntil { !isNil "combat_readiness" }; while { KPLIB_endgame == 0 } do { - waitUntil { sleep 0.3; count blufor_sectors >= 3; }; + waitUntil { sleep 0.3; count KPLIB_sectors_player >= 3; }; waitUntil { sleep 0.3; combat_readiness >= (_minimum_readiness / KPLIB_difficulty_modifier); }; sleep (random 30); @@ -76,7 +76,7 @@ while { KPLIB_endgame == 0 } do { }; }; - if ( !([] call KPLIB_fnc_isBigtownActive) ) then { + if ( !([] call KPLIB_fnc_isCapitalActive) ) then { sleep (600.0 / KPLIB_difficulty_modifier); }; diff --git a/Missionframework/scripts/server/patrols/manage_patrols.sqf b/Missionframework/scripts/server/patrols/manage_patrols.sqf index e37b1bca5..c2eeb2ba9 100644 --- a/Missionframework/scripts/server/patrols/manage_patrols.sqf +++ b/Missionframework/scripts/server/patrols/manage_patrols.sqf @@ -8,8 +8,8 @@ if ( KPLIB_unitcap > 1.3 ) then { _combat_triggers_infantry = [10,20,35,55,70,80 sleep 5; -waitUntil { sleep 0.3; !isNil "blufor_sectors" }; -waitUntil { sleep 0.3; count blufor_sectors > 3 }; +waitUntil { sleep 0.3; !isNil "KPLIB_sectors_player" }; +waitUntil { sleep 0.3; count KPLIB_sectors_player > 3 }; if (worldName != "song_bin_tanh") then { { diff --git a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf index f09d36231..7d04309f0 100644 --- a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf +++ b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf @@ -4,28 +4,28 @@ if (combat_readiness > 15) then { private _init_units_count = (([markerPos _targetsector, KPLIB_capture_size, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)); - if !(_targetsector in sectors_bigtown) then { + if !(_targetsector in KPLIB_sectors_capital) then { while {(_init_units_count * 0.75) <= ([markerPos _targetsector, KPLIB_capture_size, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)} do { sleep 5; }; }; - if (_targetsector in active_sectors) then { + if (_targetsector in KPLIB_sectors_active) then { private _nearestower = [markerpos _targetsector, KPLIB_side_enemy, KPLIB_radiotower_size * 1.4] call KPLIB_fnc_getNearestTower; if !(isNil "_nearestower") then { private _reinforcements_time = (((((markerpos _nearestower) distance (markerpos _targetsector)) / 1000) ^ 1.66 ) * 120) / (KPLIB_difficulty_modifier * KPLIB_csat_aggressivity); - if (_targetsector in sectors_bigtown) then { + if (_targetsector in KPLIB_sectors_capital) then { _reinforcements_time = _reinforcements_time * 0.35; }; private _current_timer = time; - waitUntil {sleep 1; (_current_timer + _reinforcements_time < time) || (_targetsector in blufor_sectors) || (_nearestower in blufor_sectors)}; + waitUntil {sleep 1; (_current_timer + _reinforcements_time < time) || (_targetsector in KPLIB_sectors_player) || (_nearestower in KPLIB_sectors_player)}; sleep 15; - if ((_targetsector in active_sectors) && !(_targetsector in blufor_sectors) && !(_nearestower in blufor_sectors) && (!([] call KPLIB_fnc_isBigtownActive) || _targetsector in sectors_bigtown)) then { + if ((_targetsector in KPLIB_sectors_active) && !(_targetsector in KPLIB_sectors_player) && !(_nearestower in KPLIB_sectors_player) && (!([] call KPLIB_fnc_isCapitalActive) || _targetsector in KPLIB_sectors_capital)) then { reinforcements_sector_under_attack = _targetsector; reinforcements_set = true; ["lib_reinforcements",[markertext _targetsector]] remoteExec ["bis_fnc_shownotification"]; diff --git a/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf b/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf index 6335443d0..2362e3483 100644 --- a/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf +++ b/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf @@ -11,6 +11,6 @@ while { true } do { waitUntil { sleep 0.3; ( time > ( _localtime + _reset_time ) ) || reinforcements_set }; - if ( !reinforcements_set && !([] call KPLIB_fnc_isBigtownActive) ) then { reinforcements_sector_under_attack = ""; } + if ( !reinforcements_set && !([] call KPLIB_fnc_isCapitalActive) ) then { reinforcements_sector_under_attack = ""; } }; diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index 5387478da..eb898075c 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -9,7 +9,7 @@ private _targetpos = _targetsector; if (_targetpos isEqualType "") then { _targetpos = markerPos _targetsector; }; -private _spawnsector = ([sectors_airspawn, [_targetpos], {(markerpos _x) distance _input0}, "ASCEND"] call BIS_fnc_sortBy) select 0; +private _spawnsector = ([KPLIB_sectors_airSpawn, [_targetpos], {(markerpos _x) distance _input0}, "ASCEND"] call BIS_fnc_sortBy) select 0; private _newvehicle = objNull; private _pilot_group = grpNull; if (isNull _chopper_type) then { diff --git a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf index 50395a6e4..99254b7e4 100644 --- a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf @@ -2,11 +2,11 @@ params ["_liberated_sector"]; private _combat_readiness_increase = 0; switch (true) do { - case (_liberated_sector in sectors_bigtown): {_combat_readiness_increase = floor (random 10) * KPLIB_difficulty_modifier;}; - case (_liberated_sector in sectors_capture): {_combat_readiness_increase = floor (random 6) * KPLIB_difficulty_modifier;}; - case (_liberated_sector in sectors_military): {_combat_readiness_increase = 5 + (floor (random 11)) * KPLIB_difficulty_modifier;}; - case (_liberated_sector in sectors_factory): {_combat_readiness_increase = 3 + (floor (random 7)) * KPLIB_difficulty_modifier;}; - case (_liberated_sector in sectors_tower): {_combat_readiness_increase = floor (random 4);}; + case (_liberated_sector in KPLIB_sectors_capital): {_combat_readiness_increase = floor (random 10) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in KPLIB_sectors_city): {_combat_readiness_increase = floor (random 6) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in KPLIB_sectors_military): {_combat_readiness_increase = 5 + (floor (random 11)) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in KPLIB_sectors_factory): {_combat_readiness_increase = 3 + (floor (random 7)) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in KPLIB_sectors_tower): {_combat_readiness_increase = floor (random 4);}; }; combat_readiness = combat_readiness + _combat_readiness_increase; @@ -14,12 +14,12 @@ if (combat_readiness > 100.0 && KPLIB_difficulty_modifier <= 2.0) then {combat_r stats_readiness_earned = stats_readiness_earned + _combat_readiness_increase; [_liberated_sector, 0] remoteExecCall ["remote_call_sector"]; -blufor_sectors pushback _liberated_sector; publicVariable "blufor_sectors"; +KPLIB_sectors_player pushback _liberated_sector; publicVariable "KPLIB_sectors_player"; stats_sectors_liberated = stats_sectors_liberated + 1; reset_battlegroups_ai = true; publicVariable "reset_battlegroups_ai"; -if (_liberated_sector in sectors_factory) then { +if (_liberated_sector in KPLIB_sectors_factory) then { { if (_liberated_sector in _x) exitWith {KPLIB_production = KPLIB_production - [_x];}; } forEach KPLIB_production; @@ -43,7 +43,7 @@ if (_liberated_sector in sectors_factory) then { [_liberated_sector] spawn F_cr_liberatedSector; -if ((random 100) <= KPLIB_cr_wounded_chance || (count blufor_sectors) == 1) then { +if ((random 100) <= KPLIB_cr_wounded_chance || (count KPLIB_sectors_player) == 1) then { [_liberated_sector] spawn civrep_wounded_civs; }; @@ -60,10 +60,10 @@ sleep 45; if (KPLIB_endgame == 0) then { if ( - !(_liberated_sector in sectors_tower) + !(_liberated_sector in KPLIB_sectors_tower) && { (random (150 / (KPLIB_difficulty_modifier * KPLIB_csat_aggressivity))) < (combat_readiness - 15) - || _liberated_sector in sectors_bigtown + || _liberated_sector in KPLIB_sectors_capital } && {[] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap} ) then { diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index 72f660816..51ed47a07 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -59,10 +59,10 @@ while {true} do { } forEach KPLIB_all_fobs; { - if ( _x in sectors_capture ) then { + if ( _x in KPLIB_sectors_city ) then { _local_infantry_cap = _local_infantry_cap + (10 * KPLIB_resources_multiplier); }; - } foreach blufor_sectors; + } foreach KPLIB_sectors_player; KPLIB_fob_resources = _local_fob_resources; KPLIB_supplies_global = _local_supplies_global; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf index 94e3040d5..beb03fd3f 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf @@ -7,7 +7,7 @@ _ownership = [ markerpos _sector ] call KPLIB_fnc_getSectorOwnership; if ( _ownership != KPLIB_side_enemy ) exitWith {}; _squad_type = blufor_squad_inf_light; -if ( _sector in sectors_military ) then { +if ( _sector in KPLIB_sectors_military ) then { _squad_type = blufor_squad_inf; }; @@ -47,8 +47,8 @@ waitUntil { if ( KPLIB_endgame == 0 ) then { if ( _attacktime <= 1 && ( [markerpos _sector] call KPLIB_fnc_getSectorOwnership == KPLIB_side_enemy ) ) then { - blufor_sectors = blufor_sectors - [ _sector ]; - publicVariable "blufor_sectors"; + KPLIB_sectors_player = KPLIB_sectors_player - [ _sector ]; + publicVariable "KPLIB_sectors_player"; [_sector, 2] remoteExec ["remote_call_sector"]; reset_battlegroups_ai = true; [] spawn KPLIB_fnc_doSave; diff --git a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm index 15e0a0059..f58bad5e7 100644 --- a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm +++ b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm @@ -52,7 +52,7 @@ link23[] = {20,21}; link24[] = {21,15}; link25[] = {22,23}; globals[] = {0.000000,0,0,0,0,640,480,1,27,6316128,1,-462.464111,712.458435,919.987671,76.941620,1232,884,1}; -window[] = {2,-1,-1,-1,-1,941,182,1622,182,3,1250}; +window[] = {2,-1,-1,-1,-1,915,156,1596,156,3,1250}; *//*%FSM*/ class FSM { @@ -146,8 +146,8 @@ class FSM { name = "Start_new_monitoring"; itemno = 6; - init = /*%FSM*/"_allSectors = sectors_allSectors - blufor_sectors;" \n - "_allSectors = _allSectors - active_sectors;"/*%FSM*/; + init = /*%FSM*/"_allSectors = KPLIB_sectors_all - KPLIB_sectors_player;" \n + "_allSectors = _allSectors - KPLIB_sectors_active;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -180,8 +180,8 @@ class FSM itemno = 9; priority = 0.000000; to="Get_adjusted_sector"; - precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"([] call KPLIB_fnc_getOpforCap) < KPLIB_sector_cap"/*%FSM*/; + precondition = /*%FSM*/"_opforCount = [] call KPLIB_fnc_getOpforCap;"/*%FSM*/; + condition=/*%FSM*/"_opforCount < KPLIB_sector_cap"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -283,12 +283,12 @@ class FSM "};" \n "" \n "// Spawn resource crates" \n - "if (_sector in sectors_factory || _sector in sectors_capture) then {" \n + "if (_sector in KPLIB_sectors_factory || _sector in KPLIB_sectors_city) then {" \n " [_sector] call KPLIB_fnc_spawnSectorCrates;" \n "};" \n "" \n "// Spawn intel items" \n - "if (_sector in sectors_military) then {" \n + "if (_sector in KPLIB_sectors_military) then {" \n " [_sector] call KPLIB_fnc_spawnSectorIntel;" \n "};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; @@ -317,10 +317,10 @@ class FSM " [" \n " format [" \n " ""Active sectors: %1""," \n - " if (active_sectors isEqualTo []) then {" \n + " if (KPLIB_sectors_active isEqualTo []) then {" \n " ""None""" \n " } else {" \n - " active_sectors apply {markerText _x} joinString "", """ \n + " KPLIB_sectors_active apply {markerText _x} joinString "", """ \n " }" \n " ]," \n " ""SECTORMONITOR""" \n diff --git a/Missionframework/scripts/server/sector/ied_manager.sqf b/Missionframework/scripts/server/sector/ied_manager.sqf index 557464fe8..38603540f 100644 --- a/Missionframework/scripts/server/sector/ied_manager.sqf +++ b/Missionframework/scripts/server/sector/ied_manager.sqf @@ -36,7 +36,7 @@ if (!(isnull _roadobj)) then { if (KPLIB_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> IED %1 spawned at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; - while {_sector in active_sectors && mineActive _ied_obj && !_goes_boom} do { + while {_sector in KPLIB_sectors_active && mineActive _ied_obj && !_goes_boom} do { _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_friendly}; _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_friendly}; if (count _nearinfantry >= _infantry_trigger || count _nearvehicles >= _vehicle_trigger) then { diff --git a/Missionframework/scripts/server/sector/lose_sectors.sqf b/Missionframework/scripts/server/sector/lose_sectors.sqf index 7b00bffc1..15ebbc1a1 100644 --- a/Missionframework/scripts/server/sector/lose_sectors.sqf +++ b/Missionframework/scripts/server/sector/lose_sectors.sqf @@ -1,5 +1,5 @@ waitUntil { !isNil "KPLIB_all_fobs" }; -waitUntil { !isNil "blufor_sectors" }; +waitUntil { !isNil "KPLIB_sectors_player" }; sleep 5; @@ -13,7 +13,7 @@ while { KPLIB_endgame == 0 } do { [ _x ] call attack_in_progress_sector; }; sleep 0.5; - } foreach blufor_sectors; + } foreach KPLIB_sectors_player; { _ownership = [ _x ] call KPLIB_fnc_getSectorOwnership; diff --git a/Missionframework/scripts/server/sector/manage_one_sector.sqf b/Missionframework/scripts/server/sector/manage_one_sector.sqf index d7067b8b4..0bd267caf 100644 --- a/Missionframework/scripts/server/sector/manage_one_sector.sqf +++ b/Missionframework/scripts/server/sector/manage_one_sector.sqf @@ -34,15 +34,15 @@ private _guerilla = false; if (KPLIB_unitcap < 1) then {_popfactor = KPLIB_unitcap;}; -if (_sector in active_sectors) exitWith {}; -active_sectors pushback _sector; publicVariable "active_sectors"; +if (_sector in KPLIB_sectors_active) exitWith {}; +KPLIB_sectors_active pushback _sector; publicVariable "KPLIB_sectors_active"; private _opforcount = [] call KPLIB_fnc_getOpforCap; [_sector, _opforcount] call wait_to_spawn_sector; -if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call KPLIB_fnc_getSectorRange, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0)) then { +if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] call KPLIB_fnc_getSectorRange, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0)) then { - if (_sector in sectors_bigtown) then { + if (_sector in KPLIB_sectors_capital) then { if (combat_readiness < 30) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); @@ -77,7 +77,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (_iedcount > 16) then {_iedcount = 16}; }; - if (_sector in sectors_capture) then { + if (_sector in KPLIB_sectors_city) then { if (combat_readiness < 50) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); @@ -110,7 +110,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (_iedcount > 12) then {_iedcount = 12}; }; - if (_sector in sectors_military) then { + if (_sector in KPLIB_sectors_military) then { _squad1 = ([] call KPLIB_fnc_getSquadComp); _squad2 = ([] call KPLIB_fnc_getSquadComp); if (KPLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; @@ -128,7 +128,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K _building_range = 120; }; - if (_sector in sectors_factory) then { + if (_sector in KPLIB_sectors_factory) then { if (combat_readiness < 40) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); @@ -154,7 +154,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K if (_iedcount > 8) then {_iedcount = 8}; }; - if (_sector in sectors_tower) then { + if (_sector in KPLIB_sectors_tower) then { _squad1 = ([] call KPLIB_fnc_getSquadComp); if (combat_readiness > 30) then {_squad2 = ([] call KPLIB_fnc_getSquadComp);}; if (KPLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; @@ -233,7 +233,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K sleep 10; - if ((_sector in sectors_factory) || (_sector in sectors_capture) || (_sector in sectors_bigtown) || (_sector in sectors_military)) then { + if ((_sector in KPLIB_sectors_factory) || (_sector in KPLIB_sectors_city) || (_sector in KPLIB_sectors_capital) || (_sector in KPLIB_sectors_military)) then { [_sector] remoteExec ["reinforcements_remote_call",2]; }; @@ -256,7 +256,7 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K sleep 60; - active_sectors = active_sectors - [_sector]; publicVariable "active_sectors"; + KPLIB_sectors_active = KPLIB_sectors_active - [_sector]; publicVariable "KPLIB_sectors_active"; sleep 600; @@ -297,14 +297,14 @@ if ((!(_sector in blufor_sectors)) && (([markerPos _sector, [_opforcount] call K } forEach _managed_units; _stopit = true; - active_sectors = active_sectors - [_sector]; publicVariable "active_sectors"; + KPLIB_sectors_active = KPLIB_sectors_active - [_sector]; publicVariable "KPLIB_sectors_active"; }; }; sleep SECTOR_TICK_TIME; }; } else { sleep 40; - active_sectors = active_sectors - [_sector]; publicVariable "active_sectors"; + KPLIB_sectors_active = KPLIB_sectors_active - [_sector]; publicVariable "KPLIB_sectors_active"; }; [format ["Sector %1 (%2) deactivated - Was managed on: %3", (markerText _sector), _sector, debug_source], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2]; diff --git a/Missionframework/scripts/shared/diagnostics.sqf b/Missionframework/scripts/shared/diagnostics.sqf index c0df0db21..8cf01516a 100644 --- a/Missionframework/scripts/shared/diagnostics.sqf +++ b/Missionframework/scripts/shared/diagnostics.sqf @@ -15,7 +15,7 @@ private _source = ""; [format ["KP Ranks: %1", KPPLM_KPR], "MISSIONSTART"] call KPLIB_fnc_log; ["------------------------------------", "MISSIONSTART"] call KPLIB_fnc_log; -waitUntil {sleep 1; !isNil "active_sectors"}; +waitUntil {sleep 1; !isNil "KPLIB_sectors_active"}; private _delay = 120; @@ -35,7 +35,7 @@ while {true} do { ((round (diag_fps * 100.0)) / 100.0), {local _x} count allGroups, {local _x} count allUnits, - count active_sectors, + count KPLIB_sectors_active, diag_activeScripts select 0, diag_activeScripts select 1, diag_activeScripts select 2, diff --git a/Missionframework/scripts/shared/fetch_params.sqf b/Missionframework/scripts/shared/fetch_params.sqf index 577676a90..53adb6c47 100644 --- a/Missionframework/scripts/shared/fetch_params.sqf +++ b/Missionframework/scripts/shared/fetch_params.sqf @@ -170,39 +170,39 @@ switch (KPLIB_resources_multiplier) do { switch (KPLIB_victoryCondition) do { case 1: { KPLIB_victoryCheck = { - (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) + (count (KPLIB_sectors_player select {_x in KPLIB_sectors_capital})) == (count KPLIB_sectors_capital) && { - (count (blufor_sectors select {_x in sectors_military})) == (count sectors_military) + (count (KPLIB_sectors_player select {_x in KPLIB_sectors_military})) == (count KPLIB_sectors_military) } }; }; case 2: { KPLIB_victoryCheck = { - (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) + (count (KPLIB_sectors_player select {_x in KPLIB_sectors_capital})) == (count KPLIB_sectors_capital) && { - (count (blufor_sectors select {!(_x in sectors_bigtown)})) >= ((count (sectors_allSectors - sectors_bigtown)) * 0.6) + (count (KPLIB_sectors_player select {!(_x in KPLIB_sectors_capital)})) >= ((count (KPLIB_sectors_all - KPLIB_sectors_capital)) * 0.6) } }; }; case 3: { KPLIB_victoryCheck = { - (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) + (count (KPLIB_sectors_player select {_x in KPLIB_sectors_capital})) == (count KPLIB_sectors_capital) && { - (count (blufor_sectors select {!(_x in sectors_bigtown)})) >= ((count (sectors_allSectors - sectors_bigtown)) * 0.8) + (count (KPLIB_sectors_player select {!(_x in KPLIB_sectors_capital)})) >= ((count (KPLIB_sectors_all - KPLIB_sectors_capital)) * 0.8) } }; }; case 4: { KPLIB_victoryCheck = { - (count blufor_sectors) == (count sectors_allSectors) + (count KPLIB_sectors_player) == (count KPLIB_sectors_all) }; }; default { KPLIB_victoryCheck = { - (count (blufor_sectors select {_x in sectors_bigtown})) == (count sectors_bigtown) + (count (KPLIB_sectors_player select {_x in KPLIB_sectors_capital})) == (count KPLIB_sectors_capital) }; }; }; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index d91a3007a..e3fc938b3 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -29,7 +29,7 @@ if (isServer) then { if ((side _killer) == KPLIB_side_friendly) then { // Increase combat readiness for kills near a capital. - private _nearby_bigtown = sectors_bigtown select {!(_x in blufor_sectors) && (_unit distance (markerpos _x) < 250)}; + private _nearby_bigtown = KPLIB_sectors_capital select {!(_x in KPLIB_sectors_player) && (_unit distance (markerpos _x) < 250)}; if (count _nearby_bigtown > 0) then { combat_readiness = combat_readiness + (0.5 * KPLIB_difficulty_modifier); stats_readiness_earned = stats_readiness_earned + (0.5 * KPLIB_difficulty_modifier); From ba02c3bd3c840bfb9ba1ea9dba63f303ba0ff282 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 17 May 2020 10:23:29 +0200 Subject: [PATCH 036/115] Fix FOB truck get FOB box mass set --- CHANGELOG.md | 1 + Missionframework/kp_objectInits.sqf | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c28f7d5a..43f47b099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset. * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. +* Fixed: FOB truck got mass set, but should've just apply to FOB boxes. ## 0.96.7 (2020-05-10) * Added: CfgFunctions library created from `shared/functions` and all of these functions optimized. diff --git a/Missionframework/kp_objectInits.sqf b/Missionframework/kp_objectInits.sqf index b8a19da19..780bd8c5c 100644 --- a/Missionframework/kp_objectInits.sqf +++ b/Missionframework/kp_objectInits.sqf @@ -44,7 +44,6 @@ KPLIB_objectInits = [ [_this] spawn { params ["_fobBox"]; waitUntil {sleep 0.1; time > 0}; - [_fobBox] call KPLIB_fnc_setFobMass; if ((typeOf _fobBox) isEqualTo FOB_box_typename) then { [_fobBox] call KPLIB_fnc_setFobMass; [_fobBox] remoteExecCall ["KPLIB_fnc_setLoadableViV", 0, _fobBox]; From c42a28486a50015ac6b33573107461a52888e295 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 17 May 2020 10:25:31 +0200 Subject: [PATCH 037/115] Equalize variable name of fob array --- Missionframework/functions/fn_addActionsPlayer.sqf | 4 ++-- Missionframework/functions/fn_getFobName.sqf | 4 ++-- .../functions/fn_getNearestBluforObjective.sqf | 4 ++-- Missionframework/functions/fn_getNearestFob.sqf | 6 +++--- Missionframework/functions/fn_getOpforSpawnPoint.sqf | 2 +- Missionframework/functions/fn_getSaveData.sqf | 4 ++-- .../scripts/client/actions/do_repackage_fob.sqf | 4 ++-- Missionframework/scripts/client/build/do_build_fob.sqf | 8 ++++---- .../scripts/client/markers/fob_markers.sqf | 8 ++++---- .../scripts/client/misc/playerNamespace.sqf | 4 ++-- .../scripts/client/spawn/redeploy_manager.sqf | 6 +++--- .../scripts/client/tutorial/fn_tutorial.fsm | 10 +++++----- .../scripts/client/ui/cinematic_camera.sqf | 10 +++++----- Missionframework/scripts/server/base/startgame.sqf | 10 +++++----- Missionframework/scripts/server/game/save_manager.sqf | 8 ++++---- .../server/remotecall/build_fob_remote_call.sqf | 4 ++-- .../scripts/server/resources/recalculate_resources.sqf | 2 +- .../scripts/server/sector/attack_in_progress_fob.sqf | 4 ++-- .../scripts/server/sector/lose_sectors.sqf | 4 ++-- 19 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index 8816612ed..ed57880ea 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -2,7 +2,7 @@ File: fn_addActionsPlayer.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -310,7 +310,7 @@ _player addAction [ && {alive _originalTarget} && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} && {!( - KPLIB_all_fobs isEqualTo [] + KPLIB_sectors_fob isEqualTo [] || KPLIB_production isEqualTo [] )} && {build_confirmed isEqualTo 0} diff --git a/Missionframework/functions/fn_getFobName.sqf b/Missionframework/functions/fn_getFobName.sqf index 749d4af6d..8da59a444 100644 --- a/Missionframework/functions/fn_getFobName.sqf +++ b/Missionframework/functions/fn_getFobName.sqf @@ -2,7 +2,7 @@ File: fn_getFobName.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,4 +19,4 @@ params [ ["_fob", [0, 0, 0], [[]], [2, 3]] ]; -military_alphabet param [KPLIB_all_fobs findIf {(_x distance2d _fob) < 100}, ""] +military_alphabet param [KPLIB_sectors_fob findIf {(_x distance2d _fob) < 100}, ""] diff --git a/Missionframework/functions/fn_getNearestBluforObjective.sqf b/Missionframework/functions/fn_getNearestBluforObjective.sqf index 2a25e67ad..839e5851d 100644 --- a/Missionframework/functions/fn_getNearestBluforObjective.sqf +++ b/Missionframework/functions/fn_getNearestBluforObjective.sqf @@ -19,9 +19,9 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]] ]; -if (KPLIB_all_fobs isEqualTo [] && KPLIB_sectors_player isEqualTo []) exitWith {[]}; +if (KPLIB_sectors_fob isEqualTo [] && KPLIB_sectors_player isEqualTo []) exitWith {[]}; -private _objectives = KPLIB_all_fobs + (KPLIB_sectors_player apply {markerPos _x}); +private _objectives = KPLIB_sectors_fob + (KPLIB_sectors_player apply {markerPos _x}); _objectives = _objectives apply {[_x distance2d _pos, _x]}; _objectives sort true; diff --git a/Missionframework/functions/fn_getNearestFob.sqf b/Missionframework/functions/fn_getNearestFob.sqf index a1a0b4972..e421f323f 100644 --- a/Missionframework/functions/fn_getNearestFob.sqf +++ b/Missionframework/functions/fn_getNearestFob.sqf @@ -2,7 +2,7 @@ File: fn_getNearestFob.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,8 +19,8 @@ params [ ["_pos", getPos player, [[]], [2, 3]] ]; -if !(KPLIB_all_fobs isEqualTo []) then { - private _fobs = KPLIB_all_fobs apply {[_pos distance2d _x, _x]}; +if !(KPLIB_sectors_fob isEqualTo []) then { + private _fobs = KPLIB_sectors_fob apply {[_pos distance2d _x, _x]}; _fobs sort true; (_fobs select 0) select 1 } else { diff --git a/Missionframework/functions/fn_getOpforSpawnPoint.sqf b/Missionframework/functions/fn_getOpforSpawnPoint.sqf index 1e3673fad..47357ce6c 100644 --- a/Missionframework/functions/fn_getOpforSpawnPoint.sqf +++ b/Missionframework/functions/fn_getOpforSpawnPoint.sqf @@ -53,7 +53,7 @@ private ["_valid", "_current", "_distances"]; if (_valid) then { // Fetch distances to FOBs - _distances = (KPLIB_all_fobs apply {(markerPos _current) distance2d _x}) select {_x < _max}; + _distances = (KPLIB_sectors_fob apply {(markerPos _current) distance2d _x}) select {_x < _max}; // Fetch distances to blufor sectors _distances append ((KPLIB_sectors_player apply {(markerPos _current) distance2d (markerPos _x)}) select {_x < _max}); diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index f61aca607..5ecccfdd3 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -66,7 +66,7 @@ private ["_fobPos", "_fobObjects", "_grpUnits", "_fobMines"]; typeOf _x, _x mineDetectedBy KPLIB_side_friendly ]}); -} forEach KPLIB_all_fobs; +} forEach KPLIB_sectors_fob; // Save all fetched objects private ["_savedPos", "_savedVecDir", "_savedVecUp", "_class", "_hasCrew"]; @@ -192,7 +192,7 @@ private _weights = [ _aiGroups, KPLIB_sectors_player, combat_readiness, - KPLIB_all_fobs, + KPLIB_sectors_fob, KPLIB_permissions, KPLIB_vehicle_to_military_base_links, KPLIB_civ_rep, diff --git a/Missionframework/scripts/client/actions/do_repackage_fob.sqf b/Missionframework/scripts/client/actions/do_repackage_fob.sqf index 7e4084fb9..9f61fa28f 100644 --- a/Missionframework/scripts/client/actions/do_repackage_fob.sqf +++ b/Missionframework/scripts/client/actions/do_repackage_fob.sqf @@ -11,9 +11,9 @@ if (dorepackage > 0) then { private _fob = [] call KPLIB_fnc_getNearestFob; if !(_fob isEqualTo []) then { - KPLIB_all_fobs = KPLIB_all_fobs - [_fob]; + KPLIB_sectors_fob = KPLIB_sectors_fob - [_fob]; KPLIB_clearances deleteAt (KPLIB_clearances findIf {(_x select 0) isEqualTo _fob}); - publicVariable "KPLIB_all_fobs"; + publicVariable "KPLIB_sectors_fob"; publicVariable "KPLIB_clearances"; }; diff --git a/Missionframework/scripts/client/build/do_build_fob.sqf b/Missionframework/scripts/client/build/do_build_fob.sqf index b7536605c..5ebdcaf7d 100644 --- a/Missionframework/scripts/client/build/do_build_fob.sqf +++ b/Missionframework/scripts/client/build/do_build_fob.sqf @@ -1,6 +1,6 @@ private [ "_minfobdist", "_minsectordist", "_distfob", "_clearedtobuildfob", "_distsector", "_clearedtobuildsector", "_idx" ]; -if ( count KPLIB_all_fobs >= KPLIB_maximum_fobs ) exitWith { +if ( count KPLIB_sectors_fob >= KPLIB_maximum_fobs ) exitWith { hint format [ localize "STR_HINT_FOBS_EXCEEDED", KPLIB_maximum_fobs ]; }; @@ -15,10 +15,10 @@ FOB_build_in_progress = true; publicVariable "FOB_build_in_progress"; _idx = 0; -while { (_idx < (count KPLIB_all_fobs)) && _clearedtobuildfob } do { - if ( player distance (KPLIB_all_fobs select _idx) < _minfobdist ) then { +while { (_idx < (count KPLIB_sectors_fob)) && _clearedtobuildfob } do { + if ( player distance (KPLIB_sectors_fob select _idx) < _minfobdist ) then { _clearedtobuildfob = false; - _distfob = player distance (KPLIB_all_fobs select _idx); + _distfob = player distance (KPLIB_sectors_fob select _idx); }; _idx = _idx + 1; }; diff --git a/Missionframework/scripts/client/markers/fob_markers.sqf b/Missionframework/scripts/client/markers/fob_markers.sqf index 0a2314e68..7fa5ef0b1 100644 --- a/Missionframework/scripts/client/markers/fob_markers.sqf +++ b/Missionframework/scripts/client/markers/fob_markers.sqf @@ -1,5 +1,5 @@ waitUntil {!isNil "save_is_loaded"}; -waitUntil {!isNil "KPLIB_all_fobs"}; +waitUntil {!isNil "KPLIB_sectors_fob"}; waitUntil {save_is_loaded}; uiSleep 3; @@ -8,15 +8,15 @@ private _markers = []; private _markers_mobilespawns = []; while {true} do { - if (count _markers != count KPLIB_all_fobs) then { + if (count _markers != count KPLIB_sectors_fob) then { {deleteMarkerLocal _x;} forEach _markers; _markers = []; - for "_idx" from 0 to ((count KPLIB_all_fobs) - 1) do { + for "_idx" from 0 to ((count KPLIB_sectors_fob) - 1) do { private _marker = createMarkerLocal [format ["fobmarker%1", _idx], markers_reset]; _marker setMarkerTypeLocal "b_hq"; _marker setMarkerSizeLocal [1.5, 1.5]; - _marker setMarkerPosLocal (KPLIB_all_fobs select _idx); + _marker setMarkerPosLocal (KPLIB_sectors_fob select _idx); _marker setMarkerTextLocal format ["FOB %1",military_alphabet select _idx]; _marker setMarkerColorLocal "ColorYellow"; _markers pushback _marker; diff --git a/Missionframework/scripts/client/misc/playerNamespace.sqf b/Missionframework/scripts/client/misc/playerNamespace.sqf index 518aeace9..2c1b607c4 100644 --- a/Missionframework/scripts/client/misc/playerNamespace.sqf +++ b/Missionframework/scripts/client/misc/playerNamespace.sqf @@ -2,7 +2,7 @@ File: playerNamespace.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-12 - Last Update: 2020-05-10 + Last Update: 2020-05-17 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -22,7 +22,7 @@ private _fobName = ""; while {true} do { // FOB distance, name and position - if !(KPLIB_all_fobs isEqualTo []) then { + if !(KPLIB_sectors_fob isEqualTo []) then { _fobPos = [] call KPLIB_fnc_getNearestFob; _fobDist = player distance2d _fobPos; _fobName = ["", ["FOB", [_fobPos] call KPLIB_fnc_getFobName] joinString " "] select (_fobDist < KPLIB_fob_range); diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 19c235395..0650c5924 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -7,7 +7,7 @@ private _frame_pos = []; KPLIB_force_redeploy = false; -waitUntil {!isNil "KPLIB_all_fobs"}; +waitUntil {!isNil "KPLIB_sectors_fob"}; waitUntil {!isNil "KPLIB_sectors_player"}; waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; @@ -82,8 +82,8 @@ while {true} do { while {dialog && alive player && deploy == 0} do { choiceslist = [[_basenamestr, getposATL startbase]]; - for [{_idx=0},{_idx < count KPLIB_all_fobs},{_idx=_idx+1}] do { - choiceslist = choiceslist + [[format ["FOB %1 - %2", (military_alphabet select _idx),mapGridPosition (KPLIB_all_fobs select _idx)],KPLIB_all_fobs select _idx]]; + for [{_idx=0},{_idx < count KPLIB_sectors_fob},{_idx=_idx+1}] do { + choiceslist = choiceslist + [[format ["FOB %1 - %2", (military_alphabet select _idx),mapGridPosition (KPLIB_sectors_fob select _idx)],KPLIB_sectors_fob select _idx]]; }; if (KPLIB_mobilerespawn) then { diff --git a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm index 95d278a55..1e02244dd 100644 --- a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm +++ b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm @@ -231,7 +231,7 @@ class FSM "&& {alive player}" \n "&& {" \n " private _locations = [startbase];" \n - " _locations append KPLIB_all_fobs;" \n + " _locations append KPLIB_sectors_fob;" \n " !((_locations select {(_x distance2d player) < KPLIB_fob_range}) isEqualTo [])" \n "}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; @@ -317,7 +317,7 @@ class FSM name = "Set_all_completion"; itemno = 7; init = /*%FSM*/"private _fobComplete = {" \n - " !(KPLIB_all_fobs isEqualTo [])" \n + " !(KPLIB_sectors_fob isEqualTo [])" \n " ||" \n " {!(KPLIB_sectors_player isEqualTo [])}" \n "};" \n @@ -536,7 +536,7 @@ class FSM priority = 0.000000; to="Build_storage_ar"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(KPLIB_all_fobs isEqualTo [])"/*%FSM*/; + condition=/*%FSM*/"!(KPLIB_sectors_fob isEqualTo [])"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -570,7 +570,7 @@ class FSM priority = 0.000000; to="Build_storage_ar"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(KPLIB_all_fobs isEqualTo [])"/*%FSM*/; + condition=/*%FSM*/"!(KPLIB_sectors_fob isEqualTo [])"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -641,7 +641,7 @@ class FSM to="Complete_task"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " (((KPLIB_all_fobs select 0) nearObjects KPLIB_fob_range) select {" \n + " (((KPLIB_sectors_fob select 0) nearObjects KPLIB_fob_range) select {" \n " (_x getVariable [""KP_liberation_storage_type"", -1]) == 0" \n " }) isEqualTo []" \n ")"/*%FSM*/; diff --git a/Missionframework/scripts/client/ui/cinematic_camera.sqf b/Missionframework/scripts/client/ui/cinematic_camera.sqf index 20d420c49..fed11860f 100644 --- a/Missionframework/scripts/client/ui/cinematic_camera.sqf +++ b/Missionframework/scripts/client/ui/cinematic_camera.sqf @@ -1,5 +1,5 @@ if ( isNil "KPLIB_sectors_active" ) then { KPLIB_sectors_active = [] }; -if ( isNil "KPLIB_all_fobs" ) then { KPLIB_all_fobs = [] }; +if ( isNil "KPLIB_sectors_fob" ) then { KPLIB_sectors_fob = [] }; cinematic_camera_started = true; private _last_transition = -1; @@ -24,9 +24,9 @@ while { cinematic_camera_started } do { private _positions = [ getpos startbase ]; if ( !first_camera_round ) then { - if ( count KPLIB_all_fobs > 0 ) then { + if ( count KPLIB_sectors_fob > 0 ) then { for [ {_idx=0},{_idx < 2},{_idx=_idx+1} ] do { - _positions pushback (selectRandom KPLIB_all_fobs); + _positions pushback (selectRandom KPLIB_sectors_fob); }; }; @@ -256,9 +256,9 @@ while { cinematic_camera_started } do { if ( _nearest_sector != "" ) then { _nearest_sector = markertext _nearest_sector; } else { - _nearfobs = KPLIB_all_fobs select {_x distance _position < 300}; + _nearfobs = KPLIB_sectors_fob select {_x distance _position < 300}; if ( count _nearfobs > 0 ) then { - _nearest_sector = format [ "FOB %1", military_alphabet select ( KPLIB_all_fobs find ( _nearfobs select 0 ) ) ]; + _nearest_sector = format [ "FOB %1", military_alphabet select ( KPLIB_sectors_fob find ( _nearfobs select 0 ) ) ]; }; }; }; diff --git a/Missionframework/scripts/server/base/startgame.sqf b/Missionframework/scripts/server/base/startgame.sqf index f9fbd3f87..dd8f530be 100644 --- a/Missionframework/scripts/server/base/startgame.sqf +++ b/Missionframework/scripts/server/base/startgame.sqf @@ -2,7 +2,7 @@ waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; // Check if there is no FOB yet (new campaign) -if (KPLIB_all_fobs isEqualTo []) then { +if (KPLIB_sectors_fob isEqualTo []) then { // Prebuild FOB (parameter setting) or spawn FOB box if (KPLIB_build_first_fob) then { @@ -18,7 +18,7 @@ if (KPLIB_all_fobs isEqualTo []) then { } else { // Spawn FOB box and wait until the first FOB was built private _fobbox = objNull; - while {KPLIB_all_fobs isEqualTo []} do { + while {KPLIB_sectors_fob isEqualTo []} do { _fobbox = ([FOB_box_typename, FOB_truck_typename] select KPLIB_fob_vehicle) createVehicle (getposATL base_boxspawn); _fobbox setdir getDir base_boxspawn; _fobbox setposATL (getposATL base_boxspawn); @@ -28,7 +28,7 @@ if (KPLIB_all_fobs isEqualTo []) then { // If the FOB box has fallen into the sea or is destroyed, start again with spawning a new one waitUntil { sleep 1; - !(alive _fobbox) || !(KPLIB_all_fobs isEqualTo []) || (((getPosASL _fobbox) select 2) < 0) + !(alive _fobbox) || !(KPLIB_sectors_fob isEqualTo []) || (((getPosASL _fobbox) select 2) < 0) }; sleep 10; }; @@ -36,7 +36,7 @@ if (KPLIB_all_fobs isEqualTo []) then { }; // Wait a short time before paradropping the start resource crates - waitUntil {sleep 1; !(KPLIB_all_fobs isEqualTo [])}; + waitUntil {sleep 1; !(KPLIB_sectors_fob isEqualTo [])}; if (KPLIB_tutorial && {["KPLIB_Tasks_Tutorial_Fob"] call BIS_fnc_taskExists}) then { waitUntil {sleep 1; ["KPLIB_Tasks_Tutorial_Fob_02"] call BIS_fnc_taskCompleted}; sleep 3; @@ -50,7 +50,7 @@ if (KPLIB_all_fobs isEqualTo []) then { for "_i" from 1 to 6 do { _crate = createVehicle [ (KPLIB_crates select (_i % 3)), - [((KPLIB_all_fobs select 0) select 0), ((KPLIB_all_fobs select 0) select 1), 150], + [((KPLIB_sectors_fob select 0) select 0), ((KPLIB_sectors_fob select 0) select 1), 150], [], 80, "FLY" diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 120762ec4..0a234c822 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -72,7 +72,7 @@ KPLIB_sectors_player = []; // Enemy combat readiness (0-100) combat_readiness = 0; // All FOBs -KPLIB_all_fobs = []; +KPLIB_sectors_fob = []; // Player permissions data KPLIB_permissions = []; // Vehicle unlock links @@ -179,7 +179,7 @@ if (!isNil "_saveData") then { _aiGroups = _saveData select 6; KPLIB_sectors_player = _saveData select 7; combat_readiness = _saveData select 8; - KPLIB_all_fobs = _saveData select 9; + KPLIB_sectors_fob = _saveData select 9; KPLIB_permissions = _saveData select 10; KPLIB_vehicle_to_military_base_links = _saveData select 11; KPLIB_civ_rep = _saveData select 12; @@ -236,7 +236,7 @@ if (!isNil "_saveData") then { ["Save data from version: pre 0.96.5", "SAVE"] call KPLIB_fnc_log; KPLIB_sectors_player = _saveData select 0; - KPLIB_all_fobs = _saveData select 1; + KPLIB_sectors_fob = _saveData select 1; _objectsToSave = _saveData select 2; _dateTime = _saveData select 3; combat_readiness = _saveData select 4; @@ -503,7 +503,7 @@ if (!isNil "_saveData") then { publicVariable "stats_civilian_vehicles_seized"; publicVariable "stats_ieds_detonated"; publicVariable "KPLIB_sectors_player"; -publicVariable "KPLIB_all_fobs"; +publicVariable "KPLIB_sectors_fob"; publicVariable "KPLIB_clearances"; // Check for deleted military sectors or deleted classnames in the locked vehicles array diff --git a/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf b/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf index 5707df94b..f1d650fd6 100644 --- a/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf @@ -3,8 +3,8 @@ if (!isServer) exitWith {}; params [ "_new_fob", "_create_fob_building" ]; private [ "_fob_building", "_fob_pos" ]; -KPLIB_all_fobs pushback _new_fob; -publicVariable "KPLIB_all_fobs"; +KPLIB_sectors_fob pushback _new_fob; +publicVariable "KPLIB_sectors_fob"; if ( _create_fob_building ) then { _fob_pos = [ (_new_fob select 0) + 15, (_new_fob select 1) + 2, 0 ]; diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index 51ed47a07..8b21baf80 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -56,7 +56,7 @@ while {true} do { _local_fuel_global = _local_fuel_global + _fuelValue; _local_heli_slots = _local_heli_slots + _heliSlots; _local_plane_slots = _local_plane_slots + _planeSlots; - } forEach KPLIB_all_fobs; + } forEach KPLIB_sectors_fob; { if ( _x in KPLIB_sectors_city ) then { diff --git a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf index c86b93768..94271d0ff 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf @@ -44,8 +44,8 @@ if ( KPLIB_endgame == 0 ) then { if ( _attacktime <= 1 && ( [ _thispos ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_enemy ) ) then { [_thispos, 2] remoteExec ["remote_call_fob"]; sleep 3; - KPLIB_all_fobs = KPLIB_all_fobs - [_thispos]; - publicVariable "KPLIB_all_fobs"; + KPLIB_sectors_fob = KPLIB_sectors_fob - [_thispos]; + publicVariable "KPLIB_sectors_fob"; reset_battlegroups_ai = true; [_thispos] call KPLIB_fnc_destroyFob; [] spawn KPLIB_fnc_doSave; diff --git a/Missionframework/scripts/server/sector/lose_sectors.sqf b/Missionframework/scripts/server/sector/lose_sectors.sqf index 15ebbc1a1..ed96f0f47 100644 --- a/Missionframework/scripts/server/sector/lose_sectors.sqf +++ b/Missionframework/scripts/server/sector/lose_sectors.sqf @@ -1,4 +1,4 @@ -waitUntil { !isNil "KPLIB_all_fobs" }; +waitUntil { !isNil "KPLIB_sectors_fob" }; waitUntil { !isNil "KPLIB_sectors_player" }; sleep 5; @@ -21,7 +21,7 @@ while { KPLIB_endgame == 0 } do { [ _x ] call attack_in_progress_fob; }; sleep 0.5; - } foreach KPLIB_all_fobs; + } foreach KPLIB_sectors_fob; sleep 1; From d3230c570102b135b2acc17d874aa6a303b75da1 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 18 May 2020 14:58:49 +0200 Subject: [PATCH 038/115] Headers for presets --- Missionframework/presets/civilians/apex.sqf | 13 ++++- .../presets/civilians/cup_cherno.sqf | 17 ++++-- .../presets/civilians/cup_takistan.sqf | 17 ++++-- Missionframework/presets/civilians/custom.sqf | 13 ++++- .../presets/civilians/germany.sqf | 13 ++++- .../presets/civilians/middle_eastern.sqf | 15 ++++-- .../presets/civilians/rds_civ.sqf | 13 ++++- Missionframework/presets/civilians/unsung.sqf | 13 ++++- Missionframework/presets/players/apex.sqf | 29 ++++++---- Missionframework/presets/players/baf_des.sqf | 23 +++++--- Missionframework/presets/players/baf_mtp.sqf | 23 +++++--- Missionframework/presets/players/bwmod.sqf | 17 ++++-- .../presets/players/bwmod_des.sqf | 17 ++++-- Missionframework/presets/players/csat.sqf | 13 ++++- .../presets/players/csat_apex.sqf | 13 ++++- .../presets/players/cup_acr_desert.sqf | 17 ++++-- .../presets/players/cup_acr_woodland.sqf | 17 ++++-- .../presets/players/cup_baf_desert.sqf | 17 ++++-- .../presets/players/cup_baf_woodland.sqf | 17 ++++-- Missionframework/presets/players/cup_cdf.sqf | 17 ++++-- .../presets/players/cup_chdkz.sqf | 17 ++++-- Missionframework/presets/players/cup_sla.sqf | 17 ++++-- .../presets/players/cup_takistan.sqf | 17 ++++-- .../presets/players/cup_usa_desert.sqf | 21 +++++--- .../presets/players/cup_usa_woodland.sqf | 21 +++++--- .../presets/players/cup_usmc_desert.sqf | 21 +++++--- .../presets/players/cup_usmc_woodland.sqf | 21 +++++--- Missionframework/presets/players/custom.sqf | 29 ++++++---- Missionframework/presets/players/enoch.sqf | 13 ++++- Missionframework/presets/players/gm_east.sqf | 13 ++++- .../presets/players/gm_east_win.sqf | 13 ++++- Missionframework/presets/players/gm_west.sqf | 13 ++++- .../presets/players/gm_west_win.sqf | 13 ++++- Missionframework/presets/players/rhs_afrf.sqf | 13 ++++- .../presets/players/rhs_usaf_des.sqf | 21 +++++--- .../presets/players/rhs_usaf_wdl.sqf | 21 +++++--- Missionframework/presets/players/sfp_des.sqf | 13 ++++- Missionframework/presets/players/sfp_wdl.sqf | 13 ++++- Missionframework/presets/players/unsung.sqf | 13 ++++- Missionframework/presets/resistance/apex.sqf | 13 ++++- .../presets/resistance/cup_napa.sqf | 17 ++++-- .../presets/resistance/cup_takistan.sqf | 17 ++++-- .../presets/resistance/custom.sqf | 13 ++++- .../presets/resistance/germany.sqf | 13 ++++- .../presets/resistance/middle_eastern.sqf | 17 ++++-- Missionframework/presets/resistance/racs.sqf | 13 ++++- .../presets/resistance/rhs_gref.sqf | 15 ++++-- .../presets/resistance/unsung.sqf | 13 ++++- Missionframework/stringtable.xml | 54 ++++++++++++++----- 49 files changed, 649 insertions(+), 193 deletions(-) diff --git a/Missionframework/presets/civilians/apex.sqf b/Missionframework/presets/civilians/apex.sqf index 68b6b0c1e..6b485a638 100644 --- a/Missionframework/presets/civilians/apex.sqf +++ b/Missionframework/presets/civilians/apex.sqf @@ -1,9 +1,18 @@ /* + File: apex.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Tanoa civilian preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/civilians/cup_cherno.sqf b/Missionframework/presets/civilians/cup_cherno.sqf index f030141ee..6bc95eae2 100644 --- a/Missionframework/presets/civilians/cup_cherno.sqf +++ b/Missionframework/presets/civilians/cup_cherno.sqf @@ -1,11 +1,20 @@ /* + File: cup_cherno.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-19 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP Chernarus civilian preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/civilians/cup_takistan.sqf b/Missionframework/presets/civilians/cup_takistan.sqf index 8aeb70806..78d708681 100644 --- a/Missionframework/presets/civilians/cup_takistan.sqf +++ b/Missionframework/presets/civilians/cup_takistan.sqf @@ -1,11 +1,20 @@ /* + File: cup_takistan.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP Takistan civilian preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/civilians/custom.sqf b/Missionframework/presets/civilians/custom.sqf index 82d9d4027..ff1fa890a 100644 --- a/Missionframework/presets/civilians/custom.sqf +++ b/Missionframework/presets/civilians/custom.sqf @@ -1,9 +1,18 @@ /* + File: custom.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Custom (default A3 Civilians) civilian preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/civilians/germany.sqf b/Missionframework/presets/civilians/germany.sqf index 4fdd8d9ed..0cf367106 100644 --- a/Missionframework/presets/civilians/germany.sqf +++ b/Missionframework/presets/civilians/germany.sqf @@ -1,9 +1,18 @@ /* + File: germany.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-08 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Germany civilian preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/civilians/middle_eastern.sqf b/Missionframework/presets/civilians/middle_eastern.sqf index 3fe1ca792..93b9239dc 100644 --- a/Missionframework/presets/civilians/middle_eastern.sqf +++ b/Missionframework/presets/civilians/middle_eastern.sqf @@ -1,11 +1,18 @@ /* + File: middle_eastern.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Middle Eastern civilian preset. + Needed Mods: - - RHS USAF - - RHS AFRF - - Project OPFOR + - Project OPFOR Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/civilians/rds_civ.sqf b/Missionframework/presets/civilians/rds_civ.sqf index 8ade16001..49f55490f 100644 --- a/Missionframework/presets/civilians/rds_civ.sqf +++ b/Missionframework/presets/civilians/rds_civ.sqf @@ -1,9 +1,18 @@ /* + File: rds_civ.sqf + Author: PSYKO-nz - https://github.com/PSYKO-nz + Date: 2018-02-02 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + RDS civilian preset. + Needed Mods: - - RDS Civilian Pack + - RDS Civilian Pack Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/civilians/unsung.sqf b/Missionframework/presets/civilians/unsung.sqf index b84ddadd3..00678047b 100644 --- a/Missionframework/presets/civilians/unsung.sqf +++ b/Missionframework/presets/civilians/unsung.sqf @@ -1,9 +1,18 @@ /* + File: unsung.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-06-04 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Unsung civilian preset. + Needed Mods: - - The Unsung Vietnam War Mod + - Unsung Optional Mods: - - None + - None */ // Civilian classnames. diff --git a/Missionframework/presets/players/apex.sqf b/Missionframework/presets/players/apex.sqf index 662396bc1..073cd2551 100644 --- a/Missionframework/presets/players/apex.sqf +++ b/Missionframework/presets/players/apex.sqf @@ -1,17 +1,26 @@ /* + File: apex.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + NATO pacific player preset. + Needed Mods: - - None + - None Optional Mods: - - BWMod - - RHSUSAF - - F-15C - - F/A-18 - - CUP Weapons - - CUP Vehicles - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - BWMod + - CUP Vehicles + - CUP Weapons + - F-15C + - F/A-18 + - RHSUSAF + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/baf_des.sqf b/Missionframework/presets/players/baf_des.sqf index 3e38a0f92..cfaeca992 100644 --- a/Missionframework/presets/players/baf_des.sqf +++ b/Missionframework/presets/players/baf_des.sqf @@ -1,14 +1,23 @@ /* + File: baf_des.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + 3cb BAF Desert player preset. + Needed Mods: - - 3CB BAF Equipment - - 3CB BAF Vehicle - - 3CB BAF Weapons - - 3CB BAF Units - - RHS USAF + - 3CB BAF Equipment + - 3CB BAF Units + - 3CB BAF Vehicle + - 3CB BAF Weapons + - RHS USAF Optional Mods: - - F-15C - - F/A-18 + - F-15C + - F/A-18 */ /* diff --git a/Missionframework/presets/players/baf_mtp.sqf b/Missionframework/presets/players/baf_mtp.sqf index 17a02d507..903c02d79 100644 --- a/Missionframework/presets/players/baf_mtp.sqf +++ b/Missionframework/presets/players/baf_mtp.sqf @@ -1,14 +1,23 @@ /* + File: baf_mtp.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + 3cb BAF MTP player preset. + Needed Mods: - - 3CB BAF Equipment - - 3CB BAF Vehicle - - 3CB BAF Weapons - - 3CB BAF Units - - RHS USAF + - 3CB BAF Equipment + - 3CB BAF Units + - 3CB BAF Vehicle + - 3CB BAF Weapons + - RHS USAF Optional Mods: - - F-15C - - F/A-18 + - F-15C + - F/A-18 */ /* diff --git a/Missionframework/presets/players/bwmod.sqf b/Missionframework/presets/players/bwmod.sqf index 6ab6a0223..961b9910d 100644 --- a/Missionframework/presets/players/bwmod.sqf +++ b/Missionframework/presets/players/bwmod.sqf @@ -1,11 +1,20 @@ /* + File: bwmod.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + German Bundeswehr player preset. + Needed Mods: - - BWMod - - RHS USAF + - BWMod + - RHS USAF Optional Mods: - - F-15C - - F/A-18 + - F-15C + - F/A-18 */ /* diff --git a/Missionframework/presets/players/bwmod_des.sqf b/Missionframework/presets/players/bwmod_des.sqf index a21884341..964a03688 100644 --- a/Missionframework/presets/players/bwmod_des.sqf +++ b/Missionframework/presets/players/bwmod_des.sqf @@ -1,11 +1,20 @@ /* + File: bwmod_des.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-10 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + German Bundeswehr Desert player preset. + Needed Mods: - - BWMod - - RHS USAF + - BWMod + - RHS USAF Optional Mods: - - F-15C - - F/A-18 + - F-15C + - F/A-18 */ /* diff --git a/Missionframework/presets/players/csat.sqf b/Missionframework/presets/players/csat.sqf index d3f0db6b3..f6c117a54 100644 --- a/Missionframework/presets/players/csat.sqf +++ b/Missionframework/presets/players/csat.sqf @@ -1,9 +1,18 @@ /* + File: csat.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-03 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CSAT player preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/csat_apex.sqf b/Missionframework/presets/players/csat_apex.sqf index 82f1d55d0..fd8b75ba5 100644 --- a/Missionframework/presets/players/csat_apex.sqf +++ b/Missionframework/presets/players/csat_apex.sqf @@ -1,9 +1,18 @@ /* + File: csat_apex.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-03 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CSAT Pacific player preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/cup_acr_desert.sqf b/Missionframework/presets/players/cup_acr_desert.sqf index 27d402559..87691386d 100644 --- a/Missionframework/presets/players/cup_acr_desert.sqf +++ b/Missionframework/presets/players/cup_acr_desert.sqf @@ -1,11 +1,20 @@ /* + File: cup_acr_desert.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-22 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP ACR Desert player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - Qinetix's Titus + - Qinetix's Titus */ /* diff --git a/Missionframework/presets/players/cup_acr_woodland.sqf b/Missionframework/presets/players/cup_acr_woodland.sqf index 9ebab113b..c4846ca97 100644 --- a/Missionframework/presets/players/cup_acr_woodland.sqf +++ b/Missionframework/presets/players/cup_acr_woodland.sqf @@ -1,11 +1,20 @@ /* + File: cup_acr_woodland.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-22 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP ACR Woodland player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - Qinetix's Titus + - Qinetix's Titus */ /* diff --git a/Missionframework/presets/players/cup_baf_desert.sqf b/Missionframework/presets/players/cup_baf_desert.sqf index 1364d77f6..9e4d17fa3 100644 --- a/Missionframework/presets/players/cup_baf_desert.sqf +++ b/Missionframework/presets/players/cup_baf_desert.sqf @@ -1,11 +1,20 @@ /* + File: cup_baf_desert.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP BAF Desert player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/cup_baf_woodland.sqf b/Missionframework/presets/players/cup_baf_woodland.sqf index 10f9c11ca..a4d591deb 100644 --- a/Missionframework/presets/players/cup_baf_woodland.sqf +++ b/Missionframework/presets/players/cup_baf_woodland.sqf @@ -1,11 +1,20 @@ /* + File: cup_baf_woodland.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP BAF Woodland player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/cup_cdf.sqf b/Missionframework/presets/players/cup_cdf.sqf index 2f72bca81..96fda1caa 100644 --- a/Missionframework/presets/players/cup_cdf.sqf +++ b/Missionframework/presets/players/cup_cdf.sqf @@ -1,11 +1,20 @@ /* + File: cup_cdf.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-17 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP CDF player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/cup_chdkz.sqf b/Missionframework/presets/players/cup_chdkz.sqf index 2fffdec72..d8bddb2e2 100644 --- a/Missionframework/presets/players/cup_chdkz.sqf +++ b/Missionframework/presets/players/cup_chdkz.sqf @@ -1,11 +1,20 @@ /* + File: cup_chdkz.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-21 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP ChDKZ player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/cup_sla.sqf b/Missionframework/presets/players/cup_sla.sqf index 0c352a5ec..7e9801a8c 100644 --- a/Missionframework/presets/players/cup_sla.sqf +++ b/Missionframework/presets/players/cup_sla.sqf @@ -1,11 +1,20 @@ /* + File: cup_sla.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-24 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP SLA player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/cup_takistan.sqf b/Missionframework/presets/players/cup_takistan.sqf index 510c7e925..75e4102c5 100644 --- a/Missionframework/presets/players/cup_takistan.sqf +++ b/Missionframework/presets/players/cup_takistan.sqf @@ -1,11 +1,20 @@ /* + File: cup_takistan.sqf + Author: Eogos - https://github.com/Eogos + Date: 2020-04-25 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP Takistani Armed Forces player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/cup_usa_desert.sqf b/Missionframework/presets/players/cup_usa_desert.sqf index 387181995..551803f07 100644 --- a/Missionframework/presets/players/cup_usa_desert.sqf +++ b/Missionframework/presets/players/cup_usa_desert.sqf @@ -1,13 +1,22 @@ /* + File: cup_usa_desert.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-17 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP USA Desert player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/cup_usa_woodland.sqf b/Missionframework/presets/players/cup_usa_woodland.sqf index c052ce2b6..0025a7873 100644 --- a/Missionframework/presets/players/cup_usa_woodland.sqf +++ b/Missionframework/presets/players/cup_usa_woodland.sqf @@ -1,13 +1,22 @@ /* + File: cup_usa_woodland.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-17 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP USA Woodland player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/cup_usmc_desert.sqf b/Missionframework/presets/players/cup_usmc_desert.sqf index 758276c6a..9f617ef8d 100644 --- a/Missionframework/presets/players/cup_usmc_desert.sqf +++ b/Missionframework/presets/players/cup_usmc_desert.sqf @@ -1,13 +1,22 @@ /* + File: cup_usmc_desert.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP USMC Desert player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/cup_usmc_woodland.sqf b/Missionframework/presets/players/cup_usmc_woodland.sqf index b68a1343e..dc46b5d1a 100644 --- a/Missionframework/presets/players/cup_usmc_woodland.sqf +++ b/Missionframework/presets/players/cup_usmc_woodland.sqf @@ -1,13 +1,22 @@ /* + File: cup_usmc_woodland.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP USMC Woodland player preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/custom.sqf b/Missionframework/presets/players/custom.sqf index f76517829..43630e582 100644 --- a/Missionframework/presets/players/custom.sqf +++ b/Missionframework/presets/players/custom.sqf @@ -1,17 +1,26 @@ /* + File: custom.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Custom (default NATO) player preset. + Needed Mods: - - None + - None Optional Mods: - - BWMod - - RHSUSAF - - F-15C - - F/A-18 - - CUP Weapons - - CUP Vehicles - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - BWMod + - CUP Vehicles + - CUP Weapons + - F-15C + - F/A-18 + - RHSUSAF + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/enoch.sqf b/Missionframework/presets/players/enoch.sqf index 7e2bf76cc..7794aed1f 100644 --- a/Missionframework/presets/players/enoch.sqf +++ b/Missionframework/presets/players/enoch.sqf @@ -1,9 +1,18 @@ /* + File: enoch.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-07-24 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Livonia Defence Force player preset. + Needed Mods: - - Contact DLC + - Contact DLC Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/gm_east.sqf b/Missionframework/presets/players/gm_east.sqf index dfcff19a5..00a0409ef 100644 --- a/Missionframework/presets/players/gm_east.sqf +++ b/Missionframework/presets/players/gm_east.sqf @@ -1,9 +1,18 @@ /* + File: gm_east.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-07 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + East Germany player preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Helicopters (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ /* diff --git a/Missionframework/presets/players/gm_east_win.sqf b/Missionframework/presets/players/gm_east_win.sqf index 2c65eff58..7aa21571f 100644 --- a/Missionframework/presets/players/gm_east_win.sqf +++ b/Missionframework/presets/players/gm_east_win.sqf @@ -1,9 +1,18 @@ /* + File: gm_east_win.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + East Germany Winter player preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Helicopters (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ /* diff --git a/Missionframework/presets/players/gm_west.sqf b/Missionframework/presets/players/gm_west.sqf index afc3bb54e..07ff6dc1d 100644 --- a/Missionframework/presets/players/gm_west.sqf +++ b/Missionframework/presets/players/gm_west.sqf @@ -1,9 +1,18 @@ /* + File: gm_west.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-04-30 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + West Germany player preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Helicopters (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ /* diff --git a/Missionframework/presets/players/gm_west_win.sqf b/Missionframework/presets/players/gm_west_win.sqf index ed7861360..df487ba44 100644 --- a/Missionframework/presets/players/gm_west_win.sqf +++ b/Missionframework/presets/players/gm_west_win.sqf @@ -1,9 +1,18 @@ /* + File: gm_west_win.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + West Germany Winter player preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - LEN - Cold War Helicopters (due to lack fo air assets in GM for now) - https://steamcommunity.com/sharedfiles/filedetails/?id=1726445116 + - LEN - Cold War Aircraft */ /* diff --git a/Missionframework/presets/players/rhs_afrf.sqf b/Missionframework/presets/players/rhs_afrf.sqf index 6d40a08c1..86a337382 100644 --- a/Missionframework/presets/players/rhs_afrf.sqf +++ b/Missionframework/presets/players/rhs_afrf.sqf @@ -1,9 +1,18 @@ /* + File: rhs_afrf.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-14 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + RHS Armed Forces of the Russian Federation player preset. + Needed Mods: - - RHS AFRF + - RHS AFRF Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/rhs_usaf_des.sqf b/Missionframework/presets/players/rhs_usaf_des.sqf index 526d5dc89..de8c14f43 100644 --- a/Missionframework/presets/players/rhs_usaf_des.sqf +++ b/Missionframework/presets/players/rhs_usaf_des.sqf @@ -1,13 +1,22 @@ /* + File: rhs_usaf_des.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + RHS US Armed Forces Desert player preset. + Needed Mods: - - RHS USAF + - RHS USAF Optional Mods: - - F-15C - - F/A-18 - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - F-15C + - F/A-18 + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/rhs_usaf_wdl.sqf b/Missionframework/presets/players/rhs_usaf_wdl.sqf index e528e8c10..49e9fdca5 100644 --- a/Missionframework/presets/players/rhs_usaf_wdl.sqf +++ b/Missionframework/presets/players/rhs_usaf_wdl.sqf @@ -1,13 +1,22 @@ /* + File: rhs_usaf_wdl.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + RHS US Armed Forces Woodland player preset. + Needed Mods: - - RHS USAF + - RHS USAF Optional Mods: - - F-15C - - F/A-18 - - USAF Main Pack - - USAF Fighters Pack - - USAF Utility Pack + - F-15C + - F/A-18 + - USAF Fighters Pack + - USAF Main Pack + - USAF Utility Pack */ /* diff --git a/Missionframework/presets/players/sfp_des.sqf b/Missionframework/presets/players/sfp_des.sqf index d07338d38..926e59ff0 100644 --- a/Missionframework/presets/players/sfp_des.sqf +++ b/Missionframework/presets/players/sfp_des.sqf @@ -1,9 +1,18 @@ /* + File: sfp_des.sqf + Author: Dahlgren - https://github.com/Dahlgren + Date: 2017-07-24 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Swedish Armed Forces Desert player preset. + Needed Mods: - - SFP + - SFP Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/sfp_wdl.sqf b/Missionframework/presets/players/sfp_wdl.sqf index fdfe5f6b6..9190341f4 100644 --- a/Missionframework/presets/players/sfp_wdl.sqf +++ b/Missionframework/presets/players/sfp_wdl.sqf @@ -1,9 +1,18 @@ /* + File: sfp_des.sqf + Author: Dahlgren - https://github.com/Dahlgren + Date: 2017-07-24 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Swedish Armed Forces Woodland player preset. + Needed Mods: - - SFP + - SFP Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/players/unsung.sqf b/Missionframework/presets/players/unsung.sqf index 122ff92c4..053d5ace4 100644 --- a/Missionframework/presets/players/unsung.sqf +++ b/Missionframework/presets/players/unsung.sqf @@ -1,9 +1,18 @@ /* + File: unsung.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-06-04 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Unsung US player preset. + Needed Mods: - - The Unsung Vietnam War Mod + - Unsung Optional Mods: - - None + - None */ /* diff --git a/Missionframework/presets/resistance/apex.sqf b/Missionframework/presets/resistance/apex.sqf index ef2d93054..b88c6b048 100644 --- a/Missionframework/presets/resistance/apex.sqf +++ b/Missionframework/presets/resistance/apex.sqf @@ -1,9 +1,18 @@ /* + File: apex.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-08 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Tanoa resistance preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/cup_napa.sqf b/Missionframework/presets/resistance/cup_napa.sqf index 5fc884507..f3ac6ba8d 100644 --- a/Missionframework/presets/resistance/cup_napa.sqf +++ b/Missionframework/presets/resistance/cup_napa.sqf @@ -1,11 +1,20 @@ /* + File: cup_napa.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-21 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP NAPA resistance preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/cup_takistan.sqf b/Missionframework/presets/resistance/cup_takistan.sqf index f5f7a771d..c7e8c35b5 100644 --- a/Missionframework/presets/resistance/cup_takistan.sqf +++ b/Missionframework/presets/resistance/cup_takistan.sqf @@ -1,11 +1,20 @@ /* + File: cup_takistan.sqf + Author: Eogos - https://github.com/Eogos + Date: 2019-07-15 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + CUP Takistan resistance preset. + Needed Mods: - - CUP Weapons - - CUP Vehicles - - CUP Units + - CUP Units + - CUP Vehicles + - CUP Weapons Optional Mods: - - Project Infinite AIO + - Project Infinite AIO */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/custom.sqf b/Missionframework/presets/resistance/custom.sqf index af4c51146..b0d67803d 100644 --- a/Missionframework/presets/resistance/custom.sqf +++ b/Missionframework/presets/resistance/custom.sqf @@ -1,9 +1,18 @@ /* + File: custom.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-10-07 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Custom (default FIA) resistance preset. + Needed Mods: - - None + - None Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/germany.sqf b/Missionframework/presets/resistance/germany.sqf index a6ae1789e..aba299445 100644 --- a/Missionframework/presets/resistance/germany.sqf +++ b/Missionframework/presets/resistance/germany.sqf @@ -1,9 +1,18 @@ /* + File: custom.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-05-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + German resistance preset. + Needed Mods: - - Global Mobilization + - Global Mobilization Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/middle_eastern.sqf b/Missionframework/presets/resistance/middle_eastern.sqf index f1de0f3f8..df50d5ca6 100644 --- a/Missionframework/presets/resistance/middle_eastern.sqf +++ b/Missionframework/presets/resistance/middle_eastern.sqf @@ -1,11 +1,20 @@ /* + File: middle_eastern.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2017-12-09 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Middle Eastern resistance preset. + Needed Mods: - - RHS USAF - - RHS AFRF - - Project OPFOR + - Project OPFOR + - RHS AFRF + - RHS USAF Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/racs.sqf b/Missionframework/presets/resistance/racs.sqf index 193825807..fef923016 100644 --- a/Missionframework/presets/resistance/racs.sqf +++ b/Missionframework/presets/resistance/racs.sqf @@ -1,9 +1,18 @@ /* + File: racs.sqf + Author: PSYKO-nz - https://github.com/PSYKO-nz + Date: 2018-02-19 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + RACS resistance preset. + Needed Mods: - - Project OPFOR + - Project OPFOR Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/rhs_gref.sqf b/Missionframework/presets/resistance/rhs_gref.sqf index 5c7bbdf0b..aecac2d61 100644 --- a/Missionframework/presets/resistance/rhs_gref.sqf +++ b/Missionframework/presets/resistance/rhs_gref.sqf @@ -1,10 +1,19 @@ /* + File: rhs_gref.sqf + Author: FatRefrigerator - https://github.com/FatRefrigerator + Date: 2017-10-11 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + RHS Green Forces resistance preset. + Needed Mods: - - RHS: AFRF - - RHS: GREF + - RHS AFRF + - RHS GREF Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/presets/resistance/unsung.sqf b/Missionframework/presets/resistance/unsung.sqf index 42c12d498..17658b2b7 100644 --- a/Missionframework/presets/resistance/unsung.sqf +++ b/Missionframework/presets/resistance/unsung.sqf @@ -1,9 +1,18 @@ /* + File: unsung.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2019-07-25 + Last Update: 2020-05-18 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Unsung resistance preset. + Needed Mods: - - The Unsung Vietnam War Mod + - Unsung Optional Mods: - - None + - None */ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation diff --git a/Missionframework/stringtable.xml b/Missionframework/stringtable.xml index 6c9803b69..5545f8fa9 100644 --- a/Missionframework/stringtable.xml +++ b/Missionframework/stringtable.xml @@ -1,17 +1,46 @@ + - - - - - - - - - - - CTI 34 KP Liberation v0.96.8 dev @@ -6418,9 +6447,6 @@ - - - -- KP Player Menu -- -- KP 玩家選單 -- From dbc1be2b241f3a0b1a10847b30a2a0b5142fc592 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 18 May 2020 14:59:20 +0200 Subject: [PATCH 039/115] Moved FOB hunting templates --- .../apex/template1.sqf | 0 .../apex/template2.sqf | 0 .../apex/template3.sqf | 0 .../apex/template4.sqf | 0 .../apex/template5.sqf | 0 .../default/template1.sqf | 0 .../default/template10.sqf | 0 .../default/template2.sqf | 0 .../default/template3.sqf | 0 .../default/template4.sqf | 0 .../default/template5.sqf | 0 .../default/template6.sqf | 0 .../default/template7.sqf | 0 .../default/template8.sqf | 0 .../default/template9.sqf | 0 .../export_template.sqf | 4 +- .../unsung/template1.sqf | 0 .../unsung/template2.sqf | 0 .../unsung/template3.sqf | 0 .../unsung/template4.sqf | 0 .../unsung/template5.sqf | 0 .../scripts/server/init_server.sqf | 40 +++++++++---------- 22 files changed, 22 insertions(+), 22 deletions(-) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/apex/template1.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/apex/template2.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/apex/template3.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/apex/template4.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/apex/template5.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template1.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template10.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template2.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template3.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template4.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template5.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template6.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template7.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template8.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/default/template9.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/export_template.sqf (95%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/unsung/template1.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/unsung/template2.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/unsung/template3.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/unsung/template4.sqf (100%) rename Missionframework/{scripts/fob_templates => fobhunt_templates}/unsung/template5.sqf (100%) diff --git a/Missionframework/scripts/fob_templates/apex/template1.sqf b/Missionframework/fobhunt_templates/apex/template1.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/apex/template1.sqf rename to Missionframework/fobhunt_templates/apex/template1.sqf diff --git a/Missionframework/scripts/fob_templates/apex/template2.sqf b/Missionframework/fobhunt_templates/apex/template2.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/apex/template2.sqf rename to Missionframework/fobhunt_templates/apex/template2.sqf diff --git a/Missionframework/scripts/fob_templates/apex/template3.sqf b/Missionframework/fobhunt_templates/apex/template3.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/apex/template3.sqf rename to Missionframework/fobhunt_templates/apex/template3.sqf diff --git a/Missionframework/scripts/fob_templates/apex/template4.sqf b/Missionframework/fobhunt_templates/apex/template4.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/apex/template4.sqf rename to Missionframework/fobhunt_templates/apex/template4.sqf diff --git a/Missionframework/scripts/fob_templates/apex/template5.sqf b/Missionframework/fobhunt_templates/apex/template5.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/apex/template5.sqf rename to Missionframework/fobhunt_templates/apex/template5.sqf diff --git a/Missionframework/scripts/fob_templates/default/template1.sqf b/Missionframework/fobhunt_templates/default/template1.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template1.sqf rename to Missionframework/fobhunt_templates/default/template1.sqf diff --git a/Missionframework/scripts/fob_templates/default/template10.sqf b/Missionframework/fobhunt_templates/default/template10.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template10.sqf rename to Missionframework/fobhunt_templates/default/template10.sqf diff --git a/Missionframework/scripts/fob_templates/default/template2.sqf b/Missionframework/fobhunt_templates/default/template2.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template2.sqf rename to Missionframework/fobhunt_templates/default/template2.sqf diff --git a/Missionframework/scripts/fob_templates/default/template3.sqf b/Missionframework/fobhunt_templates/default/template3.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template3.sqf rename to Missionframework/fobhunt_templates/default/template3.sqf diff --git a/Missionframework/scripts/fob_templates/default/template4.sqf b/Missionframework/fobhunt_templates/default/template4.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template4.sqf rename to Missionframework/fobhunt_templates/default/template4.sqf diff --git a/Missionframework/scripts/fob_templates/default/template5.sqf b/Missionframework/fobhunt_templates/default/template5.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template5.sqf rename to Missionframework/fobhunt_templates/default/template5.sqf diff --git a/Missionframework/scripts/fob_templates/default/template6.sqf b/Missionframework/fobhunt_templates/default/template6.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template6.sqf rename to Missionframework/fobhunt_templates/default/template6.sqf diff --git a/Missionframework/scripts/fob_templates/default/template7.sqf b/Missionframework/fobhunt_templates/default/template7.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template7.sqf rename to Missionframework/fobhunt_templates/default/template7.sqf diff --git a/Missionframework/scripts/fob_templates/default/template8.sqf b/Missionframework/fobhunt_templates/default/template8.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template8.sqf rename to Missionframework/fobhunt_templates/default/template8.sqf diff --git a/Missionframework/scripts/fob_templates/default/template9.sqf b/Missionframework/fobhunt_templates/default/template9.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/default/template9.sqf rename to Missionframework/fobhunt_templates/default/template9.sqf diff --git a/Missionframework/scripts/fob_templates/export_template.sqf b/Missionframework/fobhunt_templates/export_template.sqf similarity index 95% rename from Missionframework/scripts/fob_templates/export_template.sqf rename to Missionframework/fobhunt_templates/export_template.sqf index 9668ebeb1..e007efd66 100644 --- a/Missionframework/scripts/fob_templates/export_template.sqf +++ b/Missionframework/fobhunt_templates/export_template.sqf @@ -28,7 +28,7 @@ params [ diag_log text ""; diag_log text ""; -diag_log text "[KP LIBERATION] [FOB EXPORT] ---------- START ----------"; +diag_log text "[KPLIB] [FOB EXPORT] ---------- START ----------"; // Fetch all objects diag_log text ""; @@ -77,7 +77,7 @@ diag_log text ""; diag_log text "[_objects_to_build, _objectives_to_build, _defenders_to_build, _base_corners]"; diag_log text ""; -diag_log text "[KP LIBERATION] [FOB EXPORT] ---------- END ----------"; +diag_log text "[KPLIB] [FOB EXPORT] ---------- END ----------"; diag_log text ""; diag_log text ""; diff --git a/Missionframework/scripts/fob_templates/unsung/template1.sqf b/Missionframework/fobhunt_templates/unsung/template1.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/unsung/template1.sqf rename to Missionframework/fobhunt_templates/unsung/template1.sqf diff --git a/Missionframework/scripts/fob_templates/unsung/template2.sqf b/Missionframework/fobhunt_templates/unsung/template2.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/unsung/template2.sqf rename to Missionframework/fobhunt_templates/unsung/template2.sqf diff --git a/Missionframework/scripts/fob_templates/unsung/template3.sqf b/Missionframework/fobhunt_templates/unsung/template3.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/unsung/template3.sqf rename to Missionframework/fobhunt_templates/unsung/template3.sqf diff --git a/Missionframework/scripts/fob_templates/unsung/template4.sqf b/Missionframework/fobhunt_templates/unsung/template4.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/unsung/template4.sqf rename to Missionframework/fobhunt_templates/unsung/template4.sqf diff --git a/Missionframework/scripts/fob_templates/unsung/template5.sqf b/Missionframework/fobhunt_templates/unsung/template5.sqf similarity index 100% rename from Missionframework/scripts/fob_templates/unsung/template5.sqf rename to Missionframework/fobhunt_templates/unsung/template5.sqf diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index 1b40b095a..a188d121b 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -72,34 +72,34 @@ if (KPLIB_high_command) then {KPLIB_fsm_highcommand = [] call KPLIB_fnc_highcomm switch (KPLIB_presetEnemies) do { case 1: { KPLIB_fob_templates = [ - "scripts\fob_templates\apex\template1.sqf", - "scripts\fob_templates\apex\template2.sqf", - "scripts\fob_templates\apex\template3.sqf", - "scripts\fob_templates\apex\template4.sqf", - "scripts\fob_templates\apex\template5.sqf" + "fobhunt_templates\apex\template1.sqf", + "fobhunt_templates\apex\template2.sqf", + "fobhunt_templates\apex\template3.sqf", + "fobhunt_templates\apex\template4.sqf", + "fobhunt_templates\apex\template5.sqf" ]; }; case 12: { KPLIB_fob_templates = [ - "scripts\fob_templates\unsung\template1.sqf", - "scripts\fob_templates\unsung\template2.sqf", - "scripts\fob_templates\unsung\template3.sqf", - "scripts\fob_templates\unsung\template4.sqf", - "scripts\fob_templates\unsung\template5.sqf" + "fobhunt_templates\unsung\template1.sqf", + "fobhunt_templates\unsung\template2.sqf", + "fobhunt_templates\unsung\template3.sqf", + "fobhunt_templates\unsung\template4.sqf", + "fobhunt_templates\unsung\template5.sqf" ]; }; default { KPLIB_fob_templates = [ - "scripts\fob_templates\default\template1.sqf", - "scripts\fob_templates\default\template2.sqf", - "scripts\fob_templates\default\template3.sqf", - "scripts\fob_templates\default\template4.sqf", - "scripts\fob_templates\default\template5.sqf", - "scripts\fob_templates\default\template6.sqf", - "scripts\fob_templates\default\template7.sqf", - "scripts\fob_templates\default\template8.sqf", - "scripts\fob_templates\default\template9.sqf", - "scripts\fob_templates\default\template10.sqf" + "fobhunt_templates\default\template1.sqf", + "fobhunt_templates\default\template2.sqf", + "fobhunt_templates\default\template3.sqf", + "fobhunt_templates\default\template4.sqf", + "fobhunt_templates\default\template5.sqf", + "fobhunt_templates\default\template6.sqf", + "fobhunt_templates\default\template7.sqf", + "fobhunt_templates\default\template8.sqf", + "fobhunt_templates\default\template9.sqf", + "fobhunt_templates\default\template10.sqf" ]; }; }; From 73187078c7a6a7bd10ca89595d4ea77cab2749f2 Mon Sep 17 00:00:00 2001 From: MJVEVERUSKA <65508396+MJVEVERUSKA@users.noreply.github.com> Date: Thu, 21 May 2020 21:27:21 +0200 Subject: [PATCH 040/115] Update stringtable.xml --- Missionframework/stringtable.xml | 599 ++++++++++++++++++++++++++++++- 1 file changed, 598 insertions(+), 1 deletion(-) diff --git a/Missionframework/stringtable.xml b/Missionframework/stringtable.xml index 5545f8fa9..9ed7c54bb 100644 --- a/Missionframework/stringtable.xml +++ b/Missionframework/stringtable.xml @@ -38,6 +38,9 @@ Turkish | Updated: pre 0.96.8 Carbneth - https://github.com/Carbneth + + Czech | Updated: pre 0.96.8 + MJVEVERUSKA - https://github.com/MJVEVERUSKA --> @@ -59,6 +62,7 @@ Atla Mobilizar 배치 + Výsadek Deployment in progress ... @@ -72,6 +76,7 @@ Atlama süreci devam ediyor... Mobilização em andamento... 배치중입니다... + Probíhá Výsadek... Close @@ -85,6 +90,7 @@ Kapat Fechar 닫기 + Zavřít YOU ARE WOUNDED @@ -98,6 +104,7 @@ AĞIR YARALANDIN! VOCÊ ESTÁ FERIDO! 부상당했습니다. + JSI V BEZVĚDOMÍ -- BUILD -- @@ -111,6 +118,7 @@ -- İNŞA ET -- -- CONSTRUIR -- -- 건 설 -- + -- STAVĚT -- BUILD MENU @@ -124,6 +132,7 @@ İNŞAAT MENÜSÜ MENU DE CONSTRUÇÃO 건설메뉴 + MENU STAVĚNÍ Build @@ -137,6 +146,7 @@ İnşa Et Construir 건설/배치 + Postavit Supplies @@ -150,6 +160,7 @@ Erzaklar Suprimentos 보급품 + Zásoby Ammunition @@ -163,6 +174,7 @@ Mühimmat Munição 탄약 + Munice Fuel @@ -176,6 +188,7 @@ Yakıt Combustível 연료 + Palivo Bleedout in %1 seconds @@ -189,6 +202,7 @@ Kanamadan ölmeye %1 saniye Morte por hemorragia em %1 segundos %1 초 후 의식을 잃거나 과다출혈로 사망합니다. + Vykrvácíš za %1 vteřin Stabilized @@ -202,6 +216,7 @@ Stabilize edildi Hemorragia estancada 출혈이 멈추어 안정되었습니다. + Stabilizován -- Rotation @@ -215,6 +230,7 @@ -- Açı -- Rotação -- 회전 + -- Otočit -- Build @@ -228,6 +244,7 @@ -- Kur -- Construir -- 건설(설치) + -- Postavit -- Build and Repeat @@ -241,6 +258,7 @@ -- Kur ve tekrarla -- Construir e repetir -- 반복 건설(설치) + -- Postavit a Opakovat -- Cancel @@ -254,6 +272,7 @@ -- İptal -- Cancelar -- 취소 + -- Zrušit Building canceled. @@ -267,6 +286,7 @@ İnşaat iptal edildi. Construção cancelada. 건설(설치) 취소 + Stavění zrušeno Building confirmed. @@ -280,6 +300,7 @@ İnşaat kuruldu. Construção confirmada. 건설(설치) 완료 + Stavění potvrzeno Can't place here: there are %1 object(s) within %2 meters of the object position. @@ -293,6 +314,7 @@ Buraya koyulamaz: %2 metre içinde %1 obje var. Impossível inserir aqui: Há %1 objeto(s) dentro de %2 metros da posição deste item. 건설(설치) 불가 : 설치하고자 하는 위치에 %1 개의 객체가 %2 미터 안에 있습니다. + Nelze stavět, poblíž je %1 objekt(ů) ve vzdálenosti %2 metrů od pozice objektu This position is valid. @@ -306,6 +328,7 @@ Bu pozisyon uygun. Esta posição é válida. 건설(설치) 가능 + Pozice je správná -- ARSENAL -- @@ -319,6 +342,7 @@ -- ARSENAL -- -- ARSENAL -- -- 무기고 -- + -- ARZENÁL -- -- LOAD CRATE @@ -332,6 +356,7 @@ -- SANDIĞI YÜKLE -- CARREGAR CAIXA NO TRANSPORTE -- 군수물자 적재 + -- NALOŽIT BEDNU -- UNLOAD CRATES @@ -345,6 +370,7 @@ -- SANDIKLARI İNDİR -- DESCARREGAR CAIXAS -- 군수물자 하역 + -- VYLOŽIT BEDNU -- LOAD TO VEHICLE @@ -353,6 +379,7 @@ -- ЗАГРУЗИТЬ В ТРАНСПОРТ -- 차량에 적재 -- ARACA YÜKLE + -- NALOŽIT DO VOZIDLA -- UNLOAD FROM VEHICLE @@ -361,6 +388,7 @@ -- ВЫГРУЗИТЬ ИЗ ТРАНСПОРТА -- 차량에서 하역 -- ARAÇTAN İNDİR + -- VYLOŽENÍ Z VOZIDLA -- NO TRANSPORT VEHICLES NEARBY @@ -369,6 +397,7 @@ -- НЕТ ТРАНСПОРТА ПОБЛИЗОСТИ -- 주변에 수송차량이 없습니다. -- YAKINLARDA NAKLİYE ARACI YOK + -- NELZE NALOŽIT Ammo box successfully loaded on the transport vehicle. @@ -382,6 +411,7 @@ Mühimmat sandığı başarıyla nakliye aracına yüklendi. Caixa de munição carregada com sucesso no veículo de transporte. 군수물자를 수송차량에 성공적으로 적재하였습니다. + Bedna úspěšně naložena do vozidla. Ammo box successfully unloaded from the transport vehicle. @@ -395,6 +425,7 @@ Mühimmat sandığı başarıyla nakliye aracından indirildi. Caixa de munição descarregada com sucesso do veículo de transporte. 군수물자를 수송차량에서 성공적으로 하역하였습니다. + Bedna úspěšně vyložena z vozidla There is no nearby vehicle capable of carrying the ammo box. @@ -408,6 +439,7 @@ Yakınlarda bu sandığı taşıyabilecek araç yok. Não existe veículo nas proximidades capaz de carregar a caixa de munição. 주변에 군수물자를 수송할 수 있는 차량이 없습니다. + V blízkosti není vozidlo schopné přepravovat bedny -- DEPLOY FOB -- @@ -421,6 +453,7 @@ -- FOB KUR -- -- INSTALAR FOB -- -- 전초기지 설치 -- + -- POSTAVIT FOB -- Can't deploy a new FOB here, you must be at least %1 meters away from every other FOB. Nearest FOB is %2 meters away. @@ -434,6 +467,7 @@ Buraya FOB kurulamaz, diğer FOB'lerden en az %1 metre uzakta olmalısın. Şuan en yakındaki FOB %2 metre uzakta. Não é possível instalar a FOB aqui, você precisa estar no mínimo a %1 metros de distância de outra FOB. A FOB mais próxima está a %2 metros. 전초기지를 설치할 수 없습니다. 다른 전초기지로부터 %1 미터 떨어져 있어야 합니다. 현재 가장 가까운 전초기지와 %2 미터 떨어져 있습니다. + Zde Nelze postavit nové FOB, musí být vzdáleno %1 metrů od jakékoliv jiné FOB. Nejbližší FPB je vzdáleno %2 metrů. Can't deploy a new FOB here, you must be at least %1 meters away from every capturable zone. Nearest zone is %2 meters away. @@ -447,6 +481,7 @@ Buraya FOB kurulamaz, düşman bölgelerinden en az %1 metre uzakta olmalısın. Şuan en yakın düşman bölgelesi %2 metre uzakta. Não é possível instalar a FOB aqui, você precisa estar no mínimo a %1 metros de distância de qualquer setor capturável. O setor mais próima está a %2 metros. 전초기지를 설치할 수 없습니다. 점령지에서 %1 미터 떨어져 있어야 합니다. 현재 가장 가까운 점령지는 %2 미터 떨어져 있습니다. + Zde Nelze postavit nové FOB, musí být vzdáleno %1 metrů od jakékoliv zabratelné zóny. Nejbližší zóna je vzdálena %2 metrů. Can't build on water. @@ -460,6 +495,7 @@ Su üstünde kurulamaz. Não é possível construir na água. 물에는 전초기지를 설치 할 수 없습니다. + Nemůžeš stavět na vodě Can't build further than %1 meters away from the FOB. @@ -473,6 +509,7 @@ FOB'den %1 metre uzakta inşaat yapılamaz. Não é possível construir com mais de %1 metros de distância da FOB. 전초기지에서 %1 미터 이상 떨어지면 건설(설치)할 수 없습니다. + Nemůžeš stavět dál než %1 metrů od FOB. FOB Container @@ -485,6 +522,7 @@ FOB Konteynırı FOB no Contêiner 전초기지 설치박스 + FOB Kontejner FOB Truck @@ -498,6 +536,7 @@ FOB Kamyonu FOB transportável 전초기지 설치차량 + FOB Náklaďák Mobile respawn @@ -511,6 +550,7 @@ Respawn Aracı Respawn móvel 재투입차량 + Mobilní respawn Arsenal box @@ -524,6 +564,7 @@ Arsenal Sandığı Caixa de Arsenal 무기고 + Bedna se zbrojnicí DEPLOYMENT @@ -537,6 +578,7 @@ CANLANMA MOBILIZAÇÃO 배치될 전초기지 선택 + VÝSADEK Deploy @@ -550,6 +592,7 @@ Canlan Mobilizar 배치 + Výsadek -- REDEPLOY -- @@ -563,6 +606,7 @@ -- YENİDEN SEÇ -- -- REMOBILIZAR -- -- 재배치 -- + -- ZNOVUNASAZENÍ -- Build (Crew) @@ -576,6 +620,7 @@ Ekip Oluştur Construir (tripulado) 배치(승무원포함) + Postavit (Mužstvo) Light Rifle Squad @@ -589,6 +634,7 @@ Hafif Silah Timi Grupo de Combate de Infantaria Leve 소총분대 + Lehké útočné družstvo Heavy Rifle Squad @@ -602,6 +648,7 @@ Ağır Silah Timi Grupo de Combate de Infantaria Pesada 화기분대 + Těžké útočné družstvo AT Squad @@ -615,6 +662,7 @@ Anti-Tank Timi Grupo de Combate Anti-Blindagem 대전차지원팀 + Proti-tankové družstvo AA Squad @@ -628,6 +676,7 @@ Anti-Hava Timi Grupo de Combate Anti-Aéreo 방공지원팀 + Proti-letadlové družstvo Recon Squad @@ -641,6 +690,7 @@ Keşif Timi Grupo de Combate de Reconhecimento 정찰팀 + Průzkumné družstvo Paratroopers Squad @@ -654,6 +704,7 @@ Paraşütçü Timi Grupo de Combate de Paraquedistas 공수팀 + Výsadkářské družstvo Unit cap @@ -667,6 +718,7 @@ Birim Limiti Limite de unidades 유닛 제한 + Limit jednotek Wipe Save Data @@ -680,6 +732,7 @@ Kayıtlı oyunu sil Apagar jogo salvo 저장된 게임 초기화 + Vymazat uloženou hru Confirm: Wipe Save Data @@ -693,6 +746,7 @@ Onayla: Kayıtlı oyunu sil Confirmar: Apagar jogo salvo 확인 : 저장된 게임 초기화 + Potvrdit : Vymazání uložené hry No @@ -706,6 +760,7 @@ Hayır Não 아니요 + Ne !! THE SAVEGAME WILL BE WIPED, NO RECOVERY POSSIBLE !! @@ -719,6 +774,7 @@ !! KAYITLI OYUN SİLİNECEKTİR, GERİ GETİRELEMEZ !! !! O JOGO SALVO SERÁ APAGADO, NÃO SERÁ POSSÍVEL RECUPERÁ-LO !! 주의! 저장된 내용이 복구할 수 없게 삭제됩니다. + !! ULOŽENÁ POZICE BUDE SMAZÁNA BEZ MOŽNOSTI NÁVRATU !! -- UNFLIP @@ -732,6 +788,7 @@ -- DÖNDÜR -- DESVIRAR -- 차량 바로잡기 + -- PŘEVRÁTIT -- Grid mode @@ -745,6 +802,7 @@ -- Grid modu -- Modo "grid" -- 격자 모드 + -- Režim mřížky -- CAPTURE @@ -758,6 +816,7 @@ -- ELE GEÇİR -- CAPTURAR -- 생포/포획 + -- ZAJMOUT Squad member @@ -771,6 +830,7 @@ Tim üyesi Membro do Grupo 분대원 + Člen družstva Near @@ -784,6 +844,7 @@ Yakın Próximo de 부근 + Blízko -- RECYCLE @@ -797,6 +858,7 @@ -- GERİ DÖNÜŞTÜR -- RECICLAR -- 재활용 + -- RECYKLOVAT Recycling @@ -810,6 +872,7 @@ Geri Dönüştürme Reciclando 분해중 + Recyklování Recycling this %1 will yield: @@ -823,6 +886,7 @@ Bu %1 geri dönüştürülünce bunları verecektir: Reciclando este %1, irá obter: 재활용 할 경우 %1 의 보급품이 반환됨 + Zrecyklováním %1 získáte: Recycle @@ -836,6 +900,7 @@ Geri Dönüştür Reciclar 재활용 + Recyklovat Cancel @@ -849,6 +914,7 @@ İptal Cancelar 취소 + Zrušit SECTOR CAPTURED @@ -862,6 +928,7 @@ SEKTÖR ELE GEÇİRİLDİ SETOR CAPTURADO 거점 점령 + SEKTOR ZABRÁN Our forces have captured %1. @@ -875,6 +942,7 @@ Birliklerimiz %1 sektörünü ele geçirdi Nossas forças capturaram %1. 아군이 거점 %1 을 점령중입니다. + Naše jednotky zabraly %1. SECTOR ATTACKED @@ -888,6 +956,7 @@ SEKTÖR SALDIRI ALTINDA SETOR ATACADO 거점 공격 + SEKTOR POD ÚTOKEM Hostiles forces are attacking %1! @@ -901,6 +970,7 @@ Düşman birlikleri %1 sektörüne saldırıyor! Forças hostis estão atacando %1! 적군이 거점 %1 을 공격합니다! + Nepřátelské jednotky útočí na %1! SECTOR LOST @@ -914,6 +984,7 @@ SEKTÖR KAYBEDİLDİ SETOR PERDIDO 거점 상실 + SEKTOR ZTRACEN We have lost control over %1! @@ -927,6 +998,7 @@ %1 sektöründeki hakimiyetimizi kaybettik! Perdemos controle de %1! 아군이 거점 %1 을 상실하였습니다! + Ztratil jsi kontrolu nad %1! SECTOR SAFE @@ -940,6 +1012,7 @@ SEKTÖR GÜVENDE SETOR SEGURO 거점 방어 성공 + SEKTOR ZABEZPEČEN %1 is no longer under threat. @@ -953,6 +1026,7 @@ %1 artık tehdit altında değil. %1 não está mais sob ameaça. 거점 %1 이 안정화 되었습니다. + %1 už není v nebezpečí. NEW FOB BUILT @@ -966,6 +1040,7 @@ YENİ FOB KURULDU NOVA FOB CONSTRUÍDA 신규 전초기지 설치 + POSTAVENO NOVÉ FOB FOB %1 is now operational. @@ -979,6 +1054,7 @@ FOB %1 artık hazır. FOB %1 está operacional. 전초기지 %1 를 설치 할 수 있습니다. + FOB %1 je nyní dostupné FOB SAFE @@ -992,6 +1068,7 @@ FOB GÜVENDE FOB SEGURA 전초기지 안전 + FOB ZABEZPEČENO FOB %1 is no longer under threat. @@ -1005,6 +1082,7 @@ FOB %1 artık tehdit altında değil. FOB %1 não está mais sob ameaça. 전초기지 %1 이 안정화 되었습니다. + FOB %1 už není v nebezpečí FOB ATTACKED @@ -1017,6 +1095,7 @@ FOB SALDIRI ALTINDA FOB ATACADA 전초기지 방어중 + FOB POD ÚTOKEM FOB %1 is under attack! @@ -1030,6 +1109,7 @@ FOB %1 Saldırı altında FOB %1 está sob ataque! 전초기지 %1 이 공격받고 있습니다. + FOB %1 pod útokem! FOB DESTROYED @@ -1043,6 +1123,7 @@ FOB YOK EDİLDİ FOB DESTRUÍDA 전초기지 파괴 + FOB ZNIČENO FOB %1 has been destroyed! @@ -1055,6 +1136,7 @@ FOB %1 yok edildi! FOB %1 foi destruída! 전초기지 %1 이 파괴되었습니다! + FOB %1 bylo zničeno HOSTILE FORCES INCOMING @@ -1068,6 +1150,7 @@ DÜŞMAN BİRLİKLERİ YOLDA FORÇAS HOSTIS A CAMINHO 적군 접근중 + NEPŘÁTELSKÉ JEDNOTKY PŘICHÁZEJÍ Hostile forces spotted near %1. @@ -1081,6 +1164,7 @@ Düşman birlikleri %1 yakınlarında göründü. Forças hostis identificadas nas proximidades de %1. %1 근처에 적군이 발견되었습니다! + Nepřátelské jednotky spatřeny poblíž %1 NEW INTELLIGENCE @@ -1094,6 +1178,7 @@ YENİ İSTİHBAHRAT NOVA INTELIGÊNCIA 적군에 대한 새로운 정보 + NOVÉ INFORMACE Hostile FOB near %1. @@ -1107,6 +1192,7 @@ Düşman FOB'si %1 yakınlarında. FOB hostil nas proximidades de %1. 적군 전초기지 %1 가 근처에 있습니다! + Nepřátelské FOB poblíž %1. We have interrogated a prisoner. @@ -1120,6 +1206,7 @@ Bir tutsağı başarıyla sorguladık. Interrogamos um prisioneiro. 포로를 심문하여 정보를 획득하였습니다. + Vyslechl jsi zajatce We have found secret documents. @@ -1133,6 +1220,7 @@ Gizli dosyalar bulduk. Localizamos documentos secretos. 적군 비밀문서를 획득하였습니다. + Našel jsi tajné dokumenty. SECONDARY OBJECTIVE @@ -1146,6 +1234,7 @@ İKİNCİL GÖREV OBJETIVO SECUNDÁRIO 부차적인 임무 + VEDLEJŠÍ ÚKOL Hostile FOB destroyed @@ -1159,6 +1248,7 @@ Düşman FOB'si yok edildi. FOB hostil destruída 적군 전초기지가 파괴됨 + Nepřátelské FOB zničeno. HOSTILE REINFORCEMENTS @@ -1172,6 +1262,7 @@ DÜŞMAN TAKVİYE KUVVETLERİ REFORÇOS HOSTIS 적의 지원병력 + NEPŘÁTELSKÉ POSILY Hostile forces reinforcing %1. @@ -1185,6 +1276,7 @@ Düşmanlar %1 tarafına takviye kuvvet yolladılar. Forças hostis reforçando %1. %1 로 적군의 지원병력이 이동중입니다! + Nepřátelsky posily v %1. == MISSION OPTIONS == @@ -1198,6 +1290,7 @@ == GÖREV AYARLARI == == OPÇÕES DA MISSÃO == == 미션 옵션 == + == MOŽNOSTI MISE == == GAMEPLAY OPTIONS == @@ -1210,6 +1303,7 @@ == OYNANIŞ AYARLARI == == OPÇÕES DE JOGO == == 게임플레이 옵션 == + == HERNÍ MOŽNOSTI == == TECHNICAL OPTIONS == @@ -1223,6 +1317,7 @@ == TEKNİK AYARLAR == == OPÇÕES TÉCNICAS == == 기술 옵션 == + == TECHNICKÉ MOŽNOSTI == Day duration (hours) @@ -1236,6 +1331,7 @@ Gün uzunluğu (saat) Duração do dia (horas) 1일기간설정(시간) + Délka dne (hodiny) Difficulty @@ -1249,6 +1345,7 @@ Zorluk Dificuldade: 난이도 + Obtížnost Tourist @@ -1262,6 +1359,7 @@ Turist Turista 연습 + Procházka Easy @@ -1275,6 +1373,7 @@ Kolay Fácil 쉬움 + Jednoduchá Normal @@ -1288,6 +1387,7 @@ Normal Normal 보통 + Normální Moderate @@ -1301,6 +1401,7 @@ Orta Moderada 어려움 + Obtížný Hard @@ -1314,6 +1415,7 @@ Zor Difícil 조금 어려움 + Těžký Extreme @@ -1327,6 +1429,7 @@ Uçta Extrema 매우 우려움 + Extrémní Ludicrous @@ -1340,6 +1443,7 @@ Saçmalık Absurda 터무니없이어려움 + Nemožný Oh god oh god we're all gonna die @@ -1353,6 +1457,7 @@ Hepimiz ölücez! Ah meu Deus, vamos morrer! 우리 모두가 죽게 될 운명 + Ó můj bože, všichni umřeme Manage AI Skill @@ -1364,6 +1469,7 @@ AI Yeteneklerini düzenle Gerir nível de habilidade da IA AI 능력치 + Nastavení obtížnosti AI Resources multiplier @@ -1377,6 +1483,7 @@ Kaynak arttırıcı çarpan Multiplicador de recursos 군수물자 생산 비율 + Násobitel zdrojů Stamina @@ -1390,6 +1497,7 @@ Stamina Vigor (stamina) 체력 + Výdrž Introduction @@ -1403,6 +1511,7 @@ Tanıtım Introdução 소개 영상 + Úvod Deployment cinematic @@ -1416,6 +1525,7 @@ Başlangıç sinematiği Introdução cinemática de mobilização 배포 영상 + Filmové scéna Enabled @@ -1429,6 +1539,7 @@ Açık Ativado 활성화 + Zapnuto Disabled @@ -1442,6 +1553,7 @@ Kapalı Desativado 비활성화 + Vypnuto Start the campaign with the first FOB already built @@ -1455,6 +1567,7 @@ Oyunu ilk FOB kurulu olarak başlatır Iniciar a campanha com a primeira FOB já construída 이미 설치된 전초기지에서 시작하기 + Spustit kampaň s postaveným prvním FOB Yes @@ -1468,6 +1581,7 @@ Evet Sim 네 + Ano No @@ -1481,6 +1595,7 @@ Hayır Não 아니요 + Ne Maximum amount of AI units @@ -1494,6 +1609,7 @@ AI birlik sınırı Quantidade máxima de unidades IA AI개체 최대값 + Maximální počet AI jednotek 50% - Recommended for local hosting @@ -1507,6 +1623,7 @@ 50% - Yerel sunucu için uygun 50% - Recomendado para hospedagem local 50% - 서버 실행 및 게임을 1대에서 실행할때 권장 + 50% - Doporučeno pro lokální hraní 75% - Dedicated server recommended @@ -1520,6 +1637,7 @@ 75% - Dedicated sunucu için önerilen 75% - Recomendado para servidor dedicado 75% - 전용서버에서 실행할때 권장 + 75% - Doporučeno pro dedikované servery 100% - Dedicated server recommended @@ -1533,6 +1651,7 @@ 100% - Dedicated sunucu için önerilen 100% - Recomendado para servidor dedicado 100% - 전용서버에서 실행할때 권장 + 100% - Doporučeno pro dedikované servery 125% - Dedicated server with headless client recommended @@ -1546,6 +1665,7 @@ 125% - Headless client'e sahip dedicated sunucu için önerilen 125% - Recomendado para servidor com headless client 125% - 단일 CPU의 헤드리스서버(다른PC와 사용자에게 서비스를 제공하는 서버종류)에서 실행할때 권장 + 125% - Doporučeno pro dedikované servery s Headless klienty 150% - Dedicated server with headless client recommended @@ -1559,6 +1679,7 @@ 150% - Birkaç headless client'e sahip dedicated sunucu için önerilen 150% - Recomendado para servidor com mútiplos headless clients 150% - CPU 2개 이상, 또는 다중 헤드리스서버에서 실행할때 권장 + 150% - Doporučeno pro dedikované servery s vícero Headless klienty 200% - Dedicated server with multiple headless clients recommended @@ -1572,6 +1693,7 @@ 200% - Birkaç headless client'e sahip dedicated sunucu için önerilen 200% - Recomendado para servidor com mútiplos headless clients 200% - CPU 2개 이상, 또는 다중 헤드리스서버에서 실행할때 권장 + 200% - Doporučeno pro dedikované servery s vícero Headless klienty Civilian activity @@ -1585,6 +1707,7 @@ Sivil aktivitesi Atividade Civil 민간인 활동 정도 + Aktivita civilistů None @@ -1598,6 +1721,7 @@ Hiç Nenhuma 없음 + Žádná Reduced @@ -1611,6 +1735,7 @@ Düşük Reduzida 작음 + Snížená Normal @@ -1624,6 +1749,7 @@ Normal Normal 보통 + Normální Increased @@ -1637,6 +1763,7 @@ Arttırılmış Aumentada 많음 + Zvýšená Warning: friendly fire @@ -1650,6 +1777,7 @@ Dikkat: dost ateşi Atenção: Fogo amigo 경고: 아군 공격 + Varování: Střelba do vlastních řad Hostile presence adapts to player count @@ -1663,6 +1791,7 @@ Düşman birlikleri oyuncu sayısına göre adapte olur Adaptar presença hostil de acordo com a quantidade de jogadores 플레이어수에 따른 적군 활동 조절 + Počet nepřátel se adaptuje na počet hráčů Infantry units @@ -1676,6 +1805,7 @@ Yaya birimler Unidades de infantaria 보병 부대 + Pěchota Light vehicles @@ -1689,6 +1819,7 @@ Hafif araçlar Veículos leves 전투 차량 + Lehká vozidla Armored vehicles @@ -1702,6 +1833,7 @@ Zırhlı araçlar Veículos blindados 장갑 차량 + Obrněná vozidla Air vehicles @@ -1715,6 +1847,7 @@ Hava araçları Veículos aéreos 항공기 + Letectvo Static defenses @@ -1728,6 +1861,7 @@ Statik savunmalar Defesas estáticas 방어 무기 + Statické zbraně Buildings @@ -1741,6 +1875,7 @@ Yapılar Construções 건설 물품 + Budovy Logistics @@ -1754,6 +1889,7 @@ Lojistik Logística 후방보급부대 + Logistika Infantry squads @@ -1767,6 +1903,7 @@ Piyade timleri Grupos de combate de infantaria 보병 분대 + Pěchotní Družstva Active Sectors: @@ -1780,6 +1917,7 @@ Aktif Sektörler: Setores ativos: 활성화된 거점 : + Aktivní sektory: The unitcap setting has been exceeded and further sector activation is temporarily halted. You can now see the list of currently active sectors where you shall concentrate your efforts. @@ -1793,6 +1931,7 @@ Birim sınırı aşıldığı için sektör aktivasyonu geçici olarak durduruldu. Şuan, ilgilenmeniz gereken aktif sektörler listesini görebilirsiniz. O limite de unidades foi excedido e a ativação de outros setores foi temporariamente pausada. Você pode ver a lista de setores ativos onde deverá concentrar seus esforços. 아군 또는 적 유닛의 총량이 한계치에 도달했습니다. 이 제한이 풀릴 때까지 더 이상 거점 활성화는 중단됩니다. 플레이어들은 현재 활성화된 거점만 점령할 수 있고, 그 거점들에 집중해야 합니다 + Překročen limit jednotek a bylo dočasně pozastaveno aktivování dalších sektorů. Nyní můžete vidět seznam aktivních sektorů na které by jste se měly soustředit. LOCKED BY @@ -1806,6 +1945,7 @@ TARAFINDAN KİLİTLİ BLOQUEADO POR 차량 잠금 + ZAMČENO OD UNLOCKED BY @@ -1819,6 +1959,7 @@ TARAFINDAN KİLİDİ AÇILDI DESBLOQUEADO POR 차량잠금해제 + ODEMKNUTO OD SQUAD MANAGEMENT @@ -1832,6 +1973,7 @@ TİM YÖNETİMİ GESTÃO DO GRUPO DE COMBATE 분대관리(AI) + SPRÁVA DRUŽSTVA -- SQUAD MANAGEMENT @@ -1845,6 +1987,7 @@ -- TİM YÖNETİMİ -- GESTÃO DO GRUPO DE COMBATE -- 분대원관리(AI) + -- SPRÁVA DRUŽSTVA Replace @@ -1858,6 +2001,7 @@ Değiştir Substituir. 분대원 교체 + Nahradit You will deploy on the selected squad member and replace them while keeping your current loadout. @@ -1870,6 +2014,7 @@ 你將使用你目前的身上裝備並取代選定的班級成員。 Şuanki ekipmanınız ile seçilen kişinin yerinde doğacaksınız. Você irá reaparecer no membro selecionado e o substituir enquanto mantém seu equipamento atual. + Budeš nasazen na místo člena družstva a nahradíš ho se svým aktuálním vybavením. Remove @@ -1882,6 +2027,7 @@ 移除 Kaldır Remover + Odstranit The selected squad member will be deleted. @@ -1894,6 +2040,7 @@ 所選的班級成員將被移除 Seçilen tim üyesi silinecektir. O membro selecionado será deletado + Vybraný člen družstva bude odstraněn Resupply @@ -1906,6 +2053,7 @@ 補給 Erzak Yenile Reabastecer + Přezbrojit If the selected squad member is close enough from a resupply point (mobile spawn or FOB) they will get a brand new, full loadout. @@ -1919,6 +2067,7 @@ Seçilen tim üyesi herhangi bir mühimmat tazeleme noktasına yakın ise (mobil respawn veya FOB) üstündeki herşey yenileyecektir. Se o membro selecionado estiver próximo o suficiente de um ponto de reabastecimento (respawn móvel ou FOB), irá adquirir um novo loadout. 선택한 분대원을 배치하고, 현재 분대를 유지하면서 교체할 수 있습니다. + Pokud je jednotka dostatečně blízko zásobovacímu bodu (mobilní spawn nebo FOB) pak dostane novou celou výzbroj. Confirm @@ -1932,6 +2081,7 @@ Onayla Confirmar 확인 + Potvrdit Health: @@ -1945,6 +2095,7 @@ Sağlık: Saúde: 건강: + Životy: Distance: @@ -1958,6 +2109,7 @@ Uzaklık: Distância: 거리: + Vzdálenost: Primary @@ -1971,6 +2123,7 @@ Birincil Primária 주무기 + Primární Secondary @@ -1984,6 +2137,7 @@ İkincil Secundária 보조무기 + Sekundární None @@ -1997,6 +2151,7 @@ Hiçbiri Nenhum 없음 + Žádný Driver @@ -2010,6 +2165,7 @@ Sürücü Motorista 운전수 + Řidič Gunner @@ -2023,6 +2179,7 @@ Taretçi Atirador 포수 + Střelec Commander @@ -2036,6 +2193,7 @@ Kumandan Comandante 지휘관 + Velitel Passenger @@ -2049,6 +2207,7 @@ Yolcu Passageiro 승객 + Pasažér Squad deploy @@ -2062,6 +2221,7 @@ Tim çıkar Mobilizar Grupo de Combate 분대 배치 + Výsadek družstva You have deleted the selected squad member. @@ -2075,6 +2235,7 @@ Seçilen tim üyesini sildiniz. Você deletou o membro selecionado. 선택된 분대원을 해산시킵니다. + Odstranili jste vybraného člena družstva. The selected squad member has been resupplied. @@ -2088,6 +2249,7 @@ Seçilen tim üyesinin mühimmatı yenilendi. O membro selecionado do grupo se remuniciou. 선택된 분대원이 재정비 하었습니다. + Přezbrojily jste vybraného člena družstva. The selected squad member isn't close enough from a FOB or mobile spawn. @@ -2101,6 +2263,7 @@ Seçilen tim üyesi bir FOB veya mobil spawn noktasına yakın değil. O membro selecionado do grupo não está próximo o suficiente de uma FOB ou respawn móvel. 선택된 분대원이 전초기지 또는 재투입차량에 가까이 있지 않습니다. + Vybraný člen družstva není dostatečně blízko k FOB nebo mobilnímu spawnu. PERMISSIONS MANAGEMENT @@ -2114,6 +2277,7 @@ YETKİ YÖNETİMİ GESTÃO DE PERMISSÕES 사용 권한 설정 + MANAŽER PRAVOMOCÍ Light vehicles @@ -2127,6 +2291,7 @@ Hafif araçlar Veículos leves 전투 차량 + Lehká vozidla Armored vehicles @@ -2140,6 +2305,7 @@ Zırhlı araçlar Veículos blindados 장갑 차량 + Obrněná vozidla Air vehicles @@ -2153,6 +2319,7 @@ Hava araçları Veículos aéreos 항공기 + Letectvo Construction @@ -2166,6 +2333,7 @@ İnşaat Construção 건설 + Stavění Recycling @@ -2179,6 +2347,7 @@ Geri dönüşüm Reciclando 재활용 + Recyklování Others @@ -2192,6 +2361,7 @@ Diğer Outros 기타 + Ostatní All @@ -2205,6 +2375,7 @@ Hepsi Todos 전체 + Vše None @@ -2218,6 +2389,7 @@ Hiçbiri Nenhum 없음 + Nic Allows the player to operate light vehicles as driver and gunner. @@ -2231,6 +2403,7 @@ Oyuncunun hafif araçları sürücü veya taretçi olarak kullanmasına olanak verir. Permite ao jogador operar veículos leves como condutor e atirador. 플레이어가 전투 차량을 사용할 수 있는 권한를 허가 합니다. + Povolí hráči operovat s lehkými vozidly jako řidič nebo střelec. Allows the player to operate armored vehicles as driver, gunner and commander. @@ -2244,6 +2417,7 @@ Oyuncunun zırhlı araçları sürücü, komutan veya taretçi olarak kullanmasına olanak verir. Permite ao jogador operar veículos blindados como condutor, atirador e comandante. 플레이어가 장갑 차량을 사용할 수 있는 권한를 허가 합니다. + Povolí hráči operovat s obrněnými vozidly jako řidič, střelec a velitel. Allows the player to operate air vehicles as driver and gunner. @@ -2257,6 +2431,7 @@ Oyuncunun bütün hava araçlarını pilot veya taretçi olarak kullanmasına olanak verir. Permite ao jogador operar veículos aéreos como piloto e atirador. 플레이어가 항공기를 사용할 수 있는 권한를 허가 합니다. + Povolí hráči operovat s letadly jako řidič a střelec. Allows the player to use the BUILD menu. @@ -2270,6 +2445,7 @@ Oyuncunun İNŞAAT menüsünü kullanmasını sağlar Permite ao jogador utilizar o menu de CONTRUÇÃO. 플레이어가 전초기지에서 건설메뉴를 사용할 수 있는 권한를 허가 합니다. + Povolí hráči používat menu STAVĚNÍ. Allows the player to use the RECYCLE action. @@ -2283,6 +2459,7 @@ Oyuncunun geri dönüşüm yapabilmesini sağlar Permite ao jogador utilizar a ação "RECICLAR". 플레이어가 필요없는 장비를 재활용할 수 있는 권한를 허가 합니다. + Povolí hráči RECYKLOVAT. Allows the player to use other actions: unflip, resource box manipulation, prisoner capture, etc. @@ -2296,6 +2473,7 @@ Oyuncunun araçları ters döndürme, sandıkları yönetme, esir yakalama, vb. hareketleri yapabilmesini sağlar. Permite ao jogador executar outras ações: Desvirar veículo, manipular caixas de recursos, captura de prisioneiros, etc. 플레이어가 차량을 바로잡거나, 군수물자를 조작하거나 포로를 생포하거나 문서를 획득할 수 있는 권한를 허가 합니다. + Povolí hráči používat funkce jako: převrátit, manipulace s bednami, zajmutí zajatce, atd. Gives all permissions to the player. @@ -2309,6 +2487,7 @@ Oyuncuya bütün yetkileri verir. Libera todas as permissões para o jogador. 플레이어에게 모든 권한을 허가 합니다. + Povolí hráči VŠE. Removes all permissions from the player. @@ -2322,6 +2501,7 @@ Oyuncudan bütün yetkileri alır. Remove todas as permissões do jogador. 플레이어의 허가된 권한 사항을 모두 제거합니다. + Zakáže hráči VŠE. -- PERMISSIONS @@ -2335,6 +2515,7 @@ -- YETKİLER -- PERMISSÕES -- 사용 권한 + -- PRAVOMOCE Save Changes @@ -2348,6 +2529,7 @@ Değişiklikleri Kaydet Salvar alterações 변경사항저장 + Uložit změny Permissions Management @@ -2361,6 +2543,7 @@ Yetkileri Yönet Gestão de Permissões 사용 권한 설정 + Manažer pravomocí You don't have permission from the commander to use light vehicles. @@ -2374,6 +2557,7 @@ Hafif araçları kullanmak için komutadan yetkiniz eksik. Você não tem permissão do comandante para utilizar veículos leves. 당신은 전투 차량을 사용할 수 있는 권한를 받지 못하였습니다. + Nemáš pravomoc od Komandéra používat lehká vozidla. You don't have permission from the commander to use armored vehicles. @@ -2387,6 +2571,7 @@ Zırhlı araçları kullanmak için komutadan yetkiniz eksik. Você não tem permissão do comandante para utilizar veículos blindados. 당신은 장갑 차량을 사용할 수 있는 권한를 받지 못하였습니다. + Nemáš pravomoc od Komandéra používat obrněná vozidla. You don't have permission from the commander to use air vehicles. @@ -2400,6 +2585,7 @@ Hava araçlarını kullanmak için komutadan yetkiniz eksik. Você não tem permissão do comandante para utilizar veículos aéreos. 당신은 항공기를 사용할 수 있는 권한를 받지 못하였습니다. + Nemáš pravomoc od Komandéra používat letectvo. No permissions have been set. The commander must setup the permissions to allow player actions and vehicle usage. Alternatively, the permission system can be disabled from the mission options. @@ -2413,6 +2599,7 @@ Yetkiler ayarlanmadı. Koumandan oyuncuların kullanabilicekleri araçlar için yetkileri ayarlamalı. Bunun yerine, bütün yetki sistemi de görev ayarlarından kapatılabilir. Nenhuma permissão foi liberada. O comandante precisa alterar as permissões para permitir que o jogador execute ações e utiliza veículos. Alternativamente, o sistema de permissão pode ser desabilitado no menu de opções da missão. 사용 권한를 허가 받지 못하였습니다. 관리자는 플레이어들이 장비를 사용할 수 있는 권한을 설정해야 합니다. 사용 권한 설정 메뉴에서 권한을 허가 하거나 제거할 수 있습니다. + Nejsou nastaveny pravomoce. Komandér musí nastavit pravomoce na používání funkcí a vozidel. Alternativně lze pravomoce úplně vypnou v nastaveni mise. ARSENAL @@ -2426,6 +2613,7 @@ ARSENAL ARSENAL 무기고 + ARZENÁL Edit loadout @@ -2439,6 +2627,7 @@ Loadout'u düzenle Modificar equipamento 장비 편집 + Upravit výzbroj Take loadout @@ -2452,6 +2641,7 @@ Loadout'u al Aceitar equipamento 장비 착용 + Vzít výzbroj Default @@ -2465,6 +2655,7 @@ Varsayılan Padrão 기본장비 + Výchozí -- REPACKAGE FOB -- @@ -2478,6 +2669,7 @@ -- FOB'Yİ TOPLA -- -- MOBILIZAR FOB -- -- 전초기지 재배치 -- + -- ZABALIT FOB -- REPACKAGE FOB @@ -2491,6 +2683,7 @@ FOB'Yİ TOPLA MOBILIZAR FOB 전초기지 재배치 + ZABALIT FOB Are you sure you want to repackage this FOB? @@ -2504,6 +2697,7 @@ Bu FOB'yi toplamak istediğinizden emin misiniz? Você tem certeza que quer mobilizar esta FOB? 이 전초기지를 재배치하시겠습니까? + Jste si jistý že chcete zabalit FOB? HALO Jump @@ -2517,6 +2711,7 @@ HALO atlayışı Salto em queda livre 공수 낙하 + HALO Skok Enabled - No cooldown @@ -2530,6 +2725,7 @@ Açık - Süre yok Ativado - Sem tempo de espera 활성화 - 대기시간 없음 + Zapnuto - Bez čekání Enabled - 5 minutes cooldown @@ -2543,6 +2739,7 @@ Açık - 5 dakika bekleme süresi Ativado - Espera de 5 minutos 활성화 - 대기시간 5분 + Zapnuto - 5 minut cooldown Enabled - 10 minutes cooldown @@ -2556,6 +2753,7 @@ Açık - 10 dakika bekleme süresi Ativado - Espera de 10 minutos 활성화 - 대기시간 10분 + Zapnuto - 10 minut cooldown Enabled - 15 minutes cooldown @@ -2569,6 +2767,7 @@ Açık - 15 dakika bekleme süresi Ativado - Espera de 15 minutos 활성화 - 대기시간 15분 + Zapnuto - 15 minut cooldown Enabled - 20 minutes cooldown @@ -2582,6 +2781,7 @@ Açık - 20 dakika bekleme süresi Ativado - Espera de 20 minutos 활성화 - 대기시간 20분 + Zapnuto - 20 minut cooldown Enabled - 30 minutes cooldown @@ -2595,6 +2795,7 @@ Açık - 30 dakika bekleme süresi Ativado - Espera de 30 minutos 활성화 - 대기시간 30분 + Zapnuto - 30 minut cooldown Can't perform HALO jump, you are on cooldown for %1 more minute(s). @@ -2608,6 +2809,7 @@ HALO jump yapılamıyor, %1 dakika daha beklemelisiniz. Não é possível executar o salto em queda livre, o tempo de espera é de %1 minuto(s). 지금은 공수 낙하를 할 수 없습니다. %1 분 후 가능합니다. + Nemůžete použít HALO skok, musíte počkat %1 minut -- HALO JUMP @@ -2621,6 +2823,7 @@ -- HALO ATLAYIŞI YAP -- Salto em queda livre -- 공수 낙하 + -- HALO SKOK HALO JUMP @@ -2634,6 +2837,7 @@ HALO ATLAYIŞI Salto em queda livre 공수 낙하 + HALO SKOK Clear spawned vehicle cargo @@ -2645,6 +2849,7 @@ Varolan araçları temizle 移除載具上的物品 장비 배치(생산)시 화물칸 비우기. + Vymazat náklad vyvolaného vozidla Maximum sector deactivation delay (starts increasing after 5th activation minute) @@ -2652,6 +2857,7 @@ Máximo atraso de desactivación de sector (empieza a incrementar después del 5to minuto de activación) Максимальное время деактивации сектора (начинает увелич. после 5-ти минут активации) Sektör kapanma üst limiti (Sektörün açılmasından 5 dakika sonra artmaya başlar) + Maximální zpoždění deaktivace sektoru (začíná se zvyšovat po 5. aktivační minutě) Limited Zeus interface @@ -2660,6 +2866,7 @@ Ограниченный интерфейс Zeus 제한된 제우스 인터페이스 Sınırlı Zeus Arayüzü + Omezené rozhraní Zeus Chance that enemies will stay in immobile/damaged vehicles @@ -2667,6 +2874,7 @@ Probabilidad de que los enemigos se quedarán dentro de un vehículo inmovilziado/dañado Шанс того, что враги будут оставаться в неподвижных/поврежденных автомобилях Düşmanların hasarlı araçların içinde kalma şansı + Šance, že nepřátelé zůstanou v nepohyblivých / poškozených vozidlech Deployment in progress... @@ -2680,6 +2888,7 @@ 正在佈署中... Atlama süreci devam ediyor... Mobilização em andamento... + Probíhá výsadek... Use the commander whitelist @@ -2693,6 +2902,7 @@ Kumandan beyaz listesini kullan Use a lista de permissões de comandantes 지휘관 허용 목록을 사용합니다. + Použít whitelist pro komandéra Enabled - Only use if you have modified your whitelist.sqf! @@ -2706,6 +2916,7 @@ Aktif - Yalnıza whitelist.sqf dosyasını değiştirdiyseniz kullanın! Ativado - Apenas use se tiver modificado o arquivo whitelist.sqf! 활성화 - whitelist.sqf 에 등록되어 있어야 합니다. + Povoleno - Použijte pouze pokud jste upravily whitelist.sqf! Cannot build: hostile forces nearby. @@ -2719,6 +2930,7 @@ İnşaat edilemiyor: Yakında düşmanlar var. Não é possível construir: Forças hostis na proximidade. 근처에 방해물이 있어 건설(설치)할 수 없습니다. + Nemůžeš stavět: nepřátelské jednotky poblíž. Cleanup abandoned vehicles outside FOBs @@ -2732,6 +2944,7 @@ FOB dışında bırakılan araçları temizle Remover veículos abandonados fora das FOBs 전초기지 외부의 유기된 장비 정리 + Čištění zapomenutých vozidel mimo FOB Enabled - 1 hour delay @@ -2745,6 +2958,7 @@ Açık - 1 saatde bir Ativado - 1 hora para remoção 활성화 - 1시간후 사라짐 + Zapnuto - Jednou za hodinu Enabled - 2 hours delay @@ -2758,6 +2972,7 @@ Açık - 2 saatde bir Ativado - 2 horas para remoção 활성화 - 2시간후 사라짐 + Zapnuto - Jednou za dvě hodiny Enabled - 4 hours delay @@ -2771,6 +2986,7 @@ Açık - 4 saatde bir Ativado - 4 horas para remoção 활성화 - 4시간후 사라짐 + Zapnuto - Jednou za čtyři hodiny Sorry! @@ -2784,6 +3000,7 @@ Özür dilerim! Desculpe! 미안합니다.! + Pardon! You are not authorized to use the commander slot on this server. @@ -2797,6 +3014,7 @@ Bu sunucuda kumandan slotunu kullanmak için izniniz yok. Você não está autorizado a usar o slot de comandante neste servidor. 사령관 슬롯을 사용할 권한이 없습니다. + Nemáš oprávnění používat pozici Komandéra na tomto serveru. Save respawn loadout @@ -2810,6 +3028,7 @@ Respawn ekipmanını kaydet Salvar equipamento para respawn. 재생시 기본 장비로 설정 + Uložit výzbroj pro oživení Your current loadout will be restored on every respawn. @@ -2823,6 +3042,7 @@ Şuanki ekipmanınız her doğduğunuzda yeniden verilecek Seu equipamento atual será restaurado em cada respawn. 현재 설정한 장비로 재생됨. + Tvoje aktuální výzbroj bude použita při každém oživení. Load from player @@ -2836,6 +3056,7 @@ Başka bir oyuncudan al Copiar do jogador 다른 플레이어 장비 가져오기 + Načíst od hráče Successful loadout transfer from %1. @@ -2849,6 +3070,7 @@ %1 oyuncusundan ekipman alındı. Transferência de loadout de %1 realizada. %1 의 장비, 이전 성공. + Úspěšně načteno od %1. Loadout: @@ -2862,6 +3084,7 @@ Ekipman: Equipamento: 장비: + Výzbroj: Deployment location: @@ -2875,6 +3098,7 @@ Doğma noktası: Local para mobilização: 재투입 위치: + Lokace pro výsadek: OPFOR aggressivity @@ -2888,6 +3112,7 @@ OPFOR agresifliği Agressividade inimiga 아군에 대한 적군의 공격 의지 + Agresivita OPFOR Anemic @@ -2901,6 +3126,7 @@ Kansız Anêmica 거의 없음 + Chudá Weak @@ -2914,6 +3140,7 @@ Zayıf Fraca 약함 + Slabá Normal @@ -2927,6 +3154,7 @@ Normal Normal 보통 + Normální Strong @@ -2940,6 +3168,7 @@ Güçlü Forte 강함 + Silná Extreme @@ -2953,6 +3182,7 @@ Uçta Extrema 매우강함 + Extrémní Weather @@ -2966,6 +3196,7 @@ Hava Clima 날씨 + Počasí Always sunny @@ -2979,6 +3210,7 @@ Hep güneşli Sempre ensolarado 맑은 날씨 지속 + Stále slunečno Random without rain @@ -2992,6 +3224,7 @@ Rastgele (yağmursuz) Aleatório sem chuva 무작위로 비가 내림 + Náhodně bez deště Random @@ -3005,6 +3238,7 @@ Rastgele Aleatório 모든 기상현상이 무작위로 나타남 + Náhodně Shorter nights @@ -3018,6 +3252,7 @@ Kısa geceler Noites curtas 짧은 밤 + Kratší noci Repairing @@ -3031,6 +3266,7 @@ Tamir ediliyor Reparando 수리중 + Opravování Rearming in %1s @@ -3044,6 +3280,7 @@ %1 saniyeye yeniden dolmuş olucak Remuniciando em %1s 탄약보급중입니다. %1 초 남음. + Přezbrojení za %1s Refueling @@ -3057,6 +3294,7 @@ Yakıt dolduruluyor Reabastecendo 재급유중 + Doplňování paliva -- TAKE INTEL @@ -3070,6 +3308,7 @@ -- İSTİHBARAT AL -- PEGAR INTELIGÊNCIA -- 정보 입수 + -- VZÍT INFORMACE -- SECONDARY OBJECTIVES @@ -3083,6 +3322,7 @@ -- İKİNCİL GÖREVLER -- OBJETIVOS SECUNDÁRIOS -- 부차적인 작전목표 + -- VEDLEJŠÍ ÚKOLY SECONDARY OBJECTIVES @@ -3096,6 +3336,7 @@ İKİNCİL GÖREVLER OBJETIVOS SECUNDÁRIOS 부차적인 작전목표 + VEDLEJŠÍ ÚKOLY Start @@ -3109,6 +3350,7 @@ Başla Iniciar 시작 + Začít Current intel: %1 @@ -3122,6 +3364,7 @@ Şuanki istihbarat: %1 Inteligência atual: %1 현재 정보: %1 + Zpravodajské body: %1 Insufficient intel points @@ -3135,6 +3378,7 @@ Yetersiz istihbarat puanı Pontos de inteligencia insuficientes 정보 포인트가 부족합니다. + Nedostatek zpravodajských bodů Secondary mission already in progress @@ -3148,6 +3392,7 @@ Şuan zaten ikincil bir görev var. A missão secundária já está em andamento 이미 진행중인 부차적인 작전목표가 있습니다. + Vedlejší mise již probíhá Hostile forces are heading towards %1. @@ -3161,6 +3406,7 @@ Düşmanlar %1 sektörüne doğru gidiyor. Forças hostis estão a caminho de %1. 적군이 %1 로 향하고 있습니다. + Nepřátelské jednotky míří k %1. OPFOR Convoy @@ -3174,6 +3420,7 @@ OPFOR Konvoyu Comboio inimigo 적군차량행렬 + OPFOR Konvoj Waypoint @@ -3187,6 +3434,7 @@ Varış noktası Waypoint 이동지점 + Průjezdní bod OPFOR Convoy neutralized. @@ -3200,6 +3448,7 @@ OPFOR Konvoyu etkisizleştirildi. Comboio inimigo neutralizado. 적군차량부대 무력화. + OPFOR Konvoj zneškodněn. OPFOR Convoy near %1. @@ -3213,6 +3462,7 @@ %1 civarında OPFOR Konvoyu. Comboio inimigo nas proximidades de %1. %1 근처에 적군차량행렬! + OPFOR Konvoj poblíž %1. Got it! @@ -3226,6 +3476,7 @@ Anlaşıldı! Entendido! 알았다! + Mám to! -- TUTORIAL @@ -3239,6 +3490,7 @@ -- EĞİTİM -- TUTORIAL -- 이용 안내 + -- NÁVOD TUTORIAL @@ -3252,6 +3504,7 @@ EĞİTİM TUTORIAL 이용 안내 + NÁVOD FOB Hunting @@ -3265,6 +3518,7 @@ FOB Avlama Caça à FOB 병참기지 기습 + Hon na FOB <t size='1.3' color='#ffa000'>FOB HUNTING</t><br/><br/><t size='1'>OPFOR forces use an array of small logistic bases situated behind the front lines. Destroying those assets would greatly disrupt the OPFOR supply lines and impair their capacity to react to our actions.</t><br/><br/><t size='1'>Your mission is to destroy all supply assets (trucks, containers) at the objective by any means at your disposal. Unfortunately our intelligence is not able to provide you with a precise position for the base, you will have to locate the objective in the red zone on your map.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Reward: OPFOR alert level reduced by 40%</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> @@ -3278,6 +3532,7 @@ <t size='1.3' color='#ffa000'>FOB AVLAMA</t><br/><br/><t size='1'>OPFOR kuvvetlerinin cephenin gerisinde birkaç küçük lojistik üsleri var. Bu üsleri yok etmek erzak tedariklerini zorlaştırıp, bizim hareketlerimize cevap verme kapasitelerini azaltıcaktır.</t><br/><br/><t size='1'>Göreviniz, elinizdeki imkanlarla bu üslerdeki bütün erzak sandıklarını ve araçları yok etmek. Ne yazıkki elimizdeki istihbarat bu üslerin tam konumlarını saptamaya yetmiyor, üssü haritanızdaki kırmızı bölgede sizin bulmanız lazım.</t><br/><br/><t size='1.15' color='#00a0ff'>Maliyet: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Ödül: OPFOR uyarı seviyesi %40 a düşecek.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>CAÇA À FOB</t><br/><br/><t size='1'>As forças de oposição (FOROP) utilizam um conjunto de pequenas bases de logística situadas além do fronte de batalha. Destruindo tais recursos desestabilizaria consideravelmente suas linhas de suprimento e afetaria sua capacidade de reagir às nossas ações.</t><br/><br/><t size='1'>Sua missão é destruir todas as fontes de recurso (caminhões, contêineres) que estão no objetivo, a qualquer custo. Infelizmente, nossa inteligência não foi capaz de fornecer dados da localização precisa da base. Dessa forma, você deverá localizar o objetivo dentro da zona vermelha identificada em seu mapa.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Recompensa: Alerta das forças de oposição reduzidos em 40%.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>병참기지 기습</t><br/><br/><t size='1'>현재 적군은 후방지역에 병참 기지를 운영하고 있습니다. 이 병참 기지를 파괴하면 전방 적군의 작전 수행능력을 저하시켜 아군의 작전 행동에 대응할 수 있는 역량이 약해질 것입니다.</t><br/><br/><t size='1'>아군의 작전 목표는 모든 군수물자을 파괴하는 것입니다.(트럭, 컨테이너 등) 아쉽게도 아군 정찰팀이 해당지역을 정찰하였으나 찾지 못하여 정확한 위치를 제공할 수 없기 때문에 당신의 지도에 표기된 빨간 영역 안에 위치한 적군 병참 기지를 찾아야 합니다.</t><br/><br/><t size='1.15' color='#00a0ff'>소모되는 정보 점수: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>보상: 경고 수준이 40% 감소합니다.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> + <t size='1.3' color='#ffa000'>HON NA FOB</t><br/><br/><t size='1'>Jednotky OPFOR používají řadu menších logistických základen za hlavní linii. Zničení těchto prostředků výrazně naruší zásobováni OPFOR jednotek a naruší jejich schopnost reagovat na naše akce.</t><br/><br/><t size='1'>Cílem mise je zničit všechny zásobovací prostředky (náklaďáky, kontejnery) libovolnými prostředky. Bohužel naše rozvědka není schopna vám poskytnout přesnou polohou pro základny, budete ji muset najít v červené zóně na mapě.</t><br/><br/><t size='1.15' color='#00a0ff'>Cena: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Odměna: Snížení bojové pohotovosti OPFOR o 40%</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> Convoy Hijack @@ -3291,6 +3546,7 @@ Konvoy Kaçırma Interceptação de comboio 수송부대 무력화 + Přepadení Konvoje <t size='1.3' color='#ffa000'>CONVOY HIJACK</t><br/><br/><t size='1'>OPFOR forces use road convoys to resupply their defensive positions. Intercepting one of these convoys would effectively disrupt their supply lines, and we could use the occasion to retrieve an hefty amount of ammunition.</t><br/><br/><t size='1'>Your mission is to stop the OPFOR convoy by any means necessary. You can destroy it, or hijack it to retrieve all the ammunition you can grab. The target will be spotted on your map.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Reward: OPFOR alert level reduced by 15%</t><br/><t size='1.15' color='#ffa000'>Side reward: All the ammunition you can retrieve.</t><br/><br/><t size='10'><img image='res\secondary\convoy_obj.jpg'/></t> @@ -3304,6 +3560,7 @@ <t size='1.3' color='#ffa000'>KONVOY KAÇIRMA</t><br/><br/><t size='1'>OPFOR kuvvetleri savundukları bölgelere konvoylar ile mühimmat sağlıyor. Bu konvoyları durdurmak, hem o bölgelere olan desteği azaltır, hemde kendinize mühimmat sağlamanıza yardımcı olur.</t><br/><br/><t size='1'>Göreviniz, elinizdeki imkanlarla OPFOR konvoyunu durdumak. Konvoyun hepsini yok edebilirsizin. Eğer mühimmat ele geçirmek isterseniz ise araçları kaçırabilirsiniz. Hedef haritanızda işaretlenecektir.</t><br/><br/><t size='1.15' color='#00a0ff'>Maliyet: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Ödül: OPFOR uyarı seviyesi %15 azalıcaktır.</t><br/><t size='1.15' color='#ffa000'>Yan ödül: Kurtardığınız mühimmatlar.</t><br/><br/><t size='10'><img image='res\secondary\convoy_obj.jpg'/></t> <t size='1.3' color='#ffa000'>INTERCEPTAÇÃO DE COMBOIO</t><br/><br/><t size='1'>As forças de oposição (FOROP) utilizam comboios terrestres para reabastecer suas posições defensivas. Interceptando um desses comboios afetaria efetivamente suas linhas de suprimento, e poderíamos usar a ocasião para recuperar uma grande quantidade de munições.</t><br/><br/><t size='1'>Sua missão é deter o comboio das forças de oposição utilizando qualquer meio possível. Você pode destruí-lo ou sequestrá-lo para recuperar toda a munição que conseguir transportar. O alvo será identificado em coordenadas específicas no seu mapa.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Recompensa: Nível de alerta das forças de oposição reduzido em 15%.</t><br/><t size='1.15' color='#ffa000'>Recompensa aliada: Toda a munição que conseguir.</t><br/><br/><t size='10'><img image='res\secondary\convoy_obj.jpg'/></t> <t size='1.3' color='#ffa000'>수송부대 무력화</t><br/><br/><t size='1'>현재 적군은 수송부대를 동원하여 그들의 방어 거점에 군수물자를 수송하고 있습니다. 수송부대 중 하나를 공격하여 그들의 보급선을 끊고, 많은 양의 군수물자를 노획하십시요.</t><br/><br/><t size='1'>아군의 임무는 수단과 방법을 가리지 않고 적 수송부대를 멈추게 하는 것입니다. 군수물자를 파괴할 것인지, 노획하여 아군의 군수물자로 확보할 것인지는 당신의 선택입니다. 당신의 지도에 위치가 표시될 것입니다.</t><br/><br/><t size='1.15' color='#00a0ff'>소모되는 정보 점수: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>보상: 경고 수준이 15% 감소합니다.</t><br/><t size='1.15' color='#ffa000'>추가 보상: 수송부대에서 노획할 수 있는 모든 군수물자.</t><br/><br/><t size='10'><img image='res\secondary\convoy_obj.jpg'/></t> + <t size='1.3' color='#ffa000'>PŘEPADENÍ KONVOJE</t><br/><br/><t size='1'>Jednotky OPFOR používají konvoje k zásobení obraných pozic. Přerušením jediného konvoje můžete efektivně narušit zásobování, a také můžeme využít teto příležitosti k získání značného množství munice.</t><br/><br/><t size='1'>Cílem mise je zastavit konvoj libovolnými prostředky. Můžete je zničit nebo zajmout a získat tak munici. Pozice konvoje bude zaznačena do mapy.</t><br/><br/><t size='1.15' color='#00a0ff'>Cena: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Odměna: Bojová pohotovost OPFOR snížena o 15%</t><br/><t size='1.15' color='#ffa000'>Vedlejší odměna: Veškerá munice kterou zvládnete odnést.</t><br/><br/><t size='10'><img image='res\secondary\convoy_obj.jpg'/></t> @@ -3319,6 +3576,7 @@ Sektörlerdeki BLUFOR savunmacıları Defensores aliados nos setores controlados 적군 공격시 방어군 생성 + BLUFOR obránci v obsazených sektorech Auto-danger behavior on BLUFOR forces @@ -3332,6 +3590,7 @@ BLUFOR için Oto-tehlike davranışı Comportamento automático de alerta nas forças aliadas 아군 부대의 자동 경계 행위 + Chování při automatickém nebezpečí BLUFOR jednotek Maximum number of FOBs allowed @@ -3345,6 +3604,7 @@ Maksimum FOB sayısı Número máximo de FOBs permitidas 전초기지 건설 가능 수 + Maximum postavených FOB You are not allowed to deploy more than %1 FOBs at the same time. @@ -3358,6 +3618,7 @@ Buraya %1 den fazla FOB koyamazsınız. Você não está autorizado a instalar mais de %1 FOB(s) ao mesmo tempo. %1 보다 더 많은 전진기지를 건설할 수 없습니다. + Nemůžete postavit víc jak %1 FOB %1 loadout successfully loaded. @@ -3371,6 +3632,7 @@ %1 ekipmanı başarıyla alındı. Equipamento %1 carregado com sucesso %1 장비를 성공적으로 불러왔습니다. + %1 výzbroj načtena. Search and Rescue @@ -3384,6 +3646,7 @@ Ara ve kurtar Busca e Resgate 수색 및 구출 + Záchranná mise <t size='1.3' color='#ffa000'>SEARCH AND RESCUE</t><br/><br/><t size='1'>We have lost contact with a recon helicopter on mission behind the enemy lines. We believe the chopper was shot down by hostile forces.</t><br/><br/><t size='1'>The helicopter may have crashlanded anywhere in a large zone around its last known position. Your mission is to retrieve the chopper crew and their precious intel. Hostile forces may have found them first, so you must be quick, careful, and ready to engage.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Reward: 20 intel points (10 for each crew alive).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> @@ -3397,6 +3660,7 @@ <t size='1.3' color='#ffa000'>ARA VE KURTAR</t><br/><br/><t size='1'>Dost bir keşif helikopterini düşman sahasında kaybettik. Helikopterin düşman kuvvetleri tarafından vurulduğuna inanıyoruz.</t><br/><br/><t size='1'>Helikopter son görülen yerde düştüğünü biliyoruz. Göreviniz helikopter personelini bulup ve taşıdığı önemli istihbaratı getirmenizdir. Düşman kuvvetler onu önceden bulabilirler dikkatli olun ve saldırıya açık olun.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Ödül: 20 istihbarat puanı (Her yaşayan kişi için 10).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>BUSCA E RESGATE</t><br/><br/><t size='1'>Perdemos contato com um helicóptero de reconhecimento presente em uma missão atrás das linhas inimigas. Acreditamos que o helicóptero foi abatido por forças hostis.</t><br/><br/><t size='1'>O helicóptero pode ter feito um pouso forçado em local próximo de sua última posição conhecida. Sua missão é recuperar a tripulação do helicóptero e sua preciosa inteligência. Forças hostis podem tê-los localizado primeiro, portanto seja rápido, cuidadoso e esteja pronto para engajar o inimigo.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Recompensa: 20 pontos de inteligência (10 para cada membro vivo da tripulação).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>수색 및 구출</t><br/><br/><t size='1'>적군 후방지역에서 정찰임무를 수행하던 아군 정찰기와 교신이 끊어졌습니다. 현 상황으로 판단할때 적군에게 격추당한 것 같습니다.</t><br/><br/><t size='1'>아군의 임무는 마지막 교신 위치를 중심으로 아군 정찰기의 흔적을 찾는 것입니다. 적군이 먼저 발견하기전에 아군 정찰기의 흔적을 찾아 승무원 구출 및 다른 정보들을 획득, 복귀해야 합니다. 교전이 벌어질 수 있습니다.</t><br/><br/><t size='1.15' color='#00a0ff'>소요되는 정보 점수: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>보상: 정보 점수가 20점 추가됩니다. 또한 구출한 인원 1명당 정보 점수가 10점 추가됩니다.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> + <t size='1.3' color='#ffa000'>ZÁCHRANNÁ MISE</t><br/><br/><t size='1'>Ztratili jsme kontakt s průzkumným vrtulníkem za nepřátelskými liniemi. Věříme že ji sestřelily nepřátelské jednotky.</t><br/><br/><t size='1'>Vrtulník mohl havarovat kdekoliv ve velké vzdálenosti od místa kde jsme s ní ztratily kontakt. Cílem mise je najít a zachránit přeživší posádku. Nepřátelské jednotky tam mohou být jako první, proto musíme jednat rychle, opatrně a být připraveni k boji.</t><br/><br/><t size='1.15' color='#00a0ff'>Cena: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Odměna: 20 zpravodajských bodů (10 za každého člena posádky).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> @@ -3412,6 +3676,7 @@ Tim içindeki maksimum AI limiti Limite de recrutamento de IA por grupo 아군 분대당 AI병사 모집 한도 + Limit verbování AI jednotek na družstvo. Crashed helicopter near %1. @@ -3425,6 +3690,7 @@ Düşmüş helikopter %1 yakınlarında. Helicóptero abatido nas proximidades de %1. %1 근처에 정찰기가 추락했습니다. + Havárie vrtulníku poblíž %1 SAR mission failed, both crew are KIA. @@ -3438,6 +3704,7 @@ Arama kurtarma görevi başarısız. Ekip çatışmada öldü. A missão de busca e resgate falhou, ambos os tripulantes morreram em combate. 구조작전 실패, 승무원 전원 사망. + Záchranná mise selhala, všichni jsou mrtví. SAR mission succeeded. @@ -3451,6 +3718,7 @@ Arama kurtarma başarılı. Missão de busca e resgate concluída com sucesso. 구출작전 성공! + Záchranná mise byla úspěšná Player mapmarkers activation through extended options @@ -3463,6 +3731,7 @@ Oyuncu harita işaretleri diğer ayarlardan açılabilir Ativação de identificação dos jogadores no mapa, através de opções avançadas 플레이어 지도 표시기능 활성화 + Aktivování hráčských značek skrz rozšířené menu Mobile Respawn @@ -3475,6 +3744,7 @@ Mobil respawn Respawn móvel 재투입차량 + Mobilní respawn Mobile Arsenal @@ -3487,6 +3757,7 @@ Mobil ekipman Arsenal móvel 재투입차량에 '무기고' 설치 + Mobilní arzenál @@ -3501,6 +3772,7 @@ Killah Potatoes bayrağı Bandeira da Killah Potatoes Killah Potatoes 깃발 + Killah Potatoes vlajka Small storage area @@ -3513,6 +3785,7 @@ Küçük depo Depósito pequeno 소형 저장 창고 + Malá skladovací plocha Large storage area @@ -3525,6 +3798,7 @@ Büyük depo Depósito grande 대형 저장 창고 + Velká skladovací plocha Salvage Depot @@ -3537,6 +3811,7 @@ Dönüşüm deposu Centro de desmanche de veículos 재활용공장 + Opravárenské Depo Flight Control @@ -3549,6 +3824,7 @@ Uçuş Kontrol Controle de tráfego aéreo 비행 관제소 + Letecká kontrola Helipad @@ -3561,6 +3837,7 @@ Heliped Heliporto 헬기착륙장 + Helipad Tent Hangar @@ -3573,6 +3850,7 @@ Çadırdan hangar Hangar para aeronaves 항공기 격납고 + Stanový Hangár There is no free storage area nearby. @@ -3585,6 +3863,7 @@ Yakınlarda boş depo yok Não há depósito disponível nas proximidades. 근처에 남은 저장공간이 없습니다. + V blízkosti není volná skladovací plocha. -- STORE CRATE @@ -3597,6 +3876,7 @@ -- KUTUYU DEPOLA -- ARMAZENAR CAIXA NO DEPÓSITO -- 저장창고에 쌓기 + -- ULOŽIT BEDNU -- UNLOAD SUPPLY CRATE @@ -3609,6 +3889,7 @@ -- İKMAL KUTUSUNU ÇIKAR -- DESCARREGAR CAIXA DE SUPRIMENTOS -- 보급품(S) 내리기 + -- VYLOŽIT BEDNU SE ZÁSOBAMI -- UNLOAD AMMO CRATE @@ -3621,6 +3902,7 @@ -- MERMİ KUTUSUNU ÇIKAR -- DESCARREGAR CAIXA DE MUNIÇÃO -- 탄약(A) 내리기 + -- VYLOŽIT BEDNU S MUNICÍ -- UNLOAD FUEL CRATE @@ -3633,6 +3915,7 @@ -- BENZIN KUTUSUNU ÇIKAR -- DESCARREGAR BARRIS DE COMBUSTÍVEL -- 연료(F) 내리기 + -- VYLOŽIT BEDNU S PALIVEM -- CHECK CONTENT @@ -3645,6 +3928,7 @@ -- İÇİNDEKİLER KONTROL ET -- CHECAR CONTEÚDO -- 내용물 확인 + -- ZKONTROLOVAT OBSAH Crate contains %1 resources @@ -3657,6 +3941,7 @@ Kutuda %1 kaynak var Caixa contém %1 recursos 이 박스에는 %1 자원이 있습니다. + Bedna obsahuje 1% -- Change alignment @@ -3669,6 +3954,7 @@ -- Hizaları değiştir -- Mudar alinhamento -- 땅에 맞춰 정렬 + -- Změnit zarovnání Not enough free storage space @@ -3681,6 +3967,7 @@ Yeteri kadar boş alan yok Não há espaço de armazenamento suficiente 저장 공간이 부족합니다. + -- Málo úložného prostoru You can't recycle preplaced objects @@ -3693,6 +3980,7 @@ Koyulmayan objeleri geri dönüştüremezsiniz Você não pode reciclar objetos pré inseridos 사전에 배치된 객체들은 재활용 할 수 없습니다. + Nelze rozebrat představené objekty Can't recycle:\nNo Salvage Depot in FOB area @@ -3705,6 +3993,7 @@ Geri dönüşemez:\nYakınlarda Dönüşüm Deposu yok Não é possível reciclar:\nNão há centro de desmanche de veículos na área da FOB 전초기지 영역안에 재활용공장이 없어 재활용 할 수 없습니다. + Nelze rozebrat:\nV dosahu není žádný Opravárenské depo -- REASSIGN ZEUS @@ -3717,6 +4006,7 @@ -- ZEUSU SEÇ -- REDESIGNAR ZEUS -- 제우스 재배치 + -- PŘIDĚLIT ZEUS GLOBAL @@ -3729,6 +4019,7 @@ KÜRESEL GLOBAL 전체군수물자수량 + GLOBÁLNÍ -- Switch resource display @@ -3741,6 +4032,7 @@ -- Kaynak bölgesini değiştir -- Alterar painel de recursos -- 군수물자현황 조회 + -- Změnit zobrazení surovin Following items are not allowed:\n%1 @@ -3753,6 +4045,7 @@ Şu eşyalar yasaklı:\n%1 Os seguintes itens não são permitidos:\n%1 허용 금지 항목 :\n%1 + Následující věci nejsou dovoleny:\n%1 -- Production Settings @@ -3765,6 +4058,7 @@ -- Üretim ayarları -- Definições de Produção -- 생산 설정 + -- Nastavení produkce Production Settings @@ -3777,6 +4071,7 @@ Üretim ayarları Definições de Produção 생산 설정 + Nastavení produkce Sector Type: @@ -3789,6 +4084,7 @@ Sektör türü Classe do setor: 거점 유형 : + Typ sektoru: City @@ -3801,6 +4097,7 @@ Şehir Cidade 도시 + Město Factory @@ -3813,6 +4110,7 @@ Fabrika Fábrica 공장 + Továrna Producing: @@ -3825,6 +4123,7 @@ Üretiyor Produzindo: 생산: + Produkce: Nothing @@ -3837,6 +4136,7 @@ Hiçbirşey Nada 없음. + Nic Storage: @@ -3849,6 +4149,7 @@ Depo: Depósito: 보관: + Sklad: Not present @@ -3861,6 +4162,7 @@ Depolama yok Inexistente 물품 없음 + Není Time left: @@ -3873,6 +4175,7 @@ Kalan süre: Tempo restante: 남은 시간: + Zbývající čas: No production @@ -3885,6 +4188,7 @@ Üretim yok Sem produção 생산 없음 + Žádná produkce %1 minutes @@ -3897,6 +4201,7 @@ %1 dakika %1 minutos %1 분 + %1 minuty Facilities available @@ -3909,6 +4214,7 @@ Bölgeler hazır Instalações disponíveis 가용 공장 + Dostupné továrny Stock Overview @@ -3921,6 +4227,7 @@ Stok Listesi Visão geral do armazém 보관내역 + Stav skladů %1 Crate @@ -3933,6 +4240,7 @@ %1 Kutu %1 Caixa %1 상자 + %1 Bedna %1 Crates @@ -3945,6 +4253,7 @@ %1 Kutular %1 caixas %1 상자 + %1 Bedny Choose Production @@ -3957,6 +4266,7 @@ Üretimi seç Selecione a produção 생산품 선택 + Vyberte produkci Sector setting saved. @@ -3969,6 +4279,7 @@ Sektör ayarı kaydedildi. Definição do setor salva 설정 저장 + Nastavení sektoru uloženo -- Build storage -- @@ -3981,6 +4292,7 @@ -- Depolama aç -- -- Construir depósito -- -- 저장창고 건설 -- + -- Postavit skladiště -- -- Build supply facility -- @@ -3993,6 +4305,7 @@ -- İkmal kutusu üretimi kur -- -- Construir fábrica de suprimentos -- -- 보급품(S) 생산공장 건설 + -- Postavit továrnu na zásoby -- -- Build ammo facility -- @@ -4005,6 +4318,7 @@ -- Mermi kutusu üretimi kur -- -- Construir fábrica de munição -- -- 탄약(A) 생산공장 건설 + -- Postavit továrnu na munici -- -- Build fuel facility -- @@ -4017,6 +4331,7 @@ -- Benzin kutusu üretimi kur -- -- Construir refinaria de combustível -- -- 연료(F) 생산공장 건설 + -- Postavit továrnu na palivo -- Needed facility not built in sector. @@ -4029,6 +4344,7 @@ İstenilen üretim sektörde kurulu değil. É necessária uma fábrica não construída neste setor 이 지역에는 생산에 필요한 공장이 없습니다. + Továrna nemůže být postavena v sektoru. Not enough resources.\n\nYou need:\n%1 Supplies\n%2 Ammo\n%3 Fuel @@ -4041,6 +4357,7 @@ Yetersiz kaynak.\n\nLazım olan: \n%1 İkmal \n%2 Mermi\n%3 Benzin Sem recursos suficientes.\n\nVocê precisa de:\n%1 Suprimentos\n%2 Munição\n%3 Combustível 공장을 지을러면 이 지역의 저장창고에 군수물자가 필요합니다.\n\n필요항목:\n%1 보급품\n%2 탄약\n%3 연료 + Nedostatek surovin. \n\nPotřebujete:\n%! Zásoby\n%2 Munice\n%3 Palivo Facility established. @@ -4053,6 +4370,7 @@ Üretim kuruldu. Estrutura criada. 이미 세워진 공장 + Továrna postavena AI Logistics Module @@ -4065,6 +4383,7 @@ AI Lojistiği Módulo Logístico automatizado 군수물자수송 AI 물류시스템 + Modul AI logistiky -- Logistic Overview @@ -4077,6 +4396,7 @@ -- Lojistik -- Visão Geral da Logística -- 물류 개요 + -- Logistický přehled Logistic Overview @@ -4089,6 +4409,7 @@ Lojistikler Visão Geral da Logística 물류 개요 + Logistický přehled Add @@ -4101,6 +4422,7 @@ Ekle Adicionar AI수송팀 편성 + Přidat Del @@ -4113,6 +4435,7 @@ Sil Deletar AI수송팀 해체 + Odebrat Status: @@ -4125,6 +4448,7 @@ Durum: Status: 상태: + Stav: Standby @@ -4137,6 +4461,7 @@ Beklemede Aguardando ordens 대기중 + Nečinný Loading @@ -4149,6 +4474,7 @@ Yükleniyor Carregando 군수물자 상하차 중 + Nakládá On the way @@ -4161,6 +4487,7 @@ Yolda A caminho 목적지로 이동중 + Na cestě Aborting mission @@ -4173,6 +4500,7 @@ İptal ediliyor Abortando missão 수송 중단 + Rušení mise No resources @@ -4185,6 +4513,7 @@ Kaynak yok Sem recursos 군수물자 없음 + Nejsou suroviny No storagespace @@ -4197,6 +4526,7 @@ Depolama yeri yok Sem espaço no depósito 보관 여유 없음 + Není úložné místo Next destination: @@ -4209,6 +4539,7 @@ Diğer istikamet: Próximo destino: 다음 목적지: + Další cíl: Current convoy cargo @@ -4221,6 +4552,7 @@ Şuanki konvoy kargosu Comboio de carga atual 운반중인 군수물자 + Aktuální náklad konvoje Assigned Trucks @@ -4233,6 +4565,7 @@ Seçili kamyonlar Veículos em uso 보유 트럭 + Nákladní auta Assign Truck @@ -4245,6 +4578,7 @@ Kamyon seç Designar Transporte 트럭 추가 + Koupit náklaďák Unassign Truck @@ -4257,6 +4591,7 @@ Seçimi iptal et Dispensar Transporte 트럭 해제 + Prodat náklaďák Costs: 100 supplies and 100 fuel. @@ -4269,6 +4604,7 @@ Maliyeti : 100 ikmal ve 100 benzin Custa: 100 de suprimento e 100 de combustível. 비용: 100보급품(S), 100연료(F) + Cena: 100 zásob a 100 paliva Gives: 50 supplies and 50 fuel. @@ -4281,6 +4617,7 @@ Veriyor: 50 ikmal ve 50 benzin. Fornece: 50 de suprimento e 50 de combustível. 회수: 50보급품(S), 50연료(F) + Cena: 50 zásob a 50 paliva Confirm Mission @@ -4293,6 +4630,7 @@ Onayla Confirmar Missão 수송 시작 + Potvrdit misi Abort Mission @@ -4305,6 +4643,7 @@ İptal et Abortar Missão 수송 취소 + Zrušit misi Not enough resources @@ -4317,6 +4656,7 @@ Yetersiz kaynak Sem recursos suficientes 군수물자가 충분하지 않습니다. + Nedostatek surovin Mission planning @@ -4329,6 +4669,7 @@ Planlama Planejamento de missão 수송 계획 + Plánování mise Destination A @@ -4341,6 +4682,7 @@ A istikameti Destino A 출발지역-A- + Cíl A Destination B @@ -4353,6 +4695,7 @@ B istikameti Destino B 도착지역-B- + Cíl B Supplies value from here to the other destination. (only whole numbers) @@ -4365,6 +4708,7 @@ Burdan diğer istikamete gidecek ikmaller. (sadece sayılar) Valores de suprimento daqui para o outro destino. (apenas valores inteiros) 출발지에서 도착지로 운반되는 보급품(S) 수량(정수만 입력) + Hodnota zásob odtud do cílového místa. (pouze celá čísla) Ammo value from here to the other destination. (only whole numbers) @@ -4377,6 +4721,7 @@ Burdan diğer istikamete gidecek mermiler. (sadece sayılar) Valores de munição daqui para o outro destino. (apenas valores inteiros) 출발지에서 도착지로 운반되는 탄약(A) 수량(정수만 입력) + Hodnota munice odtud do cílového místa. (pouze celá čísla) Fuel value from here to the other destination. (only whole numbers) @@ -4389,6 +4734,7 @@ Burdan diğer istikamete gidecek benzinler. (sadece sayılar) Valores de combustível daqui para o outro destino. (apenas valores inteiros) 출발지에서 도착지로 운반되는 연료(F) 수량(정수만 입력) + Hodnota paliva odtud do cílového místa. (pouze celá čísla) Your mission is not possible. @@ -4401,6 +4747,7 @@ Bu istikamet imkansız. Não é possível executar a missão designada. 이 수송임무는 현재 불가능합니다. + Vaše trasa není možná. You can't abort this mission at the moment. @@ -4413,6 +4760,7 @@ Bu görevi şuan iptal edemezsiniz. Não é possível abortar esta missão neste momento. 이 수송임무를 당장 중단 할 수 없습니다. + Trasu nelze v tuto chvíli zrušit. @@ -4428,6 +4776,7 @@ Bu bölgeyi düşman etkisinden kurtar! Strateji anahtardır! Bol şanslar askerler. Libere a região da opressão inimiga! Estratégia será essencial! Boa sorte infantaria. 적의 수중에서 이 지역을 탈환하자! 전략이 승리의 관건이다! 병사들이여, 행운을 빈다. + Osvoboďte oblast od nepřátelského útisku. Strategie je klíčová! Hodně štěstí vojáci. 1. Introduction @@ -4441,6 +4790,7 @@ 1. Giriş 1. Introdução 1. 소개 + 1. Instrukce <br/><br/>Hello gentlemen and welcome to the region, enemy forces have surprised us with a brutal and overwhelming offensive. They now have complete control of the region but with your efforts, that won't last long.<br/> <br/>Our primary objective is simple: liberate the region from enemy control!<br/> <br/>The road to victory will be long and dangerous. You will have to retake many sectors and acquire the necessary resources to improve the quantity and quality of friendly forces engaged in this campaign.<br/> <br/>Moreover, enemy forces will most certainly react to our advance. You will have to engage in secondary operations to weaken a foe that fights with higher numbers and better equipment than you do.<br/> <br/>In your efforts you will need the support of the local population, so always double-check what you're firing at!<br/> <br/>Questions? HQ out.<br/> <br/> @@ -4453,6 +4803,7 @@ <br/><br/>Beyler ve bayanlar buraya hoşgeldiniz, düşman kuvvetleri bizi yıkıcı ve üstün güç ile karşıladılar. Şimdi bütün alanı hakimiyet altına aldılar ve siz geldiniz ki uzun süre böyle devam etmeyecektir.<br/> <br/>İlk görevimiz basit; Bu bölgeyi düşman kontrolü altından kurtar!<br/> <br/>Kazanmanın yolu uzun ve tehlikeli. Almanız gereken bir sürü sektor ve kaynaklar var. Bu kaynakları kullanarak bu adayı almaya çalışan dost birliklerimize destek çıkacaksınız.<br/> <br/>Ve dahası düşman bizim gelişmemize takiben onlarda gelişecektir. İkincil görevlere giderek düşmanların gelişmesini önleyecek ve yeni mühimmatlar elde edeceksiniz.<br/> <br/>Yerli halka da bir o kadar dikkat edin! Sıkmadan önce 2 kere kontrol edin!<br/> <br/>Sorusu olan? Bağlantı kapandı. <br/> <br/> <br/><br/>Olá senhores, sejam bem-vindos à região. Forças inimigas nos surpreenderam com uma ofensiva brutal e absurda. Eles possuem agora controle completo sobre a região, porém com seus esforços, tal controle não irá durar por muito tempo.<br/> <br/>Nosso objetivo primário é simples: Liberar a região do controle inimigo!<br/> <br/>O caminho para vitória será longo e perigoso. Você terá que retomar dezenas de setores e adquirir os recursos necessários para desenvolver a quantidade e qualidade das forças aliadas engajadas nesta campanha.<br/> <br/>Além disso, as forças inimigas certamente irão reagir aos nossos avanços. Você deverá engajar em operações secundárias para enfraquecer um inimigo que combate em maior número e com melhores equipamentos que você.<br/> <br/>Em sua campanha, você precisará do apoio da população local, portanto, sempre confirme no que está disparando e em quem!<br/> <br/>Perguntas? Quartel General, câmbio. QRT.<br/> <br/> <br/><br/>제군들! 이 작전지역에 배치받은 것을 환영한다!. 현재 적군은 잔인하고 압도적인 공격으로 우리를 놀라게하였고, 이제 이 지역에 대한 완전한 통제권을 가지고 있다.<br/> <br/>하지만 아군의 노력으로 인해 오래가지 못할 것이다. 우리의 목표는 단 하나! 이 지역을 다시 탈환하는 것이다!<br/> <br/>승리의 길은 멀고도 험하다. 많은 희생을 필요로 한다. 또한 아군의 질과 양을 향상시키기 위해 필요한 자원을 생산, 확보하여 전초기지(FOB)로 수송해야 한다.<br/> <br/>적군은 우리의 진격에 가장 효과적인 방법으로 반격을 할 것이다. 따라서 우리는 적군을 약화시키기위해 부차적인 작전에도 참여해야만 한다.<br/> <br/>또한 지역 주민들의 지지를 받기위해 필요한 조치을 해야 할 것이며, 이를 항상 확인해야 할 것이다.<br/> <br/>질문? HQ out.<br/> <br/> + <br/><br/>Dobrý den, dámy a pánové, vitejte v oblasti. Jednotky OPFOR nás překvapily brutálním a ohromujícím útokem. Nyní mají vládu nad celým ostrovem, ale díky vaší snaze, ne na dlouho.<br/> <br/>Náš cíl je jednoduchý, osvobodit oblast od nepřátelského útisku.<br/> <br/>Cesta za vítězstvím bude dlouhá a nebezpečná. Musíme dobýt mnoho území a získat důležité zdroje k vylepšení a posílení BLUFOR jednotek operujících v tomto tažení.<br/> <br/>Navíc, jednotky OPFOR budou s největší pravděpodobností reagovat na váš postup. Budete muset splnit mnoho vedlejších úkolu k oslabení nepřátelské přesily s lepším vybavením.<br/> <br/>Ve svém úsilí budete potřebovat podporu místního obyvatelstva, takže se vždy ujistěte, po čem střílíte.<br/> <br/>Otázky? HQ konči.<br/> <br/> 2. Starting the campaign! @@ -4466,6 +4817,7 @@ 2. Göreve başlamak 2. Iniciando a campanha! 2. 전투시작 + 2. Začátek kampaně <br/><br/>You begin the campaign either onboard the USS Freedom, or at Chimera base, safe zones the enemy won't dare to attack. Your first choice is to choose where you want to deploy. At first you can only deploy at your starting position but as you progress, more options will become available such as Forward Operating Bases (FOB) and mobile respawns.<br/> <br/>At your starting position you can choose your equipment from a complete Arsenal. You will also find your first FOB packaged inside a container, the Spartan-01 helicopter and a few other small transport helicopters.<br/> <br/>You will have to ferry that container with the Spartan-01 (or choose to start with the first FOB already built). You can deploy this first FOB wherever you want (as long as you're 1km from the starting position and 300m from any sector), so it's up to you to choose the right place to start your campaign offensive.<br/> <br/> @@ -4478,6 +4830,7 @@ Görevinize USS Freedom'da başlayacaksınız veya Chimera Bölgesinde yani düşmanların saldıramayacağı güvenli bölgelerde. İlk işiniz nereye atlayacağınız olacaktır, siz bölgeleri aldıkça yeni FOB'ler ve mobil spawn merkezleri de açacaksınız.<br/> <br/>Başladığınızda Arsenal (Cephanelik) den istediğiniz ekipmanı seçebilirsiniz. Bir FOB Konteynırı, SPARTAN-01 helikopteri ve birkaç taşıma helikopterine de ayrıca sahipsiniz.<br/> <br/>SPARTAN-01 ile FOB Konteynırını istediğiniz yere götürüp bir FOB Bölgesi (başlangıç noktasından 1km diğer sektörlerden 300mt uzakta olmanız gerekli) açabilirsiniz ve saldırmaya o FOB'den devam edebilirsiniz.<br/> <br/> <br/><br/>Você iniciará a campanha abordo do porta-aviões USS Fredom ou na base operacional Chimera, instalações que o inimigo não se atreverá a atacar. Sua primeira escolha será definir onde irá mobilizar. Primeiramente somente poderá mobilizar na sua posição inicial, entretanto, conforme progredir, mais alternativas se tornarão disponíveis, como a Base de Operações Avançadas (FOB) e os respawns móveis.<br/> <br/>Em sua posição inicial, você poderá escolher seu equipamento através de um arsenal completo. Você terá à sua disposição sua primeira FOB transportável, dentro de um contêiner. Também estará disponível o transporte aéreo de callsign Spartan-01 e mais alguns helicópteros de transporte.<br/> <br/>Você deverá mover o mencionado contêiner utilizando a Spartan-01 (ou escolha começar com a primeira FOB já construída). Você poderá mobilizar esta FOB para onde desejar (desde que esteja a 1km do ponto inicial e a 300 metros de qualquer setor). Assim, depende apenas de você escolher o local ideal para iniciar sua campanha ofensiva.<br/> <br/> <br/><br/>최초의 작전 기지는 적이 절대로 건드리지 못할 안전지대로, 아군의 반격 나팔 소리의 첫 음표이기도 하며, 이번 반격 작전의 출발점이 될 것이다. 처음에는 작전 기지만 배치할 수 있었으나, 반격작전이 진행됨에 따라 FOB(전초기지) 또는 재투입차량에도 배치될 것이다.<br/> <br/>또한 최초의 작전 기지에서 '무기고'를 이용하여 무장을 갖출수 있고, 이미 건설된 건초기지가 있거나 또는 전초기지(FOB)차량을 1대 찾을 수 있을 것이다. 또한 운이 좋다면 재투입차량 또는 트럭이나 공중 탑재 장비등도 찾을 수 있을 것이다.<br/> <br/>당신이 처음으로 해야할 일은 무장을 갖추고, 이미 건설된 건초기지가 있다면 거기에서부터, 만약 전초기지(FOB)차량이 있다면 그 것을 찾아 FOB(전초기지)를 적당한 곳(최초의 작전기지로부터 1km, 도시로부터 300m 떨어진 곳)에 설치해야 한다. 이 지점이 바로 첫번째 반격이 시작되는 곳으로 반격을 시작하는 지점은 전적으로 당신의 선택에 달려 있다.<br/> <br/>만약 당신이 반격작전이 진행중인 상황에서 투입된다면, 먼저 지도를 살펴보라. 현재 아군이 어디서 전투중인지 알 것이다. 아군에게 무전으로 물어보거나 채팅으로 물어보면서 전투에 참여하라. 행운을 빈다.<br/> <br/> + <br/><br/>t size='10'><img image='res\tuto\fob.jpg'/></t><br/><br/>Naše kampaň začíná na místě, kde se nemusíme bát útoku OPFOR jednotek. Na prvním místě vyberte kam provedete výsadek. Ze začátku budete moci jen na Startovní základnu, ale jak budete postupovat, budou přibývat i možnosti jako jsou předsunuté základny (FOB) nebo mobilní respawn.<br/> <br/>Na startovní pozici si budete moct vybrat vybavení z kompletní Zbrojnice. Naleznete zde také svoje první zabalené FOB v kontejneru, Vrtulník Spartan-01 Huron a pár dalších transportních vrtulníků.<br/> <br/>Budete muset převézt kontejner Huronem nebo Ghosthawkem (pokud nebyla zvolena možnost postaveného prvního FOB). Můžete si vybrat jakékoliv místo kde postavíte své první FOB, a odtud začít svoji kampaň.<br/> <br/> 3. Objective @@ -4491,6 +4844,7 @@ 3. Objektifler 3. Objetivo 3. 작전 목표 + 3. Cíle <br/><br/>The primary objective of this campaign is to remove enemy forces from the region entirely. To achieve this, you will have to liberate ALL major cities within the region! This is the only victory condition for the campaign but those cities are tough nuts to crack with only limited resources at your disposal and a well established enemy force. <br/> <br/>To succeed, you will have to capture large number of different sectors, each with their own use.<br/> <br/> @@ -4502,6 +4856,7 @@ <br/><br/>作戰的最終目標是徹底將敵軍趕出這個地區，要達到這個目的，你必須解放本地區的所有主要城市！雖然這是作戰的唯一勝利條件，但在資源有限的情況下進攻這些防禦良好、又駐紮大量守軍的城市根本是天方夜譚。<br/> <br/>想要成功，你必須佔領各式各樣不同功效的戰區。<br/> <br/> <br/><br/>O objetivo primário desta campanha é remover completamente as forças inimigas da região. Para alçancar tal objetivo, você deverá liberar TODAS as principais cidades dentro da região! Esta é a única condição de vitória para a campanha, porém essas cidades serão difíceis de pacificar com recursos limitados à sua disposição. Além disso, as forças inimigas estão muito bem instaladas no território. <br/> <br/>Para lograr êxito, você deverá capturar uma extensa quantidade de setores, cada um com sua própria base de recursos.<br/> <br/> <br/><br/>이 반격 작전의 최종 목표는 모든 적을 이 지역에서 완전히 몰아내는 것이다. 하지만 대도시에는 많은 적군들이 있고, 이 적군들은 잘 정비되어 있으며 충분한 장비를 보유하고 있다.<br/> <br/>이러한 대도시를 점령하기 위해선 많은 군수물자를 필요로 한다.<br/> <br/>많은 군수물자를 확보하기 위해서는 다수의 다른 거점들을 점령해야 한다. 거점 종류는 총 5가지이며 각각 특별한 기능을 가지고 있다. 이것을 잘 활용하여 아군의 질과 양을 항상시켜 최종 목표를 달성해야 한다.<br/> <br/>주의!!! 민간인을 학살하거나 재산을 약탈하지 마라!!! 적군 민병대가 출현할 것이다!!!<br/> <br/> + <br/><br/>Hlavním úkolem je vyhnat jednotky OPFOR z oblasti. K dosažení, budete muset obsadit všechna hlavní města v oblasti. Toto je jediná podmínka vítězství kampaně.<br/> <br/>Ale tyto města budou oříšek, máte k dispozici jen omezené zdroje a města jsou obsazená po zuby ozbrojenými jednotkami OPFOR. <br/> <br/>Aby jste uspěly, budete muset obsadit mnoho jiných sektorů, každý za jiným účelem.<br/> <br/> 4. Sectors @@ -4515,6 +4870,7 @@ 4. Sektörler 4. Setores 4. 거점 + 4. Sektory <br/><br/>Sectors are split into 5 different types:<br/> <br/>- Points of Interest (PoI): Generally small to medium sized villages/towns. While strategically unimportant, these places are where the citizens of the region live and as such are key in obtaining their trust and sympathy.<br/> <br/>- Factories: Across the region you will find civilian factories under enemy control. These factories are specialized at creating one of the three resources (Supplies, Ammo, and Fuel), but can later be upgraded to produce all 3. As such they are a very strategic first target!<br/> <br/>- Military Bases: Home to large amounts of highly equipped enemy forces, these installations are heavily defended and will require large and well co-ordinated assaults if you have any hope in capturing them! Capturing these bases will enable us to deploy stronger assets in the region and are critical to your success.<br/> <br/>- Radio Towers (RT): When under enemy control, RTs will be used to call in reinforcements when a nearby sector is attacked by our own forces. The reaction time of the reinforcements will depend on the distance between the tower and the sector. When under friendly control, the towers will give useful map intel on hostile troop movements in the vicinity by intercepting their radio communications.<br/> <br/>- Major Cities: There are several major cities in the region. When all are under friendly control, we will most certainly have beaten back the enemy to a point where they cannot re-establish control. This is your primary objective.<br/> <br/> @@ -4526,6 +4882,7 @@ <br/><br/>戰區可以被分為五種不同的類型：<br/> <br/>- 興趣點（PoI）：一般都是小、中型村莊/小鎮，你可以升級楚瑜己方控制下的每個PoI（在建造完倉儲區後），並從三種用來生產軍需品和部隊的資源類型中選擇一種來生產。<br/> <br/>- 工場：敵軍控制的民用工廠散布在各個地方，由於只要為這些工廠設立倉儲區，就能從三種資源任選一種進行生產，這使得他們的戰略價值不言而喻，也使他們成為了兵家必爭之地！<br/> <br/>- 軍事基地：有著大量強大武裝的敵軍駐紮地，這類設施防守嚴謹，只有在投入毫不遜色的武力與良好的戰術決策才有可能攻陷它們！<br/> <br/>- 無線電塔（RT）：敵軍控制下的無線電塔將為附近受我軍部隊攻擊的戰區呼叫增援，增援的反應時間取決於無線電塔與戰區的距離。友軍所控制的無線電塔則能被用來監聽周遭設施並藉以取得敵軍部隊的最新動向。<br/> <br/>- 主要城市：地區內有多個主要城市，當所有城市都被我軍攻略時，才是真正解放這個地區的時候，而這也是就是你的主要目標！<br/> <br/> <br/><br/>Os setores estão divididos em 5 tipos distintos:<br/> <br/>- Pontos de interesse: Geralmente vilarejos/cidades de proporção pequena para média. Enquanto não tão importantes estratégicamente, esses locais são onde os cidadãos desta região vivem e dessa forma, é a chave para obter sua confiança e simpatia.<br/> <br/>- Fábricas: Em toda a região, você encontrará fábricas civis sob controle inimigo. Estas fábricas são especializadas no desenvolvimento de um dos três tipos de recursos (Suprimentos, Munição e Combustível), no entanto podem ser aprimorada para produzir todas as três classes de recursos, dessa forma, são alvos estratégicos e devem ser prioridade em seus esforços!<br/> <br/>- Bases Militares: Lar de uma vasta quantidade de forças inimigas bem equipadas, essas instalações são fortemente protegidas e requerem uma grande e bem coordenada força de assalto para de capturá-la. Ao capturar essas bases, será possível disponibilizar maiores recursos na região, que serão críticos para o seu sucesso.<br/> <br/>- Torres de Rádio: Quando sob domínio inimigo, as torres de rádio serão utilizadas para solicitar reforços quando um setor próximo estiver sendo atacado pela Coalizão. O tempo de reação dependerá da distância entre a torre e o setor. Quando estiver sob controle aliado, as torres fornecerão inteligência sobre a movimentação das tropas inimigas na proximidade. Isto será possível pois as torres interceptarão as frequências inimigas.<br/> <br/>- Grandes Cidades: Existem dezenas de grandes cidades na região. Quando estiverem sob controle da Coalizão, certamente não será possível ao inimigo retomar seu controle. Este é seu objetivo primário.<br/> <br/> <br/><br/>- 거점의 종류는 전부 5가지이다. 첫번째로 대도시는 큰 네모안에 세모가 그려져 있다. 대도시에는 잘 정비된 적군이 방어중이다. 이 곳을 점령하기 위해선 많은 병력이 필요하다. 참고로 모든 대도시를 점령하면 적군은 이 지역에서 후퇴할 것이다.<br/> <br/>- 두번째는 적군 군사기지로 마름모에 아래쪽에 선이 그려져 있으며 적군 기갑부대가 주둔하고 있다. 지속적으로 기계화부대를 동반한 수색정찰병을 내보고 있으며 근처 적군 도시를 공격하면 지원병을 보내기도 한다.<br/> <br/>- 세번째는 네모안에 통신탑이 그려져 있는 곳으로 '라디오타워'라고 한다. 이 곳을 점령하면 주변지역의 적 거점을 공격할때 적군들이 지원부대을 못부르거나 오더라도 적은 숫자만 오게 된다.<br/> <br/>- 네번째는 네모인데 가운데에 검은 점이 찍혀있는 것으로 '도시'이라고 한다. 이 곳을 점령하면 이용가능한 AI의 숫자가 증가(최대100명)한다.<br/> <br/>- 마지막으로 주유기 표시로 된 '공장'이다. 이 지역의 경우 도시 이름 옆에 (S),(A),(F)가 표기되어 있는데 이는 생산 가능한 보급품의 종류를 나타낸다. 즉 보급품은 (S), 탄약은 (A), 연료는 (F)이다.<br/> <br/>이 지역은 아군이 점령하게 되면 왼쪽 상단 메뉴안에 --저장창고 건설-- 이라는 메뉴가 생성된다. 마을내 적당한 곳에 저장창고를 건설하면 이 곳에 이 도시에서 생산되는 군수물자가 저장된다.<br/> <br/>이 군수물자를 AI 수송부대를 이용하여 전초기지로 운반하면 장비를 생산하는데 필요한 군수물자로 사용할 수 있게 된다.<br/> <br/> + <br/><br/>Sektory jsou rozděleny na 5 různých typů:<br/> <br/>- Body zajmu: obvykle malá a střední města, strategicky nedůležitá místa, kde žijí místní civilisté v klidu a harmonii.<br/> <br/>- Vojenské základny: plné jednotek OPFOR, tyhle základny jsou dobře bráněny a vyžadují silný a koordinovaný útok. Zajmutí těchto základen nám dovolí nasadit do boje novou techniku, která je kritická k našemu vítězství.<br/> <br/>- Továrny: Napříč celou oblastí mužete najít civilní továrny pod nepřátelskou kontrolou. Tyto továrny se specializují na výrobu jedné ze tří surovin (Zásoby, Munice, Palivo), ale později je lze vylepšit aby produkovaly všechny tři suroviny najednou. Jako takové jsou strategicky našim první cílem.<br/> <br/>- Rádiové věže: pod kontrolou OPFOR jednotek, slouží k přivolání posil do blízkých sektorů pod útokem. Rychlost reakce posil je dána vzdáleností radiové věže od sektoru. Ale pod kontrolou NATO jednotek, poskytují věže informace o pohybu nepřátelských jednotek v okolí za pomoci rádiové komunikace.<br/> <br/>- Hlavní města: V oblasti je několik Hlavních Měst. Pokud jsou všechna pod kontrolou NATO, vyhráváte.<br/> <br/> 5. Resources @@ -4539,9 +4896,10 @@ 5. Kaynaklar 5. Recursos 5. 군수물자 + 5. Zdroje - <br/><br/>In this campaign you have to manage, store and protect three types of resources:<br/> <br/><t color='#00ff00'>SUPPLIES:</t> These are the most essential. Without supplies, you will be unable to deploy additional soldiers or requisition any military hardware. As such, HQ recommends prioritising these first!<br/> <br/><t color='#ff0000'>AMMUNITION:</t> Used to stock armed vehicles such as APCs and MBTs as well as elite (and heavily armed) soldiers.<br/> <br/><t color='#ffff00'>FUEL:</t> Every vehicle needs fuel, some being more thirsty than others.<br/> <br/>You may come across all three resources in any sector but for a considerable and constant supply, you must capture Factory sectors! Once captured, factories require a storage area (scroll menu action) and then they can immediately begin producing their intended resource. If you can afford it, any factory can be upgraded to produce the other two resources as well. <br/> <br/> + <br/><br/>In this campaign you have to manage, store and protect three types of resources:<br/><br/><t color='#00ff00'>SUPPLIES:</t> These are the most essential. Without supplies, you will be unable to deploy additional soldiers or requisition any military hardware. As such, HQ recommends prioritising these first!<br/> <br/><t color='#ff0000'>AMMUNITION:</t> Used to stock armed vehicles such as APCs and MBTs as well as elite (and heavily armed) soldiers.<br/> <br/><t color = '#ffff00'>FUEL:</t> Every vehicle needs fuel, some being more thirsty than others.<br/> <br/>You may come across all three resources in any sector but for a considerable and constant supply, you must capture Factory sectors! Once captured, factories require a storage area (scroll menu action) and then they can immediately begin producing their intended resource. If you can afford it, any factory can be upgraded to produce the other two resources as well. <br/> <br/> <br/><br/>In dieser Kampagne müssen Sie drei Arten von Ressourcen verwalten, einlagern und beschützen:<br/> <br/><t color='#00ff00'>NACHSCHUB:</t> Diese sind von essenzieller Bedeutung. Ohne Nachschu können Sie weder Soldaten rekrutieren, noch militärisches Gerät anfordern. Daher empfiehlt HQ diese zu bevorzugen!<br/> <br/><t color='#ff0000'>MUNITION:</t> Werden für bewaffnete Fahrzeuge wie Spz und Kpz, sowie für Elite (schwerbewaffnete) Soldaten benötigt.<br/> <br/><t color='#ffff00'>KRAFTSTOFF:</t> Jedes Fahrzeug benötigt Kraftstoff. Einige sind durstiger, als andere.<br/> <br/>In den Sektoren können Sie durchaus alle drei Arten von Ressourcen finden, aber für einen signifikanten und konstanten Nachschub, müssen Sie PoI und Fabriken einnehmen. Nach Übernahme benötigen beide Lagerflächen (Scroll-Menü) und der PoI benötigt zusätzlich noch ein Fabrikgebäude (wieder Scroll-Menü). Alle drei Arten von Fabriken können in ein und dem selben PoI gebaut werden, jedoch müssen Sie eine erste und einzige Abgabe dafür bereitstellen! Das sind 50 von der Ressource, die nachher von der Fabrik produziert werden soll und je 100 der anderen beiden Ressourcen.<br/><br/> <br/><br/>En esta campaña tendrás que administrar, almacenar y proteger tres tipos de recursos:<br/> <br/><t color='#00ff00'>SUMINISTROS:</t> Estos son los más escenciales. Sin suministros, no podrás desplegar soldados adiciones ni solicitar mejoras militares. Como tal, HQ recomienda priorizar dichos recursos!<br/> <br/><t color='#ff0000'>MUNICION:</t> Se usa para reabastecer vehículos como APCs y Tanques, así como soldados de élite (altamente armados).<br/> <br/><t color='#ffff00'>COMBUSTIBLE:</t> Cada vehículo necesita combustible, algunos requieren más que otros.<br/> <br/>Quizá te cruces con los 3 tipos de recursos en un sector pero, para tener un fuente considerable y constante de suministros, deberás capturar sectores industriales! Una vez capturadas, las industrias requieren una zona de almacenamiento (acción en el menú escroleable) y después, ellos pueden empezar a productir los recursos deseados inmediatamente. Si puedes costearlo, cualquier industria puede ser mejorada para porducir los otros dos recursos también.<br/> <br/> <br/><br/>In questa campagna è necessario gestire, memorizzare e proteggere tre tipi di risorse:<br/> <br/><t color='#00ff00'>APPROVVIGIONAMENTI:</t> Questi sono i più essenziali. Senza approvvigionamenti, non sarete in grado di distribuire soldati o richiedere qualsiasi hardware militare. In quanto tale, HQ raccomanda di dare priorità a queste risorse per prime!<br/> <br/><t color='#ff0000'>MUNIZIONI:</t> Utilizzate per lo stoccaggio di veicoli armati come APC e MBT, nonché soldati di élite (e pesantemente armati).<br/> <br/><t color='#ffff00'>CARBURANTE:</t> Ogni veicolo ha bisogno di carburante, alcuni hanno più sete di altri.<br/> <br/>Puoi incontrare tutte e tre le risorse in qualsiasi settore, ma per una fornitura considerevole e costante, devi catturare i PDI e le Fabbriche! Una volta catturati, entrambi richiedono un'area di stoccaggio (menu rotellina) e poi un PDI richiederà anche la costruzione di strutture (nuovamente, menu rotellina). Tutte e tre le strutture possono essere costruite in qualsiasi PDI ma dovete fornire un costo iniziale per impostare queste strutture! Costo 50 della risorsa specifica e 100 delle altre due.<br/> <br/> @@ -4550,6 +4908,7 @@ <br/><br/>在這次作戰中你必須管理、囤積與保護三種資源：<br/> <br/><t color='#00ff00'>補給：</t>最關鍵的物資。一旦沒有補給，你將無法佈署更多士兵或其餘軍事資源，因此，指揮部建議優先謀取這項資源！<br/> <br/><t color='#ff0000'>彈藥：</t>用來採購步兵戰車（APC）和主戰坦克（MBT）等裝甲載具，同時也被用於招募武裝菁英的重裝士兵。<br/> <br/><t color='#ffff00'>油料：</t>載具的必需品，任何載具都需要油料，尤其是那些「大胃王」的大型載具們。<br/> <br/>在作戰過程中你或許能在任意戰區內搜刮到以上三種資源，但是為了解放這個區域，你勢必需要更穩定而有效的補給線，這時候你就需要去佔領興趣點(PoI)和工廠了！兩者都能在占領後建立一個倉儲區（用滾輪動作選單來建立），而興趣點還需要額外建立資源生產設施（依舊是滾輪動作選單)。一個PoI能夠同時建立三種生產設施，但你必須先投資才能全數建立起來！建造設施需要 50 點對應的資源與其餘兩個資源各 100 點。<br/> <br/> <br/><br/>Nesta campanha você deverá gerir, estocar e proteger três tipos de recursos.:<br/> <br/><t color='#00ff00'>SUPRIMENTOS:</t> Este é o recurso essencial. Sem suprimentos, será impossível mobilizar infantaria adicional ou requisitar equipamentos militares. Desse modo, o QG recomenda priorizar estes recursos!<br/> <br/><t color='#ff0000'>MUNIÇÃO:</t> Utilizada para abastecer veículos blindados armados, bem como soldados de elite de equipamento bélico pesado.<br/> <br/><t color='#ffff00'>COMBUSTÍVEL:</t> Todo veículo precisa de combustível, alguns consomem mais que outros.<br/> <br/>Você cruzará com todos os três tipos de recursos dispersos pelos setores, porém para adquirir uma quantidade considerável e abastecimento constante, você deverá capturar setores com fábricas/refinarias. Uma vez capturadas, as fábricas precisarão de um depósito (use o scroll do mouse) e então poderão imediatamente iniciar a produção do recurso pretendido. Se puder arcar com os custos, as fábricas poderão ser aprimoradas para produzir os demais recursos. <br/> <br/> <br/><br/>군수물자는 총 3가지 종류가 있다.<br/> <br/><t color='#00ff00'>보급품:</t> 보급품(S)은 가장 중요한 군수물자로, 보급품이 없으면 AI 보병을 비롯하여 모든 장비를 배치(생산)할 수 없다.<br/> <br/>또한 장비를 배치(생산)할 때 가장 많이 소비되는 보급품이다.<br/> <br/><t color='#ff0000'>탄약:</t> 탄약(A)은 무장한 장비를 배치(생산)할 때 필요하다.<br/> <br/><t color='#ffff00'>연료:</t> 연료(F)는 장비을 움직이기 위해서 꼭 필요한 보급품이며, 대형 장비는 더 많은 연료를 소비한다.<br/> <br/>각 군수물자는 지도에서 주유기 표시로 된 '공장 '에서 생산된다. 이 지역의 경우 도시 이름 옆에 (S),(A),(F)가 표기되어 있는데 이는 생산 가능한 보급품의 종류를 나타낸다. 즉 보급품은 (S), 탄약은 (A), 연료는 (F)이다.<br/> <br/>이 지역을 아군이 점령하게 되면 왼쪽 상단 메뉴안에 --저장창고건설-- 이라는 메뉴가 생성된다. 도시내 적당한 곳에 저장창고를 건설하면 이 곳에 이 마을에서 생산된 군수물자가 저장된다. 이 군수물자를 AI수송부대를 이용하여 전초기지로 운반하면 장비를 생산하는데 사용할 수 있게 된다.<br/> <br/>만약 이 '생산공장'에서 생산중인 물품을 변경하고자 한다면, 도시내에 설치한 저장창고로 공장건설에 필요한 군수물자(생산하고자 하는 군수물자 50, 나머지 두가지 군수물자 100)을 운반한 후 변경하고자 하는 군수물자의 생산공장을 건설하면 된다.<br/> <br/>생산품은 '생산 설정' 에서 변경할 수 있고, AI 수송부대는 물류 개요' 에서 편성할 수 있다.<br/> <br/>아군 AI 수송부대의 트럭은 1회에 1대당 최대 200개의 군수물자를 운반할 수 있다.<br/> <br/> + <br/><br/>V této kampani musíte spravovat, ukládat a chránit tři typy zdrojů:<br/> <br/><t color = '#00ff00'>SUROVINY :</t> Toto jsou nejdůležitější. Bez spotřebního materiálu nebudete moci nasadit další vojáky ani zabavit vojenskou techniku. Velitelství jako takové doporučuje prioritu těchto prvních!<br/> <br/><t color = '# ff0000' >MUNICE:</t>Používá se k zásobě ozbrojených vozidel, jako jsou APC a MBT, stejně jako elity (a těžce vyzbrojení) vojáci.<br/> <br/><t color = '#ffff00'>PALIVO:</t>Každé vozidlo potřebuje palivo, některé jsou více žíznivé než ostatní.<br/> <br/>Možná narazíte na všechny tři zdroje v jakémkoli sektoru, ale pro značnou a stálou dodávku musíte zachytit tovární sektory! Jakmile jsou továrny zachyceny, vyžadují úložný prostor (akce nabídky posouvání) a poté mohou okamžitě začít vyrábět zamýšlený zdroj. Pokud si to můžete dovolit, může být každá továrna upgradována tak, aby vytvořila další dva zdroje. <br/> <br/> 6. Alert Level @@ -4563,6 +4922,7 @@ 6. Uyarı Seviyesi 6. Nível de Alerta 6. 경고수준 + 6. Úroveň pohotovosti <br/><br/>The enemy won't let you liberate all of its brand new territory without a reaction. When you begin the campaign, hostile forces will only be composed of the garrisons inside military bases. However as you become more threatening by liberating more and more sectors, they will start calling in more reinforcements and equipment to counter you.<br/> <br/>To limit the enemies operational capabilities, you will have to fulfill secondary objectives that will consist of destroying their logistical bases and raiding their convoys. This is not required to win the campaign but if you ignore the alert level for too long, you're in for quite a lot of resistance.<br/> <br/> @@ -4574,6 +4934,7 @@ <br/><br/>敵人不可能任你為所欲為。作戰剛開始時，敵軍部隊僅由本地軍事基地的駐紮部隊構成，但解放的戰區越多將使你對他們的威脅度也越來越高，而這也將促他們派出更多、更好與更強的部隊與人手來對付你。<br/> <br/>想要遏制住敵人的作戰能力，你必須透過摧毀敵方前線基地、掠奪對方補給車隊等次要任務來破壞他們對你的威脅度評估。次要任務並非這次作戰的必要項目，但坐視警戒度的提升將大大地提升敵人的抵抗強度！<br/> <br/> <br/><br/>O inimigo não irá permitir a conquista de seu território sem uma reação. Quando iniciar sua campanha, forças hostis serão apenas compostas por guarnições dentro de bases militares. No entanto, ao liberar mais setores, as forças inimigas chamarão mais reforços e equipamentos para tentar te combater.<br/> <br/>Para limitar a capacidade operacional das forças de oposição, você deverá cumprir objetivos secundários que consistem na destruição de bases logísticas e no assalto aos comboios inimigos. Isto não é obrigatório para lograr êxito na campanha, todavia se o nível de alerta for ignorado por muito tempo, você enfrentará uma forte resistência inimiga.<br/> <br/> <br/><br/>처음 반격 작전을 시작할 때에 적군들은 우리를 우습게 여길 것이다! 하지만 작전이 진행될 수록 적군들은 우리를 위험하게 느끼게 될 것이고 점점 더 많은 적군부대와 부딛치게 될 것이다.<br/> <br/>적군의 작전 능력을 억제하려면, 부차적인 임무수행을 통해 적의 후방보급기지를 파괴하거나, 보급차량을 습격, 전방으로 향하는 군수물자를 파괴하여야 한다.<br/> <br/>만약에 강력한 적군과 부딛치는 것을 두려워하지 않는다면, 부차적인 임무는 무시하고 오로지 적진을 향해 돌격하라!!!<br/> <br/> + <br/><br/>Jednotky OPFOR vás nenechají obsazovat nové sektory bez jakékoliv reakce. Na začátku kampaně jsou nepřátelé schováni pouze v nepřátelských základnách. Nebezpečí však vzrůstá s každým obsazeným sektorem, jednotky OPFOR si častěji přivolají posily, vozidla a jiné vybavení proti vám.<br/> <br/>Ke snížení nebezpečí musíte plnit vedlejší mise, například zničení logistické základny. Tohle není nutné k vyhrání kampaně a však pokud budete ignorovat vzrůstající nebezpečí, mohou přijít velké problémy.<br/> <br/> 7. Construction @@ -4587,6 +4948,7 @@ 7. İnşa etmek 7. Construção 7. 건설(배치) + 7. Stavění <br/><br/>To help you succeed in your endeavors, you have a construction capability at every FOB that allows you to deploy infantry, vehicles, defenses, fortifications and so on to your specific location.<br/> <br/>Although infantry, vehicles and defenses will cost resources, fortifications such as structures, sandbags and walls will not.<br/> <br/>The construction system will be available when you are within 100 meters of any FOB.<br/> <br/> @@ -4598,6 +4960,7 @@ <br/><br/>為了協助你成功解放這裡，指揮部允許你在每個前線基地周遭限定的範圍內佈署步兵、載具、防禦工事等軍備設施與建造工事。<br/> <br/>步兵、載具和防禦設備（如固定式武器）需要消耗資源，但建築、沙包、掩體等工事是完全免費的。<br/> <br/>你可以在前線基地半徑 100 公尺內使用建造系統。<br/> <br/> <br/><br/>Para auxiliar no sucesso de sua iniciativa, você terá a capacidade de construir em todas suas bases avançadas, que o permitirá mobilizar infantaria, veículos, defesas, fortificações e etc para sua localidade.<br/> <br/>Embora infantaria, veículos e defesas exijam recursos para seu desenvolvimento, fortificações como estruturas, sacos de areia e muros não terão custo.<br/> <br/>O sistema de construção estará disponível quando você estiver a 100 metros de qualquer FOB.<br/> <br/> <br/><br/>전초기지나 장비 또는 AI 보병을 건설(배치)하기 위해선 우선 관리자로부터 권한을 획득해야 한다. 권한을 획득한 후 제한된 갯수의 전초기지를 건설 할 수 있고, 전초기지를 건설한 후 125m거리 이내에서 장비를 생산(배치) 할 수 있다.<br/> <br/>전초기지를 건설하게 되면 제일 먼저 소형 또는 대형 저장 창고부터 건설해야 한다. 이 창고로 AI 수송부대를 이용하여 각 거점에서 생산된 군수물자를 운반, 필요한 장비를 건설(배치)해야 한다. 각 전초기지에 보관중인 보급품은 공유할 수 없다.<br/> <br/>따라서 전선이 이동하게 되면, 후방의 전초기지에 저장중인 군수물자를 새로이 건설한 전방의 전초기지로 AI 수송부대를 이용하여 운반해야 한다.<br/> <br/>아군 AI 수송부대의 트럭은 1회에 1대당 최대 200개의 군수물자를 운반할 수 있다.<br/> <br/>주의! 지역 민간인들의 지지가 없다면 적 민병대가 출현하여 아군 AI 수송부대를 습격, 군수물자를 파괴하거나 도난 당할 수 있으니 작전시 민간인을 학살하거나 재산을 약탈하지 않는다.<br/> <br/> + <br/><br/>Abyste uspěly ve své snaze, máte možnost stavět jednotky, vozidla a opevnění. Samozřejmě v závislosti na zdrojích.<br/> <br/>Ačkoli pěchota, vozidla a obrana budou stát zdroje, opevnění, jako jsou budovy, pytle s pískem a zdi, nikoliv.<br/> <br/>Systém stavění je dostupný do 150 metrů od FOB. Tehdy se vám objeví možnost stavět v kontextové nabídce.<br/> <br/> 8. Deploying another FOB @@ -4611,6 +4974,7 @@ 8. Başka bir FOB kurmak 8. Instalando outra FOB 8. 전초기지(FOB) + 8. Zřízení FOB <br/><br/>To build a brand new FOB, go to the construction menu and then the logistics tab and build a FOB container or a FOB truck (the same thing, only with wheels). Then you can position the FOB container/truck where you want to deploy your shiny new FOB. However, be aware that you can't build a FOB within 1km of your starting position, within 300m of any sector, or within 2km of any other FOB.<br/> <br/>That would simply be redundant!<br/> <br/> @@ -4622,6 +4986,7 @@ <br/><br/>要建立一个新的前線基地，打開建造選單的後勤面板，並建立一個前線基地貨櫃或前線基地載具（一樣的東西，只是多個輪子）。然後你就能帶著前線基地貨櫃或前線基地車到任何你想佈署的位置進行佈署了。注意，你不能在起始作戰基地 1 公里內、戰區 300 公尺内，或是其它前線基地 2 公里内部署前線基地。<br/> <br/>因為這麼多前線基地實在是太多餘了！<br/> <br/> <br/><br/>Para construir uma nova FOB, acesse o menu de construção, selecione a aba de logística e então construir FOB no conteiner ou uma FOB transportável (é a mesma coisa, mas com rodas). Em seguida, poderá posicionar sua linda e nova FOB (transportável ou no conteiner) onde desejar. No entanto, esteja ciente de que não poderá construir a FOB dentro de 1km da sua posição inicial, dentro de 300 metros de qualquer setor ou dentro de 2km de outra FOB.<br/> <br/>Seria simplesmente redundante!<br/> <br/> <br/><br/>최초 작전 기지 또는 이미 건설된 전초기지의 건설(배치)메뉴에서 FOB container 또는 FOB truck을 찾을 수 있을 것이다. FOB truck을 선택하여 생산한 후 배치하고 싶은 지역으로 이동하여 건설(설치)하면 된다.<br/> <br/>단, 최초 작전기지로 부터 1Km, 거점으로부터 300m, 다른 전초기지로부터 2Km 이내에는 설치를 할 수 없다.<br/> <br/>7항 건설(배치)에서 설명하였듯이 전초기지를 건설하게 되면 제일 먼저 소형 또는 대형 저장 창고부터 건설해야 한다. 이 후 AI 수송부대를 이용하여 각 거점 또는 후방의 전초기지에 보관중인 군수물자를 운반, 필요한 장비를 건설(배치) 하면 된다.<br/> <br/>주의! 지역 민간인들의 지지가 없다면 적 민병대가 출현하여 아군 AI 수송부대를 습격, 군수물자를 파괴하거나 도난 당할 수 있으니 작전시 민간인을 학살하거나 재산을 약탈하지 않는다.<br/> <br/> + <br/><br/>K postavení nového FOB, jděte do stavebního menu a pote do logistické záložky, poté postavte FOB kontejner nebo FOB náklaďák (to je to samé ale na kolech).<br/> <br/>Poté přesuňte kontejner na místo kde rozložíte z brusu nové FOB. Mějte se však na pozoru, FOB nelze postavit uvnitř obsazeného sektoru nebo ve vzdálenosti 2km od jiného FOB a 1km od startovní základny.<br/> <br/>To by bylo prostě zbytečné!<br/> <br/> 9. Secondary Objectives @@ -4635,6 +5000,7 @@ 9. İkincil Objektifler 9. Objetivos Secundários 9. 부차적인 임무 + 9. Vedlejší úkoly <br/><br/>When you capture sectors, sometimes the few hostiles forces remaining will surrender. You can then capture those prisoners and take them back to a nearby FOB to be interrogated.<br/> <br/>That interrogation, executed in the utmost respect of the Geneva Convention, will allow you to obtain information which can be used to reveal the rough position of an enemy logistics base, enemy convoy or friendly search and rescue.<br/> <br/>After going there you will need to find the exact position of your target, then use any means at your disposal to complete your objective. Succeeding at this task will be rewarded, reducing the alert level consequently and with it the efficiency of all hostile forces.<br/> <br/> @@ -4646,6 +5012,7 @@ <br/><br/>有时候當你占領戰區時，一些敵軍殘兵會選擇投降。你可以將他們抓到任何一個前線基地（不包含起始作戰基地）進行審問。<br/> <br/>審問後獲得的情資將能用來定位出敵方前線基地或補給車隊的大致位置、或是換取搜索與營救友軍的準確情報。<br/> <br/>之後你必須找到這些目標的精確位置並不惜代價完成任務。任務成功的獎勵將降低敵方的警界度，並進而削弱所有敵軍的戰鬥能力。<br/> <br/> <br/><br/>Quando você capturar setores, em algumas situações as forças hostis remanescentes se renderão. Você poderá capturar os prisioneiros e levá-los para a FOB mais próxima para serem interrogados.<br/> <br/>O interrogatório, executado em observância à Convenção de Genebra, o permitirá a obtenção de informações que podem ser empregadas para revelar a posição aproximada da base de logística inimiga, comboio inimigo ou operações de busca e resgate de forças aliadas.<br/> <br/>Após chegar na área de operações, você precisará identificar a localização exata do seu alvo, e então fazer uso dos meios necessários à sua disposição para concluir seu objetivo. Ao lograr êxito em sua tarefa, serão recompensados, reduzindo o nível de alerta reducing the alert level inimigo e consequentemente a eficiência de todas as forças hostis.<br/> <br/> <br/><br/>적군의 거점들을 점령하다보면 간혹 포로를 잡을 수 있다. 이 포로를 아군 전초기지로 호송하여 심문하게 되면 정보점수가 올라간다.<br/> <br/>이 정보 점수를 사용하여 부차적인 임무 3가지를 반복해서 진행할 수 있는데, 임무를 성공하면, 적군의 작전 능력을 떨어트리거나, 더 많은 정보 점수, 또는 군수물자를 보상으로 받게 된다.<br/> <br/> + <br/><br/>Když obsadíte sektor, někdy se stane že některé nepřátelské jednotky zůstanou a vzdají se. Ty můžete zajmout a převést do nejbližší FOB kde budou vyslechnuti.<br/> <br/>Z výslechu, z úcty k Ženevským konvencím, můžete zjistit vice nebo méně přesné informace o nepřátelských logistických základnách, nepřátelských konvojích nebo o spojeneckých zajatcích.<br/> <br/>Poté, co tam půjdete, budete muset najít přesnou polohu vašeho cíle, a pak pomocí jakýchkoli prostředků, které máte k dispozici, dokončete svůj úkol. Úspěch v tomto úkolu bude odměněn, čímž se sníží úroveň pohotovosti a tím i účinnost všech nepřátelských sil.<br/> <br/> 10. Commanding @@ -4659,6 +5026,7 @@ 10. Komuta etmek 10. Comandando 10. 지휘 및 기타정보 + 10. Velení <br/><br/>When a player uses the Commander role, they get access to the Zeus interface by pressing the corresponding key (Y by default). This interface allows the commanding of friendly forces in 3D or map view.<br/> <br/>Moreover the commander gets additional build options that will allow them to obtain crewed vehicles or entire pre-made squads.<br/> <br/>This role is now mandatory, as it provides direct access to the management of production sectors and AI logistics. Given that you are positioned by a FOB, you will see the options "Production Settings" and "Logistic Overview".<br/> <br/> The first enables the ability to decide which Factory produces which specific resources, as well as a detailed current overview.<br/> <br/> The latter allows you to command an AI logitical convoy, where you may "Add" logistical groups, purchase any amount of trucks per group and command them to move specific amounts of resources across the region for you.<br/> <br/> @@ -4670,6 +5038,7 @@ <br/><br/>當一名玩家扮演指揮官角色時，他將會得到使用宙斯功能的權限，該介面讓玩家可以在 3D 或地圖視角中指揮友軍部隊。<br/> <br/>除此之外，指揮官還有額外的建築選項，讓他可以招募載有友軍單位的載具或一整個預設的 AI 班級。<br/> <br/>現階段由於該角色有著戰區產出管理與AI後勤管理的直接權限，因此必須有玩家進行操作。當處於前線基地的範圍內時，你將會看到「產出設定」和「後勤總覽」兩個選項。<br/> <br/>前者有著指定PoI和工廠資源產出類型，以及察看總覽細項的功能。<br/> <br/>後者則讓你能夠指揮 AI 車隊，其中你可以「添增」後勤單位、為後勤單位購買任意數量的卡車，並指揮他們在指定區域之間來往進行運輸物資。<br/> <br/> <br/><br/>Quando um jogador assume a função de comandante, ele recebem acesso à interface Zeus ao pressionar a tecla correspondente (a tecla padrão é 'Y'). Essa interface permite o comando de forças aliadas na plataforma 3D ou através do mapa.<br/> <br/>Ademais, o comandante recebe opções adicionais de construção que o permitirão obter veículos tripulados ou grupos predeterminados.<br/> <br/>Tal função é agora obrigatória, pois possibilita acesso direto à gestão dos setores de produção e logísticas automatizadas. Quando estiver posicionado numa FOB, você poderá observar as opções "Configuração de Produção" e "Visão Geral de Logística".<br/> <br/> A primeira habilita a capacidade de decidir que fabrica/refinaria irá produzir qual recurso específico, bem como uma visão geral detalhada sobre o serviço.<br/> <br/> O último permite a você comandar o sistema automatizado de comboio logístico, onde você poderá "adicionar" grupos logísticos, adquirir quantos transportes desejar e os comandar para transportar quantidades específicas de recursos através do território.<br/> <br/> <br/><br/>- 지휘 :<br/> <br/>지휘권한은 관리자가 허가한 자만이 획득할 수 있다. 지휘자는 각 거점에서 생산되고 있는 군수물자를 지정하거나 내역을 살펴 볼 수 있고, 각 군수물자를 AI수송부대를 이용하여 운반할 수 있다. 또한 제우스 기능을 사용할 수 있다.<br/> <br/>- 기타 정보 :<br/> <br/>항공기를 사용하기 위해서는 반드시 '비행 관제소'를 먼저 만들어야만 한다. 이후 '항공기 격납고'를 만들고 항공기를 배치한다. 항공기 격납고 수에 따라 운행할 수 있는 항공기 숫자가 결정된다.<br/> <br/>비행장은 평지라 할지라도 습기가 많은 지역은 항공기 이착률이 힘들기 때문에 적군 비행장을 점령하여 사용하기를 권한다.<br/> <br/>고급 장비는 특정한 군사기지를 점령해야만 전초기지에서 생산(배치)할 수 있다. 지도에 보면 군사기지 이름 옆에 원이 그려져 있고 체크가 된 곳이 있는데 이 곳을 점령하게되면 체크 옆에 표기되어 있는 장비를 생산(배치)할 수 있게 된다.<br/> <br/>전투에 사용한 장비는 반드시 전초기지로 가지고 귀환해야 한다. 전초기지범위 밖에 있으면 사라지기 때문이다. 노획장비 또한 없어지지 않기 때문에 반드시 전초기지로 귀환해서 접속종료를 하기 바란다.<br/> <br/>AI은 1플레이어가 최대 12명까지 뽑아서 사용할 수있으나, 지휘하기엔 의무병과 공병을 포함하여 3~5명정도를 추천한다.<br/> <br/>함부로 민간인을 학살하거나 재산(특히 집)을 파괴하거나 약탈(차량같은 것)하지 말라. 민병대 출현하게 되면 머리 아프다.<br/> <br/>민간인들에게 환영받기 위해서는 부상당한 민간인(간혹 지도에 보라색이 생김)들을 도와줘라.<br/> <br/>끝으로 재미있는 게임 시간이 되길 바란다!<br/> <br/> + <br/><br/>Když hráč použije roli Velitele, získá přístup k rozhraní Zeus stisknutím odpovídající klávesy (ve výchozím nastavení Y). Toto rozhraní umožňuje velení přátelských sil v zobrazení 3D nebo mapy.<br/> <br/>Navíc komandér získá přístup postavit vozidla s posádkou nebo celé předvytvořené družstva.<br/> <br/>Tato role je důležitá, a jako taková dává přímý přístup k spravování produkce v sektorech a logistice AI. Pokud budete stát na FOB, dostanete možnosti "Nastavení produkce" a "Logistický přehled".<br/> <br/> První vám dá možnost nastavit která továrna bude produkovat kterou surovinu, jako také detailní přehled.<br/> <br/> Písmena vám dovolí rozkazovat AI logistickým konvojům, kde můžete "Přidat" logistické skupiny, koupit jakékoliv množství náklaďáků na skupinu a přikázat jim převážet specifické množství surovin napříč celou oblastí pro vás.<br/> <br/> Arsenal mode @@ -4682,6 +5051,7 @@ Ekipman(Arsenal) modu Modo do Arsenal 무기고 모델 + Nastavení Zbrojnice No restrictions @@ -4694,6 +5064,7 @@ Kısıtlama yok Sem restrições 제한 없음 + Bez Omezení Use preset from config @@ -4706,6 +5077,7 @@ config.sqf kullan Usar predefinição de config.sqf 사용자 설정(기본임무설정) + Použít nastavení z configu -- PUSH CRATE @@ -4718,6 +5090,7 @@ -- KUTUYU İTTİR -- EMPURRAR CAIXA -- -- 군수물품 밀기 + -- TLAČIT KRABICI -- STACK AND SORT @@ -4730,6 +5103,7 @@ -- SIRALA VE DÜZENLE -- ORDENAR E CLASSIFICAR -- -- 군수물품 재배치/분류 + -- SESKUPIT A ROZTŘÍDIT @@ -4741,6 +5115,7 @@ BI支援模塊系統權限 Acesso ao Módulo de Suporte da Bohemia Interactive BI 지원 단위 시스템 권한 + BI Modul podpory Přístup do systému Commander only @@ -4753,6 +5128,7 @@ Sadece komutan Apenas comandante 지휘관 + Pouze Komandér Whitelisted only @@ -4765,6 +5141,7 @@ Sadece beyaz listedekiler Apenas quem está na lista de permissão 등록된 사용자 + Pouze whitelist Everyone @@ -4777,6 +5154,7 @@ Herkes Todos 모든 사용자 + Kdokoliv -- Extended Options -- @@ -4789,6 +5167,7 @@ -- Gelişmiş Ayarlar -- -- Opções Avançadas -- -- 확장 옵션 -- + -- Rozšířené Možnosti -- Extended Options @@ -4801,6 +5180,7 @@ Gelişmiş Ayarlar Opções Avançadas 추가 설정 + Rozšířené Možnosti - disabled - @@ -4813,6 +5193,7 @@ - kapalı - - desativado - - 비활성화 - + - vypnuto - Squad Management @@ -4825,6 +5206,7 @@ Tim Yönetimi Gestão de equipe 분대 관리 + Správa Družstva Join @@ -4837,6 +5219,7 @@ Katıl Se juntar 참가 + Přidat se Create @@ -4849,6 +5232,7 @@ Yarat Criar 만들기 + Vytvořit Rename @@ -4861,6 +5245,7 @@ Yeniden Adlandır Renomear 이름변경 + Přejmenovat Leader @@ -4873,6 +5258,7 @@ Lider Líder 분대장위임 + Velitel Cancel @@ -4885,6 +5271,7 @@ İptal Cancelar 취소 + Zrušit Choose @@ -4897,6 +5284,7 @@ Seç Selecionar 선택 + Vybrat Platoon and Squad Awareness @@ -4909,6 +5297,7 @@ Platon ve Tim Farkındalığı Indicador de grupo no mapa 분대 추가 기능 설정 + Ostražitost Týmů a Družstev Show platoon overlay: @@ -4921,6 +5310,7 @@ Platonu ekranda göster: Mostrar indicador de pelotão: 아군 분대명 보이기 설정: + Zobrazit přehled družstev: active @@ -4933,6 +5323,7 @@ aktif Ativo 활성화 + aktivní Show player nametags: @@ -4945,6 +5336,7 @@ Oyuncu isimlerini göster: Mostrar nome dos jogadores 아군 플레이어 이름 보이기 설정: + Zobrazit hráčské jmenovky: Yes @@ -4957,6 +5349,7 @@ Evet Sim 예 + Ano No @@ -4969,6 +5362,7 @@ Evet Não 아니요 + Ne Adjust View Distance @@ -4981,6 +5375,7 @@ Görüş Mesafesi Ajustar distância de visão 가시거리 설정 + Přizpůsobit Dohled View Distance @@ -4993,6 +5388,7 @@ Görüş Mesafesi Distância de visão 가시거리 + Dohled Infantry @@ -5005,6 +5401,7 @@ Kara Askeri Infantaria 보병 + Pěchota Vehicles @@ -5017,6 +5414,7 @@ Araçlar Veículos 차량 + Vozidlo Objects @@ -5029,6 +5427,7 @@ Objeler Objetos 사물 + Objekty Adjust view distance to keep FPS above @@ -5041,6 +5440,7 @@ Görüş mesafesini ayarlarak FPS'i yüksek tutun Ajustar distância de visão para manter FPS acima de 설정한 프레임에 맞게 시야거리 조절 + Přizpůsobit dohled k zachování FPS nad Adjust Terrain Details @@ -5053,6 +5453,7 @@ Yer Detayı Ayarı Ajustar detalhes do terreno 지형 그래픽 설정 + Přizpůsobit detaily terénu Very Low @@ -5065,6 +5466,7 @@ Çok Düşük Muito baixo 매우 낮음 + Velmi nízké Low @@ -5077,6 +5479,7 @@ Düşük Baixo 낮음 + Nízké Normal @@ -5089,6 +5492,7 @@ Normal Normal 보통 + Normální High @@ -5101,6 +5505,7 @@ Yüksek Alto 높음 + Vysoké Show teammates on map: @@ -5113,6 +5518,7 @@ Dostları haritada göster: Mostrar membros da equipe no mapa: 지도에 아군 플레이어 표시 설정: + Zobrazit spoluhráče na mapě: In-Vehicle Sound Volume @@ -5125,6 +5531,7 @@ Araç-içi Ses Volume do som dentro do veículo 차량 탑승시 소리크기 설정 + Hlasitost ve vozidle Test @@ -5137,6 +5544,7 @@ Test Teste 실험 + Test Respawn @@ -5149,6 +5557,7 @@ Yeniden Doğ Respawn 재생 + Respawn Replace nearest AI @@ -5161,6 +5570,7 @@ En yakındaki AI ile değiş Substituir IA mais próxima 가장 가까운 AI + Nahradit nejbližší AI A civilian named %1 was killed! @@ -5173,6 +5583,7 @@ %1 ismindeki sivil öldürüldü! Um civil de nome %1 foi morto! 민간인 %가 사망하였다! + Civilista jménem %1 byl zabit jednotkami BLUFOR! A civilian's vehicle was seized! @@ -5185,6 +5596,7 @@ Bir sivil aracı ele geçirildi! Um veículo de civil foi tomado! 민간인의 차량이 탈취되었다! + Civilní vozidlo bylo zajato jednotkami BLUFOR! Civilians are complaining about %1 lost buildings. @@ -5197,6 +5609,7 @@ Siviller %1 kadar yıkılan binaları hakkında konuşuyorlar. Civis estão reclamando sobre %1 construções destruídas 민간인들이 %1 건물이 파괴된 것에 대해 불평하고 있다. + Civilisté si stěžují na %1 zničené budovy. Civilian named %1 is thankful for your help. @@ -5207,6 +5620,7 @@ Um civil chamado %1 agradeceu sua ajuda. 平民 %1 感謝你的幫助。 시민 %1 가 도와줘서 고맙다고 인사한다. + Civilista jménem %1 ti děkuje za pomoc. Civil Reputation penalty for buildings if building is @@ -5219,6 +5633,7 @@ Şu türdeki binalara ceza verilince, ceza uygulanır Penalidade na reputação civil se a construção estiver 평판에 영향을 주는 민간 건물 파괴 정도 + Penalizace reputace u civilistů pokud je budova damaged @@ -5231,6 +5646,7 @@ zarar görmüş Danificada 손상시 + poškozená fully destroyed @@ -5243,6 +5659,7 @@ tamamen yokedilmiş Totalmente destruída 완전 파손시 + kompletně zničena SERVER RESTART NOTIFICATION @@ -5255,6 +5672,7 @@ 伺服器重啟提醒 NOTIFICAÇÃO DE REINÍCIO DO SERVIDOR 서버 재시작 알림! + OZNÁMENÍ O RESTARTU SERVERU The server will restart in less than 60 seconds! @@ -5267,6 +5685,7 @@ 伺服器將在 60 秒內重啟！ O servidor irá reiniciar em menos de 60 segundos! 서버가 60초후 재시작 됩니다! + Server se restartuje za méně jak 60 vteřin! The server will restart in less than 5 minutes! @@ -5279,6 +5698,7 @@ 伺服器將在 5 分鐘內重啟！ O servidor irá reiniciar em menos de 5 minutos! 서버가 5분후 재시작 됩니다. + Server se restartuje za méně jak 5 minut! The server will restart in less than 15 minutes! @@ -5291,6 +5711,7 @@ 伺服器將在 15 分鐘內重啟！ O servidor irá reiniciar em menos de 15 minutos! 서버가 15분후 재시작 됩니다. + Server se restartuje za méně jak 15 minut! The server will restart in less than 30 minutes! @@ -5303,6 +5724,7 @@ 伺服器將在 30 分鐘內重啟！ O servidor irá reiniciar em menos de 30 minutos! 서버가 30분후 재시작 됩니다. + Server se restartuje za méně jak 30 minut! Automatic Server Restart after (hours) @@ -5315,6 +5737,7 @@ 自動重啟伺服器時間（小時） Reinício automático do servidor após (horas) 자동 서버 재시작(시간) + Automatický restart serveru za (hodiny) == DEBUG MESSAGES == @@ -5327,6 +5750,7 @@ == 除錯訊息 == == MENSAGENS DE DEBUG == == 정보 수집 메세지 == + == DEBUGOVACÍ ZPRÁVY == Civil Informant @@ -5338,6 +5762,7 @@ 民間線人 Informante Civil 민간인 정보원 + Civilní Informace Civil Reputation @@ -5349,6 +5774,7 @@ 民間聲望 Reputação Civil 민간인 평판 + Civilní Reputace A civilian from %1 says he has some information for us. @@ -5361,6 +5787,7 @@ 來自 %1 的一位平民說他有情報要交給我們。 Um civil de %1 disse que possui algumas informações para nos apresentar. %1 이름의 민간인이 우리에게 정보가 있다고 접근중이다. + Civilista z %1, říká že má pro nás nějakou informaci. The civilian gave us some important information. @@ -5373,6 +5800,7 @@ 平民給了我們一些重要情報。 Um civil nos concedeu algumas informações importantes. 민간인들이 우리에게 중요한 정보를 몇가지 알려 주었다. + Civilista nám dal nějaké důležité informace. The civilian has disappeared. @@ -5385,6 +5813,7 @@ 平民消失了。 Um civil desapareceu. 민간인이 행방불명되었다. + Civilista odešel. The civilian died. @@ -5397,6 +5826,7 @@ 平民死亡了。 Um civil morreu. 민간인이 사망하였다. + Civilista umřel. Asymmetric Threat @@ -5408,6 +5838,7 @@ 非對稱威脅 Ameaça Assimétrica 비대칭 위협 + Asymmetric Threat Logistic @@ -5420,6 +5851,7 @@ 後勤 Logística 물류 + Logistika Logistic Convoy Ambush @@ -5432,6 +5864,7 @@ 後勤車隊遭到襲擊 Emboscada no Comboio Logístico 아군 AI수송부대가 습격을 당했다. + Přepadení Logistického konvoje Guerilla forces attacking our convoy near %1. @@ -5444,6 +5877,7 @@ 游擊隊正在 %1 附近攻擊我們的車隊 Forças de guerrilha estão atacando nosso comboio nas proximidades de %1. 적군 민병대가 1% 부근에서 아군 AI수송부대를 공격하고 있다! + Odboj přepadl náš konvoj poblíž %1. The ambush was successfully repelled. @@ -5456,6 +5890,7 @@ 成功擊退了游擊隊。 A emboscada foi frustrada com sucesso. 아군 AI수송부대에 대한 적 민병대의 공격을 성공적으로 막아내었다. + Přepadení bylo úspěšně odraženo The guerilla forces escaped with the convoy resources. @@ -5468,6 +5903,7 @@ 游擊隊搶走了車隊物資。 As forças de guerrilha escaparam com os recursos do comboio. 적군 민병대가 아군 AI수송부대가 운반중이던 군수물자를 탈취하였다. + Odboj uprchl se surovinami z konvoje. Sectorspawn @@ -5478,6 +5914,7 @@ 戰區刷新 Spawn do setor 거점재생 + Sectorspawn Killed units @@ -5488,6 +5925,7 @@ 擊殺單位 Unidades mortas 적군 사살 + Zabité jednotky Treat the civilian (field dressing) @@ -5499,6 +5937,7 @@ 治療平民（基礎繃帶） Preste socorro ao civil (curativo) 민간인 치료 + Ošetřit civilistu(pomocí bandáže) You need a field dressing. @@ -5510,6 +5949,7 @@ 你需要一個基礎繃帶。 Você precisa de curativo. 붕대가 필요하다. + Potřebuješ ošetřit. There is a high ranked officer near %1. @@ -5521,6 +5961,7 @@ %1 附近有一名高級軍官。 Há um oficial de alta patente nas proximidades de %1. %1 근처에 적군의 고급 장교가 있는 것으로 파악되었다. + Důstojník s vysokou hodností poblíž %1. The officer was successfully killed. @@ -5532,6 +5973,7 @@ 成功刺殺了軍官。 O oficial foi morto. Missão cumprida. 적군 장교를 암살하는데 성공하였다. + Důstojník úspěšně zabit. The officer has moved on. @@ -5543,6 +5985,7 @@ 軍官逃離了。 O oficial escapou. 적군 장교가 이동중이다. + Důstojník utekl. Mobile Respawn Cooldown (minutes) @@ -5554,6 +5997,7 @@ 機動重生點每次重生所需冷卻時間（分鐘） Tempo de espera do respawn móvel (minutos) 재투입차량에서 재생시 필요한 대기 시간(분) + Mobilní respawn cooldown (minuty) %1 minutes mobile respawn cooldown left. @@ -5565,6 +6009,7 @@ 機動重生點還需要 %1 分鐘冷卻。 Falta(m) %1 minuto(s) de tempo de espera do respawn móvel. %1 분 남음(재투입차량에서 재생대기시간) + Zbývá %1 minut na mobilní respawn. An allied resistance fighter named %1 was killed! @@ -5576,6 +6021,7 @@ 一名叫做 %1 的友軍抵抗軍戰士陣亡了！ Um aliado das forças de resistência de nome %1 foi morto! % 라고 하는 아군에 협조한 민병대가 전사하였다. + Spojenecký bojovník domobrany %1 byl zabit hráčem %2! Gamedata saving @@ -5586,6 +6032,7 @@ 儲存數據中 Salvando dados do jogo 게임 저장 + Ukládání hry Production @@ -5596,6 +6043,7 @@ 生產 Produção 생산 + Produkce @@ -5605,6 +6053,7 @@ Сохранить/Загрузить параметры Carica/Salva Parametri 매개변수설정 저장/불러오기 + Uložit/načíst parametry SAVE selected parameters @@ -5613,6 +6062,7 @@ Сохранить выбранные параметры SALVA i parametri 매개변수설정 저장 + Uložit vybrané parametry LOAD parameters or use selected if no saved value found @@ -5621,6 +6071,7 @@ Загрузить параметры или использовать выбранные, если не найдено сохраненного значения CARICA parametri o utilizza selezionati se non è stato trovato alcun valore salvato 매개변수설정 불러오기/ 저장된 설정이 없는 경우 현재 선택된 설정 사용 + Načíst parametry nebo použít vybrané pokud nebyly nalezeny žádné uložené. Use selected parameters without saving @@ -5629,6 +6080,7 @@ Использовать выбранные параметры без сохранения Usa i parametri selezionati senza salvare 현재 설정을 저장하지 않고 선택한 설정을 사용 + Použít vybrané parametry bez ukládání -- Raise @@ -5637,6 +6089,7 @@ -- Поднять -- Aumenta -- 높이 올리기 + -- Zvýšit -- Lower @@ -5645,6 +6098,7 @@ -- Опустить -- Abbassa -- 높이 내리기 + -- Snížit Guerilla forces on the way. @@ -5653,6 +6107,7 @@ Партизанские силы в пути. Guerriglieri in arrivo. 도로에 적군 민병대 세력 발견! + Partyzánské síly na cestě. Guerilla forces are incoming to %1 from the %2. @@ -5661,6 +6116,7 @@ Партизанские силы идут из %2 в %1. Guerriglieri in arrivo su %1 da %2. 적군 민병대가 %2 에서 %1 로 이동중입니다. + Partyzáni přicházejí do %1 z %2. == REVIVE OPTIONS (Disregarded, if you play with ACE Medical) == @@ -5673,6 +6129,7 @@ == CANLANDIRMA AYARLARI == == OPÇÕES DE RESSUCITAÇÃO == == 의료시스템 (ACE모드 사용시 무시할 것) == + == REVIVE OPTIONS (bez ohledu na to, pokud hrajete s ACE Medical) == Arsenal @@ -5681,6 +6138,7 @@ Арсенал Arsenale 무기고 + Arzenál BI arsenal @@ -5689,6 +6147,7 @@ Арсенал BI BI Arsenale BI 무기고 + BI arzenál ACE arsenal @@ -5697,6 +6156,7 @@ Арсенал ACE ACE Arsenale ACE 무기고 + Arzenál ACE Victory Condition @@ -5704,6 +6164,7 @@ Condición de Victoria Условие для победы 승리 조건 + Vítězství All capitals @@ -5711,6 +6172,7 @@ Todas las capitales Все столицы 모든 대도시 + Všechna hlavní města All capitals and military bases @@ -5718,6 +6180,7 @@ Todas las capitales y bases militares Все столицы и военные базы 모든 대도시 및 군사기지 + Všechna hlavní města a vojenské základny All capitals and 60% of the sectors @@ -5725,6 +6188,7 @@ Todas las capitales y 60% de los sectores Все столицы и 60% секторов 모든 대도시 및 60%의 거점 + Všechna hlavní města a 60% sektoru All capitals and 80% of the sectors @@ -5732,6 +6196,7 @@ TOdas las capitales y 80% de los sectores Все столицы и 80% секторов 모든 대도시 및 80%의 거점 + Všechna hlavní města a 80% sektoru All sectors @@ -5739,6 +6204,7 @@ Todos los sectores Все секторы 모든 거점 + Všechny sektory CAMPAIGN COMPLETED @@ -5746,6 +6212,7 @@ CAMPAÑA COMPLETA КАМПАНИЯ ВЫПОЛНЕНА 군사작전 완료 + CAMPAIGN KOMPLET You have liberated the area from the enemy oppression. @@ -5753,6 +6220,7 @@ Haz liberado el área de la oposión enemiga. Вы освободили территорию от угнетения врага. 당신은 적의 억압으로부터 이 지역을 해방시켰다. + Osvobodili jste oblast od nepřátelského útlaku. Playtime: %1 days, %2 hours, %3 minutes and %4 seconds @@ -5760,6 +6228,7 @@ Tiempo de juego: %1 días, %2 horas, %3 minutos y %4 segundos Игровое время: %1 дней, %2 часов, %3 минут и %4 секунд 걸린 시간: %1 일, %2 시간, %3 분 and %4 초 + Doba hraní: % 1 dny, % 2 hodiny, % 3 minuty a % 4 sekund OPFOR infantry killed: %1 @@ -5773,6 +6242,7 @@ Öldürülen OPFOR: %1 Baixas inimigas em combate: %1 적군 사망자 : %1 + Pěchota OPFOR zabila: %1 OPFOR infantry killed by players: %1 @@ -5786,6 +6256,7 @@ Oyuncular tarafından öldürülen OPFOR sayısı: %1 Infantaria inimiga eliminada por jogadores: %1 플레이어에 의한 적군 사망자 : %1 + Pěchota OPFOR zabitá hráči: %1 OPFOR vehicles destroyed: %1 @@ -5799,6 +6270,7 @@ OPFOR yokedilen araçları: %1 Veículos inimigos destruídos: %1 파괴된 적군 차량 : %1 + Vozidla OPFOR byla zničena: %1 OPFOR vehicles destroyed by players: %1 @@ -5812,6 +6284,7 @@ OPFOR yokedilen araçları (oyuncular tarafından): %1 Veículos inimigos destruídos por jogadores: %1 플레이어에 의해 파괴된 적군 차량 : %1 + Vozidla OPFOR zničená hráči: %1 BLUFOR soldiers recruited: %1 @@ -5825,6 +6298,7 @@ Çağrılan BLUFOR askerleri: %1 Soldados aliados recrutados: %1 AI 병사 소집 : %1 + Nábor vojáků BLUFOR: %1 BLUFOR infantry killed: %1 @@ -5838,6 +6312,7 @@ BLUFOR kayıpları: %1 Baixas aliadas em combate: %1 아군 사망자 : %1 + BLUFOR zabila: %1 BLUFOR vehicles built: %1 @@ -5851,6 +6326,7 @@ BLUFOR yaratılan araçları: %1 Veículos aliados construídos: %1 생산된 아군 차량 : %1 + Postavena vozidla BLUFOR: %1 BLUFOR vehicles destroyed: %1 @@ -5864,6 +6340,7 @@ BLUFOR yokedilen araçları: %1 Veículos aliados destruídos: %1 파괴된 아군 차량 : %1 + Vozidla BLUFOR zničena: %1 Player deaths: %1 @@ -5877,6 +6354,7 @@ Ölen oyuncular: %1 Morte de jogadores: %1 플레이어 사망 : %1 + Úmrtí hráčů: %1 BLUFOR friendly fire incidents: %1 @@ -5890,6 +6368,7 @@ BLUFOR dost ateşi: %1 Incidentes de fogo amigo: %1 아군간 오인사격에 의한 피해 : %1 + Incidenty přátelské BLUFOR: %1 Resistance fighters killed: %1 @@ -5897,6 +6376,7 @@ Combatientes de la resistencia eliminados: %1 Убито бойцов сопротивления: %1 적군 전투기 격추 : %1 + Spojenci zabili: %1 Allied resistance fighters killed: %1 @@ -5904,6 +6384,7 @@ Combatientes de la resistencia aliada eliminados: %1 Убито союзнических бойцов сопротивления: %1 아군 전투기 격추 : %1 + Spojenci zabití: %1 Allied resistance fighters killed by players: %1 @@ -5911,6 +6392,7 @@ Combatientes de la resistencia aliada eliminados por jugadores: %1 Убито союзнических бойцов сопротивления игроками: %1 플레이어에 의해 격추된 전투기 : %1 + Spojenci zabití hráči: %1 Civilians killed: %1 @@ -5924,6 +6406,7 @@ Öldürülen siviller: %1 Civis mortos: %1 민간인 사망자 : %1 + Civilisté zabili: %1 Civilians killed by players: %1 @@ -5937,6 +6420,7 @@ Öldürülen siviller (oyuncular tarafından): %1 Civis mortos por jogadores: %1 플레이어에 의한 민간인 사망자 : %1 + Civilisté zabití hráči: %1 Civilians healed: %1 @@ -5944,6 +6428,7 @@ Civiles curados: %1 Гражданских вылечено: %1 민간인 치료 : %1 + Uzdravení civilisté: %1 Civilian vehicles destroyed: %1 @@ -5951,6 +6436,7 @@ Vehículos civiles destruidos: %1 Транспорта гражданских уничтожено: %1 파괴된 민간인 차량 : %1 + Civilní vozidla byla zničena: %1 Civilian vehicles destroyed by players: %1 @@ -5958,6 +6444,7 @@ Vehículos civiles destruidos por jugadores: %1 Транспорта гражданских уничтожено игроками: %1 플레이어에 의해 파괴된 민간인 차량 : %1 + Civilní vozidla zničená hráči: %1 Civilian vehicles seized: %1 @@ -5965,6 +6452,7 @@ Vehículos civiles capturados: %1 Транспорта гражданских захвачено: %1 민간인 차량 탈취 : %1 + Krádež civilních vozidel: %1 Civilian buildings destroyed: %1 @@ -5972,6 +6460,7 @@ Edificios civiles destruidos: %1 Построек гражданских уничтожено: %1 파괴된 민간 건물 : %1 + Zničeno civilních budov: %1 Vehicles recycled: %1 @@ -5985,6 +6474,7 @@ Geri dönüşüm olan araçlar: %1 Veículos reciclados: %1 재활용된 차량 : %1 + Recyklovaná vozidla: %1 Ammunition produced: %1 @@ -5992,6 +6482,7 @@ Municiones producidas: %1 Произведено боеприпасов: %1 생산된 탄약 : %1 + Výroba munice: %1 Ammunition spent: %1 @@ -5999,6 +6490,7 @@ Municiones gastadas: %1 Боеприпасов потрачено: %1 사용된 탄약 : %1 + Spotřeba munice: %1 Fuel produced: %1 @@ -6006,6 +6498,7 @@ Combustible producido: %1 Произведено топлива: %1 생산된 기름 : %1 + Výroba paliva: %1 Fuel spent: %1 @@ -6013,6 +6506,7 @@ Combustible gastado: %1 Топлива потрачено: %1 사용된 기름 : %1 + Spotřeba paliva: %1 Supplies produced: %1 @@ -6020,6 +6514,7 @@ Suministros producidos: %1 Произведено припасов: %1 생산된 보급품 : %1 + Výroba surovin: %1 Supplies spent: %1 @@ -6027,6 +6522,7 @@ Suministros gastados: %1 Припасов потрачено: %1 사용된 보급품 : %1 + Spotřeba surovin: %1 Sectors liberated: %1 @@ -6040,6 +6536,7 @@ Ele geçirilen sektörler: %1 Setores liberados: %1 해방된 거점 : %1 + Sektory se osvobodily: %1 Sectors lost: %1 @@ -6053,6 +6550,7 @@ Kaybedilen sektörler: %1 Setores perdidos: %1 상실한 거점 : %1 + Sektory prohráli: %1 FOBs built: %1 @@ -6066,6 +6564,7 @@ Kurulan FOB'ler: %1 FOBs construídas: %1 설치된 전추기지 : %1 + Postaveny FOB: %1 FOBs lost: %1 @@ -6079,6 +6578,7 @@ Kaybedilen FOB'ler: %1 FOBs perdidas: %1 상실한 전초기지 : %1 + FOB ztratil: %1 Secondary objectives accomplished: %1 @@ -6092,6 +6592,7 @@ Bitirilen ikinci görevler: %1 Objetivos secundários alcançados: %1 부차적인 임무 달성 : %1 + Dosažené sekundární cíle: %1 Prisoners captured: %1 @@ -6105,6 +6606,7 @@ Ele geçirilen esirler: %1 Prisioneiros capturados: %1 포로 획득 : %1 + Vězni zajati: %1 Hostile battlegroups called: %1 @@ -6118,6 +6620,7 @@ Düşman savaş grupları: %1 Grupos de combate hostis chamados: %1 전투에 참여한 적 전투단 : %1 + Nepřátelské bojové skupiny nazvané: %1 Hostile reinforcements called: %1 @@ -6131,6 +6634,7 @@ Düşman takviye kuvvetleri: %1 Reforços hostis requisitados: %1 전투에 참여한 적 지원병력 : %1 + Nepřátelské posily nazývané: %1 Total combat readiness raised: %1 @@ -6144,6 +6648,7 @@ Hazırda olan asker sayısı: %1 Disposição total de combatentes em alerta: %1 전체 위협도 상승값 : %1 + Bojová připravenost: %1 IEDs detonated: %1 @@ -6157,6 +6662,7 @@ Patlatılan mayınlar: %1 IEDs detonadas: %1 폭파된 폭발물 : %1 + Výbuch miny: %1 Number of Potato 01 losses: %1 @@ -6169,6 +6675,7 @@ Potato 01 kayıpları: %1 Número de baixas de Potato 01: %1 파괴된 재투입차량 : %1 + Počet ztracených Potato 01: %1 Rabbits killed: %1 @@ -6182,6 +6689,7 @@ Öldürülen tavşanlar: %1 Coelhos mortos: %1 대량 학살 : %1 + Zabití králíci: %1 Many thanks for playing KP LIBERATION! @@ -6195,6 +6703,7 @@ KP LIBERATION oynadığınız için çok teşekkürler! Muito obrigado por jogar KP LIBERATION! 지금까지 KP LIBERATION에 참여해 주신 분들께 감사드립니다! + Děkujeme za hraní KP LIBERATION! We hope you enjoyed playing it, as much as we enjoyed making it. @@ -6208,6 +6717,7 @@ Umarım oynarken eğlenmişsinizdir, biz yaparken eğlendiğimiz kadar. Esperamos que tenham gostado de jogar, da mesma forma que gostamos de desenvolver esta missão. 개발자가 재미있게 만들고자 한 만큼 여러분도 재미있었기를 바랍니다. + Doufáme, že jste si tuto misi užili stejně, jako když jsme ji vytvořili. (Press ESC to exit) @@ -6221,6 +6731,7 @@ (ESC'ye basıp çıkabilirsiniz.) (Aperte ESC para sair) (ESC 키를 누르면 나갈 수 있습니다.) + (Stisknutím klávesy ESC ukončete program) -- Clear FOB area @@ -6228,6 +6739,7 @@ -- Очистить зону FOB -- FOB Gebiet räumen -- 전초기지 주변 정리 + -- Vymazat zónu FOB FOB repackaged.\nPossibly created clearance will be reverted upon server restart. @@ -6235,6 +6747,7 @@ FOB empacado. \nProbablemente el permiso de creación será revertido después de reiniciar el servidor. FOB свернуто.\nЕсли вы очищали место для FOB, оно будет восстановлено после перезапуска сервера. FOB가 재포장됩니다. 이 상태로 서버 재시작시 이 부근의 건물이나 장비들은 사라집니다. + FOB je zabalen. \Po restartování serveru bude pravděpodobně vytvořené oprávnění zrušeno. Dynamic fog (A3 Vanilla) @@ -6242,6 +6755,7 @@ Niebla dinámica (A3 Default) Динамический туман (A3 Vanilla) 동적인 안개 (A3 Vanilla) + Dynamická mlha (A3 Vanilla) Start FOB provided as @@ -6249,6 +6763,7 @@ Empezar con FOB proveído como Создать FOB в виде 시작시 전초기지는 다음과 같이 제공됩니다. + První FOB poskyzován jako FOB Container @@ -6256,6 +6771,7 @@ Contenedor FOB FOB Контейнер 전초기지 설치박스 + FOB Kontejner FOB Truck @@ -6263,186 +6779,230 @@ Camión FOB FOB Грузовик 전초기지 설치트럭 + FOB Nákladní auto Client options variant Spielermenü Variante Variantes de opciones de cliente + Vybrat možnost klienta GREUH Extended Options GREUH Erweiterte Optionen GREHU Opciones Extendidas + GREUH Rozšířené možnosti KP Player Menu (requires CBA) KP Spielermenü (benötigt CBA) Menú de jugador KP (requiere CBA) + KP Player Menu (vyžaduje CBA) Are you sure? Bist du sicher? ¿Estás seguro? + jsi si tím jistý? This will permanently remove a total of %1 terrain objects (houses, trees, fences, lamps, etc.) within a radius of %2m around %3. Dies wird insgesamt %1 Kartenobjekte (Häuser, Bäume, Zäune, Lampen, etc.) im Umkreis von %2m um %3 herum permanent entfernen. Esta acción removera permanentemente un total de %1 objetos de terreno (casas, árboles, bardas, lamparas, etc.) dentro de un radio de %2m alrededor de %3. + Tím se trvale odstraní celkem %1 terénních objektů (domy, stromy, ploty, lampy atd.) V okruhu %2m kolem %3. Add enemies to Zeus editable objects Feindliche Einheiten für Zeus editierbar Agregar enemigos como objetos editables de Zeus + Přidejte nepřátele k upravitelným objektům Zeus Arma 3 High Command for Commander Arma 3 Oberbefehl für Kommandanten Arma 3 High Command para comandantes + Arma 3 Vrchní velení velitele Arma 3 High Command Arma 3 Oberbefehl Arma 3 High Command + Arma 3 Vrchní velení velitele BI Support System access Zugriff auf BI Support System + BI Podpora přístupu do systému Commander and Whitelist Kommandant und Whitelist + Velitel a whitelist Everyone Jeder + Každý Weapon sway Waffenschwanken (Weapon sway) + Zbraň houpat Ingame Tutorial Tutorial im Spiel + Výukový program Ingame Crate Kiste + Bedna Surrendering Soldier Kapitulierender Soldat + Vzdávající se voják Wounded Civilian Verwundeter Zivilist + Zraněný civilista KP Liberation Tutorial KP Liberation Tutorial + KP Liberation Tutorial Do you want to enable the interactive tutorial?<br/>It'll guide you through the aspects of the mission. Check your tasks area on the map for further information on each task.<br/><br/>(This popup can be disabled in the mission parameters) Möchtest du das interaktive Tutorial aktivieren?<br/>Es wird dich durch einzelnen Missionsaspekte führen. Prüfe die Aufgaben im Kartenbildschirm für weitere Informationen zu den einzelnen Aufgaben.<br/><br/>(Dieses Pop-Up kann in den Missionsparametern deaktiviert werden) + Chcete povolit interaktivní výukový program?<br/>Provede vás aspekty mise. Další informace o jednotlivých úkolech naleznete v oblasti úkolů na mapě.<br/><br/>(Toto okno lze v parametrech mise deaktivovat) You've completed all currently available/implemented tutorials.<br/>Have a lot of fun with playing this mission.<br/><br/>Should you've questions or want to learn the more deeper mechanics, make sure you visit the <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki">KP Liberation Wiki</a>.<br/>We've also a <a href="https://discord.gg/Qk35Sw8">Discord Server</a> where hundreds of KP Libertion players are around. Du hast alle derzeit verfügbaren/implementierten Tutorials abgeschlossen.<br/>Wir wünschen dir sehr viel Spaß mit dem Spielen der Mission.<br/><br/>Solltest du Fragen haben oder die etwas über die tiefergehenden Mechaniken erfahren wollen, dann schaue als erstes in das <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki">KP Liberation Wiki</a>.<br/>Außerdem gibt es unseren <a href="https://discord.gg/Qk35Sw8">Discord Server</a>, wo hunderte von KP Liberation Spielern zu finden sind. + Dokončili jste všechny aktuálně dostupné/implementované výukové programy.<br/> Užij si spoustu zábavy při hraní této mise.<br/><br/> Pokud máte dotazy nebo se chcete dozvědět hlubší mechaniku, ujistěte se, že navštívíte stránku <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki"> KP Osvobození Wiki</a>. <br/> Také jsme a <a href="https://discord.gg/Qk35Sw8">Discord Server</a> kde jsou kolem stovky hráčů KP Libertion. KP Liberation Tutorial Tasks KP Liberation Tutorial Aufgaben + KP osvobození Výuky Tasks of the KP Liberation Tutorial.<br/>It'll create new tasks when the correct circumstances are reached and there are still tutorials available. Aufgaben des KP Liberation Tutorials.<br/>Es werden automatisch neue Aufgaben erstellt, sobald die entsprechenden Umstände eintreten und noch weitere Tutorials verfügbar sind. + Úkoly KP Osvobození Tutorial.<br/>To bude vytvářet nové úkoly, když jsou dosaženy správné okolnosti a stále jsou k dispozici výukové programy. First FOB deployment Erste FOB errichten + První nasazení FOB This tasks will guide you through the deployment of your first FOB and gathering the start resources. Diese Aufgaben werden dich durch die Bereitstellung deiner ersten FOB und dem Sammeln der Startressourcen führen. + Tyto úkoly vás provedou nasazením prvního fob a shromažďováním počátečních prostředků. Transport FOB Container FOB Container transportieren + Přepravní FOB kontejner This is your first FOB container, which allows you to deploy a FOB.<br/>You need to slingload it via the transport helicopter to a position at least 1km away from the operation base in order to deploy it. We recommend to build it in the vicinity of a factory.<br/>After you've transported the container to the desired position, head near to it and you'll get an scroll wheel action to place the FOB.<br/>We'll continue after you've deployed your first FOB. Dies ist dein erster FOB Container mit dem du eine FOB bereitstellen kannst.<br/>Diesen musst du als Außenlast mit dem Transporthelikopter zu einer Position mit mindestens 1km Abstand zur Operationsbasis bringen, um die FOB aufzubauen. Wir empfehlen die erste FOB in der Nähe eines Fabrik-Sektors zu errichten.<br/>Nachdem du den Container zur gewünschten Position gebracht hast, nähere dich ihm und du wirst eine Mausrad-Aktion erhalten, um die FOB aufzustellen.<br/>Wir fahren fort nachdem du deine erste FOB errichtet hast. + Jedná se o váš první FOB kontejner, který vám umožní nasadit FOB.<br/> Musíte ho naložit transportním vrtulníkem na pozici, která je vzdálena alespoň 1 km od operační základny, abyste ji mohli nasadit. Doporučujeme jej postavit v blízkosti továrny.<br/> Po přepravě kontejneru do požadovaného místa zamiřte k němu a získáte akci rolovacího kolečka, která umístí FOB.<br/> Budeme pokračovat, až to provedete. Drive FOB Truck FOB Truck fahren + Nákladní auto FOB This is your first FOB truck, which allows you to deploy a FOB.<br/>You need to drive it to a position at least 1km away from the operation base in order to deploy it. We recommend to build it in the vicinity of a factory.<br/>After you've driven the truck to the desired position, head near to it and you'll get an scroll wheel action to place the FOB.<br/>We'll continue after you've deployed your first FOB. Dies ist dein erster FOB LKW mit dem du eine FOB bereitstellen kannst.<br/>Diesen musst du zu einer Position mit mindestens 1km Abstand zur Operationsbasis fahren, um die FOB aufzubauen. Wir empfehlen die erste FOB in der Nähe eines Fabrik-Sektors zu errichten.<br/>Nachdem du den LKW zur gewünschten Position gebracht hast, nähere dich ihm und du wirst eine Mausrad-Aktion erhalten, um die FOB aufzustellen.<br/>Wir fahren fort nachdem du deine erste FOB errichtet hast. + Jedná se o váš první FOB truck, který vám umožní nasadit FOB.<br/> Musíte ho dojet na pozici alespoň 1 km od operační základny, abyste ji mohli nasadit. Doporučujeme ji postavit v blízkosti továrny.<br/> Poté, co jste řídili vůz do požadovaného místa, zamiřte blízko k němu a dostanete akci rolovacího kolečka pro umístění FOB.<br/> Budeme pokračovat, až rozmístíte svůj první FOB. Build a storage area Baue einen Lagerbereich + Vytvoření úložného prostoru Now you've access to the build menu via the scroll wheel actions.<br/>Use this action to place a storage area. You can find it in the support tab of the build menu.<br/>This is needed to store the resource crates we'll send to you after this task. Nun hast du Zugriff zum Baumenü über die Mausrad-Aktionen.<br/>Benutze diese Aktion, um einen Lagerbereich zu errichten. Die Lagerbereich sind im Unterstützungs-Reiter des Baumenüs.<br/>Dieser ist notwendig, um die Startressourcen, die wir dir im Anschluss an diese Aufgabe zukommen lassen, einzulagern. + Nyní máte přístup k nabídce sestavení prostřednictvím akcí rolovacího kolečka.<br/> Tato akce slouží k umístění skladovacího prostoru. Najdete ji na kartě budovy v nabídce stavení.<br/> To je nutné k uložení beden prostředků, které vám pošleme po tomto úkolu. Collect start resources Sammle Startressourcen + Shromáždit počáteční zdroje We've send you some start resource crates via paradrop. Collect them and store them in your storage area to add them to the FOB resource pool.<br/>Resources have always to be stored in such areas to use them for building. It's not enough to have them near the FOB. If you go near a crate you'll have a store and a push scroll wheel action, which will help you. Wir haben dir ein paar Kisten mit Startressourcen per Fallschirmabwurf zukommen lassen. Sammel sie ein und lagere sie in deinen Lagerbereich ein, um sie den verfügbaren Ressourcen der FOB hinzuzufügen.<br/>Ressourcen müssen übrigens immer in solche Bereiche eingelagert werden, damit sie zum bauen verwendet werden können. Es reicht nicht aus, die Kisten einfach in der Nähe der FOB zu haben. Bist du in der Nähe einer Kiste, hast du unter anderem eine "Einlagern" und "Schieben" Mausrad-Aktion, welche dir helfen werden. + Poslali jsme vám přes paradrop nějaké bedny se startem. Shromážděte je a uložte je do úložiště a přidejte je do fondu zdrojů FOB.<br/> Zdroje musí být vždy uloženy v těchto oblastech, aby je mohly používat pro stavbu. Nestačí je mít blízko FOB. Pokud se přiblížíte k bedně, budete mít možnost a akci push rolovacího kolečka, která vám pomůže. Capture your first factory Erobere deine erste Fabrik + Zachyťte svou první továrnu This tasks will guide you through the process of capturing a factory sector, take possible POWs, help possible wounded civilians and start the resource production. Diese Aufgaben werden dich durch die Eroberung eines Fabrik-Sektors, das Festnehmen möglicher Gefangener, der Betreuung möglicher verwundeter Zivilisten und den Start der Ressourcenproduktion führen. + Tyto úkoly vás provedou procesem zachycení výrobního sektoru, vezmou možné válečné zajatce, pomohou zraněným civilistům a zahájí výrobu zdrojů. Approach a factory Nähere dich einer Fabrik + Přistupte k továrně It's always a good decision to start your campaign with capturing a factory. That way you'll be able to produce more resources, which you'll need in order to build more vehicles and later air assets.<br/>We've marked up to three near factory sectors on the map for you. Decide by yourself, which one you want to approach.<br/>We'll continue, if you're near one of the marked factories.<br/><br/>More information about the different sector types can be found in our <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Sectors">Wiki</a>. Es ist immer eine gute Entscheidung die Kampagne mit der Eroberung einer Fabrik zu beginnen. Dadurch wirst du in der Lage sein weitere Ressourcen zu produzieren, um weitere Bodenfahrzeuge und später auch Luftfahrzeuge zu bauen.<br/>Wir haben bis zu drei nahe Fabriken für dich auf der Karte markiert. Entscheide selbst, welche du angehen möchtest.<br/>Wir fahren fort, wenn du in der Nähe einer der markierten Fabriken bist.<br/><br/>Mehr Informationen über die verschiedenen Sektortypen findest du in unserem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Sectors">Wiki</a>. + Je vždy dobré začít kampaň se zachycením továrny. Tímto způsobem budete moci produkovat více zdrojů, které budete potřebovat, abyste mohli postavit více vozidel a později letecké prostředky.<br/> Označili jsme na mapě až tři blízké výrobní sektory. Rozhodněte se sami, který z nich chcete přistupovat.<br/> Budeme pokračovat, pokud jste poblíž jedné z označených továren.<br/><br/> Více informací o různých typech odvětví naleznete v našem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Sectors"> Wiki</a>. Conquer the factory Erobere die Fabrik + Dobýt továrnu The factory is now activated and will spawn enemy defenders. A full sector activation might take up to 20 seconds, depending on the amount of player side units near the sector. The more troops, the faster it'll spawn. This is to avoid random spawning by e.g. helicopter or jet fly-bys.<br/><br/>Now you've to defeat the enemy garrison until they surrender. Die Fabrik ist nun aktiv und wird feindliche Verteidigungstruppen erzeugen. Eine vollständige Sektoraktivierung kann bis zu 20 Sekunden dauern, abhängig von der Menge an freundlichen Einheiten in der Nähe eine Sektors. Umso mehr Einheiten, umso schneller. Dies verhindert, dass zufällige Sektoren durch lediglich vorbeifliegende Helikopter oder Jets aktiviert werden.<br/><br/>Nun musst du die feindliche Garnison, bis zur Aufgabe, bekämpfen. + Továrna je nyní aktivována a bude plodit nepřátelské obránce. Úplná aktivace sektoru může trvat až 20 sekund, v závislosti na množství jednotek na straně hráče v blízkosti sektoru. Čím více vojáků, tím rychleji se vynoří. To má zabránit náhodnému tření např. vrtulník nebo tryskové přelety .<br/><br/> Nyní musíte porazit nepřátelskou posádku, dokud se nevzdají. Capture and care Gefangennahme und Versorgung + Zachyťte a pečujte After capturing a sector there is a chance that enemies surrendered or wounded civilians are in need of medical aid.<br/>We've marked these for you this time. Normally you need to search the buildings for surrendering enemies and have a look on the map for small violet circles which gives a hint for wounded civilians.<br/><br/>Approach all of the markers to capture the enemies and provide medical assistance for the civilians. Nachdem ein Sektor erobert wurde, besteht die Chance, dass Feinde sich ergeben und verwundete Zivilisten medizinische Hilfe benötigen.<br/>Dieses mal haben wir diese für dich markiert. Normalerweise musst du die Gebäude nach sich ergebenen Feinden durchsuchen und auf der Karte nach kleinen violetten Markierungen schauen, welche dir einen Anhaltspunkt für verwundete Zivilisten gibt.<br/><br/>Nähere dich allen Markierungen, um Feinde gefangen zu nehmen und den Zivilisten zu helfen. + Po obsazení sektoru je šance, že nepřátelé, kteří se vzdali nebo budou zraněni civilisté, potřebují lékařskou pomoc.<br/> Tentokrát jsme je označili. Za normálních okolností je třeba hledat budovy pro odevzdání nepřátel a podívat se na mapě pro malé fialové kruhy, které dává náznak pro zraněné civilisty.<br/><br/> Přistupte ke všem značkám, abyste zachytili nepřátele a poskytli lékařskou pomoc civilistům. Build a storage area Baue einen Lagerbereich + Vybudujte skladovací prostor You need to place down a storage area for each factory you conquer. Otherwise the factory won't be able to produce resources due to a lack of storage space.<br/>Use the scroll wheel action to place a storage area at the factory sector. Für jede eroberte Fabrik muss ein Lagerbereich errichtet werden. Andernfalls wird die Fabrik, aufgrund fehlendem Lagerplatz, keine Ressourcen produzieren können.<br/>Benutze die entsprechende Mausrad-Aktion, um einen Lagerbereich bei der Fabrik zu errichten. + musíte umístit úložný prostor pro každou továrnu, kterou dobýváte. V opačném případě nebude továrna schopna vyrábět zdroje z důvodu nedostatku úložného prostoru.<br/> Pomocí akce rolovacího kolečka umístěte úložný prostor do výrobního sektoru. Start the production Starte die Produktion + Zahajte výrobu Now the factory is ready to start produce resources. Use the scroll-wheel action to open the production interface and start the production in the just conquered factory.<br/>More detailed information about the interface can be found in our <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Production">Wiki</a>. Nun ist die Fabrik dafür bereit, um Ressourcen zu produzieren. Benutze die Mausrad-Aktion, um das Produktionsinterface zu öffnen und die Produktion in der eroberten Fabrik zu starten.<br/>Detailliertere Informationen über das Produktionsinterface findest du in unserem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Production">Wiki</a>. + Nyní je továrna připravena začít vyrábět zdroje. Pomocí akce rolovacího kolečka otevřete výrobní rozhraní a začněte vyrábět v právě dobyté továrně.<br/> Podrobnější informace o rozhraní naleznete v našem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Production">Wiki</a>. @@ -6453,6 +7013,7 @@ -- Menú de Jugador KP -- -- KP Spielermenü -- -- KP Menu do Jogador -- + -- KP Player Nabídka -- KP Player Menu @@ -6460,6 +7021,7 @@ Menú de Jugador KP KP Spielermenü KP Menu do Jogador + KP Player Nabídka Player Information @@ -6467,6 +7029,7 @@ Información de Jugador Spielerinformationen Informação do Jogador + Informace o hráči Rank: @@ -6474,6 +7037,7 @@ Rango: Dienstgrad: Rank: + Hodnost: Score: @@ -6481,6 +7045,7 @@ Puntaje: Punkte: Pontuação: + Skóre: Playtime: @@ -6488,6 +7053,7 @@ Tiempo de juego: Spielzeit: Tempo de jogo: + Čas hraní: KP Ranks mod not loaded @@ -6495,6 +7061,7 @@ KP Ranks mod no ha sido cargado KP Ranks Mod nicht geladen O mod KP Ranks não está carregado + KP Ranks mod nebyl načten Group Management @@ -6502,12 +7069,14 @@ Administración de grupo Gruppenverwaltung Gerenciar Grupo + Správa skupiny Create Erstellen Crear Criar + Vytvořit Join @@ -6515,6 +7084,7 @@ Unirse Beitreten Juntar-se + Připojit se Rename @@ -6522,6 +7092,7 @@ Renombrar Umbenennen Renomear + Přejmenovat View Distance Settings @@ -6529,6 +7100,7 @@ Configuración de distancia de visión Sichtweiteneinstellungen Distância de Visão + Nastavení vzdálenosti m on foot @@ -6536,6 +7108,7 @@ m a pie m zu Fuß m A pé + Pěšák m in ground vehicles @@ -6543,6 +7116,7 @@ m en vehículos de tierra m in Bodenfahrzeugen m em veículos terrestres + Vozidla m in air vehicles @@ -6550,6 +7124,7 @@ m en vehículos de aire m in Luftfahrzeugen m em veículos aéreos + Letectvo Misc Settings @@ -6557,6 +7132,7 @@ Configuración miscelanea Sonstige Einstellungen Outras Configurações + Různé nastavení Terrain detail: @@ -6564,6 +7140,7 @@ Detalle de terreno: Terraindetail: Detalhe do terreno: + Detail terénu: Low @@ -6571,6 +7148,7 @@ Bajo Niedrig Baixo + Nízký Standard @@ -6578,6 +7156,7 @@ Estandard Standard Padrão + Normální High @@ -6585,6 +7164,7 @@ Alto Hoch Alto + Vysoký Very High @@ -6592,6 +7172,7 @@ Muy alto Sehr Hoch Muito Alto + Velmi vysoký Ultra @@ -6599,6 +7180,7 @@ Ultra Ultra Ultra + Ultra Auto 3rd person view: @@ -6606,6 +7188,7 @@ Cámara auto 3era persona: Auto 3rd-Person-Sicht: Câmera auto em 3º pessoa: + Pohled z třetí osoby: Disabled @@ -6613,6 +7196,7 @@ Desabilitar Deaktiviert Desativado + Zakázáno Air vehicles @@ -6620,6 +7204,7 @@ Vehículos de aire Luftfahrzeuge Veículos aéreos + Letectvo Ground vehicles @@ -6627,6 +7212,7 @@ Vehículos de tierra Bodenfahrzeuge Veículos terrestres + Pozemní vozidla All vehicles @@ -6634,6 +7220,7 @@ Todos los vehículos Alle Fahrzeuge Todos os veículos + Všechna vozidla Disable radio chatter: @@ -6641,6 +7228,7 @@ Deshabilitar conversaciones de radio: KI Funk deaktivieren: Desativar comm's de rádio: + Zakázat rádiový chat: No @@ -6648,6 +7236,7 @@ No Nein Não + Ne Voice @@ -6655,6 +7244,7 @@ Voz Stimme Voz + hlas Voice + Chat @@ -6662,6 +7252,7 @@ Voz + Chat Stimme + Chat Voz + Chat + Hlas + chat In vehicle volume: @@ -6669,6 +7260,7 @@ Volumen en vehículo: Lautstärke im Fahrzeug: Volume dentro do veículo: + Hlasitost Apply @@ -6676,6 +7268,7 @@ Aplicar Anwenden Aplicar + Potvrdit The sound adjustment is overwritten by ACE, if you should use it. @@ -6683,6 +7276,7 @@ Los ajustes de sonido han sido sobreescritos por ACE, si debieras usarlos. Die Lautstärkeanpassung wird durch ACE überschrieben, wenn du es nutzen solltest. O ajuste de som é sobrescrito pelo ACE se você usar ele. + Úprava zvuku je přepsána ACE, pokud ji použijete. You're not the leader of this group. @@ -6690,6 +7284,7 @@ No eres el líder en el grupo. Du bist nicht der Anführer dieser Gruppe. Você não é o lider desse grupo. + Nejste vůdce této skupiny. Leveling system disabled @@ -6697,11 +7292,13 @@ Sistema de niveles desactivado Levelsystem deaktiviert Sistema de níveis desativado + Vyrovnávací systém zakázán KP Player Menu v1.0.2\nby Wyqer KP Spielermenü v1.0.2\nvon Wyqer Menú de Jugador KP v1.0.2\npor Wyqer + KP Player Menu v1.0.2\nby Wyqer From ba787c4d056f310fd5e3dffa079c3e49122cce60 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Fri, 22 May 2020 15:06:56 +0200 Subject: [PATCH 041/115] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43f47b099..1946157b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## 0.96.8 (TBD) +* Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA) * Tweaked: Splitted the config file in seperate files, as it was getting quite big. * Tweaked: Unified the prefix of all variables to `KPLIB_`. * Tweaked: Arsenal presets are now in the presets folder. From 6c14fe45962c401ff513bd594f771cd834dc7c40 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Fri, 22 May 2020 18:45:16 +0200 Subject: [PATCH 042/115] Added `param` prefix to param variables --- .../GREUH/Scripts/GREUH_cache_units.sqf | 2 +- .../GREUH/Scripts/GREUH_playermarkers.sqf | 4 +- Missionframework/KPLIB_classnameLists.sqf | 4 +- Missionframework/KPLIB_config.sqf | 36 +-- .../functions/fn_addActionsPlayer.sqf | 20 +- .../functions/fn_allowCrewInImmobile.sqf | 6 +- Missionframework/functions/fn_clearCargo.sqf | 4 +- .../functions/fn_forceBluforCrew.sqf | 6 +- .../functions/fn_getBluforRatio.sqf | 6 +- Missionframework/functions/fn_getLocalCap.sqf | 4 +- .../functions/fn_getOpforFactor.sqf | 6 +- .../functions/fn_getOpforSpawnPoint.sqf | 4 +- Missionframework/functions/fn_getSaveData.sqf | 14 +- .../functions/fn_getSectorOwnership.sqf | 10 +- .../functions/fn_getSectorRange.sqf | 8 +- .../functions/fn_getSquadComp.sqf | 4 +- .../functions/fn_getUnitsCount.sqf | 6 +- .../functions/fn_hasPermission.sqf | 4 +- .../functions/fn_spawnCivilians.sqf | 6 +- .../functions/fn_spawnMilitaryPostSquad.sqf | 4 +- Missionframework/init.sqf | 6 +- Missionframework/kp_objectInits.sqf | 6 +- Missionframework/onPlayerRespawn.sqf | 16 +- Missionframework/presets/init_presets.sqf | 4 +- .../scripts/client/actions/do_recycle.sqf | 2 +- .../scripts/client/actions/intel_manager.sqf | 8 +- .../scripts/client/actions/open_arsenal.sqf | 12 +- .../client/actions/recycle_manager.sqf | 4 +- .../scripts/client/actions/unflip_manager.sqf | 2 +- .../scripts/client/build/do_build.sqf | 12 +- .../scripts/client/build/do_build_fob.sqf | 6 +- .../scripts/client/build/open_build_menu.sqf | 10 +- .../client/civinformant/civinfo_escort.sqf | 2 +- .../civinformant/civinfo_notifications.sqf | 4 +- .../client/commander/enforce_whitelist.sqf | 2 +- .../scripts/client/init_client.sqf | 14 +- .../scripts/client/markers/fob_markers.sqf | 2 +- .../scripts/client/markers/group_icons.sqf | 8 +- .../scripts/client/markers/hostile_groups.sqf | 2 +- .../scripts/client/markers/sector_manager.sqf | 4 +- .../scripts/client/markers/spot_timer.sqf | 4 +- .../scripts/client/misc/fn_initArsenal.sqf | 8 +- .../scripts/client/misc/init_markers.sqf | 2 +- .../client/misc/permissions_warning.sqf | 2 +- .../scripts/client/misc/playerNamespace.sqf | 10 +- .../remotecall/remote_call_incoming.sqf | 2 +- .../client/remotecall/remote_call_intel.sqf | 8 +- .../client/remotecall/remote_call_sector.sqf | 2 +- .../scripts/client/spawn/do_halo.sqf | 6 +- .../scripts/client/spawn/redeploy_manager.sqf | 12 +- .../scripts/client/spawn/spawn_camera.sqf | 4 +- .../scripts/client/tutorial/fn_tutorial.fsm | 12 +- Missionframework/scripts/client/ui/intro.sqf | 2 +- .../scripts/client/ui/squad_management.sqf | 2 +- .../scripts/client/ui/ui_manager.sqf | 10 +- .../scripts/server/ai/building_defence_ai.sqf | 4 +- .../scripts/server/ai/prisonner_ai.sqf | 2 +- .../server/asymmetric/asymmetric_loop.sqf | 4 +- .../server/asymmetric/ied/manage_asymIED.sqf | 4 +- .../asymmetric/random/asym_sector_ambush.sqf | 2 +- .../asymmetric/random/sector_guerilla.sqf | 2 +- .../scripts/server/base/startgame.sqf | 6 +- .../battlegroup/counter_battlegroup.sqf | 4 +- .../battlegroup/random_battlegroups.sqf | 14 +- .../server/battlegroup/readiness_increase.sqf | 2 +- .../server/battlegroup/spawn_battlegroup.sqf | 6 +- .../server/civrep/fnc/f_kp_cr_changeCR.sqf | 6 +- .../civrep/fnc/f_kp_cr_getBuildings.sqf | 6 +- .../civrep/wounded/civrep_wounded_civs.sqf | 4 +- .../server/game/apply_default_permissions.sqf | 2 +- .../scripts/server/game/cleanup_vehicles.sqf | 6 +- .../scripts/server/game/manage_time.sqf | 6 +- .../scripts/server/game/manage_weather.sqf | 4 +- .../scripts/server/game/save_manager.sqf | 12 +- .../scripts/server/game/server_restart.sqf | 2 +- .../scripts/server/game/zeus_synchro.sqf | 6 +- .../server/highcommand/fn_highcommand.fsm | 4 +- .../scripts/server/init_server.sqf | 12 +- .../scripts/server/offloading/show_fps.sqf | 2 +- .../server/patrols/civilian_patrols.sqf | 2 +- .../patrols/manage_one_civilian_patrol.sqf | 8 +- .../server/patrols/manage_one_patrol.sqf | 8 +- .../scripts/server/patrols/manage_patrols.sqf | 8 +- .../server/patrols/reinforcements_manager.sqf | 10 +- .../remotecall/add_logiTruck_remote_call.sqf | 2 +- .../remotecall/del_logiTruck_remote_call.sqf | 2 +- .../sector_liberated_remote_call.sqf | 14 +- .../resources/recalculate_resources.sqf | 8 +- .../scripts/server/resources/unit_cap.sqf | 2 +- .../server/secondary/convoy_hijack.sqf | 6 +- .../scripts/server/secondary/fob_hunting.sqf | 4 +- .../server/secondary/search_and_rescue.sqf | 2 +- .../server/sector/attack_in_progress_fob.sqf | 12 +- .../sector/attack_in_progress_sector.sqf | 12 +- .../scripts/server/sector/fn_destroyFob.sqf | 4 +- .../server/sector/fn_sectorMonitor.fsm | 6 +- .../server/sector/fn_spawnSectorCrates.sqf | 4 +- .../scripts/server/sector/ied_manager.sqf | 4 +- .../server/sector/manage_one_sector.sqf | 52 ++-- .../server/sector/wait_to_spawn_sector.sqf | 12 +- .../server/support/fn_createSuppModules.sqf | 18 +- .../scripts/shared/diagnostics.sqf | 4 +- .../scripts/shared/fetch_params.sqf | 274 +++++++++--------- .../scripts/shared/init_shared.sqf | 2 +- .../scripts/shared/kill_manager.sqf | 20 +- 105 files changed, 496 insertions(+), 496 deletions(-) diff --git a/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf b/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf index ed1b32791..d7bc22d9c 100644 --- a/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf +++ b/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf @@ -4,7 +4,7 @@ waitUntil { !isNil "nametags_distance" }; while { true } do { - _scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == KPLIB_side_friendly ) } ] call BIS_fnc_conditionalSelect; + _scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == KPLIB_side_player ) } ] call BIS_fnc_conditionalSelect; _scanned_units = [ _scanned_units, { (_x == leader group player ) || (_x distance player < nametags_distance) } ] call BIS_fnc_conditionalSelect; _scanned_units = [ _scanned_units, { (_x != player) && (( vehicle player ) != ( vehicle _x )) } ] call BIS_fnc_conditionalSelect; KPLIB_nametag_units = [] + _scanned_units; diff --git a/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf b/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf index b56cac7af..118469107 100644 --- a/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf +++ b/Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf @@ -6,8 +6,8 @@ private _color = ""; private _ticks = 0; private _cfg = configFile >> "cfgVehicles"; -if ( side player == KPLIB_side_friendly ) then { - _color = KPLIB_color_friendly; +if ( side player == KPLIB_side_player ) then { + _color = KPLIB_color_player; } else { _color = KPLIB_color_enemy; }; diff --git a/Missionframework/KPLIB_classnameLists.sqf b/Missionframework/KPLIB_classnameLists.sqf index e049e819b..c4c49c0a6 100644 --- a/Missionframework/KPLIB_classnameLists.sqf +++ b/Missionframework/KPLIB_classnameLists.sqf @@ -2,7 +2,7 @@ File: KPLIB_lists.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-10 - Last Update: 2020-05-15 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -280,7 +280,7 @@ boats_names = [ ]; // Classnames of artillery vehicles, which should be added to the support module -KPLIB_suppMod_artyVeh = [ +KPLIB_param_supportModule_artyVeh = [ "B_G_Mortar_01_F", "B_MBT_01_arty_F", "B_MBT_01_mlrs_F", diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 4574cc96e..9d834fd89 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -2,7 +2,7 @@ File: KPLIB_config.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-16 - Last Update: 2020-05-17 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -53,7 +53,7 @@ 29 = SFP (Desert) 30 = LDF (Contact DLC) */ -KPLIB_presetPlayers = 0; +KPLIB_presetPlayer = 0; /* ----- Enemy preset ----- @@ -79,7 +79,7 @@ KPLIB_presetPlayers = 0; 19 = CUP British Armed Forces (Desert) 20 = CUP British Armed Forces (Woodland) */ -KPLIB_presetEnemies = 0; +KPLIB_presetEnemy = 0; /* ----- Resistance preset ----- @@ -134,7 +134,7 @@ KPLIB_presetArsenal = 0; */ // Player side. -KPLIB_side_friendly = WEST; +KPLIB_side_player = WEST; // Enemy side. KPLIB_side_enemy = EAST; @@ -145,14 +145,14 @@ KPLIB_side_resistance = RESISTANCE; // Civilian side. KPLIB_side_civilian = CIVILIAN; -// Friendly sector marker color. -KPLIB_color_friendly = "ColorBLUFOR"; +// Player owned sector marker color. +KPLIB_color_player = "ColorBLUFOR"; // Enemy sector marker color. KPLIB_color_enemy = "ColorOPFOR"; // Enemy sector marker color. (activated) -KPLIB_color_enemy_bright = "ColorRED"; +KPLIB_color_enemyActive = "ColorRED"; /* @@ -180,19 +180,19 @@ KPLIB_save_interval = 60; */ // Build range around the main FOB building. -KPLIB_fob_range = 125; +KPLIB_range_fob = 125; // Altitude in metres for the HALO jump. -KPLIB_halo_altitude = 2500; +KPLIB_height_halo = 2500; // Range to activate a sector. -KPLIB_sector_size = 1000; +KPLIB_range_sectorActivation = 1000; // Range to capture a sector. -KPLIB_capture_size = 175; +KPLIB_range_sectorCapture = 175; // Radio Tower scanning range. -KPLIB_radiotower_size = 2500; +KPLIB_range_radioTowerScan = 2500; /* @@ -203,16 +203,16 @@ KPLIB_radiotower_size = 2500; */ // Cap for BLUFOR. -KPLIB_blufor_cap = 100; +KPLIB_cap_playerSide = 100; -// Cap for sector defenders. -KPLIB_sector_cap = 180; +// Cap for enemy units. +KPLIB_cap_enemySide = 180; // Cap for enemy battlegroups. -KPLIB_battlegroup_cap = 150; +KPLIB_cap_battlegroup = 150; // Cap for enemy patrols. -KPLIB_patrol_cap = 150; +KPLIB_cap_patrol = 150; // Size of enemy battlegroups. KPLIB_battlegroup_size = 6; @@ -375,6 +375,6 @@ KPLIB_commander_actions = [ /* Whitelist for BI support framework access. Same format as for the commander actions. */ -KPLIB_suppMod_whitelist = [ +KPLIB_supportModule_whitelist = [ ]; diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index ed57880ea..9bfccb2be 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -2,7 +2,7 @@ File: fn_addActionsPlayer.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-05-17 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -48,7 +48,7 @@ _player addAction [ true, "", " - KPLIB_halo_param > 0 + KPLIB_param_halo > 0 && {isNull (objectParent _originalTarget)} && {alive _originalTarget} && { @@ -132,7 +132,7 @@ _player addAction [ " isNull (objectParent _originalTarget) && {alive _originalTarget} - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_range_fob * 0.8)} && { _originalTarget getVariable ['KPLIB_hasDirectAccess', false] || {[3] call KPLIB_fnc_hasPermission} @@ -267,7 +267,7 @@ _player addAction [ "", " alive _originalTarget - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_range_fob * 0.8)} && {build_confirmed isEqualTo 0} " ]; @@ -287,7 +287,7 @@ _player addAction [ && {alive _originalTarget} && {!(KPLIB_production isEqualTo [])} && { - _originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8) + _originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_range_fob * 0.8) || {!(_originalTarget getVariable ['KPLIB_nearProd', []] isEqualTo [])} } && {build_confirmed isEqualTo 0} @@ -304,11 +304,11 @@ _player addAction [ true, "", " - KPLIB_ailogistics + KPLIB_param_logistic && {_originalTarget getVariable ['KPLIB_hasDirectAccess', false]} && {isNull (objectParent _originalTarget)} && {alive _originalTarget} - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_range_fob * 0.8)} && {!( KPLIB_sectors_fob isEqualTo [] || KPLIB_production isEqualTo [] @@ -327,7 +327,7 @@ _player addAction [ true, "", " - KPLIB_permissions_param + KPLIB_param_permissions && {_originalTarget getVariable ['KPLIB_hasDirectAccess', false]} && {alive _originalTarget} && {build_confirmed isEqualTo 0} @@ -355,7 +355,7 @@ if (player == ([] call KPLIB_fnc_getCommander)) then { // Create FOB clearance _player addAction [ ["", localize "STR_CLEARANCE_ACTION", ""] joinString "", - {[player getVariable ["KPLIB_fobPos", [0, 0, 0]], KPLIB_fob_range * 0.9, true] call KPLIB_fnc_createClearanceConfirm;}, + {[player getVariable ["KPLIB_fobPos", [0, 0, 0]], KPLIB_range_fob * 0.9, true] call KPLIB_fnc_createClearanceConfirm;}, nil, -850, false, @@ -365,7 +365,7 @@ _player addAction [ _originalTarget getVariable ['KPLIB_hasDirectAccess', false] && {isNull (objectParent _originalTarget)} && {alive _originalTarget} - && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_fob_range * 0.8)} + && {_originalTarget getVariable ['KPLIB_fobDist', 99999] < (KPLIB_range_fob * 0.8)} && {build_confirmed isEqualTo 0} " ]; diff --git a/Missionframework/functions/fn_allowCrewInImmobile.sqf b/Missionframework/functions/fn_allowCrewInImmobile.sqf index fe1a2424a..bc635c88a 100644 --- a/Missionframework/functions/fn_allowCrewInImmobile.sqf +++ b/Missionframework/functions/fn_allowCrewInImmobile.sqf @@ -2,7 +2,7 @@ File: fn_allowCrewInImmobile.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-09-05 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,7 +21,7 @@ params [ if (isNull _vehicle) exitWith {["Null object given"] call BIS_fnc_error; false}; -// KPLIB_allowEnemiesInImmobile (0-50-100) -_vehicle allowCrewInImmobile (random 100 < KPLIB_allowEnemiesInImmobile); +// KPLIB_param_allowEnemiesInImmobile (0-50-100) +_vehicle allowCrewInImmobile (random 100 < KPLIB_param_allowEnemiesInImmobile); true diff --git a/Missionframework/functions/fn_clearCargo.sqf b/Missionframework/functions/fn_clearCargo.sqf index d8fb7bf35..c27986847 100644 --- a/Missionframework/functions/fn_clearCargo.sqf +++ b/Missionframework/functions/fn_clearCargo.sqf @@ -2,7 +2,7 @@ File: fn_clearCargo.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-30 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -24,7 +24,7 @@ params [ if (isNull _obj) exitWith {["Null object given"] call BIS_fnc_error; false}; -if (_force || {!((typeOf _obj) in KPLIB_ace_crates) && {KPLIB_clear_cargo || {!((typeOf _obj) isKindOf "AllVehicles")}}}) then { +if (_force || {!((typeOf _obj) in KPLIB_ace_crates) && {KPLIB_param_clearCargo || {!((typeOf _obj) isKindOf "AllVehicles")}}}) then { clearWeaponCargoGlobal _obj; clearMagazineCargoGlobal _obj; clearBackpackCargoGlobal _obj; diff --git a/Missionframework/functions/fn_forceBluforCrew.sqf b/Missionframework/functions/fn_forceBluforCrew.sqf index 2c28209d3..5a141fe74 100644 --- a/Missionframework/functions/fn_forceBluforCrew.sqf +++ b/Missionframework/functions/fn_forceBluforCrew.sqf @@ -2,7 +2,7 @@ File: fn_forceBluforCrew.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -26,10 +26,10 @@ if (isNull _veh) exitWith {["Null object given"] call BIS_fnc_error; false}; private _grp = createVehicleCrew _veh; // If the config crew isn't the correct side, replace it with the crew classnames from the preset -if ((side _grp) != KPLIB_side_friendly) then { +if ((side _grp) != KPLIB_side_player) then { {deleteVehicle _x} forEach (units _grp); - _grp = createGroup [KPLIB_side_friendly, true]; + _grp = createGroup [KPLIB_side_player, true]; while {count units _grp < 3} do { [crewman_classname, getPos _veh, _grp] call KPLIB_fnc_createManagedUnit; }; diff --git a/Missionframework/functions/fn_getBluforRatio.sqf b/Missionframework/functions/fn_getBluforRatio.sqf index 87cf0695e..4ecc34a32 100644 --- a/Missionframework/functions/fn_getBluforRatio.sqf +++ b/Missionframework/functions/fn_getBluforRatio.sqf @@ -2,7 +2,7 @@ File: fn_getBluforRatio.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-17 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,9 +21,9 @@ params [ if (_sector isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_error; -1}; -private _range = [KPLIB_capture_size, KPLIB_capture_size * 1.4] select (_sector in KPLIB_sectors_capital); +private _range = [KPLIB_range_sectorCapture, KPLIB_range_sectorCapture * 1.4] select (_sector in KPLIB_sectors_capital); private _red = [(markerPos _sector), _range, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount; -private _blue = [(markerPos _sector), _range, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _blue = [(markerPos _sector), _range, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; if (_blue > 0 || _red > 0) then { _blue / (_blue + _red) diff --git a/Missionframework/functions/fn_getLocalCap.sqf b/Missionframework/functions/fn_getLocalCap.sqf index a5c8ef3e8..c95d00c7b 100644 --- a/Missionframework/functions/fn_getLocalCap.sqf +++ b/Missionframework/functions/fn_getLocalCap.sqf @@ -2,7 +2,7 @@ File: fn_getLocalCap.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,4 +15,4 @@ Blufor unit cap [NUMBER] */ -(round (infantry_cap / 2)) min KPLIB_blufor_cap +(round (infantry_cap / 2)) min KPLIB_cap_playerSide diff --git a/Missionframework/functions/fn_getOpforFactor.sqf b/Missionframework/functions/fn_getOpforFactor.sqf index ba18026e8..b5efc89ce 100644 --- a/Missionframework/functions/fn_getOpforFactor.sqf +++ b/Missionframework/functions/fn_getOpforFactor.sqf @@ -2,7 +2,7 @@ File: fn_getOpforFactor.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,8 +15,8 @@ Opfor factor [NUMBER] */ -if !(KPLIB_adaptive_opfor) exitWith {1}; +if !(KPLIB_param_adaptive) exitWith {1}; -private _bluforcount = (0.2 * (KPLIB_side_friendly countSide allUnits)) + ([] call KPLIB_fnc_getPlayerCount); +private _bluforcount = (0.2 * (KPLIB_side_player countSide allUnits)) + ([] call KPLIB_fnc_getPlayerCount); (0.5 + (_bluforcount / 25.0)) min 1 diff --git a/Missionframework/functions/fn_getOpforSpawnPoint.sqf b/Missionframework/functions/fn_getOpforSpawnPoint.sqf index 47357ce6c..cf138ed5b 100644 --- a/Missionframework/functions/fn_getOpforSpawnPoint.sqf +++ b/Missionframework/functions/fn_getOpforSpawnPoint.sqf @@ -2,7 +2,7 @@ File: fn_getOpforSpawnPoint.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-17 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -79,7 +79,7 @@ private ["_valid", "_current", "_distances"]; // Make sure that there is no blufor unit inside min dist to spawn if (_valid) then { - if (([markerpos _current, _min, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0) then { + if (([markerpos _current, _min, KPLIB_side_player] call KPLIB_fnc_getUnitsCount) > 0) then { _valid = false; }; }; diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index 5ecccfdd3..b311da6fe 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -2,7 +2,7 @@ File: fn_getSaveData.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-29 - Last Update: 2020-05-17 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -26,7 +26,7 @@ private _allCrates = []; // Get all blufor groups private _allBlueGroups = allGroups select { - (side _x == KPLIB_side_friendly) && // Only blufor groups + (side _x == KPLIB_side_player) && // Only blufor groups {isNull objectParent (leader _x)} && // Make sure it's an infantry group {!(((units _x) select {alive _x}) isEqualTo [])} // At least one unit has to be alive }; @@ -35,7 +35,7 @@ private _allBlueGroups = allGroups select { private ["_fobPos", "_fobObjects", "_grpUnits", "_fobMines"]; { _fobPos = _x; - _fobObjects = (_fobPos nearObjects (KPLIB_fob_range * 1.2)) select { + _fobObjects = (_fobPos nearObjects (KPLIB_range_fob * 1.2)) select { ((toLower (typeof _x)) in KPLIB_classnamesToSave) && // Exclude classnames which are not in the presets {alive _x} && // Exclude dead or broken objects {getObjectType _x >= 8} && // Exclude preplaced terrain objects @@ -56,15 +56,15 @@ private ["_fobPos", "_fobObjects", "_grpUnits", "_fobMines"]; _grpUnits = (units _x) select {!(isPlayer _x) && (alive _x)}; // Add to save array _aiGroups pushBack [getPosATL (leader _x), (_grpUnits apply {typeOf _x})]; - } forEach (_allBlueGroups select {(_fobPos distance2D (leader _x)) < (KPLIB_fob_range * 1.2)}); + } forEach (_allBlueGroups select {(_fobPos distance2D (leader _x)) < (KPLIB_range_fob * 1.2)}); // Save all mines around FOB - _fobMines = allMines inAreaArray [_fobPos, KPLIB_fob_range * 1.2, KPLIB_fob_range * 1.2]; + _fobMines = allMines inAreaArray [_fobPos, KPLIB_range_fob * 1.2, KPLIB_range_fob * 1.2]; _allMines append (_fobMines apply {[ getPosWorld _x, [vectorDirVisual _x, vectorUpVisual _x], typeOf _x, - _x mineDetectedBy KPLIB_side_friendly + _x mineDetectedBy KPLIB_side_player ]}); } forEach KPLIB_sectors_fob; @@ -125,7 +125,7 @@ private ["_supplyValue", "_ammoValue", "_fuelValue"]; // Save crates at blufor sectors which spawn crates on activation { _allCrates append ( - ((nearestObjects [markerPos _x, KPLIB_crates, KPLIB_capture_size]) select {isNull attachedTo _x}) apply { + ((nearestObjects [markerPos _x, KPLIB_crates, KPLIB_range_sectorCapture]) select {isNull attachedTo _x}) apply { [typeOf _x, _x getVariable ["KPLIB_crate_value", 0], getPosATL _x] } ); diff --git a/Missionframework/functions/fn_getSectorOwnership.sqf b/Missionframework/functions/fn_getSectorOwnership.sqf index 55561adc4..7201e1eb0 100644 --- a/Missionframework/functions/fn_getSectorOwnership.sqf +++ b/Missionframework/functions/fn_getSectorOwnership.sqf @@ -2,7 +2,7 @@ File: fn_getSectorOwnership.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -10,7 +10,7 @@ Parameter(s): _pos - Position to get owner [POSITION, defaults to [0, 0, 0]] - _radius - Radius to count units [NUMBER, defaults to KPLIB_capture_size] + _radius - Radius to count units [NUMBER, defaults to KPLIB_range_sectorCapture] Returns: Owner of the position [SIDE] @@ -18,13 +18,13 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]], - ["_radius", KPLIB_capture_size, [0]] + ["_radius", KPLIB_range_sectorCapture, [0]] ]; private _capCount = 3; private _capRatio = 0.85; private _capRatioMin = 0.51; -private _blufor = [_pos, _radius, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _blufor = [_pos, _radius, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; private _opfor = [_pos, _radius, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount; private _ratio = 0; @@ -32,7 +32,7 @@ if (_blufor + _opfor != 0) then { _ratio = _blufor / (_blufor + _opfor); }; -if (_blufor > 0 && {(_opfor <= _capCount && _ratio > _capRatioMin) || _ratio > _capRatio}) exitWith {KPLIB_side_friendly}; +if (_blufor > 0 && {(_opfor <= _capCount && _ratio > _capRatioMin) || _ratio > _capRatio}) exitWith {KPLIB_side_player}; if (_blufor == 0 && _opfor > _capCount) exitWith {KPLIB_side_enemy}; if (_blufor == 0 && _opfor <= _capCount) exitWith {KPLIB_side_civilian}; diff --git a/Missionframework/functions/fn_getSectorRange.sqf b/Missionframework/functions/fn_getSectorRange.sqf index f1ce1a86a..905f40f53 100644 --- a/Missionframework/functions/fn_getSectorRange.sqf +++ b/Missionframework/functions/fn_getSectorRange.sqf @@ -2,7 +2,7 @@ File: fn_getSectorRange.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -20,6 +20,6 @@ params [ ]; -if (_unitCount < (KPLIB_sector_cap / 2)) exitWith {KPLIB_sector_size}; -if (_unitCount <= KPLIB_sector_cap) exitWith {KPLIB_sector_size - (KPLIB_sector_size * 0.5 * ((_unitCount / KPLIB_sector_cap) - 0.5))}; -KPLIB_sector_size * 0.75 +if (_unitCount < (KPLIB_cap_enemySide / 2)) exitWith {KPLIB_range_sectorActivation}; +if (_unitCount <= KPLIB_cap_enemySide) exitWith {KPLIB_range_sectorActivation - (KPLIB_range_sectorActivation * 0.5 * ((_unitCount / KPLIB_cap_enemySide) - 0.5))}; +KPLIB_range_sectorActivation * 0.75 diff --git a/Missionframework/functions/fn_getSquadComp.sqf b/Missionframework/functions/fn_getSquadComp.sqf index 02f40244b..692c00976 100644 --- a/Missionframework/functions/fn_getSquadComp.sqf +++ b/Missionframework/functions/fn_getSquadComp.sqf @@ -2,7 +2,7 @@ File: fn_getSquadComp.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-15 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -51,7 +51,7 @@ if (_type == "army") then { }; } else { private _multiplier = 1; - if (KPLIB_unitcap < 1) then {_multiplier = KPLIB_unitcap;}; + if (KPLIB_param_unitcap < 1) then {_multiplier = KPLIB_param_unitcap;}; while {count _squadcomp < (10 * _multiplier)} do {_squadcomp pushback (selectRandom KPLIB_o_militiaInfantry)}; }; diff --git a/Missionframework/functions/fn_getUnitsCount.sqf b/Missionframework/functions/fn_getUnitsCount.sqf index e24a3b32a..9a1324cf3 100644 --- a/Missionframework/functions/fn_getUnitsCount.sqf +++ b/Missionframework/functions/fn_getUnitsCount.sqf @@ -2,7 +2,7 @@ File: fn_getUnitsCount.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -11,7 +11,7 @@ Parameter(s): _pos - Description [POSITION, defaults to [0, 0, 0] _radius - Description [NUMBER, defaults to 100] - _side - Description [SIDE, defaults to KPLIB_side_friendly] + _side - Description [SIDE, defaults to KPLIB_side_player] Returns: Amount of units [NUMBER] @@ -20,7 +20,7 @@ params [ ["_pos", [0, 0, 0], [[]], [2, 3]], ["_radius", 100, [0]], - ["_side", KPLIB_side_friendly, [sideEmpty]] + ["_side", KPLIB_side_player, [sideEmpty]] ]; private _amount = _side countSide ((_pos nearEntities ["Man", _radius]) select {!(captive _x) && ((getpos _x) select 2 < 500)}); diff --git a/Missionframework/functions/fn_hasPermission.sqf b/Missionframework/functions/fn_hasPermission.sqf index 602dd11c4..4bba4bc85 100644 --- a/Missionframework/functions/fn_hasPermission.sqf +++ b/Missionframework/functions/fn_hasPermission.sqf @@ -2,7 +2,7 @@ File: fn_hasPermission.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -20,7 +20,7 @@ params [ ]; if (_permission isEqualTo -1) exitWith {["No permission number given"] call BIS_fnc_error; false}; -if (!KPLIB_permissions_param) exitWith {true}; +if (!KPLIB_param_permissions) exitWith {true}; if (isNil "KPLIB_last_permission_check_time") then {KPLIB_last_permission_check_time = -1000;}; diff --git a/Missionframework/functions/fn_spawnCivilians.sqf b/Missionframework/functions/fn_spawnCivilians.sqf index 1b488c142..434a8df0c 100644 --- a/Missionframework/functions/fn_spawnCivilians.sqf +++ b/Missionframework/functions/fn_spawnCivilians.sqf @@ -2,7 +2,7 @@ File: fn_spawnCivilians.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-17 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,13 +25,13 @@ private _civs = []; private _sPos = markerPos _sector; // Amount and spread depending if capital or city/factory -private _amount = round ((3 + (floor (random 7))) * KPLIB_civilian_activity); +private _amount = round ((3 + (floor (random 7))) * KPLIB_param_civActivity); private _spread = 1; if (_sector in KPLIB_sectors_capital) then { _amount = _amount + 10; _spread = 2.5; }; -_amount = _amount * (sqrt (KPLIB_unitcap)); +_amount = _amount * (sqrt (KPLIB_param_unitcap)); // Spawn civilians private _grp = grpNull; diff --git a/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf b/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf index 97f439ce7..d556e9648 100644 --- a/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf +++ b/Missionframework/functions/fn_spawnMilitaryPostSquad.sqf @@ -2,7 +2,7 @@ File: fn_spawnMilitaryPostSquad.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-15 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,7 +23,7 @@ if (_pos isEqualTo [0, 0, 0]) exitWith {["No or zero pos given"] call BIS_fnc_er // Get all military patrol towers near given position private _allPosts = ( - nearestObjects [_pos, ["Land_Cargo_Patrol_V1_F","Land_Cargo_Patrol_V2_F","Land_Cargo_Patrol_V3_F","Land_Cargo_Patrol_V4_F"], KPLIB_capture_size, true] + nearestObjects [_pos, ["Land_Cargo_Patrol_V1_F","Land_Cargo_Patrol_V2_F","Land_Cargo_Patrol_V3_F","Land_Cargo_Patrol_V4_F"], KPLIB_range_sectorCapture, true] ) select {alive _x}; // Exit if no patrol towers were found diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index d4b20e5f2..e17d84d01 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -4,9 +4,9 @@ KPLIB_endgame = 0; KPLIB_respawn_marker = "respawn"; // Version of the KP Liberation framework -KPLIB_version = [0, 96, 7]; +KPLIB_version = [0, 96, 8]; -enableSaving [ false, false ]; +enableSaving [false, false]; if (isDedicated) then {debug_source = "Server";} else {debug_source = name player;}; @@ -20,7 +20,7 @@ if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; [] call compile preprocessFileLineNumbers "kp_objectInits.sqf"; // Activate selected player menu. If CBA isn't loaded -> fallback to GREUH -if (KPPLM_CBA && KPLIB_playermenu) then { +if (KPPLM_CBA && KPLIB_param_playerMenu) then { [] call KPPLM_fnc_postInit; } else { [] execVM "GREUH\scripts\GREUH_activate.sqf"; diff --git a/Missionframework/kp_objectInits.sqf b/Missionframework/kp_objectInits.sqf index 780bd8c5c..b2d287530 100644 --- a/Missionframework/kp_objectInits.sqf +++ b/Missionframework/kp_objectInits.sqf @@ -113,15 +113,15 @@ KPLIB_objectInits = [ // Add valid vehicles to support module, if system is enabled [ - KPLIB_suppMod_artyVeh, - {if (KPLIB_suppMod > 0) then {KPLIB_suppMod_arty synchronizeObjectsAdd [_this];};} + KPLIB_param_supportModule_artyVeh, + {if (KPLIB_param_supportModule > 0) then {KPLIB_param_supportModule_arty synchronizeObjectsAdd [_this];};} ], // Disable autocombat (if set in parameters) and fleeing [ ["Man"], { - if (!(KPLIB_autodanger) && {(side _this) isEqualTo KPLIB_side_friendly}) then { + if (!(KPLIB_param_autodanger) && {(side _this) isEqualTo KPLIB_side_player}) then { _this disableAI "AUTOCOMBAT"; }; _this allowFleeing 0; diff --git a/Missionframework/onPlayerRespawn.sqf b/Missionframework/onPlayerRespawn.sqf index ed268e227..bea644c1c 100644 --- a/Missionframework/onPlayerRespawn.sqf +++ b/Missionframework/onPlayerRespawn.sqf @@ -22,23 +22,23 @@ if (isNil "KPLIB_respawn_loadout") then { // Support Module handling if ([ false, - player isEqualTo ([] call KPLIB_fnc_getCommander) || (getPlayerUID player) in KPLIB_suppMod_whitelist, + player isEqualTo ([] call KPLIB_fnc_getCommander) || (getPlayerUID player) in KPLIB_supportModule_whitelist, true -] select KPLIB_suppMod) then { - waitUntil {!isNil "KPLIB_suppMod_req" && !isNil "KPLIB_suppMod_arty" && time > 5}; +] select KPLIB_param_supportModule) then { + waitUntil {!isNil "KPLIB_param_supportModule_req" && !isNil "KPLIB_param_supportModule_arty" && time > 5}; // Remove link to corpse, if respawned if (!isNull _oldUnit) then { - KPLIB_suppMod_req synchronizeObjectsRemove [_oldUnit]; - _oldUnit synchronizeObjectsRemove [KPLIB_suppMod_req]; + KPLIB_param_supportModule_req synchronizeObjectsRemove [_oldUnit]; + _oldUnit synchronizeObjectsRemove [KPLIB_param_supportModule_req]; }; // Link player to support modules - [player, KPLIB_suppMod_req, KPLIB_suppMod_arty] call BIS_fnc_addSupportLink; + [player, KPLIB_param_supportModule_req, KPLIB_param_supportModule_arty] call BIS_fnc_addSupportLink; // Init modules, if newly joined and not client host if (isNull _oldUnit && !isServer) then { - [KPLIB_suppMod_req] call BIS_fnc_moduleSupportsInitRequester; - [KPLIB_suppMod_arty] call BIS_fnc_moduleSupportsInitProvider; + [KPLIB_param_supportModule_req] call BIS_fnc_moduleSupportsInitRequester; + [KPLIB_param_supportModule_arty] call BIS_fnc_moduleSupportsInitProvider; }; }; diff --git a/Missionframework/presets/init_presets.sqf b/Missionframework/presets/init_presets.sqf index 32b44f168..cc67d1ce9 100644 --- a/Missionframework/presets/init_presets.sqf +++ b/Missionframework/presets/init_presets.sqf @@ -8,7 +8,7 @@ if (isServer) then { ["Only if you e.g. use a CUP preset and you get messages about missing CUP classes, then check your loaded mods.", "PRESETS"] call KPLIB_fnc_log; }; -switch (KPLIB_presetPlayers) do { +switch (KPLIB_presetPlayer) do { case 1: {[] call compile preprocessFileLineNumbers "presets\players\apex.sqf";}; case 2: {[] call compile preprocessFileLineNumbers "presets\players\baf_mtp.sqf";}; case 3: {[] call compile preprocessFileLineNumbers "presets\players\baf_des.sqf";}; @@ -42,7 +42,7 @@ switch (KPLIB_presetPlayers) do { default {[] call compile preprocessFileLineNumbers "presets\players\custom.sqf";}; }; -switch (KPLIB_presetEnemies) do { +switch (KPLIB_presetEnemy) do { case 1: {[] call compile preprocessFileLineNumbers "presets\enemies\apex.sqf";}; case 2: {[] call compile preprocessFileLineNumbers "presets\enemies\rhs_afrf.sqf";}; case 3: {[] call compile preprocessFileLineNumbers "presets\enemies\takistan.sqf";}; diff --git a/Missionframework/scripts/client/actions/do_recycle.sqf b/Missionframework/scripts/client/actions/do_recycle.sqf index 45e6c730a..2cb872006 100644 --- a/Missionframework/scripts/client/actions/do_recycle.sqf +++ b/Missionframework/scripts/client/actions/do_recycle.sqf @@ -82,7 +82,7 @@ if (dialog) then {closeDialog 0}; if (dorecycle == 1 && !(isnull _vehToRecycle) && alive _vehToRecycle) then { if (!(KPLIB_recycle_building_near) && ((_price_s + _price_a + _price_f) > 0)) exitWith {hint localize "STR_NORECBUILDING_ERROR";}; - private _storage_areas = (([] call KPLIB_fnc_getNearestFob) nearobjects (KPLIB_fob_range * 1.2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; + private _storage_areas = (([] call KPLIB_fnc_getNearestFob) nearobjects (KPLIB_range_fob * 1.2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; private _crateSum = (ceil (_price_s / 100)) + (ceil (_price_a / 100)) + (ceil (_price_f / 100)); private _spaceSum = 0; diff --git a/Missionframework/scripts/client/actions/intel_manager.sqf b/Missionframework/scripts/client/actions/intel_manager.sqf index 405fbe1e3..630fe14e8 100644 --- a/Missionframework/scripts/client/actions/intel_manager.sqf +++ b/Missionframework/scripts/client/actions/intel_manager.sqf @@ -1,6 +1,6 @@ // TODO Remove this loop by adding the actions to the units/intel objects on spawn waitUntil {!isNil "KPLIB_permissions"}; -waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_permissions_param}; +waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_param_permissions}; private _near_people = []; private _near_intel = []; @@ -12,14 +12,14 @@ while {true} do { _near_people = (getPosATL player) nearEntities [["Man"], 5]; _near_intel = (getPosATL player) nearEntities [KPLIB_intelObjectClasses, 5]; { - if ((captive _x) && !(_x in _actionned_captive_units) && !((side group _x) == KPLIB_side_friendly) && !(_x getVariable ["ACE_isUnconscious", false])) then { - _x addAction ["" + localize "STR_SECONDARY_CAPTURE" + "",{[_this select 0] join (group player);},"",-850,true,true,"","(vehicle player == player) && (side group _target != KPLIB_side_friendly) && (captive _target)"]; + if ((captive _x) && !(_x in _actionned_captive_units) && !((side group _x) == KPLIB_side_player) && !(_x getVariable ["ACE_isUnconscious", false])) then { + _x addAction ["" + localize "STR_SECONDARY_CAPTURE" + "",{[_this select 0] join (group player);},"",-850,true,true,"","(vehicle player == player) && (side group _target != KPLIB_side_player) && (captive _target)"]; _actionned_captive_units pushback _x; }; } forEach _near_people; { - if (!(alive _x) || ((player distance _x) > 5) || ((side group _x) == KPLIB_side_friendly)) then { + if (!(alive _x) || ((player distance _x) > 5) || ((side group _x) == KPLIB_side_player)) then { removeAllActions _x; _actionned_captive_units = _actionned_captive_units - [_x]; }; diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index 2e9ef83e6..3af71de67 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/Missionframework/scripts/client/actions/open_arsenal.sqf @@ -9,7 +9,7 @@ private _backpack = backpack player; private ["_loadouts_data"]; // Get loadouts either from ACE or BI arsenals -if (KPLIB_ace && KPLIB_arsenal_type) then { +if (KPLIB_ace && KPLIB_param_arsenalType) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -74,13 +74,13 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( load_loadout > 0 ) then { private _loaded_loadout = _loadouts_data select (lbCurSel 201); - if (KPLIB_ace && KPLIB_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { player setUnitLoadout (_loaded_loadout select 1); } else { [player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory; }; - if (KPLIB_arsenalUsePreset) then { + if (KPLIB_param_useArsenalPreset) then { if ([_backpack] call KPLIB_fnc_checkGear) then { hint format [ localize "STR_HINT_LOADOUT_LOADED", _loaded_loadout param [0]]; }; @@ -115,15 +115,15 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( edit_loadout > 0 ) then { closeDialog 0; waitUntil { !dialog }; - if (KPLIB_ace && KPLIB_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { [player, player, false] call ace_arsenal_fnc_openBox; } else { [ "Open", false ] spawn BIS_fnc_arsenal; }; - if (KPLIB_arsenalUsePreset) then { + if (KPLIB_param_useArsenalPreset) then { uiSleep 5; - private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KPLIB_ace && KPLIB_arsenal_type); + private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KPLIB_ace && KPLIB_param_arsenalType); waitUntil {sleep 1; isNull (uinamespace getvariable [_arsenalDisplay, displayNull])}; [_backpack] call KPLIB_fnc_checkGear; }; diff --git a/Missionframework/scripts/client/actions/recycle_manager.sqf b/Missionframework/scripts/client/actions/recycle_manager.sqf index 9d9bf9761..5ea7d2817 100644 --- a/Missionframework/scripts/client/actions/recycle_manager.sqf +++ b/Missionframework/scripts/client/actions/recycle_manager.sqf @@ -15,7 +15,7 @@ veh_action_distance = 10; ]; while {true} do { - waitUntil {sleep 2; player getVariable ['KPLIB_fobDist', 99999] < KPLIB_fob_range}; + waitUntil {sleep 2; player getVariable ['KPLIB_fobDist', 99999] < KPLIB_range_fob}; if ([4] call KPLIB_fnc_hasPermission) then { private _detected_vehicles = (getPos player) nearObjects veh_action_detect_distance select { @@ -32,7 +32,7 @@ while {true} do { || ((typeOf _x) == "rhsusf_mkvsoc") ) && _x distance2d startbase > 1000 && - (_x distance2d ([] call KPLIB_fnc_getNearestFob)) < KPLIB_fob_range && + (_x distance2d ([] call KPLIB_fnc_getNearestFob)) < KPLIB_range_fob && (getObjectType _x) >= 8 }; diff --git a/Missionframework/scripts/client/actions/unflip_manager.sqf b/Missionframework/scripts/client/actions/unflip_manager.sqf index 226c15124..a7bf33707 100644 --- a/Missionframework/scripts/client/actions/unflip_manager.sqf +++ b/Missionframework/scripts/client/actions/unflip_manager.sqf @@ -1,5 +1,5 @@ waitUntil {!isNil "KPLIB_permissions"}; -waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_permissions_param}; +waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_param_permissions}; private [ "_unflippable_vehicles", "_detected_vehicles", "_next_vehicle", "_next_vehicle_already_in_list", "_idact_next" ]; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 10825b261..7ee76823e 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -3,7 +3,7 @@ private [ "_maxdist", "_truepos", "_built_object_remote", "_pos", "_grp", "_classname", "_idx", "_unitrank", "_posfob", "_ghost_spot", "_vehicle", "_dist", "_actualdir", "_near_objects", "_near_objects_25", "_debug_colisions" ]; build_confirmed = 0; -_maxdist = KPLIB_fob_range; +_maxdist = KPLIB_range_fob; _truepos = []; _debug_colisions = false; KP_vector = true; @@ -40,7 +40,7 @@ while { true } do { _price_f = ((KPLIB_buildList select buildtype) select buildindex) select 3; _nearfob = [] call KPLIB_fnc_getNearestFob; - _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; + _storage_areas = (_nearfob nearobjects (KPLIB_range_fob * 2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; [_price_s, _price_a, _price_f, _classname, buildtype, _storage_areas] remoteExec ["build_remote_call",2]; }; @@ -49,14 +49,14 @@ while { true } do { _pos = [(getpos player select 0) + 1,(getpos player select 1) + 1, 0]; _grp = group player; if ( manned ) then { - _grp = createGroup KPLIB_side_friendly; + _grp = createGroup KPLIB_side_player; }; _classname createUnit [_pos, _grp,"this addMPEventHandler [""MPKilled"", {_this spawn kill_manager}]", 0.5, "private"]; build_confirmed = 0; } else { if ( buildtype == 8 ) then { _pos = [(getpos player select 0) + 1,(getpos player select 1) + 1, 0]; - _grp = createGroup KPLIB_side_friendly; + _grp = createGroup KPLIB_side_player; _grp setGroupId [format ["%1 %2",squads_names select buildindex, groupId _grp]]; _idx = 0; { @@ -147,7 +147,7 @@ while { true } do { if !(buildtype isEqualTo 99) then { { - _x setPos (_posfob getPos [KPLIB_fob_range, 10 * _forEachIndex]) + _x setPos (_posfob getPos [KPLIB_range_fob, 10 * _forEachIndex]) } forEach _fob_spheres; }; @@ -268,7 +268,7 @@ while { true } do { _price_f = ((KPLIB_buildList select buildtype) select buildindex) select 3; _nearfob = [] call KPLIB_fnc_getNearestFob; - _storage_areas = (_nearfob nearobjects (KPLIB_fob_range * 2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; + _storage_areas = (_nearfob nearobjects (KPLIB_range_fob * 2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; _supplyCrates = ceil (_price_s / 100); _ammoCrates = ceil (_price_a / 100); diff --git a/Missionframework/scripts/client/build/do_build_fob.sqf b/Missionframework/scripts/client/build/do_build_fob.sqf index 5ebdcaf7d..853b32d38 100644 --- a/Missionframework/scripts/client/build/do_build_fob.sqf +++ b/Missionframework/scripts/client/build/do_build_fob.sqf @@ -1,11 +1,11 @@ private [ "_minfobdist", "_minsectordist", "_distfob", "_clearedtobuildfob", "_distsector", "_clearedtobuildsector", "_idx" ]; -if ( count KPLIB_sectors_fob >= KPLIB_maximum_fobs ) exitWith { - hint format [ localize "STR_HINT_FOBS_EXCEEDED", KPLIB_maximum_fobs ]; +if ( count KPLIB_sectors_fob >= KPLIB_param_maxFobs ) exitWith { + hint format [ localize "STR_HINT_FOBS_EXCEEDED", KPLIB_param_maxFobs ]; }; _minfobdist = 1000; -_minsectordist = KPLIB_capture_size + KPLIB_fob_range; +_minsectordist = KPLIB_range_sectorCapture + KPLIB_range_fob; _distfob = 1; _clearedtobuildfob = true; _distsector = 1; diff --git a/Missionframework/scripts/client/build/open_build_menu.sqf b/Missionframework/scripts/client/build/open_build_menu.sqf index 80fda36c8..4567362c9 100644 --- a/Missionframework/scripts/client/build/open_build_menu.sqf +++ b/Missionframework/scripts/client/build/open_build_menu.sqf @@ -34,7 +34,7 @@ localize "STR_BUILD8" ]; _nearfob = [] call KPLIB_fnc_getNearestFob; -_actual_fob = KPLIB_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; +_actual_fob = KPLIB_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_range_fob}; while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { _build_list = KPLIB_buildList select buildtype; @@ -42,7 +42,7 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { if (_oldbuildtype != buildtype || synchro_done) then { synchro_done = false; _oldbuildtype = buildtype; - _actual_fob = KPLIB_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_fob_range}; + _actual_fob = KPLIB_fob_resources select {((_x select 0) distance _nearfob) < KPLIB_range_fob}; lbClear 110; { @@ -53,8 +53,8 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { switch (_classnamevar) do { case FOB_box_typename: {_entrytext = localize "STR_FOBBOX";}; - case Arsenal_typename: {if (KPLIB_mobilearsenal) then {_entrytext = localize "STR_ARSENAL_BOX";};}; - case Respawn_truck_typename: {if (KPLIB_mobilerespawn) then {_entrytext = localize "STR_RESPAWN_TRUCK";};}; + case Arsenal_typename: {if (KPLIB_param_mobileArsenal) then {_entrytext = localize "STR_ARSENAL_BOX";};}; + case Respawn_truck_typename: {if (KPLIB_param_mobileRespawn) then {_entrytext = localize "STR_RESPAWN_TRUCK";};}; case FOB_truck_typename: {_entrytext = localize "STR_FOBTRUCK";}; case "Flag_White_F": {_entrytext = localize "STR_INDIV_FLAG";}; case KPLIB_small_storage_building: {_entrytext = localize "STR_SMALL_STORAGE";}; @@ -114,7 +114,7 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { _selected_item = lbCurSel 110; _affordable = false; _squad_full = false; - if ((buildtype == 1) && (count (units group player) >= KPLIB_max_squad_size)) then { + if ((buildtype == 1) && (count (units group player) >= KPLIB_param_maxSquadSize)) then { _squad_full = true; }; _linked = false; diff --git a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf index f341c2333..6ed517566 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf @@ -31,7 +31,7 @@ waitUntil {sleep 5; if (alive _informant) then { if (_is_near_fob) then { sleep 5; - private _grp = createGroup [KPLIB_side_friendly, true]; + private _grp = createGroup [KPLIB_side_player, true]; [_informant] joinSilent _grp; _informant playmove "AmovPercMstpSnonWnonDnon_AmovPsitMstpSnonWnonDnon_ground"; _informant disableAI "ANIM"; diff --git a/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf b/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf index 1f2ad6e25..727f7eeef 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_notifications.sqf @@ -28,11 +28,11 @@ switch (_notif_id) do { case 4: { ["lib_civ_hvt_start", [markertext ([10000, _pos] call KPLIB_fnc_getNearestSector)]] call BIS_fnc_showNotification; private _marker = createMarker ["HVT_marker", _pos]; - _marker setMarkerColor KPLIB_color_enemy_bright; + _marker setMarkerColor KPLIB_color_enemyActive; _marker setMarkerType "hd_unknown"; private _marker_zone = createMarker ["HVT_zone", _pos]; - _marker_zone setMarkerColor KPLIB_color_enemy_bright; + _marker_zone setMarkerColor KPLIB_color_enemyActive; _marker_zone setMarkerShape "ELLIPSE"; _marker_zone setMarkerBrush "FDiagonal"; _marker_zone setMarkerSize [500,500]; diff --git a/Missionframework/scripts/client/commander/enforce_whitelist.sqf b/Missionframework/scripts/client/commander/enforce_whitelist.sqf index de2940119..97966a7ff 100644 --- a/Missionframework/scripts/client/commander/enforce_whitelist.sqf +++ b/Missionframework/scripts/client/commander/enforce_whitelist.sqf @@ -2,7 +2,7 @@ scriptName "[KPLIB] Enforce Whitelist"; [] call compile preprocessFileLineNumbers "whitelist.sqf"; -if (!KPLIB_use_whitelist) exitWith {}; +if (!KPLIB_param_cmdrWhitelist) exitWith {}; waitUntil {alive player}; sleep 1; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index 3e1e93d9f..12b2b5afb 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -15,11 +15,11 @@ execVM "scripts\client\ammoboxes\ammobox_action_manager.sqf"; execVM "scripts\client\build\build_overlay.sqf"; execVM "scripts\client\build\do_build.sqf"; execVM "scripts\client\commander\enforce_whitelist.sqf"; -if (KPLIB_mapmarkers) then {execVM "scripts\client\markers\empty_vehicles_marker.sqf";}; +if (KPLIB_param_mapMarkers) then {execVM "scripts\client\markers\empty_vehicles_marker.sqf";}; execVM "scripts\client\markers\fob_markers.sqf"; -if (!KPLIB_high_command && KPLIB_mapmarkers) then {execVM "scripts\client\markers\group_icons.sqf";}; +if (!KPLIB_param_highCommand && KPLIB_param_mapMarkers) then {execVM "scripts\client\markers\group_icons.sqf";}; execVM "scripts\client\markers\hostile_groups.sqf"; -if (KPLIB_mapmarkers) then {execVM "scripts\client\markers\huron_marker.sqf";} else {deleteMarkerLocal "huronmarker"}; +if (KPLIB_param_mapMarkers) then {execVM "scripts\client\markers\huron_marker.sqf";} else {deleteMarkerLocal "huronmarker"}; execVM "scripts\client\markers\sector_manager.sqf"; execVM "scripts\client\markers\spot_timer.sqf"; execVM "scripts\client\misc\broadcast_squad_colors.sqf"; @@ -43,13 +43,13 @@ player addEventHandler ["SeatSwitchedMan", {[_this select 2] call kp_vehicle_per player addEventHandler ["HandleRating", {if ((_this select 1) < 0) then {0};}]; // Disable stamina, if selected in parameter -if (!KPLIB_fatigue) then { +if (!KPLIB_param_fatigue) then { player enableStamina false; player addEventHandler ["Respawn", {player enableStamina false;}]; }; // Reduce aim precision coefficient, if selected in parameter -if (!KPLIB_sway) then { +if (!KPLIB_param_weaponSway) then { player setCustomAimCoef 0.1; player addEventHandler ["Respawn", {player setCustomAimCoef 0.1;}]; }; @@ -60,9 +60,9 @@ if (!KPLIB_sway) then { execVM "scripts\client\ui\intro.sqf"; -[player] joinSilent (createGroup [KPLIB_side_friendly, true]); +[player] joinSilent (createGroup [KPLIB_side_player, true]); // Start Tutorial -if (KPLIB_tutorial && {player isEqualTo ([] call KPLIB_fnc_getCommander)}) then { +if (KPLIB_param_tutorial && {player isEqualTo ([] call KPLIB_fnc_getCommander)}) then { [] call KPLIB_fnc_tutorial; }; diff --git a/Missionframework/scripts/client/markers/fob_markers.sqf b/Missionframework/scripts/client/markers/fob_markers.sqf index 7fa5ef0b1..c1b091380 100644 --- a/Missionframework/scripts/client/markers/fob_markers.sqf +++ b/Missionframework/scripts/client/markers/fob_markers.sqf @@ -23,7 +23,7 @@ while {true} do { }; }; - if (KPLIB_mobilerespawn) then { + if (KPLIB_param_mobileRespawn) then { private _respawn_trucks = [] call KPLIB_fnc_getMobileRespawns; if (count _markers_mobilespawns != count _respawn_trucks) then { diff --git a/Missionframework/scripts/client/markers/group_icons.sqf b/Missionframework/scripts/client/markers/group_icons.sqf index 267b57af2..6eed99ec4 100644 --- a/Missionframework/scripts/client/markers/group_icons.sqf +++ b/Missionframework/scripts/client/markers/group_icons.sqf @@ -7,15 +7,15 @@ setGroupIconsVisible [true,false]; while { true } do { { - if ((_x != group player) && ((side _x == KPLIB_side_friendly))) then { + if ((_x != group player) && ((side _x == KPLIB_side_player))) then { if ( (_x in _iconed_groups) && ( - (count units _x == 0) || (side _x == KPLIB_side_friendly && (((leader _x) distance (markerPos KPLIB_respawn_marker) < 100) || ((leader _x) distance startbase < 500))))) then { + (count units _x == 0) || (side _x == KPLIB_side_player && (((leader _x) distance (markerPos KPLIB_respawn_marker) < 100) || ((leader _x) distance startbase < 500))))) then { clearGroupIcons _x; _iconed_groups = _iconed_groups - [_x]; }; if ( !(_x in _iconed_groups) && ( - (count units _x > 0) && (side _x == KPLIB_side_friendly && (((leader _x) distance (markerPos KPLIB_respawn_marker) > 100) && ((leader _x) distance startbase > 500))))) then { + (count units _x > 0) && (side _x == KPLIB_side_player && (((leader _x) distance (markerPos KPLIB_respawn_marker) > 100) && ((leader _x) distance startbase > 500))))) then { clearGroupIcons _x; _localgroup = _x; _grouptype = [_localgroup] call KPLIB_fnc_getGroupType; @@ -33,7 +33,7 @@ while { true } do { _localgroup addGroupIcon [ _groupicon, [ 0,0 ] ]; - if ( side _localgroup == KPLIB_side_friendly ) then { + if ( side _localgroup == KPLIB_side_player ) then { _groupiconsize = "group_0"; _groupsize = (count (units _localgroup)); if ( _groupsize >= 2 ) then { _groupiconsize = "group_1" }; diff --git a/Missionframework/scripts/client/markers/hostile_groups.sqf b/Missionframework/scripts/client/markers/hostile_groups.sqf index cb7ac2b8f..6ac0f71ba 100644 --- a/Missionframework/scripts/client/markers/hostile_groups.sqf +++ b/Missionframework/scripts/client/markers/hostile_groups.sqf @@ -10,7 +10,7 @@ while {true} do { {deleteMarkerLocal _x;} forEach _kp_markers_array; _kp_markers_array = []; { - if ((side _x == KPLIB_side_enemy) && (({!captive _x} count (units _x) ) > 0) && ([(getpos leader _x), KPLIB_side_friendly, KPLIB_radiotower_size] call KPLIB_fnc_getNearestTower != "")) then { + if ((side _x == KPLIB_side_enemy) && (({!captive _x} count (units _x) ) > 0) && ([(getpos leader _x), KPLIB_side_player, KPLIB_range_radioTowerScan] call KPLIB_fnc_getNearestTower != "")) then { _kp_markers_pos = getPosATL leader _x; _kp_markers_posx = floor (_kp_markers_pos select 0); _kp_markers_posx = _kp_markers_posx - (_kp_markers_posx mod 500); diff --git a/Missionframework/scripts/client/markers/sector_manager.sqf b/Missionframework/scripts/client/markers/sector_manager.sqf index dc3ef1f51..c9d2035be 100644 --- a/Missionframework/scripts/client/markers/sector_manager.sqf +++ b/Missionframework/scripts/client/markers/sector_manager.sqf @@ -26,11 +26,11 @@ while {true} do { }; {_x setMarkerColorLocal KPLIB_color_enemy;} forEach (KPLIB_sectors_all - KPLIB_sectors_player); - {_x setMarkerColorLocal KPLIB_color_friendly;} forEach KPLIB_sectors_player; + {_x setMarkerColorLocal KPLIB_color_player;} forEach KPLIB_sectors_player; { _x params ["_marker", "_base"]; - _marker setMarkerColorLocal ([KPLIB_color_enemy, KPLIB_color_friendly] select (_base in KPLIB_sectors_player)); + _marker setMarkerColorLocal ([KPLIB_color_enemy, KPLIB_color_player] select (_base in KPLIB_sectors_player)); } forEach _vehicle_unlock_markers; _sector_count = count KPLIB_sectors_player; }; diff --git a/Missionframework/scripts/client/markers/spot_timer.sqf b/Missionframework/scripts/client/markers/spot_timer.sqf index d0c929b38..c9416b6f8 100644 --- a/Missionframework/scripts/client/markers/spot_timer.sqf +++ b/Missionframework/scripts/client/markers/spot_timer.sqf @@ -1,10 +1,10 @@ createMarkerLocal ["opfor_bg_marker", markers_reset]; "opfor_bg_marker" setMarkerTypeLocal "mil_unknown"; -"opfor_bg_marker" setMarkerColorLocal KPLIB_color_enemy_bright; +"opfor_bg_marker" setMarkerColorLocal KPLIB_color_enemyActive; createMarkerLocal ["opfor_capture_marker", markers_reset]; "opfor_capture_marker" setMarkerTypeLocal "mil_objective"; -"opfor_capture_marker" setMarkerColorLocal KPLIB_color_enemy_bright; +"opfor_capture_marker" setMarkerColorLocal KPLIB_color_enemyActive; if ( isNil "sector_timer" ) then { sector_timer = 0 }; diff --git a/Missionframework/scripts/client/misc/fn_initArsenal.sqf b/Missionframework/scripts/client/misc/fn_initArsenal.sqf index 426ff31ce..27a270b57 100644 --- a/Missionframework/scripts/client/misc/fn_initArsenal.sqf +++ b/Missionframework/scripts/client/misc/fn_initArsenal.sqf @@ -2,7 +2,7 @@ File: fn_initArsenal.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-11 - Last Update: 2020-05-11 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,7 +15,7 @@ Function reached the end [BOOL] */ -if (KPLIB_arsenalUsePreset) then { +if (KPLIB_param_useArsenalPreset) then { KPLIB_arsenalWeapons = []; KPLIB_arsenalMagazines = []; KPLIB_arsenalItems = []; @@ -75,7 +75,7 @@ if (KPLIB_arsenalUsePreset) then { }; KPLIB_arsenalAllowed append KPLIB_arsenalAllowedExtension; - if (KPLIB_ace && KPLIB_arsenal_type) then {[player, KPLIB_arsenalAllowed, false] call ace_arsenal_fnc_addVirtualItems;}; + if (KPLIB_ace && KPLIB_param_arsenalType) then {[player, KPLIB_arsenalAllowed, false] call ace_arsenal_fnc_addVirtualItems;}; // Lowering to avoid issues with incorrect capitalized classnames in KPLIB_fnc_checkGear KPLIB_arsenalAllowed = KPLIB_arsenalAllowed apply {toLower _x}; @@ -84,7 +84,7 @@ if (KPLIB_arsenalUsePreset) then { [missionNamespace, true] call BIS_fnc_addVirtualMagazineCargo; [missionNamespace, true] call BIS_fnc_addVirtualItemCargo; [missionNamespace, true] call BIS_fnc_addVirtualBackpackCargo; - if (KPLIB_ace && KPLIB_arsenal_type) then {[player, true, false] call ace_arsenal_fnc_addVirtualItems;}; + if (KPLIB_ace && KPLIB_param_arsenalType) then {[player, true, false] call ace_arsenal_fnc_addVirtualItems;}; }; true diff --git a/Missionframework/scripts/client/misc/init_markers.sqf b/Missionframework/scripts/client/misc/init_markers.sqf index bbc2fe9e5..35031578f 100644 --- a/Missionframework/scripts/client/misc/init_markers.sqf +++ b/Missionframework/scripts/client/misc/init_markers.sqf @@ -2,7 +2,7 @@ _marker = createMarkerLocal ["zone_capture", markers_reset]; _marker setMarkerColorLocal "ColorUNKNOWN"; _marker setMarkerShapeLocal "Ellipse"; _marker setMarkerBrushLocal "SolidBorder"; -_marker setMarkerSizeLocal [ KPLIB_capture_size, KPLIB_capture_size ]; +_marker setMarkerSizeLocal [ KPLIB_range_sectorCapture, KPLIB_range_sectorCapture ]; _marker = createMarkerLocal ["spawn_marker", markers_reset]; _marker setMarkerColorLocal "ColorGreen"; diff --git a/Missionframework/scripts/client/misc/permissions_warning.sqf b/Missionframework/scripts/client/misc/permissions_warning.sqf index 5a87eede0..bd9c54e07 100644 --- a/Missionframework/scripts/client/misc/permissions_warning.sqf +++ b/Missionframework/scripts/client/misc/permissions_warning.sqf @@ -1,4 +1,4 @@ -if ( KPLIB_permissions_param ) then { +if ( KPLIB_param_permissions ) then { waitUntil { !(isNil "KPLIB_permissions") }; diff --git a/Missionframework/scripts/client/misc/playerNamespace.sqf b/Missionframework/scripts/client/misc/playerNamespace.sqf index 2c1b607c4..fffffb63a 100644 --- a/Missionframework/scripts/client/misc/playerNamespace.sqf +++ b/Missionframework/scripts/client/misc/playerNamespace.sqf @@ -2,7 +2,7 @@ File: playerNamespace.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-12 - Last Update: 2020-05-17 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,7 +25,7 @@ while {true} do { if !(KPLIB_sectors_fob isEqualTo []) then { _fobPos = [] call KPLIB_fnc_getNearestFob; _fobDist = player distance2d _fobPos; - _fobName = ["", ["FOB", [_fobPos] call KPLIB_fnc_getFobName] joinString " "] select (_fobDist < KPLIB_fob_range); + _fobName = ["", ["FOB", [_fobPos] call KPLIB_fnc_getFobName] joinString " "] select (_fobDist < KPLIB_range_fob); } else { _fobPos = [0, 0, 0]; _fobDist = 99999; @@ -43,12 +43,12 @@ while {true} do { player setVariable ["KPLIB_isAwayFromStart", (player distance2d startbase) > 1000]; // Is near an arsenal object - if (KPLIB_mobilearsenal) then { + if (KPLIB_param_mobileArsenal) then { player setVariable ["KPLIB_isNearArsenal", !(((player nearObjects [Arsenal_typename, 5]) select {getObjectType _x >= 8}) isEqualTo [])]; }; // Is near a mobile respawn - if (KPLIB_mobilerespawn) then { + if (KPLIB_param_mobileRespawn) then { player setVariable ["KPLIB_isNearMobRespawn", !((player nearEntities [[Respawn_truck_typename, huron_typename], 10]) isEqualTo [])]; }; @@ -57,7 +57,7 @@ while {true} do { // Nearest activated sector and possible production data player setVariable ["KPLIB_nearProd", KPLIB_production param [KPLIB_production findIf {(_x select 1) isEqualTo ([100] call KPLIB_fnc_getNearestSector)}, []]]; - player setVariable ["KPLIB_nearSector", [KPLIB_sector_size] call KPLIB_fnc_getNearestSector]; + player setVariable ["KPLIB_nearSector", [KPLIB_range_sectorActivation] call KPLIB_fnc_getNearestSector]; // Zeus module synced to player player setVariable ["KPLIB_ownedZeusModule", getAssignedCuratorLogic player]; diff --git a/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf b/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf index 7987e7d04..1d17ba808 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf @@ -16,7 +16,7 @@ if ( time > KPLIB_last_incoming_notif_time + 60 ) then { private [ "_mrk" ]; _mrk = createMarkerLocal [ "opfor_incoming_marker", _attack_destination]; "opfor_incoming_marker" setMarkerTypeLocal "selector_selectedMission"; - "opfor_incoming_marker" setMarkerColorLocal KPLIB_color_enemy_bright; + "opfor_incoming_marker" setMarkerColorLocal KPLIB_color_enemyActive; sleep 250; deleteMarkerLocal _mrk; diff --git a/Missionframework/scripts/client/remotecall/remote_call_intel.sqf b/Missionframework/scripts/client/remotecall/remote_call_intel.sqf index 09df99594..1c0352d96 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_intel.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_intel.sqf @@ -11,11 +11,11 @@ switch (_notiftype) do { waitUntil {secondary_objective_position_marker distance zeropos > 1000}; ["lib_intel_fob", [markertext ([10000, secondary_objective_position_marker] call KPLIB_fnc_getNearestSector)]] call BIS_fnc_showNotification; _secondary_marker = createMarkerLocal ["secondarymarker", secondary_objective_position_marker]; - _secondary_marker setMarkerColorLocal KPLIB_color_enemy_bright; + _secondary_marker setMarkerColorLocal KPLIB_color_enemyActive; _secondary_marker setMarkerTypeLocal "hd_unknown"; _secondary_marker_zone = createMarkerLocal ["secondarymarkerzone", secondary_objective_position_marker]; - _secondary_marker_zone setMarkerColorLocal KPLIB_color_enemy_bright; + _secondary_marker_zone setMarkerColorLocal KPLIB_color_enemyActive; _secondary_marker_zone setMarkerShapeLocal "ELLIPSE"; _secondary_marker_zone setMarkerBrushLocal "FDiagonal"; _secondary_marker_zone setMarkerSizeLocal [1500,1500]; @@ -34,11 +34,11 @@ switch (_notiftype) do { waitUntil {secondary_objective_position_marker distance zeropos > 1000}; ["lib_intel_sar", [markertext ([10000, secondary_objective_position_marker] call KPLIB_fnc_getNearestSector)]] call BIS_fnc_showNotification; _secondary_marker = createMarkerLocal ["secondarymarker", secondary_objective_position_marker]; - _secondary_marker setMarkerColorLocal KPLIB_color_enemy_bright; + _secondary_marker setMarkerColorLocal KPLIB_color_enemyActive; _secondary_marker setMarkerTypeLocal "hd_unknown"; _secondary_marker_zone = createMarkerLocal ["secondarymarkerzone", secondary_objective_position_marker]; - _secondary_marker_zone setMarkerColorLocal KPLIB_color_enemy_bright; + _secondary_marker_zone setMarkerColorLocal KPLIB_color_enemyActive; _secondary_marker_zone setMarkerShapeLocal "ELLIPSE"; _secondary_marker_zone setMarkerBrushLocal "FDiagonal"; _secondary_marker_zone setMarkerSizeLocal [1500,1500]; diff --git a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf index 5a47d3a20..0d6511a1c 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf @@ -27,4 +27,4 @@ if ( _status == 3 ) then { }; { _x setMarkerColorLocal KPLIB_color_enemy; } foreach (KPLIB_sectors_all - KPLIB_sectors_player); -{ _x setMarkerColorLocal KPLIB_color_friendly; } foreach KPLIB_sectors_player; +{ _x setMarkerColorLocal KPLIB_color_player; } foreach KPLIB_sectors_player; diff --git a/Missionframework/scripts/client/spawn/do_halo.sqf b/Missionframework/scripts/client/spawn/do_halo.sqf index fcb16d5bb..376d79cee 100644 --- a/Missionframework/scripts/client/spawn/do_halo.sqf +++ b/Missionframework/scripts/client/spawn/do_halo.sqf @@ -2,8 +2,8 @@ private [ "_dialog", "_backpack", "_backpackcontents" ]; if ( isNil "KPLIB_last_halo_jump" ) then { KPLIB_last_halo_jump = -6000; }; -if ( KPLIB_halo_param > 1 && ( KPLIB_last_halo_jump + ( KPLIB_halo_param * 60 ) ) >= time ) exitWith { - hint format [ localize "STR_HALO_DENIED_COOLDOWN", ceil ( ( ( KPLIB_last_halo_jump + ( KPLIB_halo_param * 60 ) ) - time ) / 60 ) ]; +if ( KPLIB_param_halo > 1 && ( KPLIB_last_halo_jump + ( KPLIB_param_halo * 60 ) ) >= time ) exitWith { + hint format [ localize "STR_HALO_DENIED_COOLDOWN", ceil ( ( ( KPLIB_last_halo_jump + ( KPLIB_param_halo * 60 ) ) - time ) / 60 ) ]; }; _dialog = createDialog "liberation_halo"; @@ -36,7 +36,7 @@ if ( dialog ) then { if ( dojump > 0 ) then { KPLIB_last_halo_jump = time; halo_position = halo_position getPos [random 250, random 360]; - halo_position = [ halo_position select 0, halo_position select 1, KPLIB_halo_altitude + (random 200) ]; + halo_position = [ halo_position select 0, halo_position select 1, KPLIB_height_halo + (random 200) ]; halojumping = true; sleep 0.1; cutRsc ["fasttravel", "PLAIN", 1]; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 0650c5924..02624b65f 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -59,7 +59,7 @@ while {true} do { // Get loadouts either from ACE or BI arsenals private ["_loadouts_data"]; - if (KPLIB_ace && KPLIB_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -86,7 +86,7 @@ while {true} do { choiceslist = choiceslist + [[format ["FOB %1 - %2", (military_alphabet select _idx),mapGridPosition (KPLIB_sectors_fob select _idx)],KPLIB_sectors_fob select _idx]]; }; - if (KPLIB_mobilerespawn) then { + if (KPLIB_param_mobileRespawn) then { if (KPLIB_respawn_time <= time) then { private _respawn_trucks = [] call KPLIB_fnc_getMobileRespawns; @@ -167,7 +167,7 @@ while {true} do { if ((lbCurSel 203) > 0) then { private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1); - if (KPLIB_ace && KPLIB_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { player setUnitLoadout (_selectedLoadout select 1); } else { [player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory; @@ -188,16 +188,16 @@ while {true} do { if (alive player && deploy == 1) then { [_spawn_str] spawn spawn_camera; if (KPLIB_respawn_mobile_done) then { - KPLIB_respawn_time = time + KPLIB_respawn_cooldown; + KPLIB_respawn_time = time + KPLIB_param_mobileRespawnCooldown; KPLIB_respawn_mobile_done = false; }; }; - if (KPLIB_arsenalUsePreset) then { + if (KPLIB_param_useArsenalPreset) then { [_backpack] call KPLIB_fnc_checkGear; }; - if (KPLIB_mobilerespawn && (KPLIB_respawn_time > time)) then { + if (KPLIB_param_mobileRespawn && (KPLIB_respawn_time > time)) then { hint format [localize "STR_RESPAWN_COOLDOWN_HINT", ceil ((KPLIB_respawn_time - time) / 60)]; uiSleep 12; hint ""; diff --git a/Missionframework/scripts/client/spawn/spawn_camera.sqf b/Missionframework/scripts/client/spawn/spawn_camera.sqf index 2bdd6e9e4..5e1410148 100644 --- a/Missionframework/scripts/client/spawn/spawn_camera.sqf +++ b/Missionframework/scripts/client/spawn/spawn_camera.sqf @@ -11,7 +11,7 @@ _datestring = format [ "%3/%2/%1 %4%5:%6%7", date select 0, date select 1, date private [ "_spawn_camera", "_startpos0", "_startpos1", "_endpos1","_startpos2","_endpos2","_startpos3","_endpos3"]; -if ( KPLIB_deployment_cinematic ) then { +if ( KPLIB_param_deployCinematic ) then { camUseNVG false; showCinemaBorder false; @@ -39,7 +39,7 @@ if ( KPLIB_deployment_cinematic ) then { [ format [ "%1
%2
%3
%4", name player, _spawn_str, _datestring, _nearest_sector ],1,0.8,8,1 ] spawn BIS_fnc_dynamictext; -if ( KPLIB_deployment_cinematic ) then { +if ( KPLIB_param_deployCinematic ) then { _spawn_camera camSetRelPos _endpos1; _spawn_camera camcommit 1.75; diff --git a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm index 1e02244dd..5511fb57d 100644 --- a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm +++ b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm @@ -232,7 +232,7 @@ class FSM "&& {" \n " private _locations = [startbase];" \n " _locations append KPLIB_sectors_fob;" \n - " !((_locations select {(_x distance2d player) < KPLIB_fob_range}) isEqualTo [])" \n + " !((_locations select {(_x distance2d player) < KPLIB_range_fob}) isEqualTo [])" \n "}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; @@ -330,7 +330,7 @@ class FSM " _sectorComplete" \n "];" \n "" \n - "private _nextState = diag_tickTime + ([4, 10] select KPLIB_deployment_cinematic);"/*%FSM*/; + "private _nextState = diag_tickTime + ([4, 10] select KPLIB_param_deployCinematic);"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -439,7 +439,7 @@ class FSM to="Init_path"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " [""KPLIB_tutorialTask_Fob""] call BIS_fnc_taskCompleted" \n + " [""KPLIB_param_tutorialTask_Fob""] call BIS_fnc_taskCompleted" \n " ||" \n " {[] call _fobComplete}" \n ")"/*%FSM*/; @@ -454,7 +454,7 @@ class FSM to="Init_path_1"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " [""KPLIB_tutorialTask_Sector""] call BIS_fnc_taskCompleted" \n + " [""KPLIB_param_tutorialTask_Sector""] call BIS_fnc_taskCompleted" \n " ||" \n " {[] call _sectorComplete}" \n ")"/*%FSM*/; @@ -641,7 +641,7 @@ class FSM to="Complete_task"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " (((KPLIB_sectors_fob select 0) nearObjects KPLIB_fob_range) select {" \n + " (((KPLIB_sectors_fob select 0) nearObjects KPLIB_range_fob) select {" \n " (_x getVariable [""KP_liberation_storage_type"", -1]) == 0" \n " }) isEqualTo []" \n ")"/*%FSM*/; @@ -917,7 +917,7 @@ class FSM to="Start_production"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n - " (((markerPos _factory) nearObjects KPLIB_fob_range) select {" \n + " (((markerPos _factory) nearObjects KPLIB_range_fob) select {" \n " (_x getVariable [""KP_liberation_storage_type"", -1]) == 1" \n " }) isEqualTo []" \n ")"/*%FSM*/; diff --git a/Missionframework/scripts/client/ui/intro.sqf b/Missionframework/scripts/client/ui/intro.sqf index 9f220db35..546e7e0b4 100644 --- a/Missionframework/scripts/client/ui/intro.sqf +++ b/Missionframework/scripts/client/ui/intro.sqf @@ -4,7 +4,7 @@ waitUntil { time > 0 }; [] spawn cinematic_camera; -if ( KPLIB_introduction ) then { +if ( KPLIB_param_introCinematic ) then { sleep 1; cutRsc ["intro1","PLAIN",1,true]; diff --git a/Missionframework/scripts/client/ui/squad_management.sqf b/Missionframework/scripts/client/ui/squad_management.sqf index ca8510ed5..d5cc049c4 100644 --- a/Missionframework/scripts/client/ui/squad_management.sqf +++ b/Missionframework/scripts/client/ui/squad_management.sqf @@ -186,7 +186,7 @@ while { dialog && alive player } do { if ( _fobdistance < 100 || count _nearsquad > 0 ) then { - _tempgmp = createGroup [KPLIB_side_friendly, true]; + _tempgmp = createGroup [KPLIB_side_player, true]; (typeof _selectedmember) createUnit [ markers_reset, _tempgmp,'']; [ (units _tempgmp) select 0, _selectedmember ] call KPLIB_fnc_swapInventory; deleteVehicle ((units _tempgmp) select 0); diff --git a/Missionframework/scripts/client/ui/ui_manager.sqf b/Missionframework/scripts/client/ui/ui_manager.sqf index b54b530ac..f5c5ef035 100644 --- a/Missionframework/scripts/client/ui/ui_manager.sqf +++ b/Missionframework/scripts/client/ui/ui_manager.sqf @@ -114,7 +114,7 @@ while {true} do { if (_uiticks % 25 == 0) then { - if (!isNil "KPLIB_sectors_active" && ([] call KPLIB_fnc_getOpforCap >= KPLIB_sector_cap)) then { + if (!isNil "KPLIB_sectors_active" && ([] call KPLIB_fnc_getOpforCap >= KPLIB_cap_enemySide)) then { (_overlay displayCtrl (517)) ctrlShow true; @@ -135,16 +135,16 @@ while {true} do { (_overlay displayCtrl (517)) ctrlShow false; }; - _nearest_active_sector = [KPLIB_sector_size] call KPLIB_fnc_getNearestSector; + _nearest_active_sector = [KPLIB_range_sectorActivation] call KPLIB_fnc_getNearestSector; if ( _nearest_active_sector != "" ) then { - _zone_size = KPLIB_capture_size; + _zone_size = KPLIB_range_sectorCapture; if ( _nearest_active_sector in KPLIB_sectors_capital ) then { - _zone_size = KPLIB_capture_size * 1.4; + _zone_size = KPLIB_range_sectorCapture * 1.4; }; "zone_capture" setmarkerposlocal (markerpos _nearest_active_sector); _colorzone = "ColorGrey"; - if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_friendly ) then { _colorzone = KPLIB_color_friendly }; + if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_player ) then { _colorzone = KPLIB_color_player }; if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_enemy ) then { _colorzone = KPLIB_color_enemy }; if ( [ markerpos _nearest_active_sector, _zone_size ] call KPLIB_fnc_getSectorOwnership == KPLIB_side_resistance ) then { _colorzone = "ColorCivilian" }; "zone_capture" setmarkercolorlocal _colorzone; diff --git a/Missionframework/scripts/server/ai/building_defence_ai.sqf b/Missionframework/scripts/server/ai/building_defence_ai.sqf index 814cc7e39..8fc2f64a7 100644 --- a/Missionframework/scripts/server/ai/building_defence_ai.sqf +++ b/Missionframework/scripts/server/ai/building_defence_ai.sqf @@ -13,9 +13,9 @@ while {_move_is_disabled && local _unit && alive _unit && !(captive _unit)} do { _ratio = [_sector] call KPLIB_fnc_getBluforRatio; }; - _range = floor (linearConversion [0, 1, _ratio, 0, KPLIB_capture_size / 3 * 2, true]); + _range = floor (linearConversion [0, 1, _ratio, 0, KPLIB_range_sectorCapture / 3 * 2, true]); - _hostiles = ((getPos _unit) nearEntities [["Man"], _range]) select {side _x == KPLIB_side_friendly}; + _hostiles = ((getPos _unit) nearEntities [["Man"], _range]) select {side _x == KPLIB_side_player}; if (_move_is_disabled && { diff --git a/Missionframework/scripts/server/ai/prisonner_ai.sqf b/Missionframework/scripts/server/ai/prisonner_ai.sqf index 0dfa5857e..eb8c3883f 100644 --- a/Missionframework/scripts/server/ai/prisonner_ai.sqf +++ b/Missionframework/scripts/server/ai/prisonner_ai.sqf @@ -34,7 +34,7 @@ if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == KPLIB_side_e _unit setCaptive true; }; waitUntil {sleep 1; - !alive _unit || side group _unit == KPLIB_side_friendly + !alive _unit || side group _unit == KPLIB_side_player }; if (alive _unit) then { diff --git a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf index af568fbe2..eab4ac904 100644 --- a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf +++ b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf @@ -21,7 +21,7 @@ while {KPLIB_endgame == 0} do { { private _sector = _x; private _blocked = false; - private _units_at_sector = [markerPos _sector, KPLIB_sector_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; + private _units_at_sector = [markerPos _sector, KPLIB_range_sectorActivation, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; { if ((_x select 0) == _sector) exitWith { @@ -40,7 +40,7 @@ while {KPLIB_endgame == 0} do { if ((random 100) <= KPLIB_resistance_ambush_chance) then { private _hc = [] call KPLIB_fnc_getLessLoadedHC; - private _ieds = round (([] call KPLIB_fnc_crGetMulti) * KPLIB_difficulty_modifier); + private _ieds = round (([] call KPLIB_fnc_crGetMulti) * KPLIB_param_difficulty); if (isNull _hc) then { [_sector, _ieds] spawn manage_asymIED; diff --git a/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf b/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf index 7ddc2ebcc..e00f4b303 100644 --- a/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf +++ b/Missionframework/scripts/server/asymmetric/ied/manage_asymIED.sqf @@ -31,8 +31,8 @@ if (!(isnull _roadobj)) then { if (KPLIB_asymmetric_debug > 0) then {[format ["manage_asymIED.sqf -> IED %1 spawned at %2", _count, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; while {(_sector in KPLIB_asymmetric_sectors) && (mineActive _ied_obj) && !_goes_boom} do { - _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_friendly}; - _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_friendly}; + _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_player}; + _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_player}; if (count _nearinfantry >= _infantry_trigger || count _nearvehicles >= _vehicle_trigger) then { _ied_obj setDamage 1; stats_ieds_detonated = stats_ieds_detonated + 1; publicVariable "stats_ieds_detonated"; diff --git a/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf b/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf index a98764aec..4ac6104d5 100644 --- a/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf +++ b/Missionframework/scripts/server/asymmetric/random/asym_sector_ambush.sqf @@ -37,7 +37,7 @@ if (KPLIB_asymmetric_debug > 0) then {[format ["asym_sector_ambush.sqf -> Units private _attack = false; while {(_sector in KPLIB_asymmetric_sectors) && (!isNull _grp)} do { - private _blufor_near = {alive _x && side _x == KPLIB_side_friendly} count ((getpos (leader _grp)) nearEntities [["LAND"], 140]); + private _blufor_near = {alive _x && side _x == KPLIB_side_player} count ((getpos (leader _grp)) nearEntities [["LAND"], 140]); if ((_blufor_near > 0) && !_attack) then { _attack = true; { diff --git a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf index 73e083258..8d3674f03 100644 --- a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf +++ b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf @@ -4,7 +4,7 @@ if (KPLIB_asymmetric_debug > 0) then {[format ["Sector %1 (%2) - sector_guerilla private _startpos = (markerPos _sector) getPos [(1200 + (round (random 400))), (random 360)]; -while {(([_startpos, 500, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0) || (surfaceIsWater _startpos)} do { +while {(([_startpos, 500, KPLIB_side_player] call KPLIB_fnc_getUnitsCount) > 0) || (surfaceIsWater _startpos)} do { _startpos = (markerPos _sector) getPos [(1200 + (round (random 400))), (random 360)]; }; diff --git a/Missionframework/scripts/server/base/startgame.sqf b/Missionframework/scripts/server/base/startgame.sqf index dd8f530be..b62af294a 100644 --- a/Missionframework/scripts/server/base/startgame.sqf +++ b/Missionframework/scripts/server/base/startgame.sqf @@ -5,7 +5,7 @@ waitUntil {save_is_loaded}; if (KPLIB_sectors_fob isEqualTo []) then { // Prebuild FOB (parameter setting) or spawn FOB box - if (KPLIB_build_first_fob) then { + if (KPLIB_param_firstFobBuilt) then { // Only accept spawnpoints which are at least 800m away from any sector private _y = ""; private _validPlaces = KPLIB_sectors_spawn select { @@ -19,7 +19,7 @@ if (KPLIB_sectors_fob isEqualTo []) then { // Spawn FOB box and wait until the first FOB was built private _fobbox = objNull; while {KPLIB_sectors_fob isEqualTo []} do { - _fobbox = ([FOB_box_typename, FOB_truck_typename] select KPLIB_fob_vehicle) createVehicle (getposATL base_boxspawn); + _fobbox = ([FOB_box_typename, FOB_truck_typename] select KPLIB_param_fobVehicle) createVehicle (getposATL base_boxspawn); _fobbox setdir getDir base_boxspawn; _fobbox setposATL (getposATL base_boxspawn); [_fobbox, true] call KPLIB_fnc_clearCargo; @@ -37,7 +37,7 @@ if (KPLIB_sectors_fob isEqualTo []) then { // Wait a short time before paradropping the start resource crates waitUntil {sleep 1; !(KPLIB_sectors_fob isEqualTo [])}; - if (KPLIB_tutorial && {["KPLIB_Tasks_Tutorial_Fob"] call BIS_fnc_taskExists}) then { + if (KPLIB_param_tutorial && {["KPLIB_Tasks_Tutorial_Fob"] call BIS_fnc_taskExists}) then { waitUntil {sleep 1; ["KPLIB_Tasks_Tutorial_Fob_02"] call BIS_fnc_taskCompleted}; sleep 3; } else { diff --git a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf index 6ba8742ae..37f5904c3 100644 --- a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf @@ -6,8 +6,8 @@ sleep 1800; private _sleeptime = 0; private _target_player = objNull; private _target_pos = ""; -while {KPLIB_csat_aggressivity >= 0.9 && KPLIB_endgame == 0} do { - _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_csat_aggressivity); +while {KPLIB_param_aggressivity >= 0.9 && KPLIB_endgame == 0} do { + _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_param_aggressivity); if (combat_readiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; if (combat_readiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; diff --git a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf index a9d72c5e5..5c99df515 100644 --- a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf +++ b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf @@ -1,7 +1,7 @@ -sleep (900 / KPLIB_csat_aggressivity); +sleep (900 / KPLIB_param_aggressivity); private _sleeptime = 0; -while {KPLIB_csat_aggressivity > 0.9 && KPLIB_endgame == 0} do { - _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_csat_aggressivity); +while {KPLIB_param_aggressivity > 0.9 && KPLIB_endgame == 0} do { + _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_param_aggressivity); if (combat_readiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; if (combat_readiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; @@ -12,14 +12,14 @@ while {KPLIB_csat_aggressivity > 0.9 && KPLIB_endgame == 0} do { if (!isNil "KPLIB_last_battlegroup_time") then { waitUntil { sleep 5; - diag_tickTime > (KPLIB_last_battlegroup_time + (2100 / KPLIB_csat_aggressivity)) + diag_tickTime > (KPLIB_last_battlegroup_time + (2100 / KPLIB_param_aggressivity)) }; }; if ( - (count (allPlayers - entities "HeadlessClient_F") >= (6 / KPLIB_csat_aggressivity)) - && {combat_readiness >= (60 - (5 * KPLIB_csat_aggressivity))} - && {[] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap} + (count (allPlayers - entities "HeadlessClient_F") >= (6 / KPLIB_param_aggressivity)) + && {combat_readiness >= (60 - (5 * KPLIB_param_aggressivity))} + && {[] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup} && {diag_fps > 15.0} ) then { ["", (random 100) < 45] spawn spawn_battlegroup; diff --git a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf index c8efe97e6..45982e4c7 100644 --- a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf +++ b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf @@ -14,6 +14,6 @@ while {true} do { stats_readiness_earned = stats_readiness_earned + 0.25; }; }; - if (combat_readiness > 100.0 && KPLIB_difficulty_modifier < 2) then {combat_readiness = 100.0}; + if (combat_readiness > 100.0 && KPLIB_param_difficulty < 2) then {combat_readiness = 100.0}; sleep (180 + random (180)); }; diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index abba35a20..62a32c21e 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -13,7 +13,7 @@ if !(_spawn_marker isEqualTo "") then { private _bg_groups = []; private _selected_opfor_battlegroup = []; - private _target_size = (round (KPLIB_battlegroup_size * ([] call KPLIB_fnc_getOpforFactor) * (sqrt KPLIB_csat_aggressivity))) min 16; + private _target_size = (round (KPLIB_battlegroup_size * ([] call KPLIB_fnc_getOpforFactor) * (sqrt KPLIB_param_aggressivity))) min 16; if (combat_readiness < 60) then {_target_size = round (_target_size * 0.65);}; [_spawn_marker] remoteExec ["remote_call_battlegroup"]; @@ -58,7 +58,7 @@ if !(_spawn_marker isEqualTo "") then { [_nextgrp] spawn battlegroup_ai; _bg_groups pushback _nextgrp; - if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap)) then { + if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup)) then { if (_vehicle isKindOf "Air") then { [[markerPos _spawn_marker] call KPLIB_fnc_getNearestBluforObjective, _vehicle] spawn send_paratroopers; } else { @@ -67,7 +67,7 @@ if !(_spawn_marker isEqualTo "") then { }; } forEach _selected_opfor_battlegroup; - if (KPLIB_csat_aggressivity > 0.9) then { + if (KPLIB_param_aggressivity > 0.9) then { [[markerPos _spawn_marker] call KPLIB_fnc_getNearestBluforObjective] spawn spawn_air; }; }; diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf index 02c526f5f..4d18c62c4 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_changeCR.sqf @@ -18,8 +18,8 @@ private _resistanceFriendly = [0, 1] select (KPLIB_civ_rep >= -25); KPLIB_side_resistance setFriend [KPLIB_side_enemy, _resistanceEnemy]; KPLIB_side_enemy setFriend [KPLIB_side_resistance, _resistanceEnemy]; -KPLIB_side_resistance setFriend [KPLIB_side_friendly, _resistanceFriendly]; -KPLIB_side_friendly setFriend [KPLIB_side_resistance, _resistanceFriendly]; +KPLIB_side_resistance setFriend [KPLIB_side_player, _resistanceFriendly]; +KPLIB_side_player setFriend [KPLIB_side_resistance, _resistanceFriendly]; if (KPLIB_civrep_debug > 0) then {[format ["changeCR finished - New value: %1", KPLIB_civ_rep], "CIVREP"] call KPLIB_fnc_log;}; -if (KPLIB_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; +if (KPLIB_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_player, (KPLIB_side_resistance getFriend KPLIB_side_player)], "CIVREP"] call KPLIB_fnc_log;}; diff --git a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf index e92ff18f8..6cfb253a1 100644 --- a/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf +++ b/Missionframework/scripts/server/civrep/fnc/f_kp_cr_getBuildings.sqf @@ -2,10 +2,10 @@ params ["_sector"]; private _return = 0; -if (KPLIB_cr_param_buildings) then { - _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(damage _x == 0) && !((typeOf _x) in KPLIB_cr_ign_buildings)}); +if (KPLIB_param_buildingDamaged) then { + _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_range_sectorCapture] select {(damage _x == 0) && !((typeOf _x) in KPLIB_cr_ign_buildings)}); } else { - _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_capture_size] select {(alive _x) && !((typeOf _x) in KPLIB_cr_ign_buildings)}); + _return = count (nearestObjects [markerPos _sector, ["House"], 1.5 * KPLIB_range_sectorCapture] select {(alive _x) && !((typeOf _x) in KPLIB_cr_ign_buildings)}); }; _return diff --git a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf index 182993d21..9cc82ac71 100644 --- a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf +++ b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf @@ -32,11 +32,11 @@ for "_i" from 1 to _count do { if (KPLIB_civrep_debug > 0) then {[format ["civrep_wounded_civs.sqf -> Spawned %1 wounded civilians at %2", _count, markerText _sector], "CIVREP"] remoteExecCall ["KPLIB_fnc_log", 2];}; -private _units_near = [markerPos _sector, 300, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _units_near = [markerPos _sector, 300, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; private _healed_civs = []; while {_units_near > 0} do { - _units_near = [markerPos _sector, 300, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; + _units_near = [markerPos _sector, 300, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; { if (((damage _x) < 0.5) && !(_x in _healed_civs)) then { (_markers select _forEachIndex) setMarkerAlpha 0; diff --git a/Missionframework/scripts/server/game/apply_default_permissions.sqf b/Missionframework/scripts/server/game/apply_default_permissions.sqf index bcee6fcd0..394fff76b 100644 --- a/Missionframework/scripts/server/game/apply_default_permissions.sqf +++ b/Missionframework/scripts/server/game/apply_default_permissions.sqf @@ -1,4 +1,4 @@ -if (!KPLIB_permissions_param) exitWith {}; +if (!KPLIB_param_permissions) exitWith {}; waitUntil {!isNil "KPLIB_permissions"}; waitUntil {!isNil "save_is_loaded"}; diff --git a/Missionframework/scripts/server/game/cleanup_vehicles.sqf b/Missionframework/scripts/server/game/cleanup_vehicles.sqf index fd6dde5ca..cd26ee094 100644 --- a/Missionframework/scripts/server/game/cleanup_vehicles.sqf +++ b/Missionframework/scripts/server/game/cleanup_vehicles.sqf @@ -5,7 +5,7 @@ _cleanup_classnames = []; _cleanup_classnames append _x; } forEach [KPLIB_b_light_classes, KPLIB_b_heavy_classes, KPLIB_b_air_classes]; -while { KPLIB_cleanup_vehicles > 0 } do { +while { KPLIB_param_vehicleCleanup > 0 } do { sleep 600; @@ -14,7 +14,7 @@ while { KPLIB_cleanup_vehicles > 0 } do { _nextvehicle = _x; _nearestfob = [ getpos _nextvehicle ] call KPLIB_fnc_getNearestFob; if ( count _nearestfob == 3 ) then { - if ( ( _nextvehicle distance _nearestfob > ( 1.2 * KPLIB_fob_range ) ) && ( _nextvehicle distance startbase > ( 1.2 * KPLIB_fob_range ) ) ) then { + if ( ( _nextvehicle distance _nearestfob > ( 1.2 * KPLIB_range_fob ) ) && ( _nextvehicle distance startbase > ( 1.2 * KPLIB_range_fob ) ) ) then { if ((toLower (typeof _nextvehicle)) in _cleanup_classnames) then { if ( count ( crew _nextvehicle ) == 0 ) then { _nextvehicle setVariable [ "KPLIB_empty_vehicle_ticker", ( _nextvehicle getVariable [ "KPLIB_empty_vehicle_ticker", 0 ] ) + 1 ]; @@ -28,7 +28,7 @@ while { KPLIB_cleanup_vehicles > 0 } do { _nextvehicle setVariable [ "KPLIB_empty_vehicle_ticker", 0 ]; }; - if ( _nextvehicle getVariable [ "KPLIB_empty_vehicle_ticker", 0 ] >= ( 6 * KPLIB_cleanup_vehicles ) ) then { + if ( _nextvehicle getVariable [ "KPLIB_empty_vehicle_ticker", 0 ] >= ( 6 * KPLIB_param_vehicleCleanup ) ) then { deleteVehicle _nextvehicle; }; diff --git a/Missionframework/scripts/server/game/manage_time.sqf b/Missionframework/scripts/server/game/manage_time.sqf index 231153024..8ea971b63 100644 --- a/Missionframework/scripts/server/game/manage_time.sqf +++ b/Missionframework/scripts/server/game/manage_time.sqf @@ -1,8 +1,8 @@ while {true} do { - if (KPLIB_shorter_nights && (daytime > 20 || daytime < 4)) then { - setTimeMultiplier (KPLIB_time_factor * 4); + if (KPLIB_param_shorterNights && (daytime > 20 || daytime < 4)) then { + setTimeMultiplier (KPLIB_param_timeMulti * 4); } else { - setTimeMultiplier KPLIB_time_factor; + setTimeMultiplier KPLIB_param_timeMulti; }; sleep 10; }; diff --git a/Missionframework/scripts/server/game/manage_weather.sqf b/Missionframework/scripts/server/game/manage_weather.sqf index 523be355c..1c4e0a82a 100644 --- a/Missionframework/scripts/server/game/manage_weather.sqf +++ b/Missionframework/scripts/server/game/manage_weather.sqf @@ -2,13 +2,13 @@ private _weathers = [ [0.25], [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55], [0, 0.1, 0.15, 0.2, 0.25, 0.3, 0.325, 0.35, 0.375, 0.4, 0.425, 0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1] -] select (KPLIB_weather_param - 1); +] select (KPLIB_param_weather - 1); private _newWeather = selectRandom _weathers; 0 setOvercast _newWeather; forceWeatherChange; -[format ["Set initial weather to: %1 - Param Value: %2 - Time: %3", _newWeather, KPLIB_weather_param, diag_tickTime], "WEATHER"] call KPLIB_fnc_log; +[format ["Set initial weather to: %1 - Param Value: %2 - Time: %3", _newWeather, KPLIB_param_weather, diag_tickTime], "WEATHER"] call KPLIB_fnc_log; while {KPLIB_endgame == 0} do { _newWeather = selectRandom _weathers; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 0a234c822..526c6cf8d 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -292,10 +292,10 @@ if (!isNil "_saveData") then { KPLIB_side_resistance setFriend [KPLIB_side_enemy, _resistanceEnemy]; KPLIB_side_enemy setFriend [KPLIB_side_resistance, _resistanceEnemy]; - KPLIB_side_resistance setFriend [KPLIB_side_friendly, _resistanceFriendly]; - KPLIB_side_friendly setFriend [KPLIB_side_resistance, _resistanceFriendly]; + KPLIB_side_resistance setFriend [KPLIB_side_player, _resistanceFriendly]; + KPLIB_side_player setFriend [KPLIB_side_resistance, _resistanceFriendly]; - if (KPLIB_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_friendly, (KPLIB_side_resistance getFriend KPLIB_side_friendly)], "CIVREP"] call KPLIB_fnc_log;}; + if (KPLIB_civrep_debug > 0) then {[format ["%1 getFriend %2: %3 - %1 getFriend %4: %5", KPLIB_side_resistance, KPLIB_side_enemy, (KPLIB_side_resistance getFriend KPLIB_side_enemy), KPLIB_side_player, (KPLIB_side_resistance getFriend KPLIB_side_player)], "CIVREP"] call KPLIB_fnc_log;}; // Apply current date and time if (_dateTime isEqualType []) then { @@ -393,7 +393,7 @@ if (!isNil "_saveData") then { // reveal mine to player side if it was detected if (_known) then { - KPLIB_side_friendly revealMine _mine; + KPLIB_side_player revealMine _mine; }; } forEach _allMines; @@ -468,7 +468,7 @@ if (!isNil "_saveData") then { if (((_saveData select 0) select 0) isEqualType 0) then { { _x params ["_spawnPos", "_units"]; - _grp = createGroup [KPLIB_side_friendly, true]; + _grp = createGroup [KPLIB_side_player, true]; { [_x, [_spawnPos, _grp] select (_forEachIndex > 0), _grp] call KPLIB_fnc_createManagedUnit; } forEach _units; @@ -479,7 +479,7 @@ if (!isNil "_saveData") then { private _dir = 0; private _unit = objNull; { - _grp = createGroup [KPLIB_side_friendly, true]; + _grp = createGroup [KPLIB_side_player, true]; { _pos = [(_x select 1) select 0, (_x select 1) select 1, ((_x select 1) select 2) + 0.2]; _dir = _x select 2; diff --git a/Missionframework/scripts/server/game/server_restart.sqf b/Missionframework/scripts/server/game/server_restart.sqf index a57e33e95..875a19bde 100644 --- a/Missionframework/scripts/server/game/server_restart.sqf +++ b/Missionframework/scripts/server/game/server_restart.sqf @@ -1,6 +1,6 @@ if (!isDedicated) exitWith {}; -_serverDuration = (KPLIB_restart * 60 * 60); +_serverDuration = (KPLIB_param_restart * 60 * 60); [format ["Restart Timer Set To %1", _serverDuration], "RESTART"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/zeus_synchro.sqf b/Missionframework/scripts/server/game/zeus_synchro.sqf index 14b0dd1a8..09d79ee39 100644 --- a/Missionframework/scripts/server/game/zeus_synchro.sqf +++ b/Missionframework/scripts/server/game/zeus_synchro.sqf @@ -12,7 +12,7 @@ private _vehicleClassnames = [toLower huron_typename]; KPLIB_b_static_classes, KPLIB_b_support_classes ]; -if (KPLIB_enemies_zeus) then {_vehicleClassnames append KPLIB_o_allVeh_classes;}; +if (KPLIB_param_zeusAddEnemies) then {_vehicleClassnames append KPLIB_o_allVeh_classes;}; private _valids = []; private _toRemove = []; @@ -25,8 +25,8 @@ while {true} do { _valids = allUnits select { (alive _x) // Alive && { - (KPLIB_enemies_zeus && {!(side (group _x) isEqualTo KPLIB_side_civilian)}) // Not civilian side, if enemy adding is enabled - || {side (group _x) isEqualTo KPLIB_side_friendly} // Player side if enemy adding is disabled + (KPLIB_param_zeusAddEnemies && {!(side (group _x) isEqualTo KPLIB_side_civilian)}) // Not civilian side, if enemy adding is enabled + || {side (group _x) isEqualTo KPLIB_side_player} // Player side if enemy adding is disabled } && {((str _x) find "BIS_SUPP_HQ_") isEqualTo -1} // Not a HQ entity from support module }; diff --git a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm index 8621effee..a9634f50a 100644 --- a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm +++ b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm @@ -254,7 +254,7 @@ class FSM "// Get all groups with at least one member alive" \n "// and not already added to high command" \n "_newGrps = allGroups select {" \n - " (side _x) isEqualTo KPLIB_side_friendly" \n + " (side _x) isEqualTo KPLIB_side_player" \n " && {!(_x in _hcGrps)}" \n " && {!(((units _x) select {alive _x}) isEqualTo [])}" \n " && {!(_cmdr in (units _x))}" \n @@ -401,7 +401,7 @@ class FSM "BIS_marta_mainscope setvariable [""rules""," \n "[" \n " [""o_"", [[0.5, 0, 0, 1], [0, 0.3, 0.6, 1]] select (KPLIB_side_enemy isEqualTo west)]," \n - " [""b_"", [[0.5, 0, 0, 1], [0, 0.3, 0.6, 1]] select (KPLIB_side_friendly isEqualTo west)]," \n + " [""b_"", [[0.5, 0, 0, 1], [0, 0.3, 0.6, 1]] select (KPLIB_side_player isEqualTo west)]," \n " [""n_"", [0, 0.5, 0, 1]]," \n " [""n_"", [0.4, 0, 0.5, 1]]" \n "], true];"/*%FSM*/; diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index a188d121b..e306af1b7 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -44,7 +44,7 @@ execVM "scripts\server\battlegroup\random_battlegroups.sqf"; execVM "scripts\server\battlegroup\readiness_increase.sqf"; execVM "scripts\server\game\apply_default_permissions.sqf"; execVM "scripts\server\game\cleanup_vehicles.sqf"; -if (!KPLIB_fog_param) then {execVM "scripts\server\game\fucking_set_fog.sqf";}; +if (!KPLIB_param_vanillaFog) then {execVM "scripts\server\game\fucking_set_fog.sqf";}; execVM "scripts\server\game\manage_time.sqf"; execVM "scripts\server\game\manage_weather.sqf"; execVM "scripts\server\game\playtime.sqf"; @@ -57,7 +57,7 @@ execVM "scripts\server\offloading\show_fps.sqf"; execVM "scripts\server\patrols\civilian_patrols.sqf"; execVM "scripts\server\patrols\manage_patrols.sqf"; execVM "scripts\server\patrols\reinforcements_resetter.sqf"; -if (KPLIB_ailogistics) then {execVM "scripts\server\resources\manage_logistics.sqf";}; +if (KPLIB_param_logistic) then {execVM "scripts\server\resources\manage_logistics.sqf";}; execVM "scripts\server\resources\manage_resources.sqf"; execVM "scripts\server\resources\recalculate_resources.sqf"; execVM "scripts\server\resources\recalculate_timer.sqf"; @@ -66,10 +66,10 @@ execVM "scripts\server\resources\unit_cap.sqf"; execVM "scripts\server\sector\lose_sectors.sqf"; KPLIB_fsm_sectorMonitor = [] call KPLIB_fnc_sectorMonitor; -if (KPLIB_high_command) then {KPLIB_fsm_highcommand = [] call KPLIB_fnc_highcommand;}; +if (KPLIB_param_highCommand) then {KPLIB_fsm_highcommand = [] call KPLIB_fnc_highcommand;}; // Select FOB templates -switch (KPLIB_presetEnemies) do { +switch (KPLIB_presetEnemy) do { case 1: { KPLIB_fob_templates = [ "fobhunt_templates\apex\template1.sqf", @@ -123,11 +123,11 @@ execVM "scripts\server\offloading\group_diag.sqf"; } forEach allUnits; // Server Restart Script from K4s0 -if (KPLIB_restart > 0) then { +if (KPLIB_param_restart > 0) then { execVM "scripts\server\game\server_restart.sqf"; }; -if (KPLIB_limited_zeus) then { +if (KPLIB_param_zeusLimited) then { zm1 setVariable ["Addons", 0, true]; removeAllCuratorAddons zm1; diff --git a/Missionframework/scripts/server/offloading/show_fps.sqf b/Missionframework/scripts/server/offloading/show_fps.sqf index 7971cc098..49c289f62 100644 --- a/Missionframework/scripts/server/offloading/show_fps.sqf +++ b/Missionframework/scripts/server/offloading/show_fps.sqf @@ -43,7 +43,7 @@ while {true} do { _myfpsmarker setMarkerColor "ColorGREEN"; if (_myfps < 30) then {_myfpsmarker setMarkerColor "ColorYELLOW";}; if (_myfps < 20) then {_myfpsmarker setMarkerColor "ColorORANGE";}; - if (_myfps < 10) then {_myfpsmarker setMarkerColor KPLIB_color_enemy_bright;}; + if (_myfps < 10) then {_myfpsmarker setMarkerColor KPLIB_color_enemyActive;}; _myfpsmarker setMarkerText format ["%1: %2 fps, %3 local groups, %4 local units", _sourcestr, (round (_myfps * 100.0)) / 100.0, _localgroups, _localunits]; diff --git a/Missionframework/scripts/server/patrols/civilian_patrols.sqf b/Missionframework/scripts/server/patrols/civilian_patrols.sqf index 18bc03442..bf9ac8624 100644 --- a/Missionframework/scripts/server/patrols/civilian_patrols.sqf +++ b/Missionframework/scripts/server/patrols/civilian_patrols.sqf @@ -1,3 +1,3 @@ -if ( KPLIB_civilian_activity > 0 ) then { +if ( KPLIB_param_civActivity > 0 ) then { for [ {_i=0}, {_i < KPLIB_civilians_amount}, {_i=_i+1} ] do { [] spawn manage_one_civilian_patrol }; }; diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index 96298de99..e13bedee6 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -13,7 +13,7 @@ while { KPLIB_endgame == 0 } do { _spawnsector = ""; _usable_sectors = []; { - if ((([markerPos _x, 1000, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) == 0) && (count ([markerPos _x, 3500] call KPLIB_fnc_getNearbyPlayers) > 0)) then { + if ((([markerPos _x, 1000, KPLIB_side_player] call KPLIB_fnc_getUnitsCount) == 0) && (count ([markerPos _x, 3500] call KPLIB_fnc_getNearbyPlayers) > 0)) then { _usable_sectors pushback _x; } @@ -43,7 +43,7 @@ while { KPLIB_endgame == 0 } do { _civveh = (selectRandom civilian_vehicles) createVehicle _spawnpos; _civveh setpos _spawnpos; _civveh addMPEventHandler ['MPKilled', {_this spawn kill_manager}]; - _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_friendly ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; + _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_player ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; ((units _grp) select 0) moveInDriver _civveh; ((units _grp) select 0) disableAI "FSM"; ((units _grp) select 0) disableAI "AUTOCOMBAT"; @@ -51,7 +51,7 @@ while { KPLIB_endgame == 0 } do { }; - { _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_friendly ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; } foreach units _grp; + { _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_player ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; } foreach units _grp; _sectors_patrol = []; _patrol_startpos = getpos (leader _grp); @@ -106,7 +106,7 @@ while { KPLIB_endgame == 0 } do { if (count ([getpos leader _grp, 4000] call KPLIB_fnc_getNearbyPlayers) == 0) then { if ( !(isNull _civveh) ) then { - if ( { ( alive _x ) && (side group _x == KPLIB_side_friendly ) } count (crew _civveh) == 0 ) then { + if ( { ( alive _x ) && (side group _x == KPLIB_side_player ) } count (crew _civveh) == 0 ) then { deleteVehicle _civveh }; }; diff --git a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf index f64a300b8..d22aa67b8 100644 --- a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf @@ -6,11 +6,11 @@ waitUntil { !isNil "combat_readiness" }; while { KPLIB_endgame == 0 } do { waitUntil { sleep 0.3; count KPLIB_sectors_player >= 3; }; - waitUntil { sleep 0.3; combat_readiness >= (_minimum_readiness / KPLIB_difficulty_modifier); }; + waitUntil { sleep 0.3; combat_readiness >= (_minimum_readiness / KPLIB_param_difficulty); }; sleep (random 30); - while { [] call KPLIB_fnc_getOpforCap > KPLIB_patrol_cap } do { + while { [] call KPLIB_fnc_getOpforCap > KPLIB_cap_patrol } do { sleep (random 30); }; @@ -63,7 +63,7 @@ while { KPLIB_endgame == 0 } do { _patrol_continue = false; } else { if ( time - _started_time > 900 ) then { - if ( [ getpos (leader _grp) , 4000 , KPLIB_side_friendly ] call KPLIB_fnc_getUnitsCount == 0 ) then { + if ( [ getpos (leader _grp) , 4000 , KPLIB_side_player ] call KPLIB_fnc_getUnitsCount == 0 ) then { _patrol_continue = false; { if ( vehicle _x != _x ) then { @@ -77,7 +77,7 @@ while { KPLIB_endgame == 0 } do { }; if ( !([] call KPLIB_fnc_isCapitalActive) ) then { - sleep (600.0 / KPLIB_difficulty_modifier); + sleep (600.0 / KPLIB_param_difficulty); }; }; diff --git a/Missionframework/scripts/server/patrols/manage_patrols.sqf b/Missionframework/scripts/server/patrols/manage_patrols.sqf index c2eeb2ba9..60bcde8bd 100644 --- a/Missionframework/scripts/server/patrols/manage_patrols.sqf +++ b/Missionframework/scripts/server/patrols/manage_patrols.sqf @@ -1,10 +1,10 @@ _combat_triggers = [20,40,50,65,80,95]; -if ( KPLIB_unitcap < 0.9 ) then { _combat_triggers = [20,45,90]; }; -if ( KPLIB_unitcap > 1.3 ) then { _combat_triggers = [15,25,40,65,75,85,95]; }; +if ( KPLIB_param_unitcap < 0.9 ) then { _combat_triggers = [20,45,90]; }; +if ( KPLIB_param_unitcap > 1.3 ) then { _combat_triggers = [15,25,40,65,75,85,95]; }; _combat_triggers_infantry = [15,35,45,60,70,85]; -if ( KPLIB_unitcap < 0.9 ) then { _combat_triggers_infantry = [15,40,80]; }; -if ( KPLIB_unitcap > 1.3 ) then { _combat_triggers_infantry = [10,20,35,55,70,80,90]; }; +if ( KPLIB_param_unitcap < 0.9 ) then { _combat_triggers_infantry = [15,40,80]; }; +if ( KPLIB_param_unitcap > 1.3 ) then { _combat_triggers_infantry = [10,20,35,55,70,80,90]; }; sleep 5; diff --git a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf index 7d04309f0..13db4bcfc 100644 --- a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf +++ b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf @@ -2,20 +2,20 @@ params ["_targetsector"]; if (combat_readiness > 15) then { - private _init_units_count = (([markerPos _targetsector, KPLIB_capture_size, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)); + private _init_units_count = (([markerPos _targetsector, KPLIB_range_sectorCapture, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)); if !(_targetsector in KPLIB_sectors_capital) then { - while {(_init_units_count * 0.75) <= ([markerPos _targetsector, KPLIB_capture_size, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)} do { + while {(_init_units_count * 0.75) <= ([markerPos _targetsector, KPLIB_range_sectorCapture, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)} do { sleep 5; }; }; if (_targetsector in KPLIB_sectors_active) then { - private _nearestower = [markerpos _targetsector, KPLIB_side_enemy, KPLIB_radiotower_size * 1.4] call KPLIB_fnc_getNearestTower; + private _nearestower = [markerpos _targetsector, KPLIB_side_enemy, KPLIB_range_radioTowerScan * 1.4] call KPLIB_fnc_getNearestTower; if !(isNil "_nearestower") then { - private _reinforcements_time = (((((markerpos _nearestower) distance (markerpos _targetsector)) / 1000) ^ 1.66 ) * 120) / (KPLIB_difficulty_modifier * KPLIB_csat_aggressivity); + private _reinforcements_time = (((((markerpos _nearestower) distance (markerpos _targetsector)) / 1000) ^ 1.66 ) * 120) / (KPLIB_param_difficulty * KPLIB_param_aggressivity); if (_targetsector in KPLIB_sectors_capital) then { _reinforcements_time = _reinforcements_time * 0.35; }; @@ -29,7 +29,7 @@ if (combat_readiness > 15) then { reinforcements_sector_under_attack = _targetsector; reinforcements_set = true; ["lib_reinforcements",[markertext _targetsector]] remoteExec ["bis_fnc_shownotification"]; - if ((random combat_readiness) > (20 + (30 / KPLIB_csat_aggressivity))) then { + if ((random combat_readiness) > (20 + (30 / KPLIB_param_aggressivity))) then { [_targetsector] spawn send_paratroopers; }; stats_reinforcements_called = stats_reinforcements_called + 1; diff --git a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf index 756281f89..d3111f7a1 100644 --- a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf @@ -4,7 +4,7 @@ params ["_index", "_nearfob", "_clientID", "_supplies", "_ammo", "_fuel"]; logiError = 0; -private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; +private _storage_areas = (_nearfob nearobjects KPLIB_range_fob) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; if ((count _storage_areas) == 0) exitWith {(localize "STR_LOGISTIC_CANTAFFORD") remoteExec ["hint",_clientID]; logiError = 1; _clientID publicVariableClient "logiError";}; diff --git a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf index 23cb9f8ec..3ee497119 100644 --- a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf @@ -6,7 +6,7 @@ logiError = 0; if (((KPLIB_logistics select _index) select 1) <= 0) exitWith {logiError = 1; _clientID publicVariableClient "logiError";}; -private _storage_areas = (_nearfob nearobjects KPLIB_fob_range) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; +private _storage_areas = (_nearfob nearobjects KPLIB_range_fob) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; if ((count _storage_areas) == 0) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExec ["hint",_clientID]; logiError = 1; _clientID publicVariableClient "logiError";}; diff --git a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf index 99254b7e4..f77b33f96 100644 --- a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf @@ -2,15 +2,15 @@ params ["_liberated_sector"]; private _combat_readiness_increase = 0; switch (true) do { - case (_liberated_sector in KPLIB_sectors_capital): {_combat_readiness_increase = floor (random 10) * KPLIB_difficulty_modifier;}; - case (_liberated_sector in KPLIB_sectors_city): {_combat_readiness_increase = floor (random 6) * KPLIB_difficulty_modifier;}; - case (_liberated_sector in KPLIB_sectors_military): {_combat_readiness_increase = 5 + (floor (random 11)) * KPLIB_difficulty_modifier;}; - case (_liberated_sector in KPLIB_sectors_factory): {_combat_readiness_increase = 3 + (floor (random 7)) * KPLIB_difficulty_modifier;}; + case (_liberated_sector in KPLIB_sectors_capital): {_combat_readiness_increase = floor (random 10) * KPLIB_param_difficulty;}; + case (_liberated_sector in KPLIB_sectors_city): {_combat_readiness_increase = floor (random 6) * KPLIB_param_difficulty;}; + case (_liberated_sector in KPLIB_sectors_military): {_combat_readiness_increase = 5 + (floor (random 11)) * KPLIB_param_difficulty;}; + case (_liberated_sector in KPLIB_sectors_factory): {_combat_readiness_increase = 3 + (floor (random 7)) * KPLIB_param_difficulty;}; case (_liberated_sector in KPLIB_sectors_tower): {_combat_readiness_increase = floor (random 4);}; }; combat_readiness = combat_readiness + _combat_readiness_increase; -if (combat_readiness > 100.0 && KPLIB_difficulty_modifier <= 2.0) then {combat_readiness = 100.0}; +if (combat_readiness > 100.0 && KPLIB_param_difficulty <= 2.0) then {combat_readiness = 100.0}; stats_readiness_earned = stats_readiness_earned + _combat_readiness_increase; [_liberated_sector, 0] remoteExecCall ["remote_call_sector"]; @@ -62,10 +62,10 @@ if (KPLIB_endgame == 0) then { if ( !(_liberated_sector in KPLIB_sectors_tower) && { - (random (150 / (KPLIB_difficulty_modifier * KPLIB_csat_aggressivity))) < (combat_readiness - 15) + (random (150 / (KPLIB_param_difficulty * KPLIB_param_aggressivity))) < (combat_readiness - 15) || _liberated_sector in KPLIB_sectors_capital } - && {[] call KPLIB_fnc_getOpforCap < KPLIB_battlegroup_cap} + && {[] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup} ) then { [_liberated_sector, (random 100) < 45] spawn spawn_battlegroup; }; diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index 8b21baf80..92b7090af 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -7,7 +7,7 @@ KPLIB_ammo_global = 0; KPLIB_fuel_global = 0; KPLIB_heli_slots = 0; KPLIB_plane_slots = 0; -infantry_cap = 50 * KPLIB_resources_multiplier; +infantry_cap = 50 * KPLIB_param_resourcesMulti; please_recalculate = true; @@ -23,10 +23,10 @@ while {true} do { private _local_fuel_global = 0; private _local_heli_slots = 0; private _local_plane_slots = 0; - private _local_infantry_cap = 50 * KPLIB_resources_multiplier; + private _local_infantry_cap = 50 * KPLIB_param_resourcesMulti; { - private _fob_buildings = _x nearobjects KPLIB_fob_range; + private _fob_buildings = _x nearobjects KPLIB_range_fob; private _storage_areas = _fob_buildings select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; private _heliSlots = {(typeOf _x) == KPLIB_heli_slot_building;} count _fob_buildings; private _planeSlots = {(typeOf _x) == KPLIB_plane_slot_building;} count _fob_buildings; @@ -60,7 +60,7 @@ while {true} do { { if ( _x in KPLIB_sectors_city ) then { - _local_infantry_cap = _local_infantry_cap + (10 * KPLIB_resources_multiplier); + _local_infantry_cap = _local_infantry_cap + (10 * KPLIB_param_resourcesMulti); }; } foreach KPLIB_sectors_player; diff --git a/Missionframework/scripts/server/resources/unit_cap.sqf b/Missionframework/scripts/server/resources/unit_cap.sqf index 761ac86c7..e5109a083 100644 --- a/Missionframework/scripts/server/resources/unit_cap.sqf +++ b/Missionframework/scripts/server/resources/unit_cap.sqf @@ -7,7 +7,7 @@ while {true} do { private _local_heli_count = 0; private _local_plane_count = 0; { - if ((side group _x == KPLIB_side_friendly) && (alive _x) && ((_x distance startbase) > 250 || (isPlayer _x))) then { + if ((side group _x == KPLIB_side_player) && (alive _x) && ((_x distance startbase) > 250 || (isPlayer _x))) then { _local_unitcap = _local_unitcap + 1; }; } forEach allUnits; diff --git a/Missionframework/scripts/server/secondary/convoy_hijack.sqf b/Missionframework/scripts/server/secondary/convoy_hijack.sqf index 9289d1765..869f233e1 100644 --- a/Missionframework/scripts/server/secondary/convoy_hijack.sqf +++ b/Missionframework/scripts/server/secondary/convoy_hijack.sqf @@ -48,7 +48,7 @@ private _convoy_group = group driver _scout_vehicle; sleep 0.5; { - _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if ( side (_this select 3) != KPLIB_side_friendly ) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; + _x addEventHandler ["HandleDamage", { private [ "_damage" ]; if ( side (_this select 3) != KPLIB_side_player ) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; } foreach [ _scout_vehicle, _escort_vehicle, _transport_vehicle, _troop_vehicle ]; _convoy_group setFormation "FILE"; @@ -84,7 +84,7 @@ private _troops_group = createGroup [KPLIB_side_enemy, true]; private _convoy_marker = createMarkerLocal [ format [ "convoymarker%1", round time], getpos _transport_vehicle ]; _convoy_marker setMarkerText (localize "STR_SECONDARY_CSAT_CONVOY"); _convoy_marker setMarkerType "o_armor"; -_convoy_marker setMarkerColor KPLIB_color_enemy_bright; +_convoy_marker setMarkerColor KPLIB_color_enemyActive; private _convoy_marker_wp1 = createMarkerLocal [ format [ "convoymarkerwp1%1", round time], _convoy_destinations select 0]; private _convoy_marker_wp2 = createMarkerLocal [ format [ "convoymarkerwp2%1", round time], _convoy_destinations select 1]; @@ -93,7 +93,7 @@ private _convoy_marker_wp3 = createMarkerLocal [ format [ "convoymarkerwp3%1", r { _x setMarkerText (localize "STR_SECONDARY_CSAT_CONVOY_WP"); _x setMarkerType "o_armor"; - _x setMarkerColor KPLIB_color_enemy_bright; + _x setMarkerColor KPLIB_color_enemyActive; _x setMarkerSize [0.6, 0.6]; } foreach [_convoy_marker_wp1, _convoy_marker_wp2, _convoy_marker_wp3]; diff --git a/Missionframework/scripts/server/secondary/fob_hunting.sqf b/Missionframework/scripts/server/secondary/fob_hunting.sqf index 3963435c7..2a2bf6fd5 100644 --- a/Missionframework/scripts/server/secondary/fob_hunting.sqf +++ b/Missionframework/scripts/server/secondary/fob_hunting.sqf @@ -1,5 +1,5 @@ -_defenders_amount = (15 * (sqrt (KPLIB_unitcap))) min 15; +_defenders_amount = (15 * (sqrt (KPLIB_param_unitcap))) min 15; _spawn_marker = [2000,999999,false] call KPLIB_fnc_getOpforSpawnPoint; if (_spawn_marker == "") exitWith {["Could not find position for fob hunting mission", "ERROR"] call KPLIB_fnc_log;}; @@ -91,7 +91,7 @@ while {(count _idxselected) < _defenders_amount && (count _idxselected) < (count [_nextDefender] spawn building_defence_ai; } forEach _idxselected; -private _sentryMax = ceil ((3 + (floor (random 4))) * (sqrt (KPLIB_unitcap))); +private _sentryMax = ceil ((3 + (floor (random 4))) * (sqrt (KPLIB_param_unitcap))); _grpsentry = createGroup [KPLIB_side_enemy, true]; _base_sentry_pos = [(_base_position select 0) + ((_base_corners select 0) select 0), (_base_position select 1) + ((_base_corners select 0) select 1), 0]; diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index 355a54628..361082521 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -97,7 +97,7 @@ if ( _alive_crew_count == 0 ) then { [7] remoteExec ["remote_call_intel"]; } else { [8] remoteExec ["remote_call_intel"]; - private _grp = createGroup [KPLIB_side_friendly, true]; + private _grp = createGroup [KPLIB_side_player, true]; { [_x ] joinSilent _grp; } foreach _pilotUnits; while {(count (waypoints _grp)) != 0} do {deleteWaypoint ((waypoints _grp) select 0);}; {_x doFollow (leader _grp)} foreach units _grp; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf index 94271d0ff..42ee8dfb3 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf @@ -6,8 +6,8 @@ sleep 5; _ownership = [ _thispos ] call KPLIB_fnc_getSectorOwnership; if ( _ownership != KPLIB_side_enemy ) exitWith {}; -if ( KPLIB_blufor_defenders ) then { - _grp = creategroup [KPLIB_side_friendly, true]; +if ( KPLIB_param_bluforDefenders ) then { + _grp = creategroup [KPLIB_side_player, true]; { [_x, _thispos, _grp] call KPLIB_fnc_createManagedUnit; } foreach blufor_squad_inf; @@ -18,8 +18,8 @@ if ( KPLIB_blufor_defenders ) then { sleep 60; _ownership = [ _thispos ] call KPLIB_fnc_getSectorOwnership; -if ( _ownership == KPLIB_side_friendly ) exitWith { - if ( KPLIB_blufor_defenders ) then { +if ( _ownership == KPLIB_side_player ) exitWith { + if ( KPLIB_param_bluforDefenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; @@ -52,13 +52,13 @@ if ( KPLIB_endgame == 0 ) then { stats_fobs_lost = stats_fobs_lost + 1; } else { [_thispos, 3] remoteExec ["remote_call_fob"]; - {[_x] spawn prisonner_ai;} foreach ((_thispos nearEntities ["Man", KPLIB_capture_size * 0.8]) select {side group _x == KPLIB_side_enemy}); + {[_x] spawn prisonner_ai;} foreach ((_thispos nearEntities ["Man", KPLIB_range_sectorCapture * 0.8]) select {side group _x == KPLIB_side_enemy}); }; }; sleep 60; -if ( KPLIB_blufor_defenders ) then { +if ( KPLIB_param_bluforDefenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf index beb03fd3f..3f158f6f9 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf @@ -11,8 +11,8 @@ if ( _sector in KPLIB_sectors_military ) then { _squad_type = blufor_squad_inf; }; -if ( KPLIB_blufor_defenders ) then { - _grp = creategroup [KPLIB_side_friendly, true]; +if ( KPLIB_param_bluforDefenders ) then { + _grp = creategroup [KPLIB_side_player, true]; { [_x, markerPos _sector, _grp] call KPLIB_fnc_createManagedUnit; } foreach _squad_type; @@ -23,8 +23,8 @@ if ( KPLIB_blufor_defenders ) then { sleep 60; _ownership = [ markerpos _sector ] call KPLIB_fnc_getSectorOwnership; -if ( _ownership == KPLIB_side_friendly ) exitWith { - if ( KPLIB_blufor_defenders ) then { +if ( _ownership == KPLIB_side_player ) exitWith { + if ( KPLIB_param_bluforDefenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; @@ -68,13 +68,13 @@ if ( KPLIB_endgame == 0 ) then { } forEach KPLIB_production; } else { [_sector, 3] remoteExec ["remote_call_sector"]; - {[_x] spawn prisonner_ai;} foreach (((markerpos _sector) nearEntities ["Man", KPLIB_capture_size * 0.8]) select {side group _x == KPLIB_side_enemy}); + {[_x] spawn prisonner_ai;} foreach (((markerpos _sector) nearEntities ["Man", KPLIB_range_sectorCapture * 0.8]) select {side group _x == KPLIB_side_enemy}); }; }; sleep 60; -if ( KPLIB_blufor_defenders ) then { +if ( KPLIB_param_bluforDefenders ) then { { if ( alive _x ) then { deleteVehicle _x }; } foreach units _grp; diff --git a/Missionframework/scripts/server/sector/fn_destroyFob.sqf b/Missionframework/scripts/server/sector/fn_destroyFob.sqf index 3435f0d83..ce15f92d7 100644 --- a/Missionframework/scripts/server/sector/fn_destroyFob.sqf +++ b/Missionframework/scripts/server/sector/fn_destroyFob.sqf @@ -2,7 +2,7 @@ File: fn_destroyFob.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-28 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -30,7 +30,7 @@ _buildings append KPLIB_b_buildings_classes; _this setDamage 1; }; }; -} forEach ((_fobPos nearObjects (KPLIB_fob_range * 1.2)) select {getObjectType _x >= 8}); +} forEach ((_fobPos nearObjects (KPLIB_range_fob * 1.2)) select {getObjectType _x >= 8}); KPLIB_clearances deleteAt (KPLIB_clearances findIf {(_x select 0) isEqualTo _fobPos}); publicVariable "KPLIB_clearances"; diff --git a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm index f58bad5e7..901828c07 100644 --- a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm +++ b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm @@ -181,7 +181,7 @@ class FSM priority = 0.000000; to="Get_adjusted_sector"; precondition = /*%FSM*/"_opforCount = [] call KPLIB_fnc_getOpforCap;"/*%FSM*/; - condition=/*%FSM*/"_opforCount < KPLIB_sector_cap"/*%FSM*/; + condition=/*%FSM*/"_opforCount < KPLIB_cap_enemySide"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -204,7 +204,7 @@ class FSM priority = 1.000000; to="Activate_sector"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"([markerPos _sector, _range, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0"/*%FSM*/; + condition=/*%FSM*/"([markerPos _sector, _range, KPLIB_side_player] call KPLIB_fnc_getUnitsCount) > 0"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -367,4 +367,4 @@ class FSM "Exit_1", }; }; -/*%FSM*/ \ No newline at end of file +/*%FSM*/ diff --git a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf index eb05d95ed..e3b69c83d 100644 --- a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf +++ b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf @@ -2,7 +2,7 @@ File: fn_spawnSectorCrates.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-28 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -27,7 +27,7 @@ if (isNil "KPLIB_sectorCratesSpawned") then {KPLIB_sectorCratesSpawned = [];}; if !(_sector in KPLIB_sectorCratesSpawned) then { KPLIB_sectorCratesSpawned pushBack _sector; - private _amount = (ceil (random 3)) * KPLIB_resources_multiplier; + private _amount = (ceil (random 3)) * KPLIB_param_resourcesMulti; private _spawnPos = []; private _j = 0; diff --git a/Missionframework/scripts/server/sector/ied_manager.sqf b/Missionframework/scripts/server/sector/ied_manager.sqf index 38603540f..2a60055f5 100644 --- a/Missionframework/scripts/server/sector/ied_manager.sqf +++ b/Missionframework/scripts/server/sector/ied_manager.sqf @@ -37,8 +37,8 @@ if (!(isnull _roadobj)) then { if (KPLIB_asymmetric_debug > 0) then {[format ["ied_manager.sqf -> IED %1 spawned at %2", _number, markerText _sector], "ASYMMETRIC"] remoteExecCall ["KPLIB_fnc_log", 2];}; while {_sector in KPLIB_sectors_active && mineActive _ied_obj && !_goes_boom} do { - _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_friendly}; - _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_friendly}; + _nearinfantry = ((getpos _ied_obj) nearEntities ["Man", _activation_radius_infantry]) select {side _x == KPLIB_side_player}; + _nearvehicles = ((getpos _ied_obj) nearEntities [["Car", "Tank", "Air"], _activation_radius_vehicles]) select {side _x == KPLIB_side_player}; if (count _nearinfantry >= _infantry_trigger || count _nearvehicles >= _vehicle_trigger) then { if (_ultra_strong) then { "Bomb_04_F" createVehicle (getpos _ied_obj); diff --git a/Missionframework/scripts/server/sector/manage_one_sector.sqf b/Missionframework/scripts/server/sector/manage_one_sector.sqf index 0bd267caf..45aeaf281 100644 --- a/Missionframework/scripts/server/sector/manage_one_sector.sqf +++ b/Missionframework/scripts/server/sector/manage_one_sector.sqf @@ -18,7 +18,7 @@ private _spawncivs = false; private _building_ai_max = 0; private _infsquad = "army"; private _building_range = 50; -private _local_capture_size = KPLIB_capture_size; +private _local_capture_size = KPLIB_range_sectorCapture; private _iedcount = 0; private _vehtospawn = []; private _managed_units = []; @@ -28,11 +28,11 @@ private _squad3 = []; private _squad4 = []; private _minimum_building_positions = 5; private _sector_despawn_tickets = BASE_TICKETS; -private _maximum_additional_tickets = (KPLIB_delayDespawnMax * 60 / SECTOR_TICK_TIME); +private _maximum_additional_tickets = (KPLIB_param_maxDespawnDelay * 60 / SECTOR_TICK_TIME); private _popfactor = 1; private _guerilla = false; -if (KPLIB_unitcap < 1) then {_popfactor = KPLIB_unitcap;}; +if (KPLIB_param_unitcap < 1) then {_popfactor = KPLIB_param_unitcap;}; if (_sector in KPLIB_sectors_active) exitWith {}; KPLIB_sectors_active pushback _sector; publicVariable "KPLIB_sectors_active"; @@ -40,23 +40,23 @@ KPLIB_sectors_active pushback _sector; publicVariable "KPLIB_sectors_active"; private _opforcount = [] call KPLIB_fnc_getOpforCap; [_sector, _opforcount] call wait_to_spawn_sector; -if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] call KPLIB_fnc_getSectorRange, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) > 0)) then { +if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] call KPLIB_fnc_getSectorRange, KPLIB_side_player] call KPLIB_fnc_getUnitsCount) > 0)) then { if (_sector in KPLIB_sectors_capital) then { if (combat_readiness < 30) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); _squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp); - if (KPLIB_unitcap >= 1) then {_squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; - if (KPLIB_unitcap >= 1.5) then {_squad4 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_param_unitcap >= 1) then {_squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_param_unitcap >= 1.5) then {_squad4 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; _vehtospawn = [(selectRandom KPLIB_o_militiaVehicles),(selectRandom KPLIB_o_militiaVehicles)]; - if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; - if ((random 100) > (50 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; + if ((random 100) > (66 / KPLIB_param_difficulty)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; + if ((random 100) > (50 / KPLIB_param_difficulty)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; if (_infsquad == "army") then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); - if ((random 100) > (33 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; + if ((random 100) > (33 / KPLIB_param_difficulty)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; }; _spawncivs = true; @@ -70,7 +70,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] _local_capture_size = _local_capture_size * 1.4; if (KPLIB_civ_rep < 0) then { - _iedcount = round (2 + (ceil (random 4)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); + _iedcount = round (2 + (ceil (random 4)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_param_difficulty); } else { _iedcount = 0; }; @@ -81,13 +81,13 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] if (combat_readiness < 50) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); - if (KPLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_param_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; - if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; - if ((random 100) > (33 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; + if ((random 100) > (66 / KPLIB_param_difficulty)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; + if ((random 100) > (33 / KPLIB_param_difficulty)) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; if (_infsquad == "army") then { _vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles); - if ((random 100) > (33 / KPLIB_difficulty_modifier)) then { + if ((random 100) > (33 / KPLIB_param_difficulty)) then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _squad3 = ([_infsquad] call KPLIB_fnc_getSquadComp); }; @@ -103,7 +103,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] _building_range = 120; if (KPLIB_civ_rep < 0) then { - _iedcount = round ((ceil (random 4)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); + _iedcount = round ((ceil (random 4)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_param_difficulty); } else { _iedcount = 0; }; @@ -113,14 +113,14 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] if (_sector in KPLIB_sectors_military) then { _squad1 = ([] call KPLIB_fnc_getSquadComp); _squad2 = ([] call KPLIB_fnc_getSquadComp); - if (KPLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_param_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; _vehtospawn = [([] call KPLIB_fnc_getAdaptiveVehicle),([] call KPLIB_fnc_getAdaptiveVehicle)]; - if ((random 100) > (33 / KPLIB_difficulty_modifier)) then { + if ((random 100) > (33 / KPLIB_param_difficulty)) then { _vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle); _squad4 = ([] call KPLIB_fnc_getSquadComp); }; - if ((random 100) > (66 / KPLIB_difficulty_modifier)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; + if ((random 100) > (66 / KPLIB_param_difficulty)) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; _spawncivs = false; @@ -132,7 +132,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] if (combat_readiness < 40) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); - if (KPLIB_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_param_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; if ((random 100) > 66) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; if ((random 100) > 33) then {_vehtospawn pushback (selectRandom KPLIB_o_militiaVehicles);}; @@ -147,7 +147,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] _building_range = 120; if (KPLIB_civ_rep < 0) then { - _iedcount = round ((ceil (random 3)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_difficulty_modifier); + _iedcount = round ((ceil (random 3)) * (round ((KPLIB_civ_rep * -1) / 33)) * KPLIB_param_difficulty); } else { _iedcount = 0; }; @@ -157,7 +157,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] if (_sector in KPLIB_sectors_tower) then { _squad1 = ([] call KPLIB_fnc_getSquadComp); if (combat_readiness > 30) then {_squad2 = ([] call KPLIB_fnc_getSquadComp);}; - if (KPLIB_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_param_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; if((random 100) > 95) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; @@ -170,7 +170,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] if (KPLIB_sectorspawn_debug > 0) then {[format ["Sector %1 (%2) - manage_one_sector calculated -> _infsquad: %3 - _squad1: %4 - _squad2: %5 - _squad3: %6 - _squad4: %7 - _vehtospawn: %8 - _building_ai_max: %9", (markerText _sector), _sector, _infsquad, (count _squad1), (count _squad2), (count _squad3), (count _squad4), (count _vehtospawn), _building_ai_max], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2];}; - if (_building_ai_max > 0 && KPLIB_adaptive_opfor) then { + if (_building_ai_max > 0 && KPLIB_param_adaptive) then { _building_ai_max = round (_building_ai_max * ([] call KPLIB_fnc_getOpforFactor)); }; @@ -220,7 +220,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] _managed_units = _managed_units + (units _grp); }; - if (_spawncivs && KPLIB_civilian_activity > 0) then { + if (_spawncivs && KPLIB_param_civActivity > 0) then { _managed_units = _managed_units + ([_sector] call KPLIB_fnc_spawnCivilians); }; @@ -243,7 +243,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] // sector lifetime loop while {!_stopit} do { // sector was captured - if (([_sectorpos, _local_capture_size] call KPLIB_fnc_getSectorOwnership == KPLIB_side_friendly) && (KPLIB_endgame == 0)) then { + if (([_sectorpos, _local_capture_size] call KPLIB_fnc_getSectorOwnership == KPLIB_side_player) && (KPLIB_endgame == 0)) then { if (isServer) then { [_sector] spawn sector_liberated_remote_call; } else { @@ -262,7 +262,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] { if (_x isKindOf "Man") then { - if (side group _x != KPLIB_side_friendly) then { + if (side group _x != KPLIB_side_player) then { deleteVehicle _x; }; } else { @@ -272,7 +272,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] }; } forEach _managed_units; } else { - if (([_sectorpos, (([_opforcount] call KPLIB_fnc_getSectorRange) + 300), KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount) == 0) then { + if (([_sectorpos, (([_opforcount] call KPLIB_fnc_getSectorRange) + 300), KPLIB_side_player] call KPLIB_fnc_getUnitsCount) == 0) then { _sector_despawn_tickets = _sector_despawn_tickets - 1; } else { // start counting running minutes after ADDITIONAL_TICKETS_DELAY diff --git a/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf b/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf index 08031e12c..6697b803b 100644 --- a/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf +++ b/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf @@ -5,38 +5,38 @@ private _start = diag_tickTime; private _corrected_size = [_opforcount] call KPLIB_fnc_getSectorRange; sleep 0.1; -private _unitscount = [markerPos _sector, _corrected_size , KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +private _unitscount = [markerPos _sector, _corrected_size , KPLIB_side_player] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 10) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 6) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 4) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 3) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; if (_unitscount > 0 && _unitscount <= 2) then { sleep 5; }; sleep 0.1; -_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_friendly] call KPLIB_fnc_getUnitsCount; +_unitscount = [markerPos _sector, _corrected_size, KPLIB_side_player] call KPLIB_fnc_getUnitsCount; if (_unitscount == 1) then { sleep 5; }; diff --git a/Missionframework/scripts/server/support/fn_createSuppModules.sqf b/Missionframework/scripts/server/support/fn_createSuppModules.sqf index c8c08b219..6c036c432 100644 --- a/Missionframework/scripts/server/support/fn_createSuppModules.sqf +++ b/Missionframework/scripts/server/support/fn_createSuppModules.sqf @@ -2,7 +2,7 @@ File: fn_createSuppModules.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-21 - Last Update: 2020-05-10 + Last Update: 2020-05-22 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,30 +15,30 @@ Function reached the end [BOOL] */ -if (!isServer || KPLIB_suppMod isEqualTo 0) exitWith {false}; +if (!isServer || KPLIB_param_supportModule isEqualTo 0) exitWith {false}; ["Creating modules", "SUPPORTMODULES"] call KPLIB_fnc_log; // Create modules private _grp = createGroup sideLogic; -KPLIB_suppMod_req = _grp createUnit ["SupportRequester", [0, 0, 0], [], 0, "NONE"]; -KPLIB_suppMod_arty = _grp createUnit ["SupportProvider_Artillery", [0, 0, 0], [], 0, "NONE"]; +KPLIB_param_supportModule_req = _grp createUnit ["SupportRequester", [0, 0, 0], [], 0, "NONE"]; +KPLIB_param_supportModule_arty = _grp createUnit ["SupportProvider_Artillery", [0, 0, 0], [], 0, "NONE"]; // Set variables which are normally set via eden object attributes { - [KPLIB_suppMod_req, _x, -1] call BIS_fnc_limitSupport; + [KPLIB_param_supportModule_req, _x, -1] call BIS_fnc_limitSupport; } forEach ["Artillery", "CAS_Heli", "CAS_Bombing", "UAV", "Drop", "Transport"]; // Publish global variables to clients -publicVariable "KPLIB_suppMod_req"; -publicVariable "KPLIB_suppMod_arty"; +publicVariable "KPLIB_param_supportModule_req"; +publicVariable "KPLIB_param_supportModule_arty"; // Delay provider init until save is loaded, to catch synchronized units from loaded save [] spawn { waitUntil {!isNil "save_is_loaded" && {save_is_loaded}}; ["Init provider on server", "SUPPORTMODULES"] call KPLIB_fnc_log; - [KPLIB_suppMod_req] call BIS_fnc_moduleSupportsInitRequester; - [KPLIB_suppMod_arty] call BIS_fnc_moduleSupportsInitProvider; + [KPLIB_param_supportModule_req] call BIS_fnc_moduleSupportsInitRequester; + [KPLIB_param_supportModule_arty] call BIS_fnc_moduleSupportsInitProvider; // Hide the three HQ entities created at zero pos. BIS scripts only hides them local for the creator waitUntil {!isNil "BIS_SUPP_HQ_WEST" && !isNil "BIS_SUPP_HQ_EAST" && !isNil "BIS_SUPP_HQ_GUER"}; diff --git a/Missionframework/scripts/shared/diagnostics.sqf b/Missionframework/scripts/shared/diagnostics.sqf index 8cf01516a..d1821975c 100644 --- a/Missionframework/scripts/shared/diagnostics.sqf +++ b/Missionframework/scripts/shared/diagnostics.sqf @@ -5,8 +5,8 @@ private _source = ""; [format ["World: %1", worldName], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Version: %1", (localize "STR_MISSION_VERSION")], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Author: %1", [missionConfigFile] call BIS_fnc_overviewAuthor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Blufor: %1", KPLIB_presetPlayers], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Opfor: %1", KPLIB_presetEnemies], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Blufor: %1", KPLIB_presetPlayer], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Opfor: %1", KPLIB_presetEnemy], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Resistance: %1", KPLIB_presetResistance], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Civilians: %1", KPLIB_presetCivilians], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Arsenal: %1", KPLIB_presetArsenal], "MISSIONSTART"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/shared/fetch_params.sqf b/Missionframework/scripts/shared/fetch_params.sqf index 53adb6c47..07e5e0fb1 100644 --- a/Missionframework/scripts/shared/fetch_params.sqf +++ b/Missionframework/scripts/shared/fetch_params.sqf @@ -39,25 +39,25 @@ if(isServer) then { // Mission Options ["--- Mission Options ---", "PARAM"] call KPLIB_fnc_log; - GET_PARAM(KPLIB_unitcap, "Unitcap", 2); - GET_PARAM(KPLIB_difficulty_modifier, "Difficulty", 2); - GET_PARAM(KPLIB_csat_aggressivity, "Aggressivity", 2); - GET_PARAM_BOOL(KPLIB_adaptive_opfor, "AdaptToPlayercount", 1); - GET_PARAM(KPLIB_civilian_activity, "Civilians", 1); - GET_PARAM_BOOL(KPLIB_build_first_fob, "FirstFob", 0); - GET_PARAM_BOOL(KPLIB_fob_vehicle, "FirstFobVehicle", 0); - GET_PARAM(KPLIB_maximum_fobs, "MaximumFobs", 26); - GET_PARAM(KPLIB_max_squad_size, "MaxSquadSize", 10); - GET_PARAM_BOOL(KPLIB_blufor_defenders, "BluforDefenders", 1); - GET_PARAM_BOOL(KPLIB_autodanger, "Autodanger", 0); - GET_PARAM(KPLIB_time_factor, "DayDuration", 12); - GET_PARAM_BOOL(KPLIB_shorter_nights, "ShorterNights", 0); - GET_PARAM(KPLIB_weather_param, "Weather", 3); - GET_PARAM_BOOL(KPLIB_fog_param, "VanillaFog", 1); - GET_PARAM(KPLIB_resources_multiplier, "ResourcesMultiplier", 3); - GET_PARAM_BOOL(KPLIB_arsenal_type, "ArsenalType", 0); - GET_PARAM_BOOL(KPLIB_playermenu, "PlayerMenu", 1); - GET_PARAM(KPLIB_victoryCondition, "VictoryCondition", 0); + GET_PARAM(KPLIB_param_unitcap, "Unitcap", 2); + GET_PARAM(KPLIB_param_difficulty, "Difficulty", 2); + GET_PARAM(KPLIB_param_aggressivity, "Aggressivity", 2); + GET_PARAM_BOOL(KPLIB_param_adaptive, "AdaptToPlayercount", 1); + GET_PARAM(KPLIB_param_civActivity, "Civilians", 1); + GET_PARAM_BOOL(KPLIB_param_firstFobBuilt, "FirstFob", 0); + GET_PARAM_BOOL(KPLIB_param_fobVehicle, "FirstFobVehicle", 0); + GET_PARAM(KPLIB_param_maxFobs, "MaximumFobs", 26); + GET_PARAM(KPLIB_param_maxSquadSize, "MaxSquadSize", 10); + GET_PARAM_BOOL(KPLIB_param_bluforDefenders, "BluforDefenders", 1); + GET_PARAM_BOOL(KPLIB_param_autodanger, "Autodanger", 0); + GET_PARAM(KPLIB_param_timeMulti, "DayDuration", 12); + GET_PARAM_BOOL(KPLIB_param_shorterNights, "ShorterNights", 0); + GET_PARAM(KPLIB_param_weather, "Weather", 3); + GET_PARAM_BOOL(KPLIB_param_vanillaFog, "VanillaFog", 1); + GET_PARAM(KPLIB_param_resourcesMulti, "ResourcesMultiplier", 3); + GET_PARAM_BOOL(KPLIB_param_arsenalType, "ArsenalType", 0); + GET_PARAM_BOOL(KPLIB_param_playerMenu, "PlayerMenu", 1); + GET_PARAM(KPLIB_param_victoryCondition, "VictoryCondition", 0); // Deactivate BI Revive when ACE Medical is running if (isClass (configfile >> "CfgPatches" >> "ace_medical")) then { @@ -78,36 +78,36 @@ if(isServer) then { // Gameplay Options ["--- Gameplay Options ---", "PARAM"] call KPLIB_fnc_log; - GET_PARAM_BOOL(KPLIB_fatigue, "Fatigue", 1); - GET_PARAM_BOOL(KPLIB_sway, "WeaponSway", 1); - GET_PARAM_BOOL(KPLIB_arsenalUsePreset, "ArsenalUsePreset", 1); - GET_PARAM_BOOL(KPLIB_mapmarkers, "MapMarkers", 1); - GET_PARAM_BOOL(KPLIB_mobilerespawn, "MobileRespawn", 1); - GET_PARAM(KPLIB_respawn_cooldown, "RespawnCooldown", 900); - GET_PARAM_BOOL(KPLIB_mobilearsenal, "MobileArsenal", 1); - GET_PARAM_BOOL(KPLIB_ailogistics, "AiLogistics", 1); - GET_PARAM_BOOL(KPLIB_cr_param_buildings, "CR_Building", 0); - GET_PARAM(KPLIB_halo_param, "HaloJump", 1); - GET_PARAM_BOOL(KPLIB_clear_cargo, "ClearCargo", 1); - GET_PARAM(KPLIB_allowEnemiesInImmobile, "AllowEnemiesInImmobile", 50); - GET_PARAM(KPLIB_delayDespawnMax, "DelayDespawnMax", 5); - GET_PARAM_BOOL(KPLIB_limited_zeus, "LimitedZeus", 1); - GET_PARAM_BOOL(KPLIB_enemies_zeus, "ZeusAddEnemies", 1); - GET_PARAM_BOOL(KPLIB_high_command, "HighCommand", 1); - GET_PARAM(KPLIB_suppMod, "SuppMod", 1); - GET_PARAM_BOOL(KPLIB_tutorial, "Tutorial", 1); + GET_PARAM_BOOL(KPLIB_param_fatigue, "Fatigue", 1); + GET_PARAM_BOOL(KPLIB_param_weaponSway, "WeaponSway", 1); + GET_PARAM_BOOL(KPLIB_param_useArsenalPreset, "ArsenalUsePreset", 1); + GET_PARAM_BOOL(KPLIB_param_mapMarkers, "MapMarkers", 1); + GET_PARAM_BOOL(KPLIB_param_mobileRespawn, "MobileRespawn", 1); + GET_PARAM(KPLIB_param_mobileRespawnCooldown, "RespawnCooldown", 900); + GET_PARAM_BOOL(KPLIB_param_mobileArsenal, "MobileArsenal", 1); + GET_PARAM_BOOL(KPLIB_param_logistic, "AiLogistics", 1); + GET_PARAM_BOOL(KPLIB_param_buildingDamaged, "CR_Building", 0); + GET_PARAM(KPLIB_param_halo, "HaloJump", 1); + GET_PARAM_BOOL(KPLIB_param_clearCargo, "ClearCargo", 1); + GET_PARAM(KPLIB_param_allowEnemiesInImmobile, "AllowEnemiesInImmobile", 50); + GET_PARAM(KPLIB_param_maxDespawnDelay, "DelayDespawnMax", 5); + GET_PARAM_BOOL(KPLIB_param_zeusLimited, "LimitedZeus", 1); + GET_PARAM_BOOL(KPLIB_param_zeusAddEnemies, "ZeusAddEnemies", 1); + GET_PARAM_BOOL(KPLIB_param_highCommand, "HighCommand", 1); + GET_PARAM(KPLIB_param_supportModule, "SuppMod", 1); + GET_PARAM_BOOL(KPLIB_param_tutorial, "Tutorial", 1); // Technical Options ["--- Technical Options ---", "PARAM"] call KPLIB_fnc_log; - GET_PARAM_BOOL(KPLIB_permissions_param, "Permissions", 1); - GET_PARAM(KPLIB_cleanup_vehicles, "CleanupVehicles", 2); - GET_PARAM_BOOL(KPLIB_introduction, "Introduction", 1); - GET_PARAM_BOOL(KPLIB_deployment_cinematic, "DeploymentCinematic", 1); - GET_PARAM_BOOL(KPLIB_use_whitelist, "Whitelist", 0); - GET_PARAM(KPLIB_restart, "ServerRestart", 0); + GET_PARAM_BOOL(KPLIB_param_permissions, "Permissions", 1); + GET_PARAM(KPLIB_param_vehicleCleanup, "CleanupVehicles", 2); + GET_PARAM_BOOL(KPLIB_param_introCinematic, "Introduction", 1); + GET_PARAM_BOOL(KPLIB_param_deployCinematic, "DeploymentCinematic", 1); + GET_PARAM_BOOL(KPLIB_param_cmdrWhitelist, "Whitelist", 0); + GET_PARAM(KPLIB_param_restart, "ServerRestart", 0); - GREUH_allow_mapmarkers = KPLIB_mapmarkers; publicVariable "GREUH_allow_mapmarkers"; - GREUH_allow_platoonview = KPLIB_mapmarkers; publicVariable "GREUH_allow_platoonview"; + GREUH_allow_mapmarkers = KPLIB_param_mapMarkers; publicVariable "GREUH_allow_mapmarkers"; + GREUH_allow_platoonview = KPLIB_param_mapMarkers; publicVariable "GREUH_allow_platoonview"; KP_serverParamsFetched = true; publicVariable "KP_serverParamsFetched"; @@ -116,58 +116,58 @@ if(isServer) then { }; // Fix for not working float values in mission params -switch (KPLIB_unitcap) do { - case 0: {KPLIB_unitcap = 0.5;}; - case 1: {KPLIB_unitcap = 0.75;}; - case 2: {KPLIB_unitcap = 1;}; - case 3: {KPLIB_unitcap = 1.25;}; - case 4: {KPLIB_unitcap = 1.5;}; - case 5: {KPLIB_unitcap = 2;}; - default {KPLIB_unitcap = 1;}; +switch (KPLIB_param_unitcap) do { + case 0: {KPLIB_param_unitcap = 0.5;}; + case 1: {KPLIB_param_unitcap = 0.75;}; + case 2: {KPLIB_param_unitcap = 1;}; + case 3: {KPLIB_param_unitcap = 1.25;}; + case 4: {KPLIB_param_unitcap = 1.5;}; + case 5: {KPLIB_param_unitcap = 2;}; + default {KPLIB_param_unitcap = 1;}; }; -switch (KPLIB_difficulty_modifier) do { - case 0: {KPLIB_difficulty_modifier = 0.5;}; - case 1: {KPLIB_difficulty_modifier = 0.75;}; - case 2: {KPLIB_difficulty_modifier = 1;}; - case 3: {KPLIB_difficulty_modifier = 1.25;}; - case 4: {KPLIB_difficulty_modifier = 1.5;}; - case 5: {KPLIB_difficulty_modifier = 2;}; - case 6: {KPLIB_difficulty_modifier = 4;}; - case 7: {KPLIB_difficulty_modifier = 10;}; - default {KPLIB_difficulty_modifier = 1;}; +switch (KPLIB_param_difficulty) do { + case 0: {KPLIB_param_difficulty = 0.5;}; + case 1: {KPLIB_param_difficulty = 0.75;}; + case 2: {KPLIB_param_difficulty = 1;}; + case 3: {KPLIB_param_difficulty = 1.25;}; + case 4: {KPLIB_param_difficulty = 1.5;}; + case 5: {KPLIB_param_difficulty = 2;}; + case 6: {KPLIB_param_difficulty = 4;}; + case 7: {KPLIB_param_difficulty = 10;}; + default {KPLIB_param_difficulty = 1;}; }; -switch (KPLIB_csat_aggressivity) do { - case 0: {KPLIB_csat_aggressivity = 0.25;}; - case 1: {KPLIB_csat_aggressivity = 0.5;}; - case 2: {KPLIB_csat_aggressivity = 1;}; - case 3: {KPLIB_csat_aggressivity = 2;}; - case 4: {KPLIB_csat_aggressivity = 4;}; - default {KPLIB_csat_aggressivity = 1;}; +switch (KPLIB_param_aggressivity) do { + case 0: {KPLIB_param_aggressivity = 0.25;}; + case 1: {KPLIB_param_aggressivity = 0.5;}; + case 2: {KPLIB_param_aggressivity = 1;}; + case 3: {KPLIB_param_aggressivity = 2;}; + case 4: {KPLIB_param_aggressivity = 4;}; + default {KPLIB_param_aggressivity = 1;}; }; -switch (KPLIB_civilian_activity) do { - case 0: {KPLIB_civilian_activity = 0;}; - case 1: {KPLIB_civilian_activity = 0.5;}; - case 2: {KPLIB_civilian_activity = 1;}; - case 3: {KPLIB_civilian_activity = 2;}; - default {KPLIB_csat_aggressivity = 1;}; +switch (KPLIB_param_civActivity) do { + case 0: {KPLIB_param_civActivity = 0;}; + case 1: {KPLIB_param_civActivity = 0.5;}; + case 2: {KPLIB_param_civActivity = 1;}; + case 3: {KPLIB_param_civActivity = 2;}; + default {KPLIB_param_aggressivity = 1;}; }; -switch (KPLIB_resources_multiplier) do { - case 0: {KPLIB_resources_multiplier = 0.25;}; - case 1: {KPLIB_resources_multiplier = 0.5;}; - case 2: {KPLIB_resources_multiplier = 0.75;}; - case 3: {KPLIB_resources_multiplier = 1;}; - case 4: {KPLIB_resources_multiplier = 1.25;}; - case 5: {KPLIB_resources_multiplier = 1.5;}; - case 6: {KPLIB_resources_multiplier = 2;}; - case 7: {KPLIB_resources_multiplier = 3;}; - default {KPLIB_resources_multiplier = 1;}; +switch (KPLIB_param_resourcesMulti) do { + case 0: {KPLIB_param_resourcesMulti = 0.25;}; + case 1: {KPLIB_param_resourcesMulti = 0.5;}; + case 2: {KPLIB_param_resourcesMulti = 0.75;}; + case 3: {KPLIB_param_resourcesMulti = 1;}; + case 4: {KPLIB_param_resourcesMulti = 1.25;}; + case 5: {KPLIB_param_resourcesMulti = 1.5;}; + case 6: {KPLIB_param_resourcesMulti = 2;}; + case 7: {KPLIB_param_resourcesMulti = 3;}; + default {KPLIB_param_resourcesMulti = 1;}; }; -switch (KPLIB_victoryCondition) do { +switch (KPLIB_param_victoryCondition) do { case 1: { KPLIB_victoryCheck = { (count (KPLIB_sectors_player select {_x in KPLIB_sectors_capital})) == (count KPLIB_sectors_capital) @@ -212,11 +212,11 @@ if (!isDedicated && hasInterface) then { player createDiarySubject ["parameters", "Mission Parameters"]; private _param = localize "STR_PARAMS_UNITCAP"; - private _value = (format ["%1", KPLIB_unitcap * 100]) + "%"; + private _value = (format ["%1", KPLIB_param_unitcap * 100]) + "%"; private _text = format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_DIFFICULTY"; - switch (KPLIB_difficulty_modifier) do { + switch (KPLIB_param_difficulty) do { case 0.75: {_value = localize "STR_PARAMS_DIFFICULTY2";}; case 1: {_value = localize "STR_PARAMS_DIFFICULTY3";}; case 1.25: {_value = localize "STR_PARAMS_DIFFICULTY4";}; @@ -229,7 +229,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_AGGRESSIVITY_PARAM"; - switch (KPLIB_csat_aggressivity) do { + switch (KPLIB_param_aggressivity) do { case 0.5: {_value = localize "STR_AGGRESSIVITY_PARAM1";}; case 1: {_value = localize "STR_AGGRESSIVITY_PARAM2";}; case 2: {_value = localize "STR_AGGRESSIVITY_PARAM3";}; @@ -239,11 +239,11 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_ADAPT_TO_PLAYERCOUNT"; - _value = if (KPLIB_adaptive_opfor) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_adaptive) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_CIVILIANS"; - switch (KPLIB_civilian_activity) do { + switch (KPLIB_param_civActivity) do { case 0.5: {_value = localize "STR_PARAMS_CIVILIANS2";}; case 1: {_value = localize "STR_PARAMS_CIVILIANS3";}; case 2: {_value = localize "STR_PARAMS_CIVILIANS4";}; @@ -252,39 +252,39 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_FIRSTFOB"; - _value = if (KPLIB_build_first_fob) then {localize "STR_YES";} else {localize "STR_NO";}; + _value = if (KPLIB_param_firstFobBuilt) then {localize "STR_YES";} else {localize "STR_NO";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_FIRSTFOBVEHICLE"; - _value = if (KPLIB_fob_vehicle) then {localize "STR_PARAMS_FIRSTFOBVEHICLE_TRUCK";} else {localize "STR_PARAMS_FIRSTFOBVEHICLE_CONTAINTER";}; + _value = if (KPLIB_param_fobVehicle) then {localize "STR_PARAMS_FIRSTFOBVEHICLE_TRUCK";} else {localize "STR_PARAMS_FIRSTFOBVEHICLE_CONTAINTER";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_FOBS_COUNT"; - _value = str KPLIB_maximum_fobs; + _value = str KPLIB_param_maxFobs; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_SQUAD_SIZE"; - _value = str KPLIB_max_squad_size; + _value = str KPLIB_param_maxSquadSize; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_BLUFOR_DEFENDERS"; - _value = if (KPLIB_blufor_defenders) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_bluforDefenders) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_AUTODANGER"; - _value = if (KPLIB_autodanger) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_autodanger) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_DAYDURATION"; - _value = str (24 / KPLIB_time_factor); + _value = str (24 / KPLIB_param_timeMulti); _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_SHORTER_NIGHTS_PARAM"; - _value = if (KPLIB_shorter_nights) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_shorterNights) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_WEATHER_PARAM"; - switch (KPLIB_weather_param) do { + switch (KPLIB_param_weather) do { case 2: {_value = localize "STR_WEATHER_PARAM2";}; case 3: {_value = localize "STR_WEATHER_PARAM3";}; default {_value = localize "STR_WEATHER_PARAM1";}; @@ -292,23 +292,23 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_FOG_PARAM"; - _value = if (KPLIB_fog_param) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_vanillaFog) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_RESOURCESMULTIPLIER"; - _value = format ["x%1", KPLIB_resources_multiplier]; + _value = format ["x%1", KPLIB_param_resourcesMulti]; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_ARSENAL"; - _value = if (KPLIB_arsenal_type) then {localize "STR_PARAMS_ARSENAL_ACE";} else {localize "STR_PARAMS_ARSENAL_BI";}; + _value = if (KPLIB_param_arsenalType) then {localize "STR_PARAMS_ARSENAL_ACE";} else {localize "STR_PARAMS_ARSENAL_BI";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_PLAYERMENU"; - _value = if (KPLIB_playermenu) then {localize "STR_PARAMS_PLAYERMENU_KP";} else {localize "STR_PARAMS_PLAYERMENU_GREUH";}; + _value = if (KPLIB_param_playerMenu) then {localize "STR_PARAMS_PLAYERMENU_KP";} else {localize "STR_PARAMS_PLAYERMENU_GREUH";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_VICTORYCONDITION"; - switch (KPLIB_victoryCondition) do { + switch (KPLIB_param_victoryCondition) do { case 1: {_value = localize "STR_PARAMS_VICTORYCONDITION_1";}; case 2: {_value = localize "STR_PARAMS_VICTORYCONDITION_2";}; case 3: {_value = localize "STR_PARAMS_VICTORYCONDITION_3";}; @@ -360,43 +360,43 @@ if (!isDedicated && hasInterface) then { }; _param = localize "STR_PARAMS_FATIGUE"; - _value = if (KPLIB_fatigue) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_fatigue) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_WEAPSWAY"; - _value = if (KPLIB_sway) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_weaponSway) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_ARSENALUSEPRESET"; - _value = if (KPLIB_arsenalUsePreset) then {localize "STR_PARAMS_USEPRESET";} else {localize "STR_PARAMS_NORESTRICTIONS";}; + _value = if (KPLIB_param_useArsenalPreset) then {localize "STR_PARAMS_USEPRESET";} else {localize "STR_PARAMS_NORESTRICTIONS";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_MAPMARKERS"; - _value = if (KPLIB_mapmarkers) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_mapMarkers) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_MOBILERESPAWN"; - _value = if (KPLIB_mobilerespawn) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_mobileRespawn) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_RESPAWN_COOLDOWN"; - _value = if (KPLIB_respawn_cooldown == 0) then {localize "STR_PARAMS_DISABLED";} else {str (KPLIB_respawn_cooldown / 60);}; + _value = if (KPLIB_param_mobileRespawnCooldown == 0) then {localize "STR_PARAMS_DISABLED";} else {str (KPLIB_param_mobileRespawnCooldown / 60);}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_MOBILEARSENAL"; - _value = if (KPLIB_mobilearsenal) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_mobileArsenal) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_AILOGISTICS"; - _value = if (KPLIB_ailogistics) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_logistic) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_CR_BUILDING"; - _value = if (KPLIB_cr_param_buildings) then {localize "STR_PARAM_CR_DAMAGED";} else {localize "STR_PARAM_CR_DESTROYED";}; + _value = if (KPLIB_param_buildingDamaged) then {localize "STR_PARAM_CR_DAMAGED";} else {localize "STR_PARAM_CR_DESTROYED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_HALO_PARAM"; - switch (KPLIB_halo_param) do { + switch (KPLIB_param_halo) do { case 1: {_value = localize "STR_HALO_PARAM1";}; case 5: {_value = localize "STR_HALO_PARAM2";}; case 10: {_value = localize "STR_HALO_PARAM3";}; @@ -408,31 +408,31 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_CLEAR_CARGO"; - _value = if (KPLIB_clear_cargo) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_clearCargo) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_ALLOW_ENEMIES_IN_IMMOBILE"; - _value = if (KPLIB_allowEnemiesInImmobile == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_allowEnemiesInImmobile;}; + _value = if (KPLIB_param_allowEnemiesInImmobile == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_param_allowEnemiesInImmobile;}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_DELAY_DESPAWN_MAX"; - _value = if (KPLIB_delayDespawnMax == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_delayDespawnMax;}; + _value = if (KPLIB_param_maxDespawnDelay == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_param_maxDespawnDelay;}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_LIMITEDZEUS"; - _value = if (KPLIB_limited_zeus) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_zeusLimited) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_ZEUSADDENEMIES"; - _value = if (KPLIB_enemies_zeus) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_zeusAddEnemies) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_HIGHCOMMAND"; - _value = if (KPLIB_high_command) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_highCommand) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_SUPPMOD"; - switch (KPLIB_suppMod) do { + switch (KPLIB_param_supportModule) do { case 1: {_value = localize "STR_PARAM_SUPPMOD_CMDRANDWHITELIST";}; case 2: {_value = localize "STR_PARAM_SUPPMOD_EVERYONE";}; default {_value = localize "STR_PARAMS_DISABLED";}; @@ -440,15 +440,15 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAM_TUTORIAL"; - _value = if (KPLIB_tutorial) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_tutorial) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PERMISSIONS_PARAM"; - _value = if (KPLIB_permissions_param) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_permissions) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_CLEANUP_PARAM"; - switch (KPLIB_cleanup_vehicles) do { + switch (KPLIB_param_vehicleCleanup) do { case 1: {_value = localize "STR_CLEANUP_PARAM1";}; case 2: {_value = localize "STR_CLEANUP_PARAM2";}; case 4: {_value = localize "STR_CLEANUP_PARAM3";}; @@ -457,29 +457,29 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_INTRO"; - _value = if (KPLIB_introduction) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_introCinematic) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_DEPLOYMENTCAMERA"; - _value = if (KPLIB_deployment_cinematic) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_deployCinematic) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_WHITELIST_PARAM"; - _value = if (KPLIB_use_whitelist) then {localize "STR_WHITELIST_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_cmdrWhitelist) then {localize "STR_WHITELIST_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_RESTART_PARAM"; - _value = if (KPLIB_restart == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_restart;}; + _value = if (KPLIB_param_restart == 0) then {localize "STR_PARAMS_DISABLED";} else {KPLIB_param_restart;}; _text = _text + format ["%1
%2

", _param, _value]; player createDiaryRecord ["parameters", ["Active", _text]]; }; // Adjustments calculation depending on selected mission parameters (shouldn't be edited) -KPLIB_production_interval = ceil (KPLIB_production_interval / KPLIB_resources_multiplier); -KPLIB_battlegroup_size = KPLIB_battlegroup_size * (sqrt KPLIB_unitcap) * (sqrt KPLIB_csat_aggressivity); -KPLIB_civilians_amount = KPLIB_civilians_amount * KPLIB_civilian_activity; -KPLIB_blufor_cap = (KPLIB_blufor_cap * KPLIB_unitcap) min 100; -KPLIB_sector_cap = KPLIB_sector_cap * KPLIB_unitcap; -KPLIB_battlegroup_cap = KPLIB_battlegroup_cap * KPLIB_unitcap; -KPLIB_patrol_cap = KPLIB_patrol_cap * KPLIB_unitcap; +KPLIB_production_interval = ceil (KPLIB_production_interval / KPLIB_param_resourcesMulti); +KPLIB_battlegroup_size = KPLIB_battlegroup_size * (sqrt KPLIB_param_unitcap) * (sqrt KPLIB_param_aggressivity); +KPLIB_civilians_amount = KPLIB_civilians_amount * KPLIB_param_civActivity; +KPLIB_cap_playerSide = (KPLIB_cap_playerSide * KPLIB_param_unitcap) min 100; +KPLIB_cap_enemySide = KPLIB_cap_enemySide * KPLIB_param_unitcap; +KPLIB_cap_battlegroup = KPLIB_cap_battlegroup * KPLIB_param_unitcap; +KPLIB_cap_patrol = KPLIB_cap_patrol * KPLIB_param_unitcap; diff --git a/Missionframework/scripts/shared/init_shared.sqf b/Missionframework/scripts/shared/init_shared.sqf index fdec895e3..28556c763 100644 --- a/Missionframework/scripts/shared/init_shared.sqf +++ b/Missionframework/scripts/shared/init_shared.sqf @@ -12,7 +12,7 @@ start_secondary_remote_call = compile preprocessFileLineNumbers "scripts\server\ zeus_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\zeus_remote_call.sqf"; change_prod_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\change_prod_remote_call.sqf"; build_fac_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\build_fac_remote_call.sqf"; -if (KPLIB_ailogistics) then { +if (KPLIB_param_logistic) then { add_logiGroup_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\add_logiGroup_remote_call.sqf"; del_logiGroup_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\del_logiGroup_remote_call.sqf"; add_logiTruck_remote_call = compile preprocessFileLineNumbers "scripts\server\remotecall\add_logiTruck_remote_call.sqf"; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index e3fc938b3..02560088e 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -26,14 +26,14 @@ if (isServer) then { if (isNil "air_weight") then {air_weight = 33}; // BLUFOR Killer handling - if ((side _killer) == KPLIB_side_friendly) then { + if ((side _killer) == KPLIB_side_player) then { // Increase combat readiness for kills near a capital. private _nearby_bigtown = KPLIB_sectors_capital select {!(_x in KPLIB_sectors_player) && (_unit distance (markerpos _x) < 250)}; if (count _nearby_bigtown > 0) then { - combat_readiness = combat_readiness + (0.5 * KPLIB_difficulty_modifier); - stats_readiness_earned = stats_readiness_earned + (0.5 * KPLIB_difficulty_modifier); - if (combat_readiness > 100.0 && KPLIB_difficulty_modifier < 2) then {combat_readiness = 100.0}; + combat_readiness = combat_readiness + (0.5 * KPLIB_param_difficulty); + stats_readiness_earned = stats_readiness_earned + (0.5 * KPLIB_param_difficulty); + if (combat_readiness > 100.0 && KPLIB_param_difficulty < 2) then {combat_readiness = 100.0}; }; // Weights adjustments depending on what vehicle the BLUFOR killer used @@ -75,7 +75,7 @@ if (isServer) then { // OPFOR casualty if (side (group _unit) == KPLIB_side_enemy) then { // Killed by BLUFOR - if (side _killer == KPLIB_side_friendly) then { + if (side _killer == KPLIB_side_player) then { stats_opfor_soldiers_killed = stats_opfor_soldiers_killed + 1; }; @@ -86,11 +86,11 @@ if (isServer) then { }; // BLUFOR casualty - if (side (group _unit) == KPLIB_side_friendly) then { + if (side (group _unit) == KPLIB_side_player) then { stats_blufor_soldiers_killed = stats_blufor_soldiers_killed + 1; // Killed by BLUFOR - if (side _killer == KPLIB_side_friendly) then { + if (side _killer == KPLIB_side_player) then { stats_blufor_teamkills = stats_blufor_teamkills + 1; }; }; @@ -101,10 +101,10 @@ if (isServer) then { stats_resistance_killed = stats_resistance_killed + 1; // Resistance is friendly to BLUFOR - if ((KPLIB_side_friendly getFriend KPLIB_side_resistance) >= 0.6) then { + if ((KPLIB_side_player getFriend KPLIB_side_resistance) >= 0.6) then { // Killed by BLUFOR - if (side _killer == KPLIB_side_friendly) then { + if (side _killer == KPLIB_side_player) then { if (KPLIB_asymmetric_debug > 0) then {[format ["Guerilla unit killed by: %1", name _killer], "ASYMMETRIC"] call KPLIB_fnc_log;}; [3, [(name _unit)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; stats_resistance_teamkills = stats_resistance_teamkills + 1; @@ -123,7 +123,7 @@ if (isServer) then { stats_civilians_killed = stats_civilians_killed + 1; // Killed by BLUFOR - if (side _killer == KPLIB_side_friendly) then { + if (side _killer == KPLIB_side_player) then { if (KPLIB_civrep_debug > 0) then {[format ["Civilian killed by: %1", name _killer], "CIVREP"] call KPLIB_fnc_log;}; [2, [(name _unit)]] remoteExec ["KPLIB_fnc_crGlobalMsg"]; [KPLIB_cr_kill_penalty, true] spawn F_cr_changeCR; From c54263c06ce17e9d7119e5c2e28fe3476bdd9415 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Fri, 22 May 2020 18:53:12 +0200 Subject: [PATCH 043/115] Changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1946157b9..90efd9cbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Tweaked: Arsenal presets are now in the presets folder. * Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal. * Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset. +* Tweaked: Parameter value variables are having a `param` prefix now. * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. * Fixed: FOB truck got mass set, but should've just apply to FOB boxes. From 4c90f2ec95ce263bd8cffa261a5dc5dac0e9badd Mon Sep 17 00:00:00 2001 From: Wyqer Date: Fri, 22 May 2020 19:11:10 +0200 Subject: [PATCH 044/115] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90efd9cbe..2ac01183c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal. * Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset. * Tweaked: Parameter value variables are having a `param` prefix now. +* Tweaked: Comments/structure of the config file. Also added some category prefix sorting to some config variables. * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. * Fixed: FOB truck got mass set, but should've just apply to FOB boxes. From e32ad09e9e192857e489fab3c9d0db5df4356505 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Fri, 22 May 2020 19:21:46 +0200 Subject: [PATCH 045/115] Missionstart log output preset strings updated --- Missionframework/scripts/shared/diagnostics.sqf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Missionframework/scripts/shared/diagnostics.sqf b/Missionframework/scripts/shared/diagnostics.sqf index d1821975c..e976f534d 100644 --- a/Missionframework/scripts/shared/diagnostics.sqf +++ b/Missionframework/scripts/shared/diagnostics.sqf @@ -5,11 +5,11 @@ private _source = ""; [format ["World: %1", worldName], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Version: %1", (localize "STR_MISSION_VERSION")], "MISSIONSTART"] call KPLIB_fnc_log; [format ["Author: %1", [missionConfigFile] call BIS_fnc_overviewAuthor], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Blufor: %1", KPLIB_presetPlayer], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Opfor: %1", KPLIB_presetEnemy], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Resistance: %1", KPLIB_presetResistance], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Civilians: %1", KPLIB_presetCivilians], "MISSIONSTART"] call KPLIB_fnc_log; -[format ["Arsenal: %1", KPLIB_presetArsenal], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Preset player: %1", KPLIB_presetPlayer], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Preset enemy: %1", KPLIB_presetEnemy], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Preset resistance: %1", KPLIB_presetResistance], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Preset civilians: %1", KPLIB_presetCivilians], "MISSIONSTART"] call KPLIB_fnc_log; +[format ["Preset arsenal: %1", KPLIB_presetArsenal], "MISSIONSTART"] call KPLIB_fnc_log; [format ["CBA: %1", KPPLM_CBA], "MISSIONSTART"] call KPLIB_fnc_log; [format ["ACE: %1", KPLIB_ace], "MISSIONSTART"] call KPLIB_fnc_log; [format ["KP Ranks: %1", KPPLM_KPR], "MISSIONSTART"] call KPLIB_fnc_log; From 6bc2d712103a239f8e9ba350b208e34ea5ce9f25 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sat, 23 May 2020 07:51:36 +0200 Subject: [PATCH 046/115] `save_is_loaded` to `KPLIB_saveLoaded` --- Missionframework/functions/fn_createClearance.sqf | 4 ++-- Missionframework/scripts/client/markers/fob_markers.sqf | 4 ++-- Missionframework/scripts/client/markers/hostile_groups.sqf | 2 +- Missionframework/scripts/client/markers/sector_manager.sqf | 4 ++-- .../scripts/client/markers/update_production_sites.sqf | 4 ++-- Missionframework/scripts/client/spawn/redeploy_manager.sqf | 4 ++-- Missionframework/scripts/client/tutorial/fn_tutorial.fsm | 4 ++-- .../scripts/server/asymmetric/asymmetric_loop.sqf | 4 ++-- Missionframework/scripts/server/base/huron_manager.sqf | 4 ++-- Missionframework/scripts/server/base/startgame.sqf | 4 ++-- Missionframework/scripts/server/base/startvehicle_spawn.sqf | 4 ++-- .../scripts/server/battlegroup/readiness_increase.sqf | 2 +- .../scripts/server/game/apply_default_permissions.sqf | 4 ++-- Missionframework/scripts/server/game/playtime.sqf | 4 ++-- Missionframework/scripts/server/game/save_manager.sqf | 4 ++-- Missionframework/scripts/server/game/synchronise_eco.sqf | 4 ++-- Missionframework/scripts/server/game/synchronise_vars.sqf | 4 ++-- .../scripts/server/highcommand/fn_highcommand.fsm | 4 ++-- .../scripts/server/resources/manage_logistics.sqf | 4 ++-- .../scripts/server/resources/manage_resources.sqf | 4 ++-- .../scripts/server/resources/recalculate_resources.sqf | 4 ++-- .../scripts/server/resources/recalculate_timer.sqf | 4 ++-- .../scripts/server/resources/recalculate_timer_sector.sqf | 4 ++-- Missionframework/scripts/server/sector/fn_sectorMonitor.fsm | 2 +- .../scripts/server/support/fn_createSuppModules.sqf | 4 ++-- 25 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Missionframework/functions/fn_createClearance.sqf b/Missionframework/functions/fn_createClearance.sqf index 96aa04faa..50b7b16f1 100644 --- a/Missionframework/functions/fn_createClearance.sqf +++ b/Missionframework/functions/fn_createClearance.sqf @@ -2,7 +2,7 @@ File: fn_createClearance.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-10 + Last Update: 2020-05-23 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -29,7 +29,7 @@ params [ if (_centerPos isEqualTo [0, 0, 0]) exitWith {["Zero position given"] call BIS_fnc_error; false}; if (_radius isEqualTo 0) exitWith {["Zero radius given"] call BIS_fnc_error; false}; -if (save_is_loaded && {(KPLIB_clearances findIf {(_x select 0) isEqualTo _centerPos}) != -1}) exitWith {false}; +if (KPLIB_saveLoaded && {(KPLIB_clearances findIf {(_x select 0) isEqualTo _centerPos}) != -1}) exitWith {false}; { _x switchLight "OFF"; diff --git a/Missionframework/scripts/client/markers/fob_markers.sqf b/Missionframework/scripts/client/markers/fob_markers.sqf index c1b091380..49e1773a5 100644 --- a/Missionframework/scripts/client/markers/fob_markers.sqf +++ b/Missionframework/scripts/client/markers/fob_markers.sqf @@ -1,6 +1,6 @@ -waitUntil {!isNil "save_is_loaded"}; +waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_sectors_fob"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; uiSleep 3; diff --git a/Missionframework/scripts/client/markers/hostile_groups.sqf b/Missionframework/scripts/client/markers/hostile_groups.sqf index 6ac0f71ba..300485d8e 100644 --- a/Missionframework/scripts/client/markers/hostile_groups.sqf +++ b/Missionframework/scripts/client/markers/hostile_groups.sqf @@ -1,6 +1,6 @@ private ["_kp_markers_array","_kp_markers_start","_kp_markers_change","_kp_markers_pos","_kp_markers_posx","_kp_markers_posy","_kp_markers_name","_kp_markers_color"]; -waitUntil {sleep 0.1; !isNil "save_is_loaded" && {save_is_loaded}}; +waitUntil {sleep 0.1; !isNil "KPLIB_saveLoaded" && {KPLIB_saveLoaded}}; _kp_markers_array = []; _kp_markers_start = 0.2; diff --git a/Missionframework/scripts/client/markers/sector_manager.sqf b/Missionframework/scripts/client/markers/sector_manager.sqf index c9d2035be..489ea493e 100644 --- a/Missionframework/scripts/client/markers/sector_manager.sqf +++ b/Missionframework/scripts/client/markers/sector_manager.sqf @@ -1,7 +1,7 @@ -waitUntil {!isNil "save_is_loaded"}; +waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_vehicle_to_military_base_links"}; waitUntil {!isNil "KPLIB_sectors_player"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; private _vehicle_unlock_markers = []; private _cfg = configFile >> "cfgVehicles"; diff --git a/Missionframework/scripts/client/markers/update_production_sites.sqf b/Missionframework/scripts/client/markers/update_production_sites.sqf index 16d5b6d83..f938b6bdc 100644 --- a/Missionframework/scripts/client/markers/update_production_sites.sqf +++ b/Missionframework/scripts/client/markers/update_production_sites.sqf @@ -1,6 +1,6 @@ -waitUntil {!isNil "save_is_loaded"}; +waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_production_markers"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; private _KPLIB_production_markers_old = [0]; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 02624b65f..37babff15 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -9,8 +9,8 @@ KPLIB_force_redeploy = false; waitUntil {!isNil "KPLIB_sectors_fob"}; waitUntil {!isNil "KPLIB_sectors_player"}; -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; private _spawn_str = ""; diff --git a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm index 5511fb57d..5ae12aebd 100644 --- a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm +++ b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm @@ -226,8 +226,8 @@ class FSM priority = 0.000000; to="Set_all_completion"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""save_is_loaded""" \n - "&& {save_is_loaded}" \n + condition=/*%FSM*/"!isNil ""KPLIB_saveLoaded""" \n + "&& {KPLIB_saveLoaded}" \n "&& {alive player}" \n "&& {" \n " private _locations = [startbase];" \n diff --git a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf index eab4ac904..ad6046161 100644 --- a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf +++ b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf @@ -1,6 +1,6 @@ -waitUntil {!isNil "save_is_loaded"}; +waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_civ_rep"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; if (KPLIB_asymmetric_debug > 0) then {[format ["Loop spawned on: %1", debug_source], "ASYMMETRIC"] call KPLIB_fnc_log;}; diff --git a/Missionframework/scripts/server/base/huron_manager.sqf b/Missionframework/scripts/server/base/huron_manager.sqf index 45885266a..8f23c2ce1 100644 --- a/Missionframework/scripts/server/base/huron_manager.sqf +++ b/Missionframework/scripts/server/base/huron_manager.sqf @@ -1,5 +1,5 @@ -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; huron = objNull; diff --git a/Missionframework/scripts/server/base/startgame.sqf b/Missionframework/scripts/server/base/startgame.sqf index b62af294a..362e384dc 100644 --- a/Missionframework/scripts/server/base/startgame.sqf +++ b/Missionframework/scripts/server/base/startgame.sqf @@ -1,5 +1,5 @@ -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; // Check if there is no FOB yet (new campaign) if (KPLIB_sectors_fob isEqualTo []) then { diff --git a/Missionframework/scripts/server/base/startvehicle_spawn.sqf b/Missionframework/scripts/server/base/startvehicle_spawn.sqf index 2407678a8..9609133c1 100644 --- a/Missionframework/scripts/server/base/startvehicle_spawn.sqf +++ b/Missionframework/scripts/server/base/startvehicle_spawn.sqf @@ -20,8 +20,8 @@ Refer to: https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_ImportantHints#commas-inside-an-array */ -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; private _placeholder = objNull; private _spawnPos = []; diff --git a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf index 45982e4c7..0c3852285 100644 --- a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf +++ b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf @@ -1,4 +1,4 @@ -waitUntil {!isNil "save_is_loaded" && {save_is_loaded}}; +waitUntil {!isNil "KPLIB_saveLoaded" && {KPLIB_saveLoaded}}; while {true} do { if ((count KPLIB_sectors_player) >= ((count KPLIB_sectors_all) * 0.9)) then { diff --git a/Missionframework/scripts/server/game/apply_default_permissions.sqf b/Missionframework/scripts/server/game/apply_default_permissions.sqf index 394fff76b..36fef26c7 100644 --- a/Missionframework/scripts/server/game/apply_default_permissions.sqf +++ b/Missionframework/scripts/server/game/apply_default_permissions.sqf @@ -1,8 +1,8 @@ if (!KPLIB_param_permissions) exitWith {}; waitUntil {!isNil "KPLIB_permissions"}; -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; while {true} do { diff --git a/Missionframework/scripts/server/game/playtime.sqf b/Missionframework/scripts/server/game/playtime.sqf index ec6b761e5..44a97ec00 100644 --- a/Missionframework/scripts/server/game/playtime.sqf +++ b/Missionframework/scripts/server/game/playtime.sqf @@ -1,5 +1,5 @@ -waitUntil { !isNil "save_is_loaded" }; -waitUntil { save_is_loaded }; +waitUntil { !isNil "KPLIB_saveLoaded" }; +waitUntil { KPLIB_saveLoaded }; while { true } do { sleep 1; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 526c6cf8d..94c34e0af 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -94,7 +94,7 @@ KPLIB_production_markers = []; // Global Intel resource resources_intel = 0; // State if the save is fully loaded -save_is_loaded = false; +KPLIB_saveLoaded = false; // Add all buildings for saving and kill manager ignore _noKillHandler append KPLIB_b_buildings_classes; @@ -538,7 +538,7 @@ if ((_lockedVehCount < (count KPLIB_sectors_military)) && (_lockedVehCount < (co publicVariable "KPLIB_vehicle_to_military_base_links"; publicVariable "KPLIB_permissions"; -save_is_loaded = true; publicVariable "save_is_loaded"; +KPLIB_saveLoaded = true; publicVariable "KPLIB_saveLoaded"; [format ["----- Saved data loaded - Time needed: %1 seconds", diag_tickTime - _start], "SAVE"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/synchronise_eco.sqf b/Missionframework/scripts/server/game/synchronise_eco.sqf index 256818e6d..b4b3fe674 100644 --- a/Missionframework/scripts/server/game/synchronise_eco.sqf +++ b/Missionframework/scripts/server/game/synchronise_eco.sqf @@ -1,10 +1,10 @@ sync_eco = []; publicVariable "sync_eco"; -waitUntil{!isNil "save_is_loaded"}; +waitUntil{!isNil "KPLIB_saveLoaded"}; waitUntil{!isNil "KPLIB_production"}; waitUntil{!isNil "KPLIB_logistics"}; waitUntil{!isNil "KPLIB_production_markers"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; if (KPLIB_production_markers isEqualTo []) then { { diff --git a/Missionframework/scripts/server/game/synchronise_vars.sqf b/Missionframework/scripts/server/game/synchronise_vars.sqf index b5eb0b08a..42fb21fa1 100644 --- a/Missionframework/scripts/server/game/synchronise_vars.sqf +++ b/Missionframework/scripts/server/game/synchronise_vars.sqf @@ -1,6 +1,6 @@ sync_vars = []; publicVariable "sync_vars"; -waitUntil{!isNil "save_is_loaded"}; +waitUntil{!isNil "KPLIB_saveLoaded"}; waitUntil{!isNil "KPLIB_fob_resources"}; waitUntil{!isNil "KPLIB_supplies_global"}; waitUntil{!isNil "KPLIB_ammo_global"}; @@ -18,7 +18,7 @@ waitUntil{!isNil "KPLIB_guerilla_strength"}; waitUntil{!isNil "infantry_weight"}; waitUntil{!isNil "armor_weight"}; waitUntil{!isNil "air_weight"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; private _KPLIB_fob_resources_old = []; private _KPLIB_supplies_global_old = -1; diff --git a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm index a9634f50a..4fbb3a6d3 100644 --- a/Missionframework/scripts/server/highcommand/fn_highcommand.fsm +++ b/Missionframework/scripts/server/highcommand/fn_highcommand.fsm @@ -103,8 +103,8 @@ class FSM priority = 0.000000; to="Init_High_Command"; precondition = /*%FSM*/"_cmdr = [] call KPLIB_fnc_getCommander;"/*%FSM*/; - condition=/*%FSM*/"!isNil ""save_is_loaded""" \n - "&& {save_is_loaded}" \n + condition=/*%FSM*/"!isNil ""KPLIB_saveLoaded""" \n + "&& {KPLIB_saveLoaded}" \n "&& {time > 5}" \n "&& {alive _cmdr}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; diff --git a/Missionframework/scripts/server/resources/manage_logistics.sqf b/Missionframework/scripts/server/resources/manage_logistics.sqf index 9bfc2e33e..df0b0716f 100644 --- a/Missionframework/scripts/server/resources/manage_logistics.sqf +++ b/Missionframework/scripts/server/resources/manage_logistics.sqf @@ -1,6 +1,6 @@ -waitUntil {!isNil "save_is_loaded"}; +waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_logistics"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; ["Logistic management started", "LOGISTIC"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/resources/manage_resources.sqf b/Missionframework/scripts/server/resources/manage_resources.sqf index 8f91429bd..64b7c1ffc 100644 --- a/Missionframework/scripts/server/resources/manage_resources.sqf +++ b/Missionframework/scripts/server/resources/manage_resources.sqf @@ -1,6 +1,6 @@ -waitUntil {!isNil "save_is_loaded"}; +waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_production"}; -waitUntil {save_is_loaded}; +waitUntil {KPLIB_saveLoaded}; sectors_recalculating = false; sectors_timer = false; diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index 92b7090af..102864b55 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -1,5 +1,5 @@ -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; KPLIB_fob_resources = []; KPLIB_supplies_global = 0; diff --git a/Missionframework/scripts/server/resources/recalculate_timer.sqf b/Missionframework/scripts/server/resources/recalculate_timer.sqf index 05d49848a..a2781a78d 100644 --- a/Missionframework/scripts/server/resources/recalculate_timer.sqf +++ b/Missionframework/scripts/server/resources/recalculate_timer.sqf @@ -1,5 +1,5 @@ -waitUntil { !isNil "save_is_loaded" }; -waitUntil {save_is_loaded}; +waitUntil { !isNil "KPLIB_saveLoaded" }; +waitUntil {KPLIB_saveLoaded}; while {true} do { sleep 3; diff --git a/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf b/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf index 9c56bd61f..80c9ee11d 100644 --- a/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf +++ b/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf @@ -1,5 +1,5 @@ -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; while {true} do { uiSleep 60; diff --git a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm index 901828c07..b81d09d11 100644 --- a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm +++ b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm @@ -88,7 +88,7 @@ class FSM priority = 0.000000; to="Init"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!isNil ""save_is_loaded"" && {save_is_loaded}"/*%FSM*/; + condition=/*%FSM*/"!isNil ""KPLIB_saveLoaded"" && {KPLIB_saveLoaded}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Missionframework/scripts/server/support/fn_createSuppModules.sqf b/Missionframework/scripts/server/support/fn_createSuppModules.sqf index 6c036c432..e07e04b89 100644 --- a/Missionframework/scripts/server/support/fn_createSuppModules.sqf +++ b/Missionframework/scripts/server/support/fn_createSuppModules.sqf @@ -2,7 +2,7 @@ File: fn_createSuppModules.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-21 - Last Update: 2020-05-22 + Last Update: 2020-05-23 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -35,7 +35,7 @@ publicVariable "KPLIB_param_supportModule_arty"; // Delay provider init until save is loaded, to catch synchronized units from loaded save [] spawn { - waitUntil {!isNil "save_is_loaded" && {save_is_loaded}}; + waitUntil {!isNil "KPLIB_saveLoaded" && {KPLIB_saveLoaded}}; ["Init provider on server", "SUPPORTMODULES"] call KPLIB_fnc_log; [KPLIB_param_supportModule_req] call BIS_fnc_moduleSupportsInitRequester; [KPLIB_param_supportModule_arty] call BIS_fnc_moduleSupportsInitProvider; From 6897ca6c4191fc8368b6ace46e884b4084af5157 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sat, 23 May 2020 07:57:55 +0200 Subject: [PATCH 047/115] `combat_readiness` to `KPLIB_enemyReadiness` --- .../functions/fn_getAdaptiveVehicle.sqf | 4 ++-- Missionframework/functions/fn_getSaveData.sqf | 4 ++-- .../ui/fn_overlayUpdateResources.sqf | 12 +++++------ .../scripts/client/misc/synchronise_vars.sqf | 2 +- .../battlegroup/counter_battlegroup.sqf | 8 ++++---- .../battlegroup/random_battlegroups.sqf | 8 ++++---- .../server/battlegroup/readiness_increase.sqf | 12 +++++------ .../scripts/server/battlegroup/spawn_air.sqf | 2 +- .../server/battlegroup/spawn_battlegroup.sqf | 8 ++++---- .../civinformant/tasks/civinfo_task.sqf | 4 ++-- .../scripts/server/game/save_manager.sqf | 6 +++--- .../scripts/server/game/synchronise_vars.sqf | 10 +++++----- .../server/patrols/manage_one_patrol.sqf | 6 +++--- .../server/patrols/reinforcements_manager.sqf | 4 ++-- .../sector_liberated_remote_call.sqf | 20 +++++++++---------- .../server/secondary/convoy_hijack.sqf | 2 +- .../scripts/server/secondary/fob_hunting.sqf | 2 +- .../server/secondary/search_and_rescue.sqf | 2 +- .../server/sector/manage_one_sector.sqf | 16 +++++++-------- .../scripts/shared/kill_manager.sqf | 4 ++-- 20 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Missionframework/functions/fn_getAdaptiveVehicle.sqf b/Missionframework/functions/fn_getAdaptiveVehicle.sqf index 6bd05b594..4f72b24b8 100644 --- a/Missionframework/functions/fn_getAdaptiveVehicle.sqf +++ b/Missionframework/functions/fn_getAdaptiveVehicle.sqf @@ -2,7 +2,7 @@ File: fn_getAdaptiveVehicle.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-15 + Last Update: 2020-05-23 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,4 +15,4 @@ Vehicle classname [STRING] */ -selectRandom ([KPLIB_o_armyVehicles, KPLIB_o_armyVehiclesLight] select (combat_readiness < 40)) +selectRandom ([KPLIB_o_armyVehicles, KPLIB_o_armyVehiclesLight] select (KPLIB_enemyReadiness < 40)) diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index b311da6fe..2dad75dcc 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -2,7 +2,7 @@ File: fn_getSaveData.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-29 - Last Update: 2020-05-22 + Last Update: 2020-05-23 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -191,7 +191,7 @@ private _weights = [ _weights, _aiGroups, KPLIB_sectors_player, - combat_readiness, + KPLIB_enemyReadiness, KPLIB_sectors_fob, KPLIB_permissions, KPLIB_vehicle_to_military_base_links, diff --git a/Missionframework/functions/ui/fn_overlayUpdateResources.sqf b/Missionframework/functions/ui/fn_overlayUpdateResources.sqf index 2a2d27a3a..de6a1affd 100644 --- a/Missionframework/functions/ui/fn_overlayUpdateResources.sqf +++ b/Missionframework/functions/ui/fn_overlayUpdateResources.sqf @@ -3,7 +3,7 @@ File: fn_overlayUpdateResources.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-01 - Last Update: 2020-05-10 + Last Update: 2020-05-23 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -46,15 +46,15 @@ if (_updateValues) then { (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_UNITCAP) ctrlSetText ([unitcap, "/", [] call KPLIB_fnc_getLocalCap] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_HELIPAD) ctrlSetText ([KPLIB_heli_count, "/", KPLIB_heli_slots] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_PLANE) ctrlSetText ([KPLIB_plane_count, "/", KPLIB_plane_slots] joinString ""); - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_ALERT) ctrlSetText ([round combat_readiness, "%"] joinString ""); + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_ALERT) ctrlSetText ([round KPLIB_enemyReadiness, "%"] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_CIVREP) ctrlSetText ([KPLIB_civ_rep,"%"] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_INTEL) ctrlSetText str round resources_intel; private _color_readiness = [0.8,0.8,0.8,1]; - if ( combat_readiness >= 25 ) then { _color_readiness = [0.8,0.8,0,1] }; - if ( combat_readiness >= 50 ) then { _color_readiness = [0.8,0.6,0,1] }; - if ( combat_readiness >= 75 ) then { _color_readiness = [0.8,0.3,0,1] }; - if ( combat_readiness >= 100 ) then { _color_readiness = [0.8,0,0,1] }; + if ( KPLIB_enemyReadiness >= 25 ) then { _color_readiness = [0.8,0.8,0,1] }; + if ( KPLIB_enemyReadiness >= 50 ) then { _color_readiness = [0.8,0.6,0,1] }; + if ( KPLIB_enemyReadiness >= 75 ) then { _color_readiness = [0.8,0.3,0,1] }; + if ( KPLIB_enemyReadiness >= 100 ) then { _color_readiness = [0.8,0,0,1] }; (_overlay displayCtrl IDC_OVERLAY_RSC_PIC_ALERT) ctrlSetTextColor _color_readiness; (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_ALERT) ctrlSetTextColor _color_readiness; diff --git a/Missionframework/scripts/client/misc/synchronise_vars.sqf b/Missionframework/scripts/client/misc/synchronise_vars.sqf index ea8d17cec..305ea5e9d 100644 --- a/Missionframework/scripts/client/misc/synchronise_vars.sqf +++ b/Missionframework/scripts/client/misc/synchronise_vars.sqf @@ -15,7 +15,7 @@ while {true} do { KPLIB_plane_count = sync_vars select 6; KPLIB_heli_slots = sync_vars select 7; KPLIB_plane_slots = sync_vars select 8; - combat_readiness = sync_vars select 9; + KPLIB_enemyReadiness = sync_vars select 9; resources_intel = sync_vars select 10; infantry_cap = sync_vars select 11; KPLIB_civ_rep = sync_vars select 12; diff --git a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf index 37f5904c3..262e715b5 100644 --- a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf @@ -9,14 +9,14 @@ private _target_pos = ""; while {KPLIB_param_aggressivity >= 0.9 && KPLIB_endgame == 0} do { _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_param_aggressivity); - if (combat_readiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; - if (combat_readiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; - if (combat_readiness >= 95) then {_sleeptime = _sleeptime * 0.75;}; + if (KPLIB_enemyReadiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; + if (KPLIB_enemyReadiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; + if (KPLIB_enemyReadiness >= 95) then {_sleeptime = _sleeptime * 0.75;}; sleep _sleeptime; waitUntil {sleep 5; - combat_readiness >= 70 && {armor_weight >= 50 || air_weight >= 50} + KPLIB_enemyReadiness >= 70 && {armor_weight >= 50 || air_weight >= 50} }; _target_player = objNull; diff --git a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf index 5c99df515..daec8f09f 100644 --- a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf +++ b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf @@ -3,9 +3,9 @@ private _sleeptime = 0; while {KPLIB_param_aggressivity > 0.9 && KPLIB_endgame == 0} do { _sleeptime = (1800 + (random 1800)) / (([] call KPLIB_fnc_getOpforFactor) * KPLIB_param_aggressivity); - if (combat_readiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; - if (combat_readiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; - if (combat_readiness >= 95) then {_sleeptime = _sleeptime * 0.75;}; + if (KPLIB_enemyReadiness >= 80) then {_sleeptime = _sleeptime * 0.75;}; + if (KPLIB_enemyReadiness >= 90) then {_sleeptime = _sleeptime * 0.75;}; + if (KPLIB_enemyReadiness >= 95) then {_sleeptime = _sleeptime * 0.75;}; sleep _sleeptime; @@ -18,7 +18,7 @@ while {KPLIB_param_aggressivity > 0.9 && KPLIB_endgame == 0} do { if ( (count (allPlayers - entities "HeadlessClient_F") >= (6 / KPLIB_param_aggressivity)) - && {combat_readiness >= (60 - (5 * KPLIB_param_aggressivity))} + && {KPLIB_enemyReadiness >= (60 - (5 * KPLIB_param_aggressivity))} && {[] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup} && {diag_fps > 15.0} ) then { diff --git a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf index 0c3852285..02f3859d6 100644 --- a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf +++ b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf @@ -2,18 +2,18 @@ waitUntil {!isNil "KPLIB_saveLoaded" && {KPLIB_saveLoaded}}; while {true} do { if ((count KPLIB_sectors_player) >= ((count KPLIB_sectors_all) * 0.9)) then { - if (combat_readiness > 0) then { - combat_readiness = combat_readiness - 0.25; + if (KPLIB_enemyReadiness > 0) then { + KPLIB_enemyReadiness = KPLIB_enemyReadiness - 0.25; }; } else { if ( - (combat_readiness < ((count KPLIB_sectors_player) * 2) && combat_readiness < 35) - || (combat_readiness < ((count KPLIB_sectors_player) * 1.25) && combat_readiness < 60) + (KPLIB_enemyReadiness < ((count KPLIB_sectors_player) * 2) && KPLIB_enemyReadiness < 35) + || (KPLIB_enemyReadiness < ((count KPLIB_sectors_player) * 1.25) && KPLIB_enemyReadiness < 60) ) then { - combat_readiness = combat_readiness + 0.25; + KPLIB_enemyReadiness = KPLIB_enemyReadiness + 0.25; stats_readiness_earned = stats_readiness_earned + 0.25; }; }; - if (combat_readiness > 100.0 && KPLIB_param_difficulty < 2) then {combat_readiness = 100.0}; + if (KPLIB_enemyReadiness > 100.0 && KPLIB_param_difficulty < 2) then {KPLIB_enemyReadiness = 100.0}; sleep (180 + random (180)); }; diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index 511a5a5a0..d12ccc4a6 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -2,7 +2,7 @@ params ["_first_objective"]; if (KPLIB_o_planes isEqualTo []) exitWith {false}; -private _planes_number = ((floor linearConversion [40, 100, combat_readiness, 1, 3]) min 3) max 0; +private _planes_number = ((floor linearConversion [40, 100, KPLIB_enemyReadiness, 1, 3]) min 3) max 0; if (_planes_number < 1) exitWith {}; diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index 62a32c21e..c4e2ef9d5 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -14,7 +14,7 @@ if !(_spawn_marker isEqualTo "") then { private _bg_groups = []; private _selected_opfor_battlegroup = []; private _target_size = (round (KPLIB_battlegroup_size * ([] call KPLIB_fnc_getOpforFactor) * (sqrt KPLIB_param_aggressivity))) min 16; - if (combat_readiness < 60) then {_target_size = round (_target_size * 0.65);}; + if (KPLIB_enemyReadiness < 60) then {_target_size = round (_target_size * 0.65);}; [_spawn_marker] remoteExec ["remote_call_battlegroup"]; @@ -24,7 +24,7 @@ if !(_spawn_marker isEqualTo "") then { if (_infOnly) then { // Infantry units to choose from - private _infClasses = [KPLIB_o_inf_classes, KPLIB_o_militiaInfantry] select (combat_readiness < 50); + private _infClasses = [KPLIB_o_inf_classes, KPLIB_o_militiaInfantry] select (KPLIB_enemyReadiness < 50); // Adjust target size for infantry _target_size = 12 max (_target_size * 4); @@ -41,7 +41,7 @@ if !(_spawn_marker isEqualTo "") then { [_grp] spawn battlegroup_ai; _bg_groups pushBack _grp; } else { - private _vehicle_pool = [KPLIB_o_battleGrpVehicles, KPLIB_o_battleGrpVehiclesLight] select (combat_readiness < 50); + private _vehicle_pool = [KPLIB_o_battleGrpVehicles, KPLIB_o_battleGrpVehiclesLight] select (KPLIB_enemyReadiness < 50); while {count _selected_opfor_battlegroup < _target_size} do { _selected_opfor_battlegroup pushback (selectRandom _vehicle_pool); @@ -74,7 +74,7 @@ if !(_spawn_marker isEqualTo "") then { sleep 3; - combat_readiness = (combat_readiness - (round ((count _bg_groups) + (random (count _bg_groups))))) max 0; + KPLIB_enemyReadiness = (KPLIB_enemyReadiness - (round ((count _bg_groups) + (random (count _bg_groups))))) max 0; stats_hostile_battlegroups = stats_hostile_battlegroups + 1; { diff --git a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf index dac6207c0..efa20b63c 100644 --- a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf +++ b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf @@ -67,9 +67,9 @@ if (alive _hvt) then { [6] remoteExec ["civinfo_notifications"]; if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> Task despawned", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; } else { - combat_readiness = round (combat_readiness * 0.6); + KPLIB_enemyReadiness = round (KPLIB_enemyReadiness * 0.6); if (!isServer) then { - publicVariableServer "combat_readiness"; + publicVariableServer "KPLIB_enemyReadiness"; }; [5] remoteExec ["civinfo_notifications"]; if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> Task ended with success", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 94c34e0af..8a2f4fe76 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -70,7 +70,7 @@ armor_weight = 33; // Blufor sectors KPLIB_sectors_player = []; // Enemy combat readiness (0-100) -combat_readiness = 0; +KPLIB_enemyReadiness = 0; // All FOBs KPLIB_sectors_fob = []; // Player permissions data @@ -178,7 +178,7 @@ if (!isNil "_saveData") then { _weights = _saveData select 5; _aiGroups = _saveData select 6; KPLIB_sectors_player = _saveData select 7; - combat_readiness = _saveData select 8; + KPLIB_enemyReadiness = _saveData select 8; KPLIB_sectors_fob = _saveData select 9; KPLIB_permissions = _saveData select 10; KPLIB_vehicle_to_military_base_links = _saveData select 11; @@ -239,7 +239,7 @@ if (!isNil "_saveData") then { KPLIB_sectors_fob = _saveData select 1; _objectsToSave = _saveData select 2; _dateTime = _saveData select 3; - combat_readiness = _saveData select 4; + KPLIB_enemyReadiness = _saveData select 4; _resourceStorages = _saveData select 5; KPLIB_production = _saveData select 6; KPLIB_logistics = _saveData select 7; diff --git a/Missionframework/scripts/server/game/synchronise_vars.sqf b/Missionframework/scripts/server/game/synchronise_vars.sqf index 42fb21fa1..6da7b2ae0 100644 --- a/Missionframework/scripts/server/game/synchronise_vars.sqf +++ b/Missionframework/scripts/server/game/synchronise_vars.sqf @@ -5,7 +5,7 @@ waitUntil{!isNil "KPLIB_fob_resources"}; waitUntil{!isNil "KPLIB_supplies_global"}; waitUntil{!isNil "KPLIB_ammo_global"}; waitUntil{!isNil "KPLIB_fuel_global"}; -waitUntil{!isNil "combat_readiness"}; +waitUntil{!isNil "KPLIB_enemyReadiness"}; waitUntil{!isNil "unitcap"}; waitUntil{!isNil "KPLIB_heli_count"}; waitUntil{!isNil "KPLIB_plane_count"}; @@ -29,7 +29,7 @@ private _KPLIB_heli_count_old = -1; private _KPLIB_plane_count_old = -1; private _KPLIB_heli_slots_old = -1; private _KPLIB_plane_slots_old = -1; -private _combat_readiness_old = -1; +private _KPLIB_enemyReadiness_old = -1; private _resources_intel_old = -999; private _infantry_cap_old = -999; private _KPLIB_civ_rep_old = -999; @@ -49,7 +49,7 @@ while {true} do { || _KPLIB_plane_count_old != KPLIB_plane_count || _KPLIB_heli_slots_old != KPLIB_heli_slots || _KPLIB_plane_slots_old != KPLIB_plane_slots - || _combat_readiness_old != combat_readiness + || _KPLIB_enemyReadiness_old != KPLIB_enemyReadiness || _resources_intel_old != resources_intel || _infantry_cap_old != infantry_cap || _KPLIB_civ_rep_old != KPLIB_civ_rep @@ -72,7 +72,7 @@ while {true} do { KPLIB_plane_count, KPLIB_heli_slots, KPLIB_plane_slots, - combat_readiness, + KPLIB_enemyReadiness, resources_intel, infantry_cap, KPLIB_civ_rep, @@ -92,7 +92,7 @@ while {true} do { _KPLIB_plane_count_old = KPLIB_plane_count; _KPLIB_heli_slots_old = KPLIB_heli_slots; _KPLIB_plane_slots_old = KPLIB_plane_slots; - _combat_readiness_old = combat_readiness; + _KPLIB_enemyReadiness_old = KPLIB_enemyReadiness; _resources_intel_old = resources_intel; _infantry_cap_old = infantry_cap; _KPLIB_civ_rep_old = KPLIB_civ_rep; diff --git a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf index d22aa67b8..a30ca2344 100644 --- a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf @@ -2,11 +2,11 @@ params [ "_minimum_readiness", "_is_infantry" ]; private [ "_headless_client" ]; waitUntil { !isNil "KPLIB_sectors_player" }; -waitUntil { !isNil "combat_readiness" }; +waitUntil { !isNil "KPLIB_enemyReadiness" }; while { KPLIB_endgame == 0 } do { waitUntil { sleep 0.3; count KPLIB_sectors_player >= 3; }; - waitUntil { sleep 0.3; combat_readiness >= (_minimum_readiness / KPLIB_param_difficulty); }; + waitUntil { sleep 0.3; KPLIB_enemyReadiness >= (_minimum_readiness / KPLIB_param_difficulty); }; sleep (random 30); @@ -35,7 +35,7 @@ while { KPLIB_endgame == 0 } do { } else { private [ "_vehicle_object" ]; - if ((combat_readiness > 75) && ((random 100) > 85) && !(KPLIB_o_helicopters isEqualTo [])) then { + if ((KPLIB_enemyReadiness > 75) && ((random 100) > 85) && !(KPLIB_o_helicopters isEqualTo [])) then { _vehicle_object = [_sector_spawn_pos, selectRandom KPLIB_o_helicopters] call KPLIB_fnc_spawnVehicle; } else { _vehicle_object = [_sector_spawn_pos, [] call KPLIB_fnc_getAdaptiveVehicle] call KPLIB_fnc_spawnVehicle; diff --git a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf index 13db4bcfc..e030466b4 100644 --- a/Missionframework/scripts/server/patrols/reinforcements_manager.sqf +++ b/Missionframework/scripts/server/patrols/reinforcements_manager.sqf @@ -1,6 +1,6 @@ params ["_targetsector"]; -if (combat_readiness > 15) then { +if (KPLIB_enemyReadiness > 15) then { private _init_units_count = (([markerPos _targetsector, KPLIB_range_sectorCapture, KPLIB_side_enemy] call KPLIB_fnc_getUnitsCount)); @@ -29,7 +29,7 @@ if (combat_readiness > 15) then { reinforcements_sector_under_attack = _targetsector; reinforcements_set = true; ["lib_reinforcements",[markertext _targetsector]] remoteExec ["bis_fnc_shownotification"]; - if ((random combat_readiness) > (20 + (30 / KPLIB_param_aggressivity))) then { + if ((random KPLIB_enemyReadiness) > (20 + (30 / KPLIB_param_aggressivity))) then { [_targetsector] spawn send_paratroopers; }; stats_reinforcements_called = stats_reinforcements_called + 1; diff --git a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf index f77b33f96..1996640e6 100644 --- a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf @@ -1,17 +1,17 @@ params ["_liberated_sector"]; -private _combat_readiness_increase = 0; +private _KPLIB_enemyReadiness_increase = 0; switch (true) do { - case (_liberated_sector in KPLIB_sectors_capital): {_combat_readiness_increase = floor (random 10) * KPLIB_param_difficulty;}; - case (_liberated_sector in KPLIB_sectors_city): {_combat_readiness_increase = floor (random 6) * KPLIB_param_difficulty;}; - case (_liberated_sector in KPLIB_sectors_military): {_combat_readiness_increase = 5 + (floor (random 11)) * KPLIB_param_difficulty;}; - case (_liberated_sector in KPLIB_sectors_factory): {_combat_readiness_increase = 3 + (floor (random 7)) * KPLIB_param_difficulty;}; - case (_liberated_sector in KPLIB_sectors_tower): {_combat_readiness_increase = floor (random 4);}; + case (_liberated_sector in KPLIB_sectors_capital): {_KPLIB_enemyReadiness_increase = floor (random 10) * KPLIB_param_difficulty;}; + case (_liberated_sector in KPLIB_sectors_city): {_KPLIB_enemyReadiness_increase = floor (random 6) * KPLIB_param_difficulty;}; + case (_liberated_sector in KPLIB_sectors_military): {_KPLIB_enemyReadiness_increase = 5 + (floor (random 11)) * KPLIB_param_difficulty;}; + case (_liberated_sector in KPLIB_sectors_factory): {_KPLIB_enemyReadiness_increase = 3 + (floor (random 7)) * KPLIB_param_difficulty;}; + case (_liberated_sector in KPLIB_sectors_tower): {_KPLIB_enemyReadiness_increase = floor (random 4);}; }; -combat_readiness = combat_readiness + _combat_readiness_increase; -if (combat_readiness > 100.0 && KPLIB_param_difficulty <= 2.0) then {combat_readiness = 100.0}; -stats_readiness_earned = stats_readiness_earned + _combat_readiness_increase; +KPLIB_enemyReadiness = KPLIB_enemyReadiness + _KPLIB_enemyReadiness_increase; +if (KPLIB_enemyReadiness > 100.0 && KPLIB_param_difficulty <= 2.0) then {KPLIB_enemyReadiness = 100.0}; +stats_readiness_earned = stats_readiness_earned + _KPLIB_enemyReadiness_increase; [_liberated_sector, 0] remoteExecCall ["remote_call_sector"]; KPLIB_sectors_player pushback _liberated_sector; publicVariable "KPLIB_sectors_player"; @@ -62,7 +62,7 @@ if (KPLIB_endgame == 0) then { if ( !(_liberated_sector in KPLIB_sectors_tower) && { - (random (150 / (KPLIB_param_difficulty * KPLIB_param_aggressivity))) < (combat_readiness - 15) + (random (150 / (KPLIB_param_difficulty * KPLIB_param_aggressivity))) < (KPLIB_enemyReadiness - 15) || _liberated_sector in KPLIB_sectors_capital } && {[] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup} diff --git a/Missionframework/scripts/server/secondary/convoy_hijack.sqf b/Missionframework/scripts/server/secondary/convoy_hijack.sqf index 869f233e1..ed774c7b8 100644 --- a/Missionframework/scripts/server/secondary/convoy_hijack.sqf +++ b/Missionframework/scripts/server/secondary/convoy_hijack.sqf @@ -156,7 +156,7 @@ sleep 20; deleteMarker _convoy_marker; { deleteMarker _x } foreach [_convoy_marker_wp1, _convoy_marker_wp2, _convoy_marker_wp3 ]; -combat_readiness = round (combat_readiness * 0.85); +KPLIB_enemyReadiness = round (KPLIB_enemyReadiness * 0.85); stats_secondary_objectives = stats_secondary_objectives + 1; [5] remoteExec ["remote_call_intel"]; KPLIB_secondary_in_progress = -1; publicVariable "KPLIB_secondary_in_progress"; diff --git a/Missionframework/scripts/server/secondary/fob_hunting.sqf b/Missionframework/scripts/server/secondary/fob_hunting.sqf index 2a2bf6fd5..6e453a146 100644 --- a/Missionframework/scripts/server/secondary/fob_hunting.sqf +++ b/Missionframework/scripts/server/secondary/fob_hunting.sqf @@ -127,7 +127,7 @@ waitUntil { (_base_objectives select {alive _x}) isEqualTo [] }; -combat_readiness = round (combat_readiness * (1 - KPLIB_secondary_objective_impact)); +KPLIB_enemyReadiness = round (KPLIB_enemyReadiness * (1 - KPLIB_secondary_objective_impact)); stats_secondary_objectives = stats_secondary_objectives + 1; sleep 1; [] spawn KPLIB_fnc_doSave; diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index 361082521..86b962ade 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -69,7 +69,7 @@ for [ {_idx=0},{_idx < _nbsentry},{_idx=_idx+1} ] do { (KPLIB_o_transportTruck createVehicle ((getpos _helowreck) getPos [25, random 360])) setDir random 360; private _vehicle_pool = KPLIB_o_armyVehicles; -if ( combat_readiness < 50 ) then { +if ( KPLIB_enemyReadiness < 50 ) then { _vehicle_pool = KPLIB_o_armyVehiclesLight; }; diff --git a/Missionframework/scripts/server/sector/manage_one_sector.sqf b/Missionframework/scripts/server/sector/manage_one_sector.sqf index 45aeaf281..bbff77bd7 100644 --- a/Missionframework/scripts/server/sector/manage_one_sector.sqf +++ b/Missionframework/scripts/server/sector/manage_one_sector.sqf @@ -8,7 +8,7 @@ params ["_sector"]; -waitUntil {!isNil "combat_readiness"}; +waitUntil {!isNil "KPLIB_enemyReadiness"}; [format ["Sector %1 (%2) activated - Managed on: %3", (markerText _sector), _sector, debug_source], "SECTORSPAWN"] remoteExecCall ["KPLIB_fnc_log", 2]; @@ -43,7 +43,7 @@ private _opforcount = [] call KPLIB_fnc_getOpforCap; if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] call KPLIB_fnc_getSectorRange, KPLIB_side_player] call KPLIB_fnc_getUnitsCount) > 0)) then { if (_sector in KPLIB_sectors_capital) then { - if (combat_readiness < 30) then {_infsquad = "militia";}; + if (KPLIB_enemyReadiness < 30) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); _squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp); @@ -78,7 +78,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] }; if (_sector in KPLIB_sectors_city) then { - if (combat_readiness < 50) then {_infsquad = "militia";}; + if (KPLIB_enemyReadiness < 50) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); if (KPLIB_param_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; @@ -99,7 +99,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] _guerilla = true; }; - _building_ai_max = round ((floor (18 + (round (combat_readiness / 10 )))) * _popfactor); + _building_ai_max = round ((floor (18 + (round (KPLIB_enemyReadiness / 10 )))) * _popfactor); _building_range = 120; if (KPLIB_civ_rep < 0) then { @@ -124,12 +124,12 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] _spawncivs = false; - _building_ai_max = round ((floor (18 + (round (combat_readiness / 4 )))) * _popfactor); + _building_ai_max = round ((floor (18 + (round (KPLIB_enemyReadiness / 4 )))) * _popfactor); _building_range = 120; }; if (_sector in KPLIB_sectors_factory) then { - if (combat_readiness < 40) then {_infsquad = "militia";}; + if (KPLIB_enemyReadiness < 40) then {_infsquad = "militia";}; _squad1 = ([_infsquad] call KPLIB_fnc_getSquadComp); if (KPLIB_param_unitcap >= 1.25) then {_squad2 = ([_infsquad] call KPLIB_fnc_getSquadComp);}; @@ -143,7 +143,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] _guerilla = true; }; - _building_ai_max = round ((floor (18 + (round (combat_readiness / 10 )))) * _popfactor); + _building_ai_max = round ((floor (18 + (round (KPLIB_enemyReadiness / 10 )))) * _popfactor); _building_range = 120; if (KPLIB_civ_rep < 0) then { @@ -156,7 +156,7 @@ if ((!(_sector in KPLIB_sectors_player)) && (([markerPos _sector, [_opforcount] if (_sector in KPLIB_sectors_tower) then { _squad1 = ([] call KPLIB_fnc_getSquadComp); - if (combat_readiness > 30) then {_squad2 = ([] call KPLIB_fnc_getSquadComp);}; + if (KPLIB_enemyReadiness > 30) then {_squad2 = ([] call KPLIB_fnc_getSquadComp);}; if (KPLIB_param_unitcap >= 1.5) then {_squad3 = ([] call KPLIB_fnc_getSquadComp);}; if((random 100) > 95) then {_vehtospawn pushback ([] call KPLIB_fnc_getAdaptiveVehicle);}; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 02560088e..65c772ea7 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -31,9 +31,9 @@ if (isServer) then { // Increase combat readiness for kills near a capital. private _nearby_bigtown = KPLIB_sectors_capital select {!(_x in KPLIB_sectors_player) && (_unit distance (markerpos _x) < 250)}; if (count _nearby_bigtown > 0) then { - combat_readiness = combat_readiness + (0.5 * KPLIB_param_difficulty); + KPLIB_enemyReadiness = KPLIB_enemyReadiness + (0.5 * KPLIB_param_difficulty); stats_readiness_earned = stats_readiness_earned + (0.5 * KPLIB_param_difficulty); - if (combat_readiness > 100.0 && KPLIB_param_difficulty < 2) then {combat_readiness = 100.0}; + if (KPLIB_enemyReadiness > 100.0 && KPLIB_param_difficulty < 2) then {KPLIB_enemyReadiness = 100.0}; }; // Weights adjustments depending on what vehicle the BLUFOR killer used From 04b3791a0e1195ae214c623be3d53592b2bf17cc Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sat, 23 May 2020 08:10:06 +0200 Subject: [PATCH 048/115] stat variable name for opfor vehicles reset --- Missionframework/functions/fn_getSaveData.sqf | 4 ++-- Missionframework/scripts/client/ui/end_screen.sqf | 8 ++++---- .../scripts/server/game/check_victory_conditions.sqf | 8 ++++---- .../scripts/server/game/save_manager.sqf | 12 ++++++------ Missionframework/scripts/shared/kill_manager.sqf | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index 2dad75dcc..e6c54a6a7 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -155,8 +155,8 @@ private _stats = [ stats_ieds_detonated, stats_opfor_killed_by_players, stats_opfor_soldiers_killed, - stats_KPLIB_o_armyVehicles_killed, - stats_KPLIB_o_armyVehicles_killed_by_players, + stats_opfor_vehicles_killed, + stats_opfor_vehicles_killed_by_players, stats_player_deaths, stats_playtime, stats_prisoners_captured, diff --git a/Missionframework/scripts/client/ui/end_screen.sqf b/Missionframework/scripts/client/ui/end_screen.sqf index fff3dcc58..dfcfd630e 100644 --- a/Missionframework/scripts/client/ui/end_screen.sqf +++ b/Missionframework/scripts/client/ui/end_screen.sqf @@ -21,8 +21,8 @@ params [ "_stats_ieds_detonated", "_stats_opfor_killed_by_players", "_stats_opfor_soldiers_killed", - "_stats_KPLIB_o_armyVehicles_killed", - "_stats_KPLIB_o_armyVehicles_killed_by_players", + "_stats_opfor_vehicles_killed", + "_stats_opfor_vehicles_killed_by_players", "_stats_player_deaths", "_stats_playtime", "_stats_prisoners_captured", @@ -88,8 +88,8 @@ if (dialog) then {sleep 3}; // First page [691, format [localize "STR_STATS_OPFOR_K_INF", _stats_opfor_soldiers_killed]] call _addReportLine; [692, format [localize "STR_STATS_OPFOR_K_INF_PL", _stats_opfor_killed_by_players]] call _addReportLine; -[693, format [localize "STR_STATS_OPFOR_K_VEH", _stats_KPLIB_o_armyVehicles_killed]] call _addReportLine; -[694, format [localize "STR_STATS_OPFOR_K_VEH_PL", _stats_KPLIB_o_armyVehicles_killed_by_players], true] call _addReportLine; +[693, format [localize "STR_STATS_OPFOR_K_VEH", _stats_opfor_vehicles_killed]] call _addReportLine; +[694, format [localize "STR_STATS_OPFOR_K_VEH_PL", _stats_opfor_vehicles_killed_by_players], true] call _addReportLine; [] call _cleanPage; // Second page diff --git a/Missionframework/scripts/server/game/check_victory_conditions.sqf b/Missionframework/scripts/server/game/check_victory_conditions.sqf index b29ae82f4..a84644e53 100644 --- a/Missionframework/scripts/server/game/check_victory_conditions.sqf +++ b/Missionframework/scripts/server/game/check_victory_conditions.sqf @@ -30,8 +30,8 @@ if ([] call KPLIB_victoryCheck && KPLIB_endgame != 1) then { publicstats pushback stats_ieds_detonated; publicstats pushback stats_opfor_killed_by_players; publicstats pushback stats_opfor_soldiers_killed; - publicstats pushback stats_KPLIB_o_armyVehicles_killed; - publicstats pushback stats_KPLIB_o_armyVehicles_killed_by_players; + publicstats pushback stats_opfor_vehicles_killed; + publicstats pushback stats_opfor_vehicles_killed_by_players; publicstats pushback stats_player_deaths; publicstats pushback stats_playtime; publicstats pushback stats_prisoners_captured; @@ -60,8 +60,8 @@ if ([] call KPLIB_victoryCheck && KPLIB_endgame != 1) then { [format ["Playtime: %1 days, %2 hours, %3 minutes, %4 seconds", _playtime_days, _playtime_hours, _playtime_minutes, _playtime_seconds], "MISSION END"] call KPLIB_fnc_log; [format ["OPFOR infantry killed: %1", stats_opfor_soldiers_killed], "MISSION END"] call KPLIB_fnc_log; [format ["OPFOR infantry killed by players: %1", stats_opfor_killed_by_players], "MISSION END"] call KPLIB_fnc_log; - [format ["OPFOR vehicles destroyed: %1", stats_KPLIB_o_armyVehicles_killed], "MISSION END"] call KPLIB_fnc_log; - [format ["OPFOR vehicles destroyed by players: %1", stats_KPLIB_o_armyVehicles_killed_by_players], "MISSION END"] call KPLIB_fnc_log; + [format ["OPFOR vehicles destroyed: %1", stats_opfor_vehicles_killed], "MISSION END"] call KPLIB_fnc_log; + [format ["OPFOR vehicles destroyed by players: %1", stats_opfor_vehicles_killed_by_players], "MISSION END"] call KPLIB_fnc_log; [format ["BLUFOR infantry recruited: %1", stats_blufor_soldiers_recruited], "MISSION END"] call KPLIB_fnc_log; [format ["BLUFOR infantry killed: %1", stats_blufor_soldiers_killed], "MISSION END"] call KPLIB_fnc_log; [format ["BLUFOR vehicles built: %1", stats_blufor_vehicles_built], "MISSION END"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 8a2f4fe76..e35b51b1e 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -134,8 +134,8 @@ stats_hostile_battlegroups = 0; stats_ieds_detonated = 0; stats_opfor_killed_by_players = 0; stats_opfor_soldiers_killed = 0; -stats_KPLIB_o_armyVehicles_killed = 0; -stats_KPLIB_o_armyVehicles_killed_by_players = 0; +stats_opfor_vehicles_killed = 0; +stats_opfor_vehicles_killed_by_players = 0; stats_player_deaths = 0; stats_playtime = 0; stats_prisoners_captured = 0; @@ -214,8 +214,8 @@ if (!isNil "_saveData") then { stats_ieds_detonated = _stats select 19; stats_opfor_killed_by_players = _stats select 20; stats_opfor_soldiers_killed = _stats select 21; - stats_KPLIB_o_armyVehicles_killed = _stats select 22; - stats_KPLIB_o_armyVehicles_killed_by_players = _stats select 23; + stats_opfor_vehicles_killed = _stats select 22; + stats_opfor_vehicles_killed_by_players = _stats select 23; stats_player_deaths = _stats select 24; stats_playtime = _stats select 25; stats_prisoners_captured = _stats select 26; @@ -257,8 +257,8 @@ if (!isNil "_saveData") then { stats_opfor_killed_by_players = _stats select 1; stats_blufor_soldiers_killed = _stats select 2; stats_player_deaths = _stats select 3; - stats_KPLIB_o_armyVehicles_killed = _stats select 4; - stats_KPLIB_o_armyVehicles_killed_by_players = _stats select 5; + stats_opfor_vehicles_killed = _stats select 4; + stats_opfor_vehicles_killed_by_players = _stats select 5; stats_blufor_vehicles_killed = _stats select 6; stats_blufor_soldiers_recruited = _stats select 7; stats_blufor_vehicles_built = _stats select 8; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 65c772ea7..3440bf2ea 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -137,11 +137,11 @@ if (isServer) then { } else { // Enemy vehicle casualty if ((toLower (typeof _unit)) in KPLIB_o_allVeh_classes) then { - stats_KPLIB_o_armyVehicles_killed = stats_KPLIB_o_armyVehicles_killed + 1; + stats_opfor_vehicles_killed = stats_opfor_vehicles_killed + 1; // Destroyed by player if (isplayer _killer) then { - stats_KPLIB_o_armyVehicles_killed_by_players = stats_KPLIB_o_armyVehicles_killed_by_players + 1; + stats_opfor_vehicles_killed_by_players = stats_opfor_vehicles_killed_by_players + 1; }; } else { // Civilian vehicle casualty From 98b5745a0246e1489fb2eb68fe2fd3d14143f3c4 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sat, 23 May 2020 08:11:26 +0200 Subject: [PATCH 049/115] Adjusted indentation in save_manager --- .../scripts/server/game/save_manager.sqf | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index e35b51b1e..061c5b5b2 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -177,17 +177,17 @@ if (!isNil "_saveData") then { _stats = _saveData select 4; _weights = _saveData select 5; _aiGroups = _saveData select 6; - KPLIB_sectors_player = _saveData select 7; - KPLIB_enemyReadiness = _saveData select 8; - KPLIB_sectors_fob = _saveData select 9; + KPLIB_sectors_player = _saveData select 7; + KPLIB_enemyReadiness = _saveData select 8; + KPLIB_sectors_fob = _saveData select 9; KPLIB_permissions = _saveData select 10; KPLIB_vehicle_to_military_base_links = _saveData select 11; - KPLIB_civ_rep = _saveData select 12; - KPLIB_clearances = _saveData select 13; - KPLIB_guerilla_strength = _saveData select 14; - KPLIB_logistics = _saveData select 15; - KPLIB_production = _saveData select 16; - KPLIB_production_markers = _saveData select 17; + KPLIB_civ_rep = _saveData select 12; + KPLIB_clearances = _saveData select 13; + KPLIB_guerilla_strength = _saveData select 14; + KPLIB_logistics = _saveData select 15; + KPLIB_production = _saveData select 16; + KPLIB_production_markers = _saveData select 17; resources_intel = _saveData select 18; _allMines = _saveData param [19, []]; _allCrates = _saveData param [20, []]; @@ -235,23 +235,23 @@ if (!isNil "_saveData") then { // --- Compatibility for older save data --- ["Save data from version: pre 0.96.5", "SAVE"] call KPLIB_fnc_log; - KPLIB_sectors_player = _saveData select 0; - KPLIB_sectors_fob = _saveData select 1; + KPLIB_sectors_player = _saveData select 0; + KPLIB_sectors_fob = _saveData select 1; _objectsToSave = _saveData select 2; _dateTime = _saveData select 3; - KPLIB_enemyReadiness = _saveData select 4; + KPLIB_enemyReadiness = _saveData select 4; _resourceStorages = _saveData select 5; - KPLIB_production = _saveData select 6; - KPLIB_logistics = _saveData select 7; + KPLIB_production = _saveData select 6; + KPLIB_logistics = _saveData select 7; _stats = _saveData select 8; _weights = _saveData select 9; KPLIB_vehicle_to_military_base_links = _saveData select 10; KPLIB_permissions = _saveData select 11; _aiGroups = _saveData select 12; resources_intel = _saveData select 13; - KPLIB_civ_rep = _saveData select 15; - KPLIB_production_markers = _saveData select 16; - KPLIB_guerilla_strength = _saveData select 17; + KPLIB_civ_rep = _saveData select 15; + KPLIB_production_markers = _saveData select 16; + KPLIB_guerilla_strength = _saveData select 17; stats_opfor_soldiers_killed = _stats select 0; stats_opfor_killed_by_players = _stats select 1; From baa0f539d27ec21d5113c6fb22b10861b92ef370 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 23 May 2020 19:30:56 +0200 Subject: [PATCH 050/115] Lower the chance for unarmed BRDM in GM East enemy preset --- CHANGELOG.md | 1 + Missionframework/presets/enemies/gm_east.sqf | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1946157b9..128eff196 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Tweaked: Arsenal presets are now in the presets folder. * Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal. * Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset. +* Tweaked: GM East enemy preset, lower the chance for unarmed BRDM. * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. * Fixed: FOB truck got mass set, but should've just apply to FOB boxes. diff --git a/Missionframework/presets/enemies/gm_east.sqf b/Missionframework/presets/enemies/gm_east.sqf index 83605e853..ac974d881 100644 --- a/Missionframework/presets/enemies/gm_east.sqf +++ b/Missionframework/presets/enemies/gm_east.sqf @@ -2,7 +2,7 @@ File: gm_east.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-06 - Last Update: 2020-05-15 + Last Update: 2020-05-23 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -65,7 +65,9 @@ KPLIB_o_militiaInfantry = [ // Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita. KPLIB_o_militiaVehicles = [ - "gm_gc_army_brdm2um" // SPW40-P2UM + "gm_gc_army_brdm2um", // SPW40-P2UM + "gm_gc_army_brdm2", // SPW-40P2 + "gm_gc_army_brdm2" // SPW-40P2 ]; // All enemy vehicles that can spawn as sector defenders and patrols at high enemy combat readiness (aggression levels). @@ -85,14 +87,16 @@ KPLIB_o_armyVehicles = [ KPLIB_o_armyVehiclesLight = [ "gm_gc_army_brdm2um", // SPW40-P2UM "gm_gc_army_brdm2", // SPW-40P2 + "gm_gc_army_brdm2", // SPW-40P2 "gm_gc_army_btr60pa", // SPW-60PA + "gm_gc_army_btr60pa", // SPW-60PA + "gm_gc_army_btr60pb" // SPW-60PB "gm_gc_army_btr60pb" // SPW-60PB ]; // All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels). KPLIB_o_battleGrpVehicles = [ "gm_gc_army_ural4320_cargo", // Truck gel. 5 Transport - "gm_gc_army_brdm2um", // SPW40-P2UM "gm_gc_army_brdm2", // SPW-40P2 "gm_gc_army_btr60pa", // SPW-60PA "gm_gc_army_btr60pb", // SPW-60PB From b7784b3eea3754a793d54c032410c5f1f98ac1f2 Mon Sep 17 00:00:00 2001 From: MJVEVERUSKA <65508396+MJVEVERUSKA@users.noreply.github.com> Date: Sat, 23 May 2020 19:53:09 +0200 Subject: [PATCH 051/115] Update stringtable.xml --- Missionframework/stringtable.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Missionframework/stringtable.xml b/Missionframework/stringtable.xml index 9ed7c54bb..adfe848a3 100644 --- a/Missionframework/stringtable.xml +++ b/Missionframework/stringtable.xml @@ -746,7 +746,7 @@ Onayla: Kayıtlı oyunu sil Confirmar: Apagar jogo salvo 확인 : 저장된 게임 초기화 - Potvrdit : Vymazání uložené hry + Potvrdit: Vymazání uložené hry No @@ -3532,7 +3532,7 @@ <t size='1.3' color='#ffa000'>FOB AVLAMA</t><br/><br/><t size='1'>OPFOR kuvvetlerinin cephenin gerisinde birkaç küçük lojistik üsleri var. Bu üsleri yok etmek erzak tedariklerini zorlaştırıp, bizim hareketlerimize cevap verme kapasitelerini azaltıcaktır.</t><br/><br/><t size='1'>Göreviniz, elinizdeki imkanlarla bu üslerdeki bütün erzak sandıklarını ve araçları yok etmek. Ne yazıkki elimizdeki istihbarat bu üslerin tam konumlarını saptamaya yetmiyor, üssü haritanızdaki kırmızı bölgede sizin bulmanız lazım.</t><br/><br/><t size='1.15' color='#00a0ff'>Maliyet: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Ödül: OPFOR uyarı seviyesi %40 a düşecek.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>CAÇA À FOB</t><br/><br/><t size='1'>As forças de oposição (FOROP) utilizam um conjunto de pequenas bases de logística situadas além do fronte de batalha. Destruindo tais recursos desestabilizaria consideravelmente suas linhas de suprimento e afetaria sua capacidade de reagir às nossas ações.</t><br/><br/><t size='1'>Sua missão é destruir todas as fontes de recurso (caminhões, contêineres) que estão no objetivo, a qualquer custo. Infelizmente, nossa inteligência não foi capaz de fornecer dados da localização precisa da base. Dessa forma, você deverá localizar o objetivo dentro da zona vermelha identificada em seu mapa.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Recompensa: Alerta das forças de oposição reduzidos em 40%.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>병참기지 기습</t><br/><br/><t size='1'>현재 적군은 후방지역에 병참 기지를 운영하고 있습니다. 이 병참 기지를 파괴하면 전방 적군의 작전 수행능력을 저하시켜 아군의 작전 행동에 대응할 수 있는 역량이 약해질 것입니다.</t><br/><br/><t size='1'>아군의 작전 목표는 모든 군수물자을 파괴하는 것입니다.(트럭, 컨테이너 등) 아쉽게도 아군 정찰팀이 해당지역을 정찰하였으나 찾지 못하여 정확한 위치를 제공할 수 없기 때문에 당신의 지도에 표기된 빨간 영역 안에 위치한 적군 병참 기지를 찾아야 합니다.</t><br/><br/><t size='1.15' color='#00a0ff'>소모되는 정보 점수: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>보상: 경고 수준이 40% 감소합니다.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> - <t size='1.3' color='#ffa000'>HON NA FOB</t><br/><br/><t size='1'>Jednotky OPFOR používají řadu menších logistických základen za hlavní linii. Zničení těchto prostředků výrazně naruší zásobováni OPFOR jednotek a naruší jejich schopnost reagovat na naše akce.</t><br/><br/><t size='1'>Cílem mise je zničit všechny zásobovací prostředky (náklaďáky, kontejnery) libovolnými prostředky. Bohužel naše rozvědka není schopna vám poskytnout přesnou polohou pro základny, budete ji muset najít v červené zóně na mapě.</t><br/><br/><t size='1.15' color='#00a0ff'>Cena: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Odměna: Snížení bojové pohotovosti OPFOR o 40%</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> + <t size='1.3' color='#ffa000'>HON NA FOB</t><br/><br/><t size='1'>Jednotky OPFOR používají řadu menších logistických základen za hlavní linii. Zničení těchto prostředků výrazně naruší zásobováni OPFOR jednotek a naruší jejich schopnost reagovat na naše akce.</t><br/><br/><t size='1'>Cílem mise je zničit všechny zásobovací prostředky (náklaďáky, kontejnery) libovolnými prostředky. Bohužel naše rozvědka není schopna vám poskytnout přesnou polohou pro základny, budete ji muset najít v červené zóně na mapě.</t><br/><br/><t size='1.15' color='#00a0ff'>Cena: 15<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Odměna: Snížení bojové pohotovosti OPFOR o 40%</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> Convoy Hijack @@ -3660,7 +3660,7 @@ <t size='1.3' color='#ffa000'>ARA VE KURTAR</t><br/><br/><t size='1'>Dost bir keşif helikopterini düşman sahasında kaybettik. Helikopterin düşman kuvvetleri tarafından vurulduğuna inanıyoruz.</t><br/><br/><t size='1'>Helikopter son görülen yerde düştüğünü biliyoruz. Göreviniz helikopter personelini bulup ve taşıdığı önemli istihbaratı getirmenizdir. Düşman kuvvetler onu önceden bulabilirler dikkatli olun ve saldırıya açık olun.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Ödül: 20 istihbarat puanı (Her yaşayan kişi için 10).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>BUSCA E RESGATE</t><br/><br/><t size='1'>Perdemos contato com um helicóptero de reconhecimento presente em uma missão atrás das linhas inimigas. Acreditamos que o helicóptero foi abatido por forças hostis.</t><br/><br/><t size='1'>O helicóptero pode ter feito um pouso forçado em local próximo de sua última posição conhecida. Sua missão é recuperar a tripulação do helicóptero e sua preciosa inteligência. Forças hostis podem tê-los localizado primeiro, portanto seja rápido, cuidadoso e esteja pronto para engajar o inimigo.</t><br/><br/><t size='1.15' color='#00a0ff'>Cost: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Recompensa: 20 pontos de inteligência (10 para cada membro vivo da tripulação).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> <t size='1.3' color='#ffa000'>수색 및 구출</t><br/><br/><t size='1'>적군 후방지역에서 정찰임무를 수행하던 아군 정찰기와 교신이 끊어졌습니다. 현 상황으로 판단할때 적군에게 격추당한 것 같습니다.</t><br/><br/><t size='1'>아군의 임무는 마지막 교신 위치를 중심으로 아군 정찰기의 흔적을 찾는 것입니다. 적군이 먼저 발견하기전에 아군 정찰기의 흔적을 찾아 승무원 구출 및 다른 정보들을 획득, 복귀해야 합니다. 교전이 벌어질 수 있습니다.</t><br/><br/><t size='1.15' color='#00a0ff'>소요되는 정보 점수: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>보상: 정보 점수가 20점 추가됩니다. 또한 구출한 인원 1명당 정보 점수가 10점 추가됩니다.</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> - <t size='1.3' color='#ffa000'>ZÁCHRANNÁ MISE</t><br/><br/><t size='1'>Ztratili jsme kontakt s průzkumným vrtulníkem za nepřátelskými liniemi. Věříme že ji sestřelily nepřátelské jednotky.</t><br/><br/><t size='1'>Vrtulník mohl havarovat kdekoliv ve velké vzdálenosti od místa kde jsme s ní ztratily kontakt. Cílem mise je najít a zachránit přeživší posádku. Nepřátelské jednotky tam mohou být jako první, proto musíme jednat rychle, opatrně a být připraveni k boji.</t><br/><br/><t size='1.15' color='#00a0ff'>Cena: 10<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Odměna: 20 zpravodajských bodů (10 za každého člena posádky).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> + <t size='1.3' color='#ffa000'>ZÁCHRANNÁ MISE</t><br/><br/><t size='1'>Ztratili jsme kontakt s průzkumným vrtulníkem za nepřátelskými liniemi. Věříme že ji sestřelily nepřátelské jednotky.</t><br/><br/><t size='1'>Vrtulník mohl havarovat kdekoliv ve velké vzdálenosti od místa kde jsme s ní ztratily kontakt. Cílem mise je najít a zachránit přeživší posádku. Nepřátelské jednotky tam mohou být jako první, proto musíme jednat rychle, opatrně a být připraveni k boji.</t><br/><br/><t size='1.15' color='#00a0ff'>Cena: 8<img image='\A3\Ui_f\data\GUI\Cfg\Ranks\general_gs.paa'/></t><br/><t size='1.15' color='#ffa000'>Odměna: 20 zpravodajských bodů (10 za každého člena posádky).</t><br/><br/><t size='10'><img image='res\secondary\fob_obj.jpg'/></t> @@ -4357,7 +4357,7 @@ Yetersiz kaynak.\n\nLazım olan: \n%1 İkmal \n%2 Mermi\n%3 Benzin Sem recursos suficientes.\n\nVocê precisa de:\n%1 Suprimentos\n%2 Munição\n%3 Combustível 공장을 지을러면 이 지역의 저장창고에 군수물자가 필요합니다.\n\n필요항목:\n%1 보급품\n%2 탄약\n%3 연료 - Nedostatek surovin. \n\nPotřebujete:\n%! Zásoby\n%2 Munice\n%3 Palivo + Nedostatek surovin.\n\nPotřebujete:\n%1 Zásoby\n%2 Munice\n%3 Palivo Facility established. @@ -4830,7 +4830,7 @@ Görevinize USS Freedom'da başlayacaksınız veya Chimera Bölgesinde yani düşmanların saldıramayacağı güvenli bölgelerde. İlk işiniz nereye atlayacağınız olacaktır, siz bölgeleri aldıkça yeni FOB'ler ve mobil spawn merkezleri de açacaksınız.<br/> <br/>Başladığınızda Arsenal (Cephanelik) den istediğiniz ekipmanı seçebilirsiniz. Bir FOB Konteynırı, SPARTAN-01 helikopteri ve birkaç taşıma helikopterine de ayrıca sahipsiniz.<br/> <br/>SPARTAN-01 ile FOB Konteynırını istediğiniz yere götürüp bir FOB Bölgesi (başlangıç noktasından 1km diğer sektörlerden 300mt uzakta olmanız gerekli) açabilirsiniz ve saldırmaya o FOB'den devam edebilirsiniz.<br/> <br/> <br/><br/>Você iniciará a campanha abordo do porta-aviões USS Fredom ou na base operacional Chimera, instalações que o inimigo não se atreverá a atacar. Sua primeira escolha será definir onde irá mobilizar. Primeiramente somente poderá mobilizar na sua posição inicial, entretanto, conforme progredir, mais alternativas se tornarão disponíveis, como a Base de Operações Avançadas (FOB) e os respawns móveis.<br/> <br/>Em sua posição inicial, você poderá escolher seu equipamento através de um arsenal completo. Você terá à sua disposição sua primeira FOB transportável, dentro de um contêiner. Também estará disponível o transporte aéreo de callsign Spartan-01 e mais alguns helicópteros de transporte.<br/> <br/>Você deverá mover o mencionado contêiner utilizando a Spartan-01 (ou escolha começar com a primeira FOB já construída). Você poderá mobilizar esta FOB para onde desejar (desde que esteja a 1km do ponto inicial e a 300 metros de qualquer setor). Assim, depende apenas de você escolher o local ideal para iniciar sua campanha ofensiva.<br/> <br/> <br/><br/>최초의 작전 기지는 적이 절대로 건드리지 못할 안전지대로, 아군의 반격 나팔 소리의 첫 음표이기도 하며, 이번 반격 작전의 출발점이 될 것이다. 처음에는 작전 기지만 배치할 수 있었으나, 반격작전이 진행됨에 따라 FOB(전초기지) 또는 재투입차량에도 배치될 것이다.<br/> <br/>또한 최초의 작전 기지에서 '무기고'를 이용하여 무장을 갖출수 있고, 이미 건설된 건초기지가 있거나 또는 전초기지(FOB)차량을 1대 찾을 수 있을 것이다. 또한 운이 좋다면 재투입차량 또는 트럭이나 공중 탑재 장비등도 찾을 수 있을 것이다.<br/> <br/>당신이 처음으로 해야할 일은 무장을 갖추고, 이미 건설된 건초기지가 있다면 거기에서부터, 만약 전초기지(FOB)차량이 있다면 그 것을 찾아 FOB(전초기지)를 적당한 곳(최초의 작전기지로부터 1km, 도시로부터 300m 떨어진 곳)에 설치해야 한다. 이 지점이 바로 첫번째 반격이 시작되는 곳으로 반격을 시작하는 지점은 전적으로 당신의 선택에 달려 있다.<br/> <br/>만약 당신이 반격작전이 진행중인 상황에서 투입된다면, 먼저 지도를 살펴보라. 현재 아군이 어디서 전투중인지 알 것이다. 아군에게 무전으로 물어보거나 채팅으로 물어보면서 전투에 참여하라. 행운을 빈다.<br/> <br/> - <br/><br/>t size='10'><img image='res\tuto\fob.jpg'/></t><br/><br/>Naše kampaň začíná na místě, kde se nemusíme bát útoku OPFOR jednotek. Na prvním místě vyberte kam provedete výsadek. Ze začátku budete moci jen na Startovní základnu, ale jak budete postupovat, budou přibývat i možnosti jako jsou předsunuté základny (FOB) nebo mobilní respawn.<br/> <br/>Na startovní pozici si budete moct vybrat vybavení z kompletní Zbrojnice. Naleznete zde také svoje první zabalené FOB v kontejneru, Vrtulník Spartan-01 Huron a pár dalších transportních vrtulníků.<br/> <br/>Budete muset převézt kontejner Huronem nebo Ghosthawkem (pokud nebyla zvolena možnost postaveného prvního FOB). Můžete si vybrat jakékoliv místo kde postavíte své první FOB, a odtud začít svoji kampaň.<br/> <br/> + <br/><br/>Zahájíte kampaň buď na palubě USS Freedom, nebo na základně Chimera, v bezpečných zónách, které se nepřítel neodváží zaútočit. První volbou je vybrat, kam chcete nasadit. Zpočátku se můžete nasadit pouze na vaší výchozí pozici, ale jak postupujete, budou k dispozici další možnosti, jako jsou Forward Operating Bases (FOB) a mobilní respawns.<br/> <br/>Na své počáteční pozici si můžete vybrat vybavení z kompletního Arsenalu. Také najdete svůj první FOB zabalený v kontejneru, vrtulník Spartan-01 a několik dalších malých transportních vrtulníků.<br/> <br/>Budete se muset přepravit s pomocí Spartan-01 (nebo se rozhodnete začít s první postavenou FOB již postavenou). Tento první FOB můžete nasadit kamkoli budete chtít (pokud jste 1 km od výchozí pozice a 300 m od jakéhokoli sektoru), takže je na vás, abyste vybrali správné místo pro zahájení ofenzivy.<br/> <br/> 3. Objective @@ -4908,7 +4908,7 @@ <br/><br/>在這次作戰中你必須管理、囤積與保護三種資源：<br/> <br/><t color='#00ff00'>補給：</t>最關鍵的物資。一旦沒有補給，你將無法佈署更多士兵或其餘軍事資源，因此，指揮部建議優先謀取這項資源！<br/> <br/><t color='#ff0000'>彈藥：</t>用來採購步兵戰車（APC）和主戰坦克（MBT）等裝甲載具，同時也被用於招募武裝菁英的重裝士兵。<br/> <br/><t color='#ffff00'>油料：</t>載具的必需品，任何載具都需要油料，尤其是那些「大胃王」的大型載具們。<br/> <br/>在作戰過程中你或許能在任意戰區內搜刮到以上三種資源，但是為了解放這個區域，你勢必需要更穩定而有效的補給線，這時候你就需要去佔領興趣點(PoI)和工廠了！兩者都能在占領後建立一個倉儲區（用滾輪動作選單來建立），而興趣點還需要額外建立資源生產設施（依舊是滾輪動作選單)。一個PoI能夠同時建立三種生產設施，但你必須先投資才能全數建立起來！建造設施需要 50 點對應的資源與其餘兩個資源各 100 點。<br/> <br/> <br/><br/>Nesta campanha você deverá gerir, estocar e proteger três tipos de recursos.:<br/> <br/><t color='#00ff00'>SUPRIMENTOS:</t> Este é o recurso essencial. Sem suprimentos, será impossível mobilizar infantaria adicional ou requisitar equipamentos militares. Desse modo, o QG recomenda priorizar estes recursos!<br/> <br/><t color='#ff0000'>MUNIÇÃO:</t> Utilizada para abastecer veículos blindados armados, bem como soldados de elite de equipamento bélico pesado.<br/> <br/><t color='#ffff00'>COMBUSTÍVEL:</t> Todo veículo precisa de combustível, alguns consomem mais que outros.<br/> <br/>Você cruzará com todos os três tipos de recursos dispersos pelos setores, porém para adquirir uma quantidade considerável e abastecimento constante, você deverá capturar setores com fábricas/refinarias. Uma vez capturadas, as fábricas precisarão de um depósito (use o scroll do mouse) e então poderão imediatamente iniciar a produção do recurso pretendido. Se puder arcar com os custos, as fábricas poderão ser aprimoradas para produzir os demais recursos. <br/> <br/> <br/><br/>군수물자는 총 3가지 종류가 있다.<br/> <br/><t color='#00ff00'>보급품:</t> 보급품(S)은 가장 중요한 군수물자로, 보급품이 없으면 AI 보병을 비롯하여 모든 장비를 배치(생산)할 수 없다.<br/> <br/>또한 장비를 배치(생산)할 때 가장 많이 소비되는 보급품이다.<br/> <br/><t color='#ff0000'>탄약:</t> 탄약(A)은 무장한 장비를 배치(생산)할 때 필요하다.<br/> <br/><t color='#ffff00'>연료:</t> 연료(F)는 장비을 움직이기 위해서 꼭 필요한 보급품이며, 대형 장비는 더 많은 연료를 소비한다.<br/> <br/>각 군수물자는 지도에서 주유기 표시로 된 '공장 '에서 생산된다. 이 지역의 경우 도시 이름 옆에 (S),(A),(F)가 표기되어 있는데 이는 생산 가능한 보급품의 종류를 나타낸다. 즉 보급품은 (S), 탄약은 (A), 연료는 (F)이다.<br/> <br/>이 지역을 아군이 점령하게 되면 왼쪽 상단 메뉴안에 --저장창고건설-- 이라는 메뉴가 생성된다. 도시내 적당한 곳에 저장창고를 건설하면 이 곳에 이 마을에서 생산된 군수물자가 저장된다. 이 군수물자를 AI수송부대를 이용하여 전초기지로 운반하면 장비를 생산하는데 사용할 수 있게 된다.<br/> <br/>만약 이 '생산공장'에서 생산중인 물품을 변경하고자 한다면, 도시내에 설치한 저장창고로 공장건설에 필요한 군수물자(생산하고자 하는 군수물자 50, 나머지 두가지 군수물자 100)을 운반한 후 변경하고자 하는 군수물자의 생산공장을 건설하면 된다.<br/> <br/>생산품은 '생산 설정' 에서 변경할 수 있고, AI 수송부대는 물류 개요' 에서 편성할 수 있다.<br/> <br/>아군 AI 수송부대의 트럭은 1회에 1대당 최대 200개의 군수물자를 운반할 수 있다.<br/> <br/> - <br/><br/>V této kampani musíte spravovat, ukládat a chránit tři typy zdrojů:<br/> <br/><t color = '#00ff00'>SUROVINY :</t> Toto jsou nejdůležitější. Bez spotřebního materiálu nebudete moci nasadit další vojáky ani zabavit vojenskou techniku. Velitelství jako takové doporučuje prioritu těchto prvních!<br/> <br/><t color = '# ff0000' >MUNICE:</t>Používá se k zásobě ozbrojených vozidel, jako jsou APC a MBT, stejně jako elity (a těžce vyzbrojení) vojáci.<br/> <br/><t color = '#ffff00'>PALIVO:</t>Každé vozidlo potřebuje palivo, některé jsou více žíznivé než ostatní.<br/> <br/>Možná narazíte na všechny tři zdroje v jakémkoli sektoru, ale pro značnou a stálou dodávku musíte zachytit tovární sektory! Jakmile jsou továrny zachyceny, vyžadují úložný prostor (akce nabídky posouvání) a poté mohou okamžitě začít vyrábět zamýšlený zdroj. Pokud si to můžete dovolit, může být každá továrna upgradována tak, aby vytvořila další dva zdroje. <br/> <br/> + <br/><br/>V této kampani musíte spravovat, ukládat a chránit tři typy zdrojů:<br/> <br/><t color ='#00ff00'>SUROVINY:</t> Toto jsou nejdůležitější. Bez spotřebního materiálu nebudete moci nasadit další vojáky ani zabavit vojenskou techniku. Velitelství jako takové doporučuje prioritu těchto prvních!<br/> <br/><t color ='#ff0000' >MUNICE:</t>Používá se k zásobě ozbrojených vozidel, jako jsou APC a MBT, stejně jako elity (a těžce vyzbrojení) vojáci.<br/> <br/><t color = '#ffff00'>PALIVO:</t>Každé vozidlo potřebuje palivo, některé jsou více žíznivé než ostatní.<br/> <br/>Možná narazíte na všechny tři zdroje v jakémkoli sektoru, ale pro značnou a stálou dodávku musíte zachytit tovární sektory! Jakmile jsou továrny zachyceny, vyžadují úložný prostor (akce nabídky posouvání) a poté mohou okamžitě začít vyrábět zamýšlený zdroj. Pokud si to můžete dovolit, může být každá továrna upgradována tak, aby vytvořila další dva zdroje. <br/> <br/> 6. Alert Level @@ -4960,7 +4960,7 @@ <br/><br/>為了協助你成功解放這裡，指揮部允許你在每個前線基地周遭限定的範圍內佈署步兵、載具、防禦工事等軍備設施與建造工事。<br/> <br/>步兵、載具和防禦設備（如固定式武器）需要消耗資源，但建築、沙包、掩體等工事是完全免費的。<br/> <br/>你可以在前線基地半徑 100 公尺內使用建造系統。<br/> <br/> <br/><br/>Para auxiliar no sucesso de sua iniciativa, você terá a capacidade de construir em todas suas bases avançadas, que o permitirá mobilizar infantaria, veículos, defesas, fortificações e etc para sua localidade.<br/> <br/>Embora infantaria, veículos e defesas exijam recursos para seu desenvolvimento, fortificações como estruturas, sacos de areia e muros não terão custo.<br/> <br/>O sistema de construção estará disponível quando você estiver a 100 metros de qualquer FOB.<br/> <br/> <br/><br/>전초기지나 장비 또는 AI 보병을 건설(배치)하기 위해선 우선 관리자로부터 권한을 획득해야 한다. 권한을 획득한 후 제한된 갯수의 전초기지를 건설 할 수 있고, 전초기지를 건설한 후 125m거리 이내에서 장비를 생산(배치) 할 수 있다.<br/> <br/>전초기지를 건설하게 되면 제일 먼저 소형 또는 대형 저장 창고부터 건설해야 한다. 이 창고로 AI 수송부대를 이용하여 각 거점에서 생산된 군수물자를 운반, 필요한 장비를 건설(배치)해야 한다. 각 전초기지에 보관중인 보급품은 공유할 수 없다.<br/> <br/>따라서 전선이 이동하게 되면, 후방의 전초기지에 저장중인 군수물자를 새로이 건설한 전방의 전초기지로 AI 수송부대를 이용하여 운반해야 한다.<br/> <br/>아군 AI 수송부대의 트럭은 1회에 1대당 최대 200개의 군수물자를 운반할 수 있다.<br/> <br/>주의! 지역 민간인들의 지지가 없다면 적 민병대가 출현하여 아군 AI 수송부대를 습격, 군수물자를 파괴하거나 도난 당할 수 있으니 작전시 민간인을 학살하거나 재산을 약탈하지 않는다.<br/> <br/> - <br/><br/>Abyste uspěly ve své snaze, máte možnost stavět jednotky, vozidla a opevnění. Samozřejmě v závislosti na zdrojích.<br/> <br/>Ačkoli pěchota, vozidla a obrana budou stát zdroje, opevnění, jako jsou budovy, pytle s pískem a zdi, nikoliv.<br/> <br/>Systém stavění je dostupný do 150 metrů od FOB. Tehdy se vám objeví možnost stavět v kontextové nabídce.<br/> <br/> + <br/><br/>Abyste uspěly ve své snaze, máte možnost stavět jednotky, vozidla a opevnění. Samozřejmě v závislosti na zdrojích.<br/> <br/>Ačkoli pěchota, vozidla a obrana budou stát zdroje, opevnění, jako jsou budovy, pytle s pískem a zdi, nikoliv.<br/> <br/>Systém stavění je dostupný do 100 metrů od FOB. Tehdy se vám objeví možnost stavět v kontextové nabídce.<br/> <br/> 8. Deploying another FOB @@ -6021,7 +6021,7 @@ 一名叫做 %1 的友軍抵抗軍戰士陣亡了！ Um aliado das forças de resistência de nome %1 foi morto! % 라고 하는 아군에 협조한 민병대가 전사하였다. - Spojenecký bojovník domobrany %1 byl zabit hráčem %2! + Spojenecký bojovník domobrany %1 byl zabit! Gamedata saving @@ -6464,7 +6464,7 @@ Vehicles recycled: %1 - Vehicules recyclés: + Vehicules recyclés: %1 Fahrzeuge wiederverwertet: %1 Vehículos reciclados: %1 Техники утилизировано: %1 @@ -6747,7 +6747,7 @@ FOB empacado. \nProbablemente el permiso de creación será revertido después de reiniciar el servidor. FOB свернуто.\nЕсли вы очищали место для FOB, оно будет восстановлено после перезапуска сервера. FOB가 재포장됩니다. 이 상태로 서버 재시작시 이 부근의 건물이나 장비들은 사라집니다. - FOB je zabalen. \Po restartování serveru bude pravděpodobně vytvořené oprávnění zrušeno. + FOB je zabalen.\Po restartování serveru bude pravděpodobně vytvořené oprávnění zrušeno. Dynamic fog (A3 Vanilla) @@ -7260,7 +7260,7 @@ Volumen en vehículo: Lautstärke im Fahrzeug: Volume dentro do veículo: - Hlasitost + Hlasitost ve vozidle: Apply From 3b93646132db91622cefea5e7ff4b549e2253a89 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 25 May 2020 14:14:49 +0200 Subject: [PATCH 052/115] Civilian preset variable rename --- Missionframework/presets/civilians/apex.sqf | 6 +++--- Missionframework/presets/civilians/cup_cherno.sqf | 6 +++--- Missionframework/presets/civilians/cup_takistan.sqf | 6 +++--- Missionframework/presets/civilians/custom.sqf | 6 +++--- Missionframework/presets/civilians/germany.sqf | 6 +++--- Missionframework/presets/civilians/middle_eastern.sqf | 6 +++--- Missionframework/presets/civilians/rds_civ.sqf | 6 +++--- Missionframework/presets/civilians/unsung.sqf | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Missionframework/presets/civilians/apex.sqf b/Missionframework/presets/civilians/apex.sqf index 6b485a638..2df2580ae 100644 --- a/Missionframework/presets/civilians/apex.sqf +++ b/Missionframework/presets/civilians/apex.sqf @@ -2,7 +2,7 @@ File: apex.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-07 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "C_Man_casual_1_F_tanoan", "C_Man_casual_2_F_tanoan", "C_Man_casual_3_F_tanoan", @@ -34,7 +34,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "C_Quadbike_01_F", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", diff --git a/Missionframework/presets/civilians/cup_cherno.sqf b/Missionframework/presets/civilians/cup_cherno.sqf index 6bc95eae2..f4a05d082 100644 --- a/Missionframework/presets/civilians/cup_cherno.sqf +++ b/Missionframework/presets/civilians/cup_cherno.sqf @@ -2,7 +2,7 @@ File: cup_cherno.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-19 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -18,7 +18,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "CUP_C_C_Assistant_01", "CUP_C_C_Citizen_02", "CUP_C_C_Citizen_01", @@ -60,7 +60,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "CUP_C_Skoda_Blue_CIV", "CUP_C_Skoda_Green_CIV", "CUP_C_Skoda_Red_CIV", diff --git a/Missionframework/presets/civilians/cup_takistan.sqf b/Missionframework/presets/civilians/cup_takistan.sqf index 78d708681..497e98886 100644 --- a/Missionframework/presets/civilians/cup_takistan.sqf +++ b/Missionframework/presets/civilians/cup_takistan.sqf @@ -2,7 +2,7 @@ File: cup_takistan.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-15 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -18,7 +18,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "CUP_C_TK_Man_04", "CUP_C_TK_Man_04_Jack", "CUP_C_TK_Man_04_Waist", @@ -47,7 +47,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "CUP_C_TT650_TK_CIV", "CUP_C_S1203_CIV", "CUP_C_S1203_Ambulance_CIV", diff --git a/Missionframework/presets/civilians/custom.sqf b/Missionframework/presets/civilians/custom.sqf index ff1fa890a..f9dc8e5f7 100644 --- a/Missionframework/presets/civilians/custom.sqf +++ b/Missionframework/presets/civilians/custom.sqf @@ -2,7 +2,7 @@ File: custom.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-07 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "C_Man_Fisherman_01_F", "C_man_w_worker_F", "C_man_1_1_F", @@ -43,7 +43,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "C_Quadbike_01_F", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", diff --git a/Missionframework/presets/civilians/germany.sqf b/Missionframework/presets/civilians/germany.sqf index 0cf367106..1a74957ca 100644 --- a/Missionframework/presets/civilians/germany.sqf +++ b/Missionframework/presets/civilians/germany.sqf @@ -2,7 +2,7 @@ File: germany.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-08 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "C_Man_casual_1_F_euro", "C_Man_casual_1_F_euro", "C_Man_casual_2_F_euro", @@ -37,7 +37,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "C_Truck_02_covered_F", "C_Truck_02_covered_F", "C_Truck_02_fuel_F", diff --git a/Missionframework/presets/civilians/middle_eastern.sqf b/Missionframework/presets/civilians/middle_eastern.sqf index 93b9239dc..8c4208d2e 100644 --- a/Missionframework/presets/civilians/middle_eastern.sqf +++ b/Missionframework/presets/civilians/middle_eastern.sqf @@ -2,7 +2,7 @@ File: middle_eastern.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "LOP_Tak_Civ_Random", "LOP_Tak_Civ_Man_06", "LOP_Tak_Civ_Man_08", @@ -36,7 +36,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "LOP_TAK_Civ_Hatchback", "LOP_TAK_Civ_Landrover", "LOP_TAK_Civ_Offroad", diff --git a/Missionframework/presets/civilians/rds_civ.sqf b/Missionframework/presets/civilians/rds_civ.sqf index 49f55490f..c298dbc96 100644 --- a/Missionframework/presets/civilians/rds_civ.sqf +++ b/Missionframework/presets/civilians/rds_civ.sqf @@ -2,7 +2,7 @@ File: rds_civ.sqf Author: PSYKO-nz - https://github.com/PSYKO-nz Date: 2018-02-02 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "RDS_Assistant", "RDS_Citizen_Random", "RDS_Citizen2", @@ -58,7 +58,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "RDS_Van_01_fuel_F", "RDS_Gaz24_Civ_03", "RDS_Gaz24_Civ_01", diff --git a/Missionframework/presets/civilians/unsung.sqf b/Missionframework/presets/civilians/unsung.sqf index 00678047b..4479b32ac 100644 --- a/Missionframework/presets/civilians/unsung.sqf +++ b/Missionframework/presets/civilians/unsung.sqf @@ -2,7 +2,7 @@ File: unsung.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-06-04 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ // Civilian classnames. -civilians = [ +KPLIB_c_units = [ "uns_civilian1", "uns_civilian1_b1", "uns_civilian2", @@ -28,7 +28,7 @@ civilians = [ ]; // Civilian vehicle classnames. -civilian_vehicles = [ +KPLIB_c_vehicles = [ "C_Truck_02_fuel_F", "C_Truck_02_transport_F", "C_Truck_02_covered_F" From 4b8380bc375bf2b750a5489dab2b5cd5cf2b70f0 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 25 May 2020 14:15:10 +0200 Subject: [PATCH 053/115] Player preset variable rename --- Missionframework/presets/players/apex.sqf | 92 +++++++++---------- Missionframework/presets/players/baf_des.sqf | 92 +++++++++---------- Missionframework/presets/players/baf_mtp.sqf | 92 +++++++++---------- Missionframework/presets/players/bwmod.sqf | 92 +++++++++---------- .../presets/players/bwmod_des.sqf | 92 +++++++++---------- Missionframework/presets/players/csat.sqf | 92 +++++++++---------- .../presets/players/csat_apex.sqf | 92 +++++++++---------- .../presets/players/cup_acr_desert.sqf | 92 +++++++++---------- .../presets/players/cup_acr_woodland.sqf | 92 +++++++++---------- .../presets/players/cup_baf_desert.sqf | 92 +++++++++---------- .../presets/players/cup_baf_woodland.sqf | 92 +++++++++---------- Missionframework/presets/players/cup_cdf.sqf | 92 +++++++++---------- .../presets/players/cup_chdkz.sqf | 92 +++++++++---------- Missionframework/presets/players/cup_sla.sqf | 92 +++++++++---------- .../presets/players/cup_takistan.sqf | 92 +++++++++---------- .../presets/players/cup_usa_desert.sqf | 92 +++++++++---------- .../presets/players/cup_usa_woodland.sqf | 92 +++++++++---------- .../presets/players/cup_usmc_desert.sqf | 92 +++++++++---------- .../presets/players/cup_usmc_woodland.sqf | 92 +++++++++---------- Missionframework/presets/players/custom.sqf | 92 +++++++++---------- Missionframework/presets/players/enoch.sqf | 92 +++++++++---------- Missionframework/presets/players/gm_east.sqf | 92 +++++++++---------- .../presets/players/gm_east_win.sqf | 92 +++++++++---------- Missionframework/presets/players/gm_west.sqf | 92 +++++++++---------- .../presets/players/gm_west_win.sqf | 92 +++++++++---------- Missionframework/presets/players/rhs_afrf.sqf | 92 +++++++++---------- .../presets/players/rhs_usaf_des.sqf | 92 +++++++++---------- .../presets/players/rhs_usaf_wdl.sqf | 92 +++++++++---------- Missionframework/presets/players/sfp_des.sqf | 92 +++++++++---------- Missionframework/presets/players/sfp_wdl.sqf | 92 +++++++++---------- Missionframework/presets/players/unsung.sqf | 92 +++++++++---------- 31 files changed, 1426 insertions(+), 1426 deletions(-) diff --git a/Missionframework/presets/players/apex.sqf b/Missionframework/presets/players/apex.sqf index 073cd2551..b761c81de 100644 --- a/Missionframework/presets/players/apex.sqf +++ b/Missionframework/presets/players/apex.sqf @@ -2,7 +2,7 @@ File: apex.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-07 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -29,26 +29,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V4_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_T_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "B_T_Truck_01_medical_F"; // This is the mobile respawn (and medical) truck. -huron_typename = "B_Heli_Transport_03_unarmed_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "B_T_crew_F"; // This defines the crew for vehicles. -pilot_classname = "B_T_Helipilot_F"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "B_T_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V4_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_T_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "B_T_Truck_01_medical_F"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "B_Heli_Transport_03_unarmed_F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "B_T_crew_F"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "B_T_Helipilot_F"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "B_Heli_Light_01_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "B_T_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -58,7 +58,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["B_T_Soldier_F",20,0,0], // Rifleman ["B_T_Soldier_LAT_F",30,0,0], // Rifleman (AT) ["B_T_Soldier_GL_F",25,0,0], // Grenadier @@ -84,7 +84,7 @@ infantry_units = [ ["B_T_Pilot_F",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_T_Quadbike_01_F",50,0,25], // Quad Bike ["B_T_LSV_01_unarmed_F",75,0,50], // Prowler ["B_T_LSV_01_armed_F",75,40,50], // Prowler (HMG) @@ -121,7 +121,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["rhsusf_m113_usarmy",200,40,100], // M113A3 (M2) ["rhsusf_m113_usarmy_MK19",200,60,100], // M113A3 (Mk19) ["rhsusf_m113_usarmy_medical",200,0,100], // M113A3 (Medical) @@ -156,7 +156,7 @@ heavy_vehicles = [ ["B_T_MBT_01_mlrs_F",800,1750,400] // M5 Sandstorm MLRS ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["B_Heli_Light_01_F",200,0,100], // MH-9 Hummingbird @@ -213,7 +213,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["B_HMG_01_F",25,40,0], // Mk30A HMG .50 ["B_HMG_01_high_F",25,40,0], // Mk30 HMG .50 (Raised) ["B_HMG_01_A_F",35,40,0], // Mk30 HMG .50 (Autonomous) @@ -227,7 +227,7 @@ static_vehicles = [ ["B_SAM_System_03_F",250,500,0] // MIM-145 Defender ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V4_F",0,0,0], ["Land_Cargo_Patrol_V4_F",0,0,0], ["Land_Cargo_Tower_V4_F",0,0,0], @@ -306,17 +306,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -356,7 +356,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "B_T_Soldier_TL_F", "B_T_Soldier_F", "B_T_Soldier_F", @@ -370,7 +370,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "B_T_Soldier_TL_F", "B_T_Soldier_LAT_F", "B_T_Soldier_LAT_F", @@ -384,7 +384,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "B_T_Soldier_TL_F", "B_T_Soldier_F", "B_T_Soldier_F", @@ -396,7 +396,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "B_T_Soldier_TL_F", "B_T_Soldier_F", "B_T_Soldier_F", @@ -408,7 +408,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "B_T_Recon_TL_F", "B_T_Recon_F", "B_T_Recon_F", @@ -422,7 +422,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "B_T_Soldier_PG_F", "B_T_Soldier_PG_F", "B_T_Soldier_PG_F", @@ -436,11 +436,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "rhsusf_m1a1aim_tuski_wd", // M1A1SA (Tusk I) "B_T_MBT_01_TUSK_F", // M2A4 Slammer UP diff --git a/Missionframework/presets/players/baf_des.sqf b/Missionframework/presets/players/baf_des.sqf index cfaeca992..43b64fb4f 100644 --- a/Missionframework/presets/players/baf_des.sqf +++ b/Missionframework/presets/players/baf_des.sqf @@ -2,7 +2,7 @@ File: baf_des.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -26,26 +26,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "UK3CB_BAF_LandRover_Amb_FFR_Sand_A_DDPM"; // This is the mobile respawn (and medical) truck. -huron_typename = "UK3CB_BAF_Merlin_HC3_18_DDPM"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "UK3CB_BAF_Crewman_DDPM"; // This defines the crew for vehicles. -pilot_classname = "UK3CB_BAF_HeliPilot_Army_DDPM"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "UK3CB_BAF_Wildcat_AH1_TRN_8A_DDPM"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "UK3CB_BAF_LandRover_Amb_FFR_Sand_A_DDPM"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "UK3CB_BAF_Merlin_HC3_18_DDPM"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "UK3CB_BAF_Crewman_DDPM"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "UK3CB_BAF_HeliPilot_Army_DDPM"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "UK3CB_BAF_Wildcat_AH1_TRN_8A_DDPM"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -55,7 +55,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // T The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["UK3CB_BAF_Pointman_DDPM",15,0,0], // Rifleman (Light) ["UK3CB_BAF_Rifleman_DDPM",20,0,0], // Rifleman ["UK3CB_BAF_LAT_ILAW_DDPM",30,0,0], // Rifleman (AT) @@ -85,7 +85,7 @@ infantry_units = [ ["UK3CB_BAF_Pilot_Army",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["B_LSV_01_unarmed_F",75,0,50], // Prowler ["B_LSV_01_armed_F",75,40,50], // Prowler (HMG) @@ -114,7 +114,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["RHS_M2A2_BUSKI",300,200,150], // M2A2ODS (Busk I) ["RHS_M2A3_BUSKIII",300,250,175], // M2A3 (Busk III) ["RHS_M6",300,250,175], // M6A2 @@ -123,7 +123,7 @@ heavy_vehicles = [ ["rhsusf_m109d_usarmy",600,1250,300] // M109A6 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["UK3CB_BAF_Wildcat_AH1_TRN_8A_DDPM",225,0,125], // Wildcat AH1 8 Transport (Unarmed) @@ -154,7 +154,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["UK3CB_BAF_Static_L7A2_Deployed_Low_DDPM",25,25,0], // L7A2 LMG (Low) ["UK3CB_BAF_Static_L7A2_Deployed_Mid_DDPM",25,25,0], // L7A2 LMG (Mid) ["UK3CB_BAF_Static_L7A2_Deployed_High_DDPM",25,25,0], // L7A2 LMG (High) @@ -170,7 +170,7 @@ static_vehicles = [ ["RHS_M119_D",100,200,0] // M119A2 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V3_F",0,0,0], ["Land_Cargo_Patrol_V3_F",0,0,0], ["Land_Cargo_Tower_V3_F",0,0,0], @@ -249,17 +249,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,75], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,75], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -285,7 +285,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "UK3CB_BAF_FT_DDPM", "UK3CB_BAF_Pointman_DDPM", "UK3CB_BAF_Pointman_DDPM", @@ -299,7 +299,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "UK3CB_BAF_FT_DDPM", "UK3CB_BAF_LAT_ILAW_DDPM", "UK3CB_BAF_LAT_ILAW_DDPM", @@ -313,7 +313,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "UK3CB_BAF_FT_DDPM", "UK3CB_BAF_Rifleman_DDPM", "UK3CB_BAF_Rifleman_DDPM", @@ -325,7 +325,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "UK3CB_BAF_FT_DDPM", "UK3CB_BAF_Rifleman_DDPM", "UK3CB_BAF_Rifleman_DDPM", @@ -337,7 +337,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "UK3CB_BAF_SC_DDPM_REC", "UK3CB_BAF_Pointman_DDPM_REC", "UK3CB_BAF_Pointman_DDPM_REC", @@ -351,7 +351,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "UK3CB_BAF_Rifleman_DDPM", "UK3CB_BAF_Rifleman_DDPM", "UK3CB_BAF_Rifleman_DDPM", @@ -365,11 +365,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "RHS_M2A3_BUSKIII", // M2A3 (Busk III) "RHS_M6", // M6A2 diff --git a/Missionframework/presets/players/baf_mtp.sqf b/Missionframework/presets/players/baf_mtp.sqf index 903c02d79..bb50488fe 100644 --- a/Missionframework/presets/players/baf_mtp.sqf +++ b/Missionframework/presets/players/baf_mtp.sqf @@ -2,7 +2,7 @@ File: baf_mtp.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -26,26 +26,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "UK3CB_BAF_LandRover_Amb_FFR_Green_A_MTP"; // This is the mobile respawn (and medical) truck. -huron_typename = "UK3CB_BAF_Merlin_HC3_18_MTP"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "UK3CB_BAF_Crewman_MTP"; // This defines the crew for vehicles. -pilot_classname = "UK3CB_BAF_HeliPilot_Army_MTP"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "UK3CB_BAF_Wildcat_AH1_TRN_8A_MTP"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "UK3CB_BAF_LandRover_Amb_FFR_Green_A_MTP"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "UK3CB_BAF_Merlin_HC3_18_MTP"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "UK3CB_BAF_Crewman_MTP"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "UK3CB_BAF_HeliPilot_Army_MTP"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "UK3CB_BAF_Wildcat_AH1_TRN_8A_MTP"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -55,7 +55,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // T The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["UK3CB_BAF_Pointman_MTP",15,0,0], // Rifleman (Light) ["UK3CB_BAF_Rifleman_MTP",20,0,0], // Rifleman ["UK3CB_BAF_LAT_ILAW_MTP",30,0,0], // Rifleman (AT) @@ -85,7 +85,7 @@ infantry_units = [ ["UK3CB_BAF_Pilot_Army",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["B_LSV_01_unarmed_F",75,0,50], // Prowler ["B_LSV_01_armed_F",75,40,50], // Prowler (HMG) @@ -114,7 +114,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["RHS_M2A2_BUSKI_WD",300,200,150], // M2A2ODS (Busk I) ["RHS_M2A3_BUSKIII_wd",300,250,175], // M2A3 (Busk III) ["RHS_M6_wd",300,250,175], // M6A2 @@ -123,7 +123,7 @@ heavy_vehicles = [ ["rhsusf_m109_usarmy",600,1250,300] // M109A6 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["UK3CB_BAF_Wildcat_AH1_TRN_8A_MTP",225,0,125], // Wildcat AH1 8 Transport (Unarmed) @@ -154,7 +154,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["UK3CB_BAF_Static_L7A2_Deployed_Low_MTP",25,25,0], // L7A2 LMG (Low) ["UK3CB_BAF_Static_L7A2_Deployed_Mid_MTP",25,25,0], // L7A2 LMG (Mid) ["UK3CB_BAF_Static_L7A2_Deployed_High_MTP",25,25,0], // L7A2 LMG (High) @@ -170,7 +170,7 @@ static_vehicles = [ ["RHS_M119_WD",100,200,0] // M119A2 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -249,17 +249,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,75], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,75], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -285,7 +285,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "UK3CB_BAF_FT_MTP", "UK3CB_BAF_Pointman_MTP", "UK3CB_BAF_Pointman_MTP", @@ -299,7 +299,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "UK3CB_BAF_FT_MTP", "UK3CB_BAF_LAT_ILAW_MTP", "UK3CB_BAF_LAT_ILAW_MTP", @@ -313,7 +313,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "UK3CB_BAF_FT_MTP", "UK3CB_BAF_Rifleman_MTP", "UK3CB_BAF_Rifleman_MTP", @@ -325,7 +325,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "UK3CB_BAF_FT_MTP", "UK3CB_BAF_Rifleman_MTP", "UK3CB_BAF_Rifleman_MTP", @@ -337,7 +337,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "UK3CB_BAF_SC_MTP_REC", "UK3CB_BAF_Pointman_MTP_REC", "UK3CB_BAF_Pointman_MTP_REC", @@ -351,7 +351,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "UK3CB_BAF_Rifleman_MTP", "UK3CB_BAF_Rifleman_MTP", "UK3CB_BAF_Rifleman_MTP", @@ -365,11 +365,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "RHS_M2A3_BUSKIII_wd", // M2A3 (Busk III) "RHS_M6_wd", // M6A2 diff --git a/Missionframework/presets/players/bwmod.sqf b/Missionframework/presets/players/bwmod.sqf index 961b9910d..4e63aa5b9 100644 --- a/Missionframework/presets/players/bwmod.sqf +++ b/Missionframework/presets/players/bwmod.sqf @@ -2,7 +2,7 @@ File: bwmod.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-07 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "rhsusf_M1078A1P2_B_WD_CP_fmtv_usarmy"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. -huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "BWA3_Crew_Fleck"; // This defines the crew for vehicles. -pilot_classname = "BWA3_Helipilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "rhsusf_M1078A1P2_B_WD_CP_fmtv_usarmy"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "RHS_CH_47F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "BWA3_Crew_Fleck"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "BWA3_Helipilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "RHS_MELB_MH6M"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["BWA3_Rifleman_lite_Fleck",15,0,0], // Rifleman (Light) ["BWA3_Rifleman_Fleck",20,0,0], // Rifleman ["BWA3_RiflemanG27_Fleck",20,0,0], // Rifleman (G27) @@ -80,7 +80,7 @@ infantry_units = [ ["rhsusf_airforce_jetpilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["rhsusf_m1025_w",100,0,50], // M1025A2 ["rhsusf_m1025_w_m2",100,40,50], // M1025A2 (M2) @@ -109,7 +109,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["rhsusf_m113_usarmy",200,40,100], // M113A3 (M2) ["rhsusf_m113_usarmy_MK19",200,60,100], // M113A3 (Mk19) ["rhsusf_m113_usarmy_medical",200,0,100], // M113A3 (Medical) @@ -123,7 +123,7 @@ heavy_vehicles = [ ["rhsusf_m109_usarmy",600,1250,300] // M109A6 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["RHS_MELB_MH6M",200,0,100], // MH-6M Little Bird @@ -155,7 +155,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["RHS_M2StaticMG_MiniTripod_WD",25,40,0], // Mk2 HMG .50 ["RHS_M2StaticMG_WD",25,40,0], // Mk2 HMG .50 (Raised) ["RHS_MK19_TriPod_WD",25,60,0], // Mk19 GMG 20mm @@ -166,7 +166,7 @@ static_vehicles = [ ["B_SAM_System_03_F",250,500,0] // MIM-145 Defender ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -245,17 +245,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -278,7 +278,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "BWA3_TL_Fleck", "BWA3_Rifleman_lite_Fleck", "BWA3_Rifleman_lite_Fleck", @@ -292,7 +292,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "BWA3_TL_Fleck", "BWA3_RiflemanAT_Pzf3_Fleck", "BWA3_RiflemanAT_Pzf3_Fleck", @@ -306,7 +306,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "BWA3_TL_Fleck", "BWA3_Rifleman_Fleck", "BWA3_Rifleman_Fleck", @@ -318,7 +318,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "BWA3_TL_Fleck", "BWA3_Rifleman_Fleck", "BWA3_Rifleman_Fleck", @@ -330,7 +330,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "BWA3_recon_TL_Fleck", "BWA3_recon_Fleck", "BWA3_recon_Fleck", @@ -344,7 +344,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", @@ -358,11 +358,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "rhsusf_m1a1aim_tuski_wd", // M1A1SA (Tusk I) "rhsusf_m1a2sep1tuskiiwd_usarmy", // M1A2SEPv1 (Tusk II) diff --git a/Missionframework/presets/players/bwmod_des.sqf b/Missionframework/presets/players/bwmod_des.sqf index 964a03688..66e978cd4 100644 --- a/Missionframework/presets/players/bwmod_des.sqf +++ b/Missionframework/presets/players/bwmod_des.sqf @@ -2,7 +2,7 @@ File: bwmod_des.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-10 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "rhsusf_M1078A1P2_B_D_CP_fmtv_usarmy"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. -huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "BWA3_Crew_Tropen"; // This defines the crew for vehicles. -pilot_classname = "BWA3_Helipilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "rhsusf_M1078A1P2_B_D_CP_fmtv_usarmy"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "RHS_CH_47F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "BWA3_Crew_Tropen"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "BWA3_Helipilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "RHS_MELB_MH6M"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["BWA3_Rifleman_lite_Tropen",15,0,0], // Rifleman (Light) ["BWA3_Rifleman_Tropen",20,0,0], // Rifleman ["BWA3_RiflemanG27_Tropen",20,0,0], // Rifleman (G27) @@ -80,7 +80,7 @@ infantry_units = [ ["rhsusf_airforce_jetpilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["rhsusf_m1025_d",100,0,50], // M1025A2 ["rhsusf_m1025_d_m2",100,40,50], // M1025A2 (M2) @@ -110,7 +110,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["rhsusf_m113d_usarmy",200,40,100], // M113A3 (M2) ["rhsusf_m113d_usarmy_MK19",200,60,100], // M113A3 (Mk19) ["rhsusf_m113d_usarmy_medical",200,0,100], // M113A3 (Medical) @@ -124,7 +124,7 @@ heavy_vehicles = [ ["rhsusf_m109d_usarmy",600,1250,300] // M109A6 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["RHS_MELB_MH6M",200,0,100], // MH-6M Little Bird @@ -156,7 +156,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["RHS_M2StaticMG_MiniTripod_D",25,40,0], // Mk2 HMG .50 ["RHS_M2StaticMG_D",25,40,0], // Mk2 HMG .50 (Raised) ["RHS_MK19_TriPod_D",25,60,0], // Mk19 GMG 20mm @@ -167,7 +167,7 @@ static_vehicles = [ ["B_SAM_System_03_F",250,500,0] // MIM-145 Defender ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V3_F",0,0,0], ["Land_Cargo_Patrol_V3_F",0,0,0], ["Land_Cargo_Tower_V3_F",0,0,0], @@ -246,17 +246,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -280,7 +280,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "BWA3_TL_Tropen", "BWA3_Rifleman_lite_Tropen", "BWA3_Rifleman_lite_Tropen", @@ -294,7 +294,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "BWA3_TL_Tropen", "BWA3_RiflemanAT_Pzf3_Tropen", "BWA3_RiflemanAT_Pzf3_Tropen", @@ -308,7 +308,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "BWA3_TL_Tropen", "BWA3_Rifleman_Tropen", "BWA3_Rifleman_Tropen", @@ -320,7 +320,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "BWA3_TL_Tropen", "BWA3_Rifleman_Tropen", "BWA3_Rifleman_Tropen", @@ -332,7 +332,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "BWA3_recon_TL_Fleck", "BWA3_recon_Fleck", "BWA3_recon_Fleck", @@ -346,7 +346,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", @@ -360,11 +360,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "rhsusf_m1a1aim_tuski_d", // M1A1SA (Tusk I) "rhsusf_m1a2sep1tuskiid_usarmy", // M1A2SEPv1 (Tusk II) diff --git a/Missionframework/presets/players/csat.sqf b/Missionframework/presets/players/csat.sqf index f6c117a54..ba95bb5b5 100644 --- a/Missionframework/presets/players/csat.sqf +++ b/Missionframework/presets/players/csat.sqf @@ -2,7 +2,7 @@ File: csat.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-03 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "Land_Pod_Heli_Transport_04_box_F"; // This is the FOB as a container. -FOB_truck_typename = "O_Truck_03_device_F"; // This is the FOB as a vehicle. -Arsenal_typename = "O_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "O_Truck_03_medical_F"; // This is the mobile respawn (and medical) truck. -huron_typename = "O_Heli_Transport_04_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "O_crew_F"; // This defines the crew for vehicles. -pilot_classname = "O_helipilot_F"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "O_Heli_Light_02_unarmed_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "O_Truck_03_transport_F"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "Land_Pod_Heli_Transport_04_box_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "O_Truck_03_device_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "O_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "O_Truck_03_medical_F"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "O_Heli_Transport_04_F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "O_crew_F"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "O_helipilot_F"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "O_Heli_Light_02_unarmed_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "O_Truck_03_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["O_Soldier_lite_F",15,0,0], // Rifleman (Light) ["O_Soldier_F",20,0,0], // Rifleman ["O_Soldier_LAT_F",30,0,0], // Rifleman (AT) @@ -70,7 +70,7 @@ infantry_units = [ ["O_Pilot_F",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["O_Quadbike_01_F",50,0,25], // Quad Bike ["O_LSV_02_unarmed_F",75,0,50], // LSV Mk2 ["O_LSV_02_armed_F",75,75,50], // LSV Mk2 (M134) @@ -87,7 +87,7 @@ light_vehicles = [ ["O_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["O_APC_Wheeled_02_rcws_v2_F",200,150,150], // Otokar ["O_APC_Tracked_02_cannon_F",200,200,150], // Stalker ["O_APC_Tracked_02_AA_F",300,250,175], // Tigris @@ -97,7 +97,7 @@ heavy_vehicles = [ ["O_MBT_02_arty_F",600,1250,300] // Sochor ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["O_UAV_01_F",75,0,25], // Tayran ["O_UAV_06_F",80,0,30], // Jinaah ["O_Heli_Light_02_unarmed_F",250,0,150], // Ka-60 Kasatka (unarmed) @@ -114,7 +114,7 @@ air_vehicles = [ ["O_T_VTOL_02_vehicle_dynamicLoadout_F",950,800,500] // Xian (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["O_Static_Designator_02_F",25,0,0], // Remote Designator ["O_HMG_01_F",25,40,0], // Mk30A HMG .50 ["O_HMG_01_high_F",25,40,0], // Mk30 HMG .50 (Raised) @@ -128,7 +128,7 @@ static_vehicles = [ ["O_SAM_System_04_F",250,500,0] // S-750 Rhea ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V3_F",0,0,0], ["Land_Cargo_Patrol_V3_F",0,0,0], ["Land_Cargo_Tower_V3_F",0,0,0], @@ -204,17 +204,17 @@ buildings = [ ["Land_Razorwire_F",0,0,0] ]; -support_vehicles = [ - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,200,100,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - [Arsenal_typename,25,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,200,100,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], + [KPLIB_b_arsenal,25,0,0], ["ACE_medicalSupplyCrate_advanced",10,0,0], ["Box_East_Support_F",10,0,0], ["Box_CSAT_Equip_F",10,0,0], @@ -245,7 +245,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "O_Soldier_SL_F", "O_Soldier_TL_F", "O_Soldier_TL_F", @@ -259,7 +259,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "O_Soldier_TL_F", "O_HeavyGunner_F", "O_Soldier_A_F", @@ -273,7 +273,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "O_Soldier_TL_F", "O_Soldier_AT_F", "O_Soldier_HAT_F", @@ -285,7 +285,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "O_Soldier_TL_F", "O_Soldier_AA_F", "O_Soldier_AAA_F", @@ -297,7 +297,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "O_recon_TL_F", "O_recon_F", "O_recon_F", @@ -311,7 +311,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "O_soldier_PG_F", "O_soldier_PG_F", "O_soldier_PG_F", @@ -325,11 +325,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "O_MBT_04_cannon_F", // T-14 "O_MBT_04_command_F", // T-14K "O_MBT_02_arty_F", // Sochor diff --git a/Missionframework/presets/players/csat_apex.sqf b/Missionframework/presets/players/csat_apex.sqf index fd8b75ba5..346e5bd39 100644 --- a/Missionframework/presets/players/csat_apex.sqf +++ b/Missionframework/presets/players/csat_apex.sqf @@ -2,7 +2,7 @@ File: csat_apex.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-03 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "Land_Pod_Heli_Transport_04_box_F"; // This is the FOB as a container. -FOB_truck_typename = "O_T_Truck_03_device_ghex_F"; // This is the FOB as a vehicle. -Arsenal_typename = "O_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "O_T_Truck_03_medical_ghex_F"; // This is the mobile respawn (and medical) truck. -huron_typename = "O_Heli_Transport_04_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "O_T_Crew_F"; // This defines the crew for vehicles. -pilot_classname = "O_T_Helipilot_F"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "O_Heli_Light_02_unarmed_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "O_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "O_T_Truck_03_covered_ghex_F"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "Land_Pod_Heli_Transport_04_box_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "O_T_Truck_03_device_ghex_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "O_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "O_T_Truck_03_medical_ghex_F"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "O_Heli_Transport_04_F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "O_T_Crew_F"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "O_T_Helipilot_F"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "O_Heli_Light_02_unarmed_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "O_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "O_T_Truck_03_covered_ghex_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "O_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["O_Soldier_lite_F",15,0,0], // Rifleman (Light) ["O_T_Soldier_F",20,0,0], // Rifleman ["O_T_Soldier_LAT_F",30,0,0], // Rifleman (AT) @@ -76,7 +76,7 @@ infantry_units = [ ["O_T_Pilot_F",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["O_T_Quadbike_01_ghex_F",50,0,25], // Quad Bike ["O_T_LSV_02_unarmed_F",75,0,50], // LSV Mk2 ["O_T_LSV_02_armed_F",75,75,50], // LSV Mk2 (M134) @@ -93,7 +93,7 @@ light_vehicles = [ ["O_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["O_T_APC_Wheeled_02_rcws_v2_ghex_F",200,150,150], // Otokar ["O_T_APC_Tracked_02_cannon_ghex_F",200,200,150], // Stalker ["O_T_APC_Tracked_02_AA_ghex_F",300,250,175], // Tigris @@ -103,7 +103,7 @@ heavy_vehicles = [ ["O_T_MBT_02_arty_ghex_F",600,1250,300] // Sochor ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["O_UAV_01_F",75,0,25], // Tayran ["O_UAV_06_F",80,0,30], // Jinaah ["O_Heli_Light_02_unarmed_F",250,0,150], // Ka-60 Kasatka (unarmed) @@ -120,7 +120,7 @@ air_vehicles = [ ["O_T_VTOL_02_vehicle_dynamicLoadout_F",950,800,500] // Xian (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["O_Static_Designator_02_F",25,0,0], // Remote Designator ["O_HMG_01_F",25,40,0], // Mk30A HMG .50 ["O_HMG_01_high_F",25,40,0], // Mk30 HMG .50 (Raised) @@ -134,7 +134,7 @@ static_vehicles = [ ["O_SAM_System_04_F",250,500,0] // S-750 Rhea ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -211,17 +211,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,200,100,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - [Arsenal_typename,25,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,200,100,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], + [KPLIB_b_arsenal,25,0,0], ["ACE_medicalSupplyCrate_advanced",10,0,0], ["Box_East_Support_F",10,0,0], ["Box_CSAT_Equip_F",10,0,0], @@ -252,7 +252,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "O_T_Soldier_SL_F", "O_T_Soldier_TL_F", "O_T_Soldier_TL_F", @@ -266,7 +266,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "O_T_Soldier_TL_F", "O_HeavyGunner_F", "O_Soldier_A_F", @@ -280,7 +280,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "O_T_Soldier_TL_F", "O_T_Soldier_AT_F", "O_T_Soldier_AAT_F", @@ -292,7 +292,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "O_T_Soldier_TL_F", "O_T_Soldier_AA_F", "O_T_Soldier_AAA_F", @@ -304,7 +304,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "O_T_Recon_TL_F", "O_T_Recon_F", "O_T_Recon_F", @@ -318,7 +318,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "O_T_Soldier_PG_F", "O_T_Soldier_PG_F", "O_T_Soldier_PG_F", @@ -332,11 +332,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "O_T_MBT_04_cannon_F", // T-14 "O_T_MBT_04_command_F", // T-14K "O_T_MBT_02_arty_ghex_F", // Sochor diff --git a/Missionframework/presets/players/cup_acr_desert.sqf b/Missionframework/presets/players/cup_acr_desert.sqf index 87691386d..905dddf18 100644 --- a/Missionframework/presets/players/cup_acr_desert.sqf +++ b/Missionframework/presets/players/cup_acr_desert.sqf @@ -2,7 +2,7 @@ File: cup_acr_desert.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-22 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_T810_Repair_CZ_DES"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_D"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_CZ_Crew_DES"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_CZ_Pilot_DES"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_DES"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "CUP_B_T810_Repair_CZ_DES"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_LR_Ambulance_CZ_D"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_CZ_Crew_DES"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_CZ_Pilot_DES"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "B_Heli_Light_01_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_T810_Unarmed_CZ_DES"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_CZ_Soldier_DES",15,0,0], // Rifleman ["CUP_B_CZ_Soldier_backpack_DES",20,0,0], // Rifleman (Backpack) ["CUP_B_CZ_Soldier_RPG_DES",30,0,0], // Rifleman (RPG) @@ -78,7 +78,7 @@ infantry_units = [ ["CUP_B_CZ_Pilot_DES",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_UAZ_Unarmed_ACR",100,0,50], // UAZ ["CUP_B_UAZ_Open_ACR",100,0,50], // UAZ (Open) ["CUP_B_UAZ_MG_ACR",100,40,50], // UAZ (DShKM) @@ -100,7 +100,7 @@ light_vehicles = [ ["CUP_B_T810_Armed_CZ_DES",125,60,75] // Tatra T810 (MG/Covered) ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_BRDM2_HQ_CZ_Des",200,25,200], // BRDM-2 (HQ) (Desert) ["CUP_B_BRDM2_CZ_Des",200,200,200], // BRDM-2 (Desert) ["I_APC_Wheeled_03_cannon_F",500,400,300], // Pandur II @@ -112,7 +112,7 @@ heavy_vehicles = [ ["CUP_B_T72_CZ",800,500,450] // T-72M4CZ ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_Mi171Sh_ACR",700,600,500], // Mi-171Sh (Rockets) ["CUP_B_Mi35_Dynamic_CZ",850,1000,550], // Mi-35 ["CUP_B_Mi35_Dynamic_CZ_Dark",850,1000,550], // Mi-35 (Dark) @@ -123,14 +123,14 @@ air_vehicles = [ ["I_Plane_Fighter_04_F",1500,1400,800] // JAS 39 Gripen ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_DSHKM_ACR",25,40,0], // DShKM ["CUP_B_AGS_ACR",35,60,0], // AGS-30 ["CUP_B_2b14_82mm_ACR",80,150,0], // Podnos 2B14 ["CUP_B_RBS70_ACR",100,200,0] // RBS 70 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -207,17 +207,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -240,7 +240,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_CZ_Soldier_SL_DES", "CUP_B_CZ_Soldier_DES", "CUP_B_CZ_Soldier_DES", @@ -254,7 +254,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_CZ_Soldier_SL_DES", "CUP_B_CZ_Soldier_RPG_DES", "CUP_B_CZ_Soldier_RPG_DES", @@ -268,7 +268,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_CZ_Soldier_SL_DES", "CUP_B_CZ_Soldier_DES", "CUP_B_CZ_Soldier_DES", @@ -280,7 +280,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_CZ_Soldier_SL_DES", "CUP_B_CZ_Soldier_DES", "CUP_B_CZ_Soldier_DES", @@ -292,7 +292,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_CZ_SpecOps_TL_DES", "CUP_B_CZ_SpecOps_Recon_DES", "CUP_B_CZ_SpecOps_Recon_DES", @@ -306,7 +306,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_CZ_Soldier_DES", "CUP_B_CZ_Soldier_DES", "CUP_B_CZ_Soldier_DES", @@ -320,11 +320,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_B_Dingo_CZ_Des", // Dingo 2 (MG) (Desert) "CUP_B_Dingo_GL_CZ_Des", // Dingo 2 (GL) (Desert) "QIN_Titus_WDL", // Nexter Titus diff --git a/Missionframework/presets/players/cup_acr_woodland.sqf b/Missionframework/presets/players/cup_acr_woodland.sqf index c4846ca97..264e924d3 100644 --- a/Missionframework/presets/players/cup_acr_woodland.sqf +++ b/Missionframework/presets/players/cup_acr_woodland.sqf @@ -2,7 +2,7 @@ File: cup_acr_woodland.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-22 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_T810_Repair_CZ_WDL"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_LR_Ambulance_CZ_W"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_CZ_Crew_WDL"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_CZ_Pilot_WDL"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_T810_Unarmed_CZ_WDL"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "CUP_B_T810_Repair_CZ_WDL"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_LR_Ambulance_CZ_W"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_Mi171Sh_Unarmed_ACR"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_CZ_Crew_WDL"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_CZ_Pilot_WDL"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "B_Heli_Light_01_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_T810_Unarmed_CZ_WDL"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_CZ_Soldier_WDL",15,0,0], // Rifleman ["CUP_B_CZ_Soldier_backpack_WDL",20,0,0], // Rifleman (Backpack) ["CUP_B_CZ_Soldier_RPG_WDL",30,0,0], // Rifleman (RPG) @@ -78,7 +78,7 @@ infantry_units = [ ["CUP_B_CZ_Pilot_WDL",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_UAZ_Unarmed_ACR",100,0,50], // UAZ ["CUP_B_UAZ_Open_ACR",100,0,50], // UAZ (Open) ["CUP_B_UAZ_MG_ACR",100,40,50], // UAZ (DShKM) @@ -96,7 +96,7 @@ light_vehicles = [ ["CUP_B_T810_Armed_CZ_WDL",125,60,75] // Tatra T810 (MG/Covered) ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_BRDM2_HQ_CZ",200,25,200], // BRDM-2 (HQ) ["CUP_B_BRDM2_CZ",200,200,200], // BRDM-2 ["CUP_B_RM70_CZ",300,750,175], // RM-70 @@ -109,7 +109,7 @@ heavy_vehicles = [ ["CUP_B_T72_CZ",800,500,450] // T-72M4CZ ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_Mi171Sh_ACR",700,600,500], // Mi-171Sh (Rockets) ["CUP_B_Mi35_Dynamic_CZ",850,1000,550], // Mi-35 ["CUP_B_Mi35_Dynamic_CZ_Dark",850,1000,550], // Mi-35 (Dark) @@ -120,14 +120,14 @@ air_vehicles = [ ["I_Plane_Fighter_04_F",1500,1400,800] // JAS 39 Gripen ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_DSHKM_ACR",25,40,0], // DShKM ["CUP_B_AGS_ACR",35,60,0], // AGS-30 ["CUP_B_2b14_82mm_ACR",80,150,0], // Podnos 2B14 ["CUP_B_RBS70_ACR",100,200,0] // RBS 70 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -204,17 +204,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -237,7 +237,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_CZ_Soldier_SL_WDL", "CUP_B_CZ_Soldier_WDL", "CUP_B_CZ_Soldier_WDL", @@ -251,7 +251,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_CZ_Soldier_SL_WDL", "CUP_B_CZ_Soldier_RPG_WDL", "CUP_B_CZ_Soldier_RPG_WDL", @@ -265,7 +265,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_CZ_Soldier_SL_WDL", "CUP_B_CZ_Soldier_WDL", "CUP_B_CZ_Soldier_WDL", @@ -277,7 +277,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_CZ_Soldier_SL_WDL", "CUP_B_CZ_Soldier_WDL", "CUP_B_CZ_Soldier_WDL", @@ -289,7 +289,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_CZ_SpecOps_TL_WDL", "CUP_B_CZ_SpecOps_Recon_WDL", "CUP_B_CZ_SpecOps_Recon_WDL", @@ -303,7 +303,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_CZ_Soldier_WDL", "CUP_B_CZ_Soldier_WDL", "CUP_B_CZ_Soldier_WDL", @@ -317,11 +317,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_B_Dingo_CZ_Wdl", // Dingo 2 (MG) (Woodland) "CUP_B_Dingo_GL_CZ_Wdl", // Dingo 2 (GL) (Woodland) "QIN_Titus_WDL", // Nexter Titus diff --git a/Missionframework/presets/players/cup_baf_desert.sqf b/Missionframework/presets/players/cup_baf_desert.sqf index 9e4d17fa3..c746e81b9 100644 --- a/Missionframework/presets/players/cup_baf_desert.sqf +++ b/Missionframework/presets/players/cup_baf_desert.sqf @@ -2,7 +2,7 @@ File: cup_baf_desert.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-15 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_LR_Ambulance_GB_D"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_BAF_Soldier_Crew_DDPM"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DDPM"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_BAF_DES"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_LR_Ambulance_GB_D"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_CH47F_GB"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_BAF_Soldier_Crew_DDPM"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_BAF_Soldier_Helipilot_DDPM"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_B_SA330_Puma_HC2_BAF"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_MTVR_BAF_DES"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_BAF_Soldier_RiflemanLite_DDPM",15,0,0], // Rifleman (Light) ["CUP_B_BAF_Soldier_Rifleman_DDPM",20,0,0], // Rifleman ["CUP_B_BAF_Soldier_RiflemanAT_DDPM",30,0,0], // Rifleman (AT) @@ -83,7 +83,7 @@ infantry_units = [ ["CUP_B_BAF_Soldier_Pilot_DDPM",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_LR_Transport_GB_D",75,0,50], // Land Rover 110 Transport ["CUP_B_LR_MG_GB_D",75,50,50], // Land Rover 110 (M2) ["CUP_B_LR_Special_M2_GB_D",100,80,50], // Land Rover 110 (M2 Special) @@ -99,7 +99,7 @@ light_vehicles = [ ["CUP_B_MTVR_BAF_DES",125,0,75] // MTVR Transport ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_FV432_Bulldog_GB_D",300,100,150], // FV432 Bulldog M240 ["CUP_B_FV432_Bulldog_GB_D_RWS",300,250,150], // FV432 Bulldog M2 RWS ["CUP_B_MCV80_GB_D",300,450,275], // MCV-80 Warrior @@ -110,7 +110,7 @@ heavy_vehicles = [ ["CUP_B_Challenger2_2CD_BAF",500,800,450] // FV4034 Challenger 2 (Two-Color Desert) ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_AW159_Unarmed_RN_Blackcat",225,0,125], // AW159 Wildcat (Black Cat, Unarmed) ["CUP_B_AW159_Unarmed_GB",225,0,125], // AW159 Wildcat (Green, Unarmed) ["CUP_B_AW159_Unarmed_RN_Grey",225,0,125], // AW159 Wildcat (Grey, Unarmed) @@ -123,7 +123,7 @@ air_vehicles = [ ["CUP_B_F35B_Stealth_BAF",1500,1750,450] // F-35B Lightning II (Stealth) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_L111A1_BAF_DDPM",25,40,0], // L111A1 Machine Gun ["CUP_B_L111A1_MiniTripod_BAF_DDPM",25,40,0], // L111A1 Minitripod ["CUP_WV_B_CRAM",500,500,0], // C-RAM @@ -133,7 +133,7 @@ static_vehicles = [ ["CUP_B_L16A2_BAF_DDPM",80,150,0] // L16A2 81mm Mortar ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -210,17 +210,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -243,7 +243,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_BAF_Soldier_TeamLeader_DDPM", "CUP_B_BAF_Soldier_Rifleman_DDPM", "CUP_B_BAF_Soldier_Rifleman_DDPM", @@ -257,7 +257,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_BAF_Soldier_TeamLeader_DDPM", "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", "CUP_B_BAF_Soldier_RiflemanLAT_DDPM", @@ -271,7 +271,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_BAF_Soldier_TeamLeader_DDPM", "CUP_B_BAF_Soldier_Rifleman_DDPM", "CUP_B_BAF_Soldier_Rifleman_DDPM", @@ -283,7 +283,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_BAF_Soldier_TeamLeader_DDPM", "CUP_B_BAF_Soldier_Rifleman_DDPM", "CUP_B_BAF_Soldier_Rifleman_DDPM", @@ -295,7 +295,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_BAF_Soldier_TeamLeader_MTP", "CUP_B_BAF_Soldier_Rifleman_MTP", "CUP_B_BAF_Soldier_Rifleman_MTP", @@ -309,7 +309,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_BAF_Soldier_Paratrooper_DDPM", "CUP_B_BAF_Soldier_Paratrooper_DDPM", "CUP_B_BAF_Soldier_Paratrooper_DDPM", @@ -323,11 +323,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_B_MCV80_GB_D_SLAT", // MCV-80 Warrior (SLAT) "CUP_B_FV510_GB_D", // FV510 Warrior "CUP_B_FV510_GB_D_SLAT", // FV510 Warrior (SLAT) diff --git a/Missionframework/presets/players/cup_baf_woodland.sqf b/Missionframework/presets/players/cup_baf_woodland.sqf index a4d591deb..f78f11564 100644 --- a/Missionframework/presets/players/cup_baf_woodland.sqf +++ b/Missionframework/presets/players/cup_baf_woodland.sqf @@ -2,7 +2,7 @@ File: cup_baf_woodland.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-15 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_FV432_GB_Ambulance"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_GB"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_BAF_Soldier_Crew_DPM"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_BAF_Soldier_Helipilot_DPM"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_SA330_Puma_HC2_BAF"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_BAF_WOOD"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "CUP_B_MTVR_Repair_USA"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_FV432_GB_Ambulance"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_CH47F_GB"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_BAF_Soldier_Crew_DPM"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_BAF_Soldier_Helipilot_DPM"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_B_SA330_Puma_HC2_BAF"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_MTVR_BAF_WOOD"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_BAF_Soldier_RiflemanLite_DPM",15,0,0], // Rifleman (Light) ["CUP_B_BAF_Soldier_Rifleman_DPM",20,0,0], // Rifleman ["CUP_B_BAF_Soldier_RiflemanAT_DPM",30,0,0], // Rifleman (AT) @@ -83,7 +83,7 @@ infantry_units = [ ["CUP_B_BAF_Soldier_Pilot_DPM",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_LR_Transport_GB_W",75,0,50], // Land Rover 110 (Transport) Woodland ["CUP_B_LR_Ambulance_GB_W",75,0,50], // Land Rover 110 (Ambulance) Woodland ["CUP_B_LR_MG_GB_W",75,50,50], // Land Rover 110 (M2) Woodland @@ -100,7 +100,7 @@ light_vehicles = [ ["CUP_B_MTVR_BAF_WOOD",125,0,75] // MTVR Transport ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_FV432_Bulldog_GB_W",300,100,150], // FV432 Bulldog M240 [Woodland] ["CUP_B_FV432_Bulldog_GB_W_RWS",300,250,150], // FV432 Bulldog M2 RWS [Woodland] ["CUP_B_FV432_Mortar",350,500,150], // FV432 Mortar @@ -112,7 +112,7 @@ heavy_vehicles = [ ["CUP_B_Challenger2_2CW_BAF",500,800,450] // FV4034 Challenger 2 (Two-Color Woodland) ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_AW159_Unarmed_RN_Blackcat",225,0,125], // AW159 Wildcat (Black Cat, Unarmed) ["CUP_B_AW159_Unarmed_GB",225,0,125], // AW159 Wildcat (Green, Unarmed) ["CUP_B_AW159_Unarmed_RN_Grey",225,0,125], // AW159 Wildcat (Grey, Unarmed) @@ -125,7 +125,7 @@ air_vehicles = [ ["CUP_B_F35B_Stealth_BAF",1500,1750,450] // F-35B Lightning II (Stealth) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_L111A1_BAF_DPM",25,40,0], // L111A1 Machine Gun ["CUP_B_L111A1_MiniTripod_BAF_DPM",25,40,0], // L111A1 Minitripod ["CUP_WV_B_CRAM",500,500,0], // C-RAM @@ -135,7 +135,7 @@ static_vehicles = [ ["CUP_B_L16A2_BAF_DPM",80,150,0] // L16A2 81mm Mortar ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -212,17 +212,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -246,7 +246,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_BAF_Soldier_TeamLeader_DPM", "CUP_B_BAF_Soldier_Rifleman_DPM", "CUP_B_BAF_Soldier_Rifleman_DPM", @@ -260,7 +260,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_BAF_Soldier_TeamLeader_DPM", "CUP_B_BAF_Soldier_RiflemanLAT_DPM", "CUP_B_BAF_Soldier_RiflemanLAT_DPM", @@ -274,7 +274,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_BAF_Soldier_TeamLeader_DPM", "CUP_B_BAF_Soldier_Rifleman_DPM", "CUP_B_BAF_Soldier_Rifleman_DPM", @@ -286,7 +286,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_BAF_Soldier_TeamLeader_DPM", "CUP_B_BAF_Soldier_Rifleman_DPM", "CUP_B_BAF_Soldier_Rifleman_DPM", @@ -298,7 +298,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_BAF_Soldier_TeamLeader_MTP", "CUP_B_BAF_Soldier_Rifleman_MTP", "CUP_B_BAF_Soldier_Rifleman_MTP", @@ -312,7 +312,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad. -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_BAF_Soldier_Paratrooper_DPM", "CUP_B_BAF_Soldier_Paratrooper_DPM", "CUP_B_BAF_Soldier_Paratrooper_DPM", @@ -326,11 +326,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_B_MCV80_GB_W_SLAT", // MCV-80 Warrior (SLAT - Woodland) "CUP_B_FV432_Mortar", // FV432 Mortar "CUP_B_FV510_GB_W", // FV510 Warrior (Woodland) diff --git a/Missionframework/presets/players/cup_cdf.sqf b/Missionframework/presets/players/cup_cdf.sqf index 96fda1caa..fc812f326 100644 --- a/Missionframework/presets/players/cup_cdf.sqf +++ b/Missionframework/presets/players/cup_cdf.sqf @@ -2,7 +2,7 @@ File: cup_cdf.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-17 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_BMP2_AMB_CDF"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_MI6A_CDF"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_CDF_Crew_FST"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_CDF_Pilot_FST"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera bas -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_Ural_Open_CDF"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_BMP2_AMB_CDF"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_MI6A_CDF"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_CDF_Crew_FST"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_CDF_Pilot_FST"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "B_Heli_Light_01_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera bas +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_Ural_Open_CDF"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_CDF_Soldier_FST",20,0,0], // Rifleman ["CUP_B_CDF_Soldier_RPG18_FST",30,0,0], // Rifleman (RPG-18) ["CUP_B_CDF_Soldier_GL_FST",25,0,0], // Grenadier @@ -77,7 +77,7 @@ infantry_units = [ ["CUP_B_CDF_Pilot_FST",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_S1203_Ambulance_CDF",75,0,50], // Škoda S1203 (Ambulance) ["CUP_B_UAZ_Unarmed_CDF",75,0,50], // UAZ ["CUP_B_UAZ_MG_CDF",100,60,50], // UAZ (DShKM) @@ -93,7 +93,7 @@ light_vehicles = [ ["CUP_B_Ural_CDF",125,0,75] // Ural ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_BRDM2_CDF",200,200,125], // BRDM-2 ["CUP_B_BRDM2_ATGM_CDF",200,400,125], // BRDM-2 (ATGM) ["CUP_B_BTR60_CDF",300,200,125], // BTR-60PB @@ -106,7 +106,7 @@ heavy_vehicles = [ ["CUP_B_T72_CDF",600,500,250] // T-72 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_Mi17_CDF",300,100,300], // Mi-8MT ["CUP_B_Pchela1T_CDF",100,0,50], // Pchela-1T ["CUP_B_Mi24_D_Dynamic_CDF",700,600,300], // Mi-24D @@ -114,7 +114,7 @@ air_vehicles = [ ["CUP_B_SU34_CDF",1200,1000,500] // Su-34 ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_DSHKM_CDF",25,40,0], // DShKM ["CUP_B_DSHkM_MiniTripod_CDF",25,40,0], // DShKM Minitripod ["CUP_B_AGS_CDF",25,60,0], // AGS-30 @@ -127,7 +127,7 @@ static_vehicles = [ ["CUP_B_D30_CDF",200,250,0] // D-30 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -205,17 +205,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -238,7 +238,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_CDF_Soldier_TL_FST", "CUP_B_CDF_Soldier_FST", "CUP_B_CDF_Soldier_FST", @@ -252,7 +252,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_CDF_Soldier_TL_FST", "CUP_B_CDF_Soldier_RPG18_FST", "CUP_B_CDF_Soldier_RPG18_FST", @@ -266,7 +266,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_CDF_Soldier_TL_FST", "CUP_B_CDF_Soldier_FST", "CUP_B_CDF_Soldier_FST", @@ -278,7 +278,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_CDF_Soldier_TL_FST", "CUP_B_CDF_Soldier_FST", "CUP_B_CDF_Soldier_FST", @@ -290,7 +290,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_CDF_Soldier_TL_MNT", "CUP_B_CDF_SOldier_MNT", "CUP_B_CDF_Soldier_GL_MNT", @@ -304,7 +304,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad. -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_CDF_Soldier_FST", "CUP_B_CDF_Soldier_FST", "CUP_B_CDF_Soldier_FST", @@ -318,11 +318,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_B_BTR60_CDF", // BTR-60 PB "CUP_B_BM21_CDF", // BM-21 "CUP_B_BMP2_CDF", // BMP-2 diff --git a/Missionframework/presets/players/cup_chdkz.sqf b/Missionframework/presets/players/cup_chdkz.sqf index d8bddb2e2..adaa42728 100644 --- a/Missionframework/presets/players/cup_chdkz.sqf +++ b/Missionframework/presets/players/cup_chdkz.sqf @@ -2,7 +2,7 @@ File: cup_chdkz.sqf Author: Eogos - https://github.com/Eogos Date: 2020-04-21 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_O_BMP_HQ_CHDKZ"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_O_BMP2_AMB_CHDKZ"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_O_MI6A_CHDKZ"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_O_INS_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_O_INS_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_O_Mi8_medevac_CHDKZ"; // These are the little birds which spawn on the Freedom or at Chimera bas -KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_O_Ural_Open_CHDKZ"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "CUP_O_BMP_HQ_CHDKZ"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_O_BMP2_AMB_CHDKZ"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_O_MI6A_CHDKZ"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_O_INS_Crew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_O_INS_Pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_O_Mi8_medevac_CHDKZ"; // These are the additional helicopters which spawn on the Freedom or at Chimera bas +KPLIB_b_addBoat = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_O_Ural_Open_CHDKZ"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_O_INS_Soldier",20,0,0], // Rifleman ["CUP_O_INS_Soldier_LAT",30,0,0], // Rifleman (RPG-18) ["CUP_O_INS_Soldier_GL",25,0,0], // Grenadier @@ -74,7 +74,7 @@ infantry_units = [ ["CUP_O_INS_Pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_O_Datsun_4seat",50,0,25], // Datsun 620 Pickup Woodland ["CUP_O_Datsun_PK",50,10,25], // Datsun 620 Pickup (PK) ["CUP_O_Datsun_AA",75,150,25], // Datsun 620 Pickup (AA) @@ -90,7 +90,7 @@ light_vehicles = [ ["CUP_O_Ural_CHDKZ",150,0,75] // Ural ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_O_BRDM2_CHDKZ",200,200,150], // BRDM-2 ["CUP_O_BRDM2_ATGM_CHDKZ",200,400,150], // BRDM-2 (ATGM) ["CUP_O_BTR60_CHDKZ",300,200,200], // BTR-60PB @@ -104,11 +104,11 @@ heavy_vehicles = [ ["CUP_O_T72_CHDKZ",700,500,300] // T-72 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_O_Mi8_CHDKZ",400,100,400] // Mi-8MT ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_O_DSHKM_ChDKZ",25,40,0], // DShKM ["CUP_O_DSHkM_MiniTripod_ChDKZ",25,40,0], // DShKM Minitripod ["CUP_O_AGS_ChDKZ",25,60,0], // AGS-30 @@ -120,7 +120,7 @@ static_vehicles = [ ["CUP_O_D30_ChDKZ",200,250,0] // D-30 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -196,17 +196,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -229,7 +229,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_O_INS_Officer", "CUP_O_INS_Woodlander3", "CUP_O_INS_Worker2", @@ -243,7 +243,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_O_INS_Officer", "CUP_O_INS_Soldier_LAT", "CUP_O_INS_Soldier_LAT", @@ -257,7 +257,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_O_INS_Officer", "CUP_O_INS_Soldier_LAT", "CUP_O_INS_Soldier_LAT", @@ -269,7 +269,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_O_INS_Officer", "CUP_O_INS_Soldier", "CUP_O_INS_Soldier", @@ -281,7 +281,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_O_RUS_Soldier_TL", "CUP_O_RUS_SpecOps_Scout", "CUP_O_RUS_SpecOps_Night", @@ -294,7 +294,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad. -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_O_INS_Soldier_LAT", "CUP_O_INS_Soldier_LAT", "CUP_O_INS_Soldier_LAT", @@ -308,11 +308,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_O_BTR60_CHDKZ", // BTR-60 PB "CUP_O_BM21_CHDKZ", // BM-21 "CUP_O_BMP2_CHDKZ", // BMP-2 diff --git a/Missionframework/presets/players/cup_sla.sqf b/Missionframework/presets/players/cup_sla.sqf index 7e9801a8c..6f936ca19 100644 --- a/Missionframework/presets/players/cup_sla.sqf +++ b/Missionframework/presets/players/cup_sla.sqf @@ -2,7 +2,7 @@ File: cup_sla.sqf Author: Eogos - https://github.com/Eogos Date: 2020-04-24 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_O_BMP_HQ_sla"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_O_BMP2_AMB_sla"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_O_Mi8_SLA_1"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_O_sla_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_O_sla_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_O_UH1H_slick_SLA"; // These are the little birds which spawn on the Freedom or at Chimera bas -KPLIB_boat_classname = "CUP_O_PBX_SLA"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_O_Ural_Open_SLA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "CUP_O_BMP_HQ_sla"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_O_BMP2_AMB_sla"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_O_Mi8_SLA_1"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_O_sla_Crew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_O_sla_Pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_O_UH1H_slick_SLA"; // These are the additional helicopters which spawn on the Freedom or at Chimera bas +KPLIB_b_addBoat = "CUP_O_PBX_SLA"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_O_Ural_Open_SLA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_O_sla_Soldier",15,0,0], // Rifleman ["CUP_O_SLA_Soldier_Backpack",20,0,0], // Rifleman (Backpack) ["CUP_O_sla_Soldier_AT",30,0,0], // Rifleman (RPG-7) @@ -77,7 +77,7 @@ infantry_units = [ ["CUP_O_sla_Pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_O_UAZ_Unarmed_SLA",100,0,50], // UAZ ["CUP_O_UAZ_MG_SLA",125,60,50], // UAZ (DShKM) ["CUP_O_UAZ_AGS30_SLA",125,80,50], // UAZ (AGS-30) @@ -90,7 +90,7 @@ light_vehicles = [ ["CUP_O_Ural_SLA",150,0,75] // Ural ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_O_BRDM2_SLA",200,200,150], // BRDM-2 ["CUP_O_BRDM2_ATGM_SLA",200,400,150], // BRDM-2 (ATGM) ["CUP_O_BTR60_SLA",300,200,200], // BTR-60PB @@ -104,7 +104,7 @@ heavy_vehicles = [ ["CUP_O_T72_SLA",700,500,300] // T-72 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_O_UH1H_armed_SLA",400,250,250], // UH-1H (Armed) ["CUP_O_UH1H_gunship_SLA",500,350,250], // UH-1H (Gunship) ["CUP_O_Mi8_SLA_2",500,350,300], // Mi-8MTV3 @@ -114,7 +114,7 @@ air_vehicles = [ ["CUP_O_SU34_SLA",1200,1000,500] // Su-34 ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_O_DSHKM_SLA",25,40,0], // DShKM ["CUP_O_DSHkM_MiniTripod_SLA",25,40,0], // DShKM Minitripod ["CUP_O_AGS_SLA",25,60,0], // AGS-30 @@ -126,7 +126,7 @@ static_vehicles = [ ["CUP_O_D30_SLA",200,250,0] // D-30 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -202,17 +202,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -237,7 +237,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_O_sla_Soldier_SL", "CUP_O_sla_Soldier", "CUP_O_sla_Soldier", @@ -251,7 +251,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_O_sla_Soldier_SL", "CUP_O_sla_Soldier_LAT", "CUP_O_sla_Soldier_LAT", @@ -265,7 +265,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_O_sla_Soldier_SL", "CUP_O_sla_Soldier_AAT", "CUP_O_sla_Soldier_AAT", @@ -277,7 +277,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_O_sla_Soldier_SL", "CUP_O_sla_Soldier_Backpack", "CUP_O_sla_Soldier_Backpack", @@ -289,7 +289,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_O_sla_SpecOps_TL", "CUP_O_sla_SpecOps", "CUP_O_sla_SpecOps_Demo", @@ -300,7 +300,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad. -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_O_sla_Officer_urban", "CUP_O_sla_Officer_urban", "CUP_O_sla_Officer_urban", @@ -314,11 +314,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_O_BTR60_SLA", // BTR-60 PB "CUP_O_BM21_SLA", // BM-21 "CUP_O_BMP2_SLA", // BMP-2 diff --git a/Missionframework/presets/players/cup_takistan.sqf b/Missionframework/presets/players/cup_takistan.sqf index 75e4102c5..90e884ba2 100644 --- a/Missionframework/presets/players/cup_takistan.sqf +++ b/Missionframework/presets/players/cup_takistan.sqf @@ -2,7 +2,7 @@ File: cup_takistan.sqf Author: Eogos - https://github.com/Eogos Date: 2020-04-25 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,26 +23,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "CUP_O_BMP_HQ_TKA"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_O_M113_Med_TKA"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_O_MI6A_TKA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_O_TK_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_O_TK_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_O_UH1H_slick_TKA"; // These are the little birds which spawn on the Freedom or at Chimera bas -KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_O_Ural_Open_TKA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "CUP_O_BMP_HQ_TKA"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_O_M113_Med_TKA"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_O_MI6A_TKA"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_O_TK_Crew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_O_TK_Pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_O_UH1H_slick_TKA"; // These are the additional helicopters which spawn on the Freedom or at Chimera bas +KPLIB_b_addBoat = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_O_Ural_Open_TKA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "O_Radar_System_02_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -52,7 +52,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_O_TK_Soldier",15,0,0], // Rifleman ["CUP_O_TK_Soldier_Backpack",20,0,0], // Rifleman (backpack) ["CUP_O_TK_Soldier_AT",30,0,0], // Rifleman (RPG-7) @@ -75,7 +75,7 @@ infantry_units = [ ["CUP_O_TK_Pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_O_Hilux_unarmed_TK_INS",50,0,50], // Hilux ["CUP_O_Hilux_M2_TK_INS",50,60,50], // Hilux (M2) ["CUP_O_Hilux_DSHKM_TK_INS",50,60,50], // Hilux (DShKM) @@ -99,7 +99,7 @@ light_vehicles = [ ["CUP_O_Ural_TKA",150,0,75] // Ural ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_O_Hilux_armored_zu23_TK_INS",100,150,75], // Hilux Armored (ZU-23-2) ["CUP_O_Hilux_armored_BTR60_TK_INS",100,200,75], // Hilux Armored (BTR-60) ["CUP_O_Hilux_armored_BMP1_TK_INS",100,350,75], // Hilux Armored (BMP-1) @@ -122,7 +122,7 @@ heavy_vehicles = [ ["CUP_O_T72_TKA",700,500,300] // T-72 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_O_UH1H_armed_TKA",400,250,250], // UH-1H (Armed) ["CUP_O_UH1H_gunship_TKA",500,350,250], // UH-1H (Gunship) ["CUP_O_Mi17_TK",500,350,300], // Mi-8MT @@ -133,7 +133,7 @@ air_vehicles = [ ["CUP_O_Su25_Dyn_TKA",1000,850,400] // Su-25 Frogfoot ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_O_KORD_high_TK",25,40,0], // KORD ["CUP_O_KORD_TK",25,40,0], // KORD Minitripod ["CUP_O_AGS_TK",25,60,0], // AGS-30 @@ -144,7 +144,7 @@ static_vehicles = [ ["CUP_O_D30_TK",200,250,0] // D-30 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -220,17 +220,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -253,7 +253,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_O_TK_Soldier_SL", "CUP_O_TK_Soldier", "CUP_O_TK_Soldier", @@ -267,7 +267,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_O_TK_Soldier_SL", "CUP_O_TK_Soldier_LAT", "CUP_O_TK_Soldier_LAT", @@ -281,7 +281,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_O_TK_Soldier_SL", "CUP_O_TK_Soldier_AAT", "CUP_O_TK_Soldier_AAT", @@ -293,7 +293,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_O_TK_Soldier_SL", "CUP_O_TK_Soldier_Backpack", "CUP_O_TK_Soldier_Backpack", @@ -305,7 +305,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_O_TK_SpecOps_TL", "CUP_O_TK_SpecOps", "CUP_O_TK_SpecOps", @@ -316,7 +316,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad. -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_O_TK_Soldier_LAT", "CUP_O_TK_Soldier_LAT", "CUP_O_TK_Soldier_LAT", @@ -330,11 +330,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_O_BTR60_TKA", // BTR-60 PB "CUP_O_BM21_TKA", // BM-21 "CUP_O_BMP2_TKA", // BMP-2 diff --git a/Missionframework/presets/players/cup_usa_desert.sqf b/Missionframework/presets/players/cup_usa_desert.sqf index 551803f07..92bfa5ac9 100644 --- a/Missionframework/presets/players/cup_usa_desert.sqf +++ b/Missionframework/presets/players/cup_usa_desert.sqf @@ -2,7 +2,7 @@ File: cup_usa_desert.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-17 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,26 +25,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_CH47F_USA"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_US_Crew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_B_MH6M_USA"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -54,7 +54,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_US_Soldier",20,0,0], // Rifleman ["CUP_B_US_Soldier_LAT",30,0,0], // Rifleman (AT) ["CUP_B_US_Soldier_GL",25,0,0], // Grenadier @@ -78,7 +78,7 @@ infantry_units = [ ["CUP_B_US_Pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 @@ -93,7 +93,7 @@ light_vehicles = [ ["CUP_B_MTVR_USA",125,0,75] // MTVR ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_M1126_ICV_M2_Desert_Slat",200,150,125], // M1126 ICV M2 CROWS (Desert - Slat) ["CUP_B_M1126_ICV_MK19_Desert_Slat",200,200,125], // M1126 ICV MK19 CROWS (Desert - Slat) ["CUP_B_M1128_MGS_Desert_Slat",200,500,125], // M1128 MGS (Desert - Slat) @@ -109,7 +109,7 @@ heavy_vehicles = [ ["CUP_B_M270_DPICM_USA",800,1750,400] // M270 MLRS (DPICM) ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_UH60M_Unarmed_FFV_MEV_US",300,0,200], // UH-60M MEDVAC (Unarmed/FFV) ["CUP_B_UH60M_US",300,25,200], // UH-60M ["CUP_B_UH60M_FFV_US",300,50,200], // UH-60M (FFV) @@ -136,7 +136,7 @@ air_vehicles = [ ["CUP_B_AH6X_USA",300,0,100] // AH-6X Littlebird ULB ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_M2StaticMG_US",25,40,0], // M2 Machine Gun ["CUP_B_M2StaticMG_MiniTripod_US",25,40,0], // M2 Minitripod ["CUP_B_TOW_TriPod_US",50,100,0], // TOW Tripod @@ -148,7 +148,7 @@ static_vehicles = [ ["CUP_B_M119_US",100,200,0] // M119 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -226,17 +226,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -272,7 +272,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -286,7 +286,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier_LAT", "CUP_B_US_Soldier_LAT", @@ -300,7 +300,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -312,7 +312,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -324,7 +324,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_US_SpecOps_TL", "CUP_B_US_SpecOps", "CUP_B_US_SpecOps_Assault", @@ -338,7 +338,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_US_Soldier", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -352,11 +352,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_WV_B_CRAM", // C-RAM "CUP_WV_B_SS_Launcher", // Mk-29 GMLS "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS diff --git a/Missionframework/presets/players/cup_usa_woodland.sqf b/Missionframework/presets/players/cup_usa_woodland.sqf index 0025a7873..2ea2c57b3 100644 --- a/Missionframework/presets/players/cup_usa_woodland.sqf +++ b/Missionframework/presets/players/cup_usa_woodland.sqf @@ -2,7 +2,7 @@ File: cup_usa_woodland.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-17 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,26 +25,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH47F_USA"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_US_Crew"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_MH6M_USA"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_CH47F_USA"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_US_Crew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_US_Pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_B_MH6M_USA"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -54,7 +54,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_US_Soldier",20,0,0], // Rifleman ["CUP_B_US_Soldier_LAT",30,0,0], // Rifleman (AT) ["CUP_B_US_Soldier_GL",25,0,0], // Grenadier @@ -78,7 +78,7 @@ infantry_units = [ ["CUP_B_US_Pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 ["CUP_B_HMMWV_MK19_USA",75,80,50], // HMMWV MK19 @@ -93,7 +93,7 @@ light_vehicles = [ ["CUP_B_MTVR_USA",125,0,75] // MTVR ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_M1126_ICV_M2_Woodland_Slat",200,150,125], // M1126 ICV M2 CROWS (Woodland - Slat) ["CUP_B_M1126_ICV_MK19_Woodland_Slat",200,200,125], // M1126 ICV MK19 CROWS (Woodland - Slat) ["CUP_B_M1128_MGS_Woodland_Slat",200,500,125], // M1128 MGS (Woodland - Slat) @@ -110,7 +110,7 @@ heavy_vehicles = [ ["CUP_B_M270_DPICM_USA",800,1750,400] // M270 MLRS (DPICM) ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_UH60M_Unarmed_FFV_MEV_US",300,0,200], // UH-60M MEDVAC (Unarmed/FFV) ["CUP_B_UH60M_US",300,25,200], // UH-60M ["CUP_B_UH60M_FFV_US",300,50,200], // UH-60M (FFV) @@ -138,7 +138,7 @@ air_vehicles = [ ["CUP_B_AH6X_USA",300,0,100] // AH-6X Littlebird ULB ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_M2StaticMG_US",25,40,0], // M2 Machine Gun ["CUP_B_M2StaticMG_MiniTripod_US",25,40,0], // M2 Minitripod ["CUP_B_TOW_TriPod_US",50,100,0], // TOW Tripod @@ -150,7 +150,7 @@ static_vehicles = [ ["CUP_B_M119_US",100,200,0] // M119 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -228,17 +228,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -274,7 +274,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -288,7 +288,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier_LAT", "CUP_B_US_Soldier_LAT", @@ -302,7 +302,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -314,7 +314,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_US_Soldier_SL", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -326,7 +326,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_US_SpecOps_TL", "CUP_B_US_SpecOps", "CUP_B_US_SpecOps_Assault", @@ -340,7 +340,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_US_Soldier", "CUP_B_US_Soldier", "CUP_B_US_Soldier", @@ -354,11 +354,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_WV_B_CRAM", // C-RAM "CUP_WV_B_SS_Launcher", // Mk-29 GMLS "CUP_WV_B_RAM_Launcher", // Mk-49 GMLS diff --git a/Missionframework/presets/players/cup_usmc_desert.sqf b/Missionframework/presets/players/cup_usmc_desert.sqf index 9f617ef8d..b7e1b099b 100644 --- a/Missionframework/presets/players/cup_usmc_desert.sqf +++ b/Missionframework/presets/players/cup_usmc_desert.sqf @@ -2,7 +2,7 @@ File: cup_usmc_desert.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-15 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,26 +25,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_USMC_Crewman_FROG_DES"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_HMMWV_Ambulance_USA"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_CH53E_USMC"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_USMC_Crewman_FROG_DES"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_B_UH1Y_UNA_USMC"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_MTVR_USA"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -54,7 +54,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_USMC_Soldier_FROG_DES",20,0,0], // Rifleman ["CUP_B_USMC_Soldier_LAT_FROG_DES",30,0,0], // Rifleman (M136) ["CUP_B_USMC_Soldier_GL_FROG_DES",25,0,0], // Grenadier @@ -78,7 +78,7 @@ infantry_units = [ ["CUP_B_USMC_Pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_M1030_USMC",50,0,25], // M1030 ["CUP_B_HMMWV_Unarmed_USA",75,0,50], // HMMWV (Unarmed) ["CUP_B_HMMWV_M2_USA",75,60,50], // HMMWV M2 @@ -93,7 +93,7 @@ light_vehicles = [ ["CUP_B_RHIB2Turret_USMC",250,200,100] // RHIB (Mk19) ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_LAV25_desert_USMC",200,175,125], // LAV-25A1 (Desert) ["CUP_B_LAV25M240_desert_USMC",200,200,125], // LAV-25A1 (M240) (Desert) ["CUP_B_LAV25_HQ_desert_USMC",200,50,125], // LAV-C2 (Desert) @@ -106,7 +106,7 @@ heavy_vehicles = [ ["CUP_B_M270_DPICM_USMC",800,1750,400] // M270 MLRS (DPICM) ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_UH1Y_MEV_USMC",200,0,100], // UH-1Y Venom (MEDVAC) ["CUP_B_UH1Y_Gunship_Dynamic_USMC",200,100,100], // UH-1Y Venom (Gunship) ["CUP_B_MH60S_FFV_USMC",250,25,200], // MH-60S Seahawk (FFV) @@ -134,7 +134,7 @@ air_vehicles = [ ["CUP_B_MV22_VIV_USMC",750,0,500] // MV-22B Osprey (VIV) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_M2StaticMG_USMC",25,40,0], // M2 Machine Gun ["CUP_B_M2StaticMG_MiniTripod_USMC",25,40,0], // M2 Minitripod ["CUP_B_TOW_TriPod_USMC",50,100,0], // TOW Tripod @@ -146,7 +146,7 @@ static_vehicles = [ ["CUP_B_M119_USMC",100,200,0] // M119 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -223,17 +223,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -270,7 +270,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_USMC_Soldier_SL_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", @@ -284,7 +284,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_USMC_Soldier_SL_FROG_DES", "CUP_B_USMC_Soldier_LAT_FROG_DES", "CUP_B_USMC_Soldier_LAT_FROG_DES", @@ -298,7 +298,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_USMC_Soldier_SL_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", @@ -310,7 +310,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_USMC_Soldier_SL_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", @@ -322,7 +322,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_FR_Soldier_TL_DES", "CUP_B_FR_Soldier_Assault_DES", "CUP_B_FR_Soldier_Assault_DES", @@ -336,7 +336,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_USMC_Soldier_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", "CUP_B_USMC_Soldier_FROG_DES", @@ -350,11 +350,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_B_F35B_USMC", // F-35B Lightning II "CUP_WV_B_CRAM", // C-RAM "CUP_WV_B_SS_Launcher", // Mk-29 GMLS diff --git a/Missionframework/presets/players/cup_usmc_woodland.sqf b/Missionframework/presets/players/cup_usmc_woodland.sqf index dc46b5d1a..a6cae9784 100644 --- a/Missionframework/presets/players/cup_usmc_woodland.sqf +++ b/Missionframework/presets/players/cup_usmc_woodland.sqf @@ -2,7 +2,7 @@ File: cup_usmc_woodland.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-15 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,26 +25,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "CUP_B_HMMWV_Ambulance_USMC"; // This is the mobile respawn (and medical) truck. -huron_typename = "CUP_B_CH53E_USMC"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "CUP_B_USMC_Crewman_FROG_WDL"; // This defines the crew for vehicles. -pilot_classname = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "CUP_B_UH1Y_UNA_USMC"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "CUP_B_MTVR_USMC"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "CUP_B_HMMWV_Ambulance_USMC"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "CUP_B_CH53E_USMC"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "CUP_B_USMC_Crewman_FROG_WDL"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "CUP_B_USMC_Pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "CUP_B_UH1Y_UNA_USMC"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "CUP_B_Zodiac_USMC"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "CUP_B_MTVR_USMC"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -54,7 +54,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["CUP_B_USMC_Soldier_FROG_WDL",20,0,0], // Rifleman ["CUP_B_USMC_Soldier_LAT_FROG_WDL",30,0,0], // Rifleman (M136) ["CUP_B_USMC_Soldier_GL_FROG_WDL",25,0,0], // Grenadier @@ -78,7 +78,7 @@ infantry_units = [ ["CUP_B_USMC_Pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["CUP_B_M1030_USMC",50,0,25], // M1030 ["CUP_B_HMMWV_Unarmed_USMC",75,0,50], // HMMWV (Unarmed) ["CUP_B_HMMWV_M1114_USMC",75,30,50], // HMMWV M240 @@ -94,7 +94,7 @@ light_vehicles = [ ["CUP_B_RHIB2Turret_USMC",250,200,100] // RHIB (Mk19) ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["CUP_B_LAV25_green",200,175,125], // LAV-25A1 (Olive) ["CUP_B_LAV25M240_green",200,200,125], // LAV-25A1 (M240) (Olive) ["CUP_B_LAV25_HQ_green",200,50,125], // LAV-C2 (Olive) @@ -107,7 +107,7 @@ heavy_vehicles = [ ["CUP_B_M270_DPICM_USMC",800,1750,400] // M270 MLRS (DPICM) ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["CUP_B_UH1Y_MEV_USMC",200,0,100], // UH-1Y Venom (MEDVAC) ["CUP_B_UH1Y_Gunship_Dynamic_USMC",200,100,100], // UH-1Y Venom (Gunship) ["CUP_B_MH60S_FFV_USMC",250,25,200], // MH-60S Seahawk (FFV) @@ -135,7 +135,7 @@ air_vehicles = [ ["CUP_B_MV22_VIV_USMC",750,0,500] // MV-22B Osprey (VIV) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["CUP_B_M2StaticMG_USMC",25,40,0], // M2 Machine Gun ["CUP_B_M2StaticMG_MiniTripod_USMC",25,40,0], // M2 Minitripod ["CUP_B_TOW_TriPod_USMC",50,100,0], // TOW Tripod @@ -147,7 +147,7 @@ static_vehicles = [ ["CUP_B_M119_USMC",100,200,0] // M119 ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -224,17 +224,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -271,7 +271,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "CUP_B_USMC_Soldier_SL_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", @@ -285,7 +285,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "CUP_B_USMC_Soldier_SL_FROG_WDL", "CUP_B_USMC_Soldier_LAT_FROG_WDL", "CUP_B_USMC_Soldier_LAT_FROG_WDL", @@ -299,7 +299,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "CUP_B_USMC_Soldier_SL_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", @@ -311,7 +311,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "CUP_B_USMC_Soldier_SL_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", @@ -323,7 +323,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "CUP_B_FR_Soldier_TL_WDL", "CUP_B_FR_Soldier_Assault_WDL", "CUP_B_FR_Soldier_Assault_WDL", @@ -337,7 +337,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "CUP_B_USMC_Soldier_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", "CUP_B_USMC_Soldier_FROG_WDL", @@ -351,11 +351,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "CUP_B_F35B_USMC", // F-35B Lightning II "CUP_WV_B_CRAM", // C-RAM "CUP_WV_B_SS_Launcher", // Mk-29 GMLS diff --git a/Missionframework/presets/players/custom.sqf b/Missionframework/presets/players/custom.sqf index 43630e582..0e22a8dee 100644 --- a/Missionframework/presets/players/custom.sqf +++ b/Missionframework/presets/players/custom.sqf @@ -2,7 +2,7 @@ File: custom.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-07 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -29,26 +29,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "B_Truck_01_medical_F"; // This is the mobile respawn (and medical) truck. -huron_typename = "B_Heli_Transport_03_unarmed_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "B_crew_F"; // This defines the crew for vehicles. -pilot_classname = "B_Helipilot_F"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "B_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "B_Truck_01_medical_F"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "B_Heli_Transport_03_unarmed_F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "B_crew_F"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "B_Helipilot_F"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "B_Heli_Light_01_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "B_Truck_01_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -58,7 +58,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["B_Soldier_lite_F",15,0,0], // Rifleman (Light) ["B_Soldier_F",20,0,0], // Rifleman ["B_soldier_LAT_F",30,0,0], // Rifleman (AT) @@ -90,7 +90,7 @@ infantry_units = [ ["B_Pilot_F",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["B_LSV_01_unarmed_F",75,0,50], // Prowler ["B_LSV_01_armed_F",75,40,50], // Prowler (HMG) @@ -131,7 +131,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["rhsusf_m113_usarmy",200,40,100], // M113A3 (M2) ["rhsusf_m113_usarmy_MK19",200,60,100], // M113A3 (Mk19) ["rhsusf_m113_usarmy_medical",200,0,100], // M113A3 (Medical) @@ -162,7 +162,7 @@ heavy_vehicles = [ ["B_MBT_01_mlrs_F",800,1750,400] // M5 Sandstorm MLRS ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["B_Heli_Light_01_F",200,0,100], // MH-9 Hummingbird @@ -219,7 +219,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["B_HMG_01_F",25,40,0], // Mk30A HMG .50 ["B_HMG_01_high_F",25,40,0], // Mk30 HMG .50 (Raised) ["B_HMG_01_A_F",35,40,0], // Mk30 HMG .50 (Autonomous) @@ -233,7 +233,7 @@ static_vehicles = [ ["B_SAM_System_03_F",250,500,0] // MIM-145 Defender ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -312,17 +312,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -362,7 +362,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "B_Soldier_TL_F", "B_Soldier_F", "B_Soldier_F", @@ -376,7 +376,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "B_Soldier_TL_F", "B_Soldier_LAT_F", "B_Soldier_LAT_F", @@ -390,7 +390,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "B_Soldier_TL_F", "B_Soldier_F", "B_Soldier_F", @@ -402,7 +402,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "B_Soldier_TL_F", "B_Soldier_F", "B_Soldier_F", @@ -414,7 +414,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "B_recon_TL_F", "B_recon_F", "B_recon_F", @@ -428,7 +428,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "B_soldier_PG_F", "B_soldier_PG_F", "B_soldier_PG_F", @@ -442,11 +442,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "rhsusf_m1a1aim_tuski_wd", // M1A1SA (Tusk I) "B_MBT_01_TUSK_F", // M2A4 Slammer UP diff --git a/Missionframework/presets/players/enoch.sqf b/Missionframework/presets/players/enoch.sqf index 7794aed1f..9c21c81b3 100644 --- a/Missionframework/presets/players/enoch.sqf +++ b/Missionframework/presets/players/enoch.sqf @@ -2,7 +2,7 @@ File: enoch.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-07-24 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V4_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "B_T_Truck_01_box_F"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "I_E_Truck_02_Medical_F"; // This is the mobile respawn (and medical) truck. -huron_typename = "B_Heli_Transport_03_unarmed_F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "I_E_Crew_F"; // This defines the crew for vehicles. -pilot_classname = "I_E_Helipilot_F"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "B_Heli_Light_01_F"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "I_E_Truck_02_transport_F"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "I_E_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V4_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "B_T_Truck_01_box_F"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "I_E_Truck_02_Medical_F"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "B_Heli_Transport_03_unarmed_F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "I_E_Crew_F"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "I_E_Helipilot_F"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "B_Heli_Light_01_F"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_T_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "I_E_Truck_02_transport_F"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_green_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "I_E_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["I_E_Soldier_lite_F",15,0,0], // Rifleman (Light) ["I_E_Soldier_F",20,0,0], // Rifleman ["I_E_Soldier_LAT2_F",30,0,0], // Rifleman (AT) @@ -77,7 +77,7 @@ infantry_units = [ ["B_T_Pilot_F",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["I_E_Quadbike_01_F",50,0,25], // Quad Bike ["I_E_Offroad_01_F",60,0,35], // Offroad ["I_E_Offroad_01_covered_F",60,0,35], // Offroad (Covered) @@ -96,7 +96,7 @@ light_vehicles = [ ["B_T_Boat_Armed_01_minigun_F",200,80,75] // Speedboat Minigun ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["B_T_APC_Wheeled_01_cannon_F",200,75,125], // AMV-7 Marshall ["I_E_APC_tracked_03_cannon_F",300,150,150], // FV-720 Odyniec ["B_T_APC_Tracked_01_AA_F",300,250,175], // IFV-6a Cheetah @@ -107,7 +107,7 @@ heavy_vehicles = [ ["I_E_Truck_02_MRL_F",600,1250,300] // Zamak MRL ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["I_E_UAV_01_F",75,0,25], // AR-2 Darter ["I_E_UAV_06_F",80,0,30], // AL-6 Pelican ["B_Heli_Light_01_F",200,0,100], // MH-9 Hummingbird @@ -126,7 +126,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["B_W_Static_Designator_01_F",25,0,0], // Remote Designator ["I_E_HMG_01_F",25,40,0], // Mk30A HMG .50 ["I_E_HMG_01_high_F",25,40,0], // Mk30 HMG .50 (Raised) @@ -140,7 +140,7 @@ static_vehicles = [ ["I_E_SAM_System_03_F",250,500,0] // MIM-145 Defender ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V4_F",0,0,0], ["Land_Cargo_Patrol_V4_F",0,0,0], ["Land_Cargo_Tower_V4_F",0,0,0], @@ -220,17 +220,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,200,100,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], - [Arsenal_typename,25,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,200,100,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], + [KPLIB_b_arsenal,25,0,0], ["ACE_medicalSupplyCrate_advanced",10,0,0], ["Box_East_Support_F",10,0,0], ["Box_CSAT_Equip_F",10,0,0], @@ -259,7 +259,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "I_E_Soldier_TL_F", "I_E_Soldier_F", "I_E_Soldier_F", @@ -273,7 +273,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "I_E_Soldier_TL_F", "I_E_Soldier_LAT2_F", "I_E_Soldier_LAT2_F", @@ -287,7 +287,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "I_E_Soldier_TL_F", "I_E_Soldier_F", "I_E_Soldier_F", @@ -299,7 +299,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "I_E_Soldier_TL_F", "I_E_Soldier_F", "I_E_Soldier_F", @@ -311,7 +311,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "B_T_Recon_TL_F", "B_T_Recon_F", "B_T_Recon_F", @@ -325,7 +325,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "B_T_Soldier_PG_F", "B_T_Soldier_PG_F", "B_T_Soldier_PG_F", @@ -339,11 +339,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "B_T_MBT_01_TUSK_F", // M2A4 Slammer UP "B_T_AFV_Wheeled_01_cannon_F", // Rhino MGS "B_T_AFV_Wheeled_01_up_cannon_F", // Rhino MGS UP diff --git a/Missionframework/presets/players/gm_east.sqf b/Missionframework/presets/players/gm_east.sqf index 00a0409ef..0b1a3d0fb 100644 --- a/Missionframework/presets/players/gm_east.sqf +++ b/Missionframework/presets/players/gm_east.sqf @@ -2,7 +2,7 @@ File: gm_east.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-07 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. -FOB_box_typename = "gm_gc_army_brdm2um"; // This is the FOB as a container/BRDM (due to lack of proper container transport in GM German EAST). -FOB_truck_typename = "gm_gc_army_btr60pu12"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "gm_gc_army_ural375d_medic"; // This is the mobile respawn (and medical) truck. -huron_typename = "gm_gc_army_btr60pa"; // This is Spartan 01, a multipurpose mobile respawn as a command BTR60. -crewman_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the crew for vehicles. -pilot_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "gm_gc_army_brdm2um"; // This is the FOB as a container/BRDM (due to lack of proper container transport in GM German EAST). +KPLIB_b_fobTruck = "gm_gc_army_btr60pu12"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "gm_gc_army_ural375d_medic"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "gm_gc_army_btr60pa"; // This is Potato 01, a multipurpose mobile respawn as a command BTR60. +KPLIB_b_crewUnit = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["gm_gc_army_rifleman_mpiak74n_80_str",20,0,0], // Rifleman ["gm_gc_army_antitank_mpiak74n_rpg7_80_str",30,0,0], // Rifleman (AT) ["gm_gc_army_machinegunner_lmgrpk_80_str",25,0,0], // Light Machinegunner @@ -60,14 +60,14 @@ infantry_units = [ ["gm_gc_army_crew_mpiaks74nk_80_blk",10,0,0] // Crewman ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["gm_gc_army_bicycle_01_oli",10,0,0], // Service Bicycle ["gm_gc_army_p601",50,0,25], // Trabant ["gm_gc_army_ural4320_cargo",125,30,75], // Ural Transport ["B_Boat_Transport_01_F",100,0,25] // Assault Boat ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["gm_gc_army_brdm2",200,40,100], // BRDM2 ["gm_gc_army_btr60pb",200,150,125], // BTR-60PB ["gm_gc_army_zsu234v1",300,250,200], // Shilka @@ -75,7 +75,7 @@ heavy_vehicles = [ ["gm_gc_army_t55a",450,550,250] // T-55 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["len_mi8amt_nva",225,0,125], // Mi8AMT ["len_mi24d_CAS_nva",550,550,250], // Mi-24D (CAS) ["len_mi24d_AT_nva",550,550,250], // Mi-24D (AT) @@ -86,11 +86,11 @@ air_vehicles = [ ["len_l39_nva",1200,1250,650] // Aero L-39 ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["gm_gc_army_fagot_launcher_tripod",50,100,0] // Static FAGOT ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V4_F",0,0,0], ["Land_Cargo_Patrol_V4_F",0,0,0], ["Land_Cargo_Tower_V4_F",0,0,0], @@ -170,17 +170,17 @@ buildings = [ ["land_gm_sandbags_01_door_02",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,200,500,0], - [FOB_truck_typename,300,500,100], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,200,500,0], + [KPLIB_b_fobTruck,300,500,100], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -202,7 +202,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "gm_gc_army_squadleader_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", @@ -216,7 +216,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "gm_gc_army_squadleader_mpiak74n_80_str", "gm_gc_army_antitank_mpiak74n_rpg7_80_str", "gm_gc_army_antitank_mpiak74n_rpg7_80_str", @@ -230,7 +230,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "gm_gc_army_squadleader_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", @@ -242,7 +242,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "gm_gc_army_squadleader_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", @@ -254,7 +254,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "gm_gc_army_squadleader_mpiak74n_80_str", "gm_gc_army_antitank_mpiak74n_rpg7_80_str", "gm_gc_army_antitank_mpiak74n_rpg7_80_str", @@ -269,7 +269,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "gm_gc_army_rifleman_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", "gm_gc_army_rifleman_mpiak74n_80_str", @@ -283,11 +283,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "gm_gc_army_t55a", // T-55 "len_mi24d_AT_nva", // Mi-24D (AT) "len_mi24p_AT_nva", // Mi-24P (AT) diff --git a/Missionframework/presets/players/gm_east_win.sqf b/Missionframework/presets/players/gm_east_win.sqf index 7aa21571f..c5b2f9f18 100644 --- a/Missionframework/presets/players/gm_east_win.sqf +++ b/Missionframework/presets/players/gm_east_win.sqf @@ -2,7 +2,7 @@ File: gm_east_win.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. -FOB_box_typename = "gm_gc_army_brdm2um_win"; // This is the FOB as a container/BRDM (due to lack of proper container transport in GM German EAST). -FOB_truck_typename = "gm_gc_army_btr60pu12_win"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "gm_gc_army_ural375d_medic_win"; // This is the mobile respawn (and medical) truck. -huron_typename = "gm_gc_army_btr60pa_win"; // This is Spartan 01, a multipurpose mobile respawn as a command BTR60. -crewman_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the crew for vehicles. -pilot_classname = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "gm_gc_army_brdm2um_win"; // This is the FOB as a container/BRDM (due to lack of proper container transport in GM German EAST). +KPLIB_b_fobTruck = "gm_gc_army_btr60pu12_win"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "gm_gc_army_ural375d_medic_win"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "gm_gc_army_btr60pa_win"; // This is Potato 01, a multipurpose mobile respawn as a command BTR60. +KPLIB_b_crewUnit = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "gm_gc_army_crew_mpiaks74nk_80_blk"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "gm_gc_bgs_p601"; // Little birds replaced with unimog for container transportation. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "gm_gc_army_ural4320_cargo"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["gm_gc_army_rifleman_mpiak74n_80_win",20,0,0], // Rifleman ["gm_gc_army_antitank_mpiak74n_rpg7_80_win",30,0,0], // Rifleman (AT) ["gm_gc_army_machinegunner_lmgrpk_80_win",25,0,0], // Light Machinegunner @@ -60,14 +60,14 @@ infantry_units = [ ["gm_gc_army_crew_mpiaks74nk_80_blk",10,0,0] // Crewman ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["gm_gc_army_bicycle_01_oli",10,0,0], // Service Bicycle ["gm_gc_army_p601",50,0,25], // Trabant ["gm_gc_army_ural4320_cargo_win",125,30,75], // Ural Transport ["B_Boat_Transport_01_F",100,0,25] // Assault Boat ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["gm_gc_army_brdm2_win",200,40,100], // BRDM2 ["gm_gc_army_btr60pb_win",200,150,125], // BTR-60PB ["gm_gc_army_zsu234v1_win",300,250,200], // Shilka @@ -75,7 +75,7 @@ heavy_vehicles = [ ["gm_gc_army_t55a_win",450,550,250] // T-55 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["len_mi8amt_nva",225,0,125], // Mi8AMT ["len_mi24d_CAS_nva",550,550,250], // Mi-24D (CAS) ["len_mi24d_AT_nva",550,550,250], // Mi-24D (AT) @@ -86,11 +86,11 @@ air_vehicles = [ ["len_l39_nva",1200,1250,650] // Aero L-39 ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["gm_gc_army_fagot_launcher_tripod",50,100,0] // Static FAGOT ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V4_F",0,0,0], ["Land_Cargo_Patrol_V4_F",0,0,0], ["Land_Cargo_Tower_V4_F",0,0,0], @@ -170,17 +170,17 @@ buildings = [ ["land_gm_sandbags_01_door_02",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,200,500,0], - [FOB_truck_typename,300,500,100], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,200,500,0], + [KPLIB_b_fobTruck,300,500,100], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -202,7 +202,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "gm_gc_army_squadleader_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", @@ -216,7 +216,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "gm_gc_army_squadleader_mpiak74n_80_win", "gm_gc_army_antitank_mpiak74n_rpg7_80_win", "gm_gc_army_antitank_mpiak74n_rpg7_80_win", @@ -230,7 +230,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "gm_gc_army_squadleader_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", @@ -242,7 +242,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "gm_gc_army_squadleader_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", @@ -254,7 +254,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "gm_gc_army_squadleader_mpiak74n_80_win", "gm_gc_army_antitank_mpiak74n_rpg7_80_win", "gm_gc_army_antitank_mpiak74n_rpg7_80_win", @@ -269,7 +269,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "gm_gc_army_rifleman_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", "gm_gc_army_rifleman_mpiak74n_80_win", @@ -283,11 +283,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "gm_gc_army_t55a_win", // T-55, "len_mi24d_AT_nva", // Mi-24D (AT) "len_mi24p_AT_nva", // Mi-24P (AT) diff --git a/Missionframework/presets/players/gm_west.sqf b/Missionframework/presets/players/gm_west.sqf index 07ff6dc1d..87a8c3b37 100644 --- a/Missionframework/presets/players/gm_west.sqf +++ b/Missionframework/presets/players/gm_west.sqf @@ -2,7 +2,7 @@ File: gm_west.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-04-30 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. -FOB_box_typename = "gm_ge_army_shelteraceI_command"; // This is the FOB as a container. -FOB_truck_typename = "gm_ge_army_bpz2a0"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "gm_ge_army_u1300l_medic"; // This is the mobile respawn (and medical) truck. -huron_typename = "gm_ge_army_m113a1g_command"; // This is Spartan 01, a multipurpose mobile respawn as a command M113. -crewman_classname = "gm_ge_army_crew_mp2a1_80_oli"; // This defines the crew for vehicles. -pilot_classname = "gm_ge_army_crew_mp2a1_80_oli"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "gm_ge_army_u1300l_container"; // Little birds replaced with unimog for container transportation. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "gm_ge_army_kat1_454_cargo"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "gm_ge_army_shelteraceI_command"; // This is the FOB as a container. +KPLIB_b_fobTruck = "gm_ge_army_bpz2a0"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "gm_ge_army_u1300l_medic"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "gm_ge_army_m113a1g_command"; // This is Potato 01, a multipurpose mobile respawn as a command M113. +KPLIB_b_crewUnit = "gm_ge_army_crew_mp2a1_80_oli"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "gm_ge_army_crew_mp2a1_80_oli"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "gm_ge_army_u1300l_container"; // Little birds replaced with unimog for container transportation. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "gm_ge_army_kat1_454_cargo"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["gm_ge_army_rifleman_g3a3_80_ols",20,0,0], // Rifleman ["gm_ge_army_antitank_g3a3_pzf44_80_ols",30,0,0], // Rifleman (AT) ["gm_ge_army_grenadier_g3a3_80_ols",25,0,0], // Grenadier @@ -62,7 +62,7 @@ infantry_units = [ ["gm_ge_army_crew_mp2a1_80_oli",10,0,0] // Crewman ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["gm_ge_army_bicycle_01_oli",10,0,0], // Service Bicycle ["gm_ge_army_k125",50,0,25], // K125 Bike ["gm_ge_army_iltis_cargo",100,0,50], // Truck 0.5t @@ -73,7 +73,7 @@ light_vehicles = [ ["B_Boat_Transport_01_F",100,0,25] // Assault Boat ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["gm_ge_army_m113a1g_apc",200,40,100], // M113A3 (MG3) ["gm_ge_army_m113a1g_apc_milan",200,60,100], // M113A3 (MILAN) ["gm_ge_army_m113a1g_medic",200,0,100], // M113A3 (Medical) @@ -86,15 +86,15 @@ heavy_vehicles = [ ["gm_ge_army_Leopard1a3a1",550,550,250] // Leopard 1A3A1 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["len_uh1d_bw",225,0,125] // BW UH-1D ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["gm_ge_army_milan_launcher_tripod",50,100,0] // Static MILAN ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V4_F",0,0,0], ["Land_Cargo_Patrol_V4_F",0,0,0], ["Land_Cargo_Tower_V4_F",0,0,0], @@ -174,17 +174,17 @@ buildings = [ ["land_gm_sandbags_01_door_02",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,200,500,0], - [FOB_truck_typename,300,500,100], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,200,500,0], + [KPLIB_b_fobTruck,300,500,100], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -206,7 +206,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "gm_ge_army_squadleader_g3a3_p2a1_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", @@ -220,7 +220,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "gm_ge_army_squadleader_g3a3_p2a1_80_ols", "gm_ge_army_antitank_g3a3_pzf44_80_ols", "gm_ge_army_antitank_g3a3_pzf44_80_ols", @@ -234,7 +234,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "gm_ge_army_squadleader_g3a3_p2a1_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", @@ -246,7 +246,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "gm_ge_army_squadleader_g3a3_p2a1_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", @@ -258,7 +258,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "gm_ge_army_squadleader_g3a3_p2a1_80_ols", "gm_ge_army_antitank_g3a3_pzf44_80_ols", "gm_ge_army_antitank_g3a3_pzf44_80_ols", @@ -273,7 +273,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "gm_ge_army_rifleman_g3a3_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", "gm_ge_army_rifleman_g3a3_80_ols", @@ -287,11 +287,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "gm_ge_army_Leopard1a1a2", // Leopard 1A1A2 "gm_ge_army_Leopard1a3a1" // Leopard 1A3A1 ]; diff --git a/Missionframework/presets/players/gm_west_win.sqf b/Missionframework/presets/players/gm_west_win.sqf index df487ba44..6e9332854 100644 --- a/Missionframework/presets/players/gm_west_win.sqf +++ b/Missionframework/presets/players/gm_west_win.sqf @@ -2,7 +2,7 @@ File: gm_west_win.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. -FOB_box_typename = "gm_ge_army_shelteraceI_command_win"; // This is the FOB as a container. -FOB_truck_typename = "gm_ge_army_bpz2a0_win"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "gm_ge_army_u1300l_medic_win_rc"; // This is the mobile respawn (and medical) truck. -huron_typename = "gm_ge_army_m113a1g_command_win"; // This is Spartan 01, a multipurpose mobile respawn as a command M113. -crewman_classname = "gm_ge_army_crew_mp2a1_80_win"; // This defines the crew for vehicles. -pilot_classname = "gm_ge_army_crew_mp2a1_80_win"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "gm_ge_army_u1300l_container_win"; // Little birds replaced with unimog for container transportation. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "gm_ge_army_kat1_454_cargo_win"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "land_gm_tower_bt_6_fuest_80"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "gm_ge_army_shelteraceI_command_win"; // This is the FOB as a container. +KPLIB_b_fobTruck = "gm_ge_army_bpz2a0_win"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "gm_ge_army_u1300l_medic_win_rc"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "gm_ge_army_m113a1g_command_win"; // This is Potato 01, a multipurpose mobile respawn as a command M113. +KPLIB_b_crewUnit = "gm_ge_army_crew_mp2a1_80_win"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "gm_ge_army_crew_mp2a1_80_win"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "gm_ge_army_u1300l_container_win"; // Little birds replaced with unimog for container transportation. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "gm_ge_army_kat1_454_cargo_win"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "land_gm_euro_shed_03"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "land_gm_radiotower_01"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["gm_ge_army_rifleman_g3a3_parka_80_win",20,0,0], // Rifleman ["gm_ge_army_antitank_g3a3_pzf44_parka_80_win",30,0,0], // Rifleman (AT) ["gm_ge_army_grenadier_g3a3_parka_80_win",25,0,0], // Grenadier @@ -62,7 +62,7 @@ infantry_units = [ ["gm_ge_army_crew_mp2a1_80_oli",10,0,0] // Crewman ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["gm_ge_army_bicycle_01_oli",10,0,0], // Service Bicycle ["gm_ge_army_k125",50,0,25], // K125 Bike ["gm_ge_army_iltis_cargo_win",100,0,50], // Truck 0.5t @@ -73,7 +73,7 @@ light_vehicles = [ ["B_Boat_Transport_01_F",100,0,25] // Assault Boat ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["gm_ge_army_m113a1g_apc_win",200,40,100], // M113A3 (MG3) ["gm_ge_army_m113a1g_apc_milan_win",200,60,100], // M113A3 (MILAN) ["gm_ge_army_m113a1g_medic",200,0,100], // M113A3 (Medical) @@ -86,15 +86,15 @@ heavy_vehicles = [ ["gm_ge_army_Leopard1a3a1_win",550,550,250] // Leopard 1A3A1 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["len_uh1d_bw",225,0,125] // BW UH-1D ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["gm_ge_army_milan_launcher_tripod",50,100,0] // Static MILAN ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V4_F",0,0,0], ["Land_Cargo_Patrol_V4_F",0,0,0], ["Land_Cargo_Tower_V4_F",0,0,0], @@ -174,17 +174,17 @@ buildings = [ ["land_gm_sandbags_01_door_02",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,200,500,0], - [FOB_truck_typename,300,500,100], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,200,500,0], + [KPLIB_b_fobTruck,300,500,100], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -206,7 +206,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", @@ -220,7 +220,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win", "gm_ge_army_antitank_g3a3_pzf44_parka_80_win", "gm_ge_army_antitank_g3a3_pzf44_parka_80_win", @@ -234,7 +234,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", @@ -246,7 +246,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", @@ -258,7 +258,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "gm_ge_army_squadleader_g3a3_p2a1_parka_80_win", "gm_ge_army_antitank_g3a3_pzf44_parka_80_win", "gm_ge_army_antitank_g3a3_pzf44_parka_80_win", @@ -273,7 +273,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "gm_ge_army_rifleman_g3a3_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", "gm_ge_army_rifleman_g3a3_parka_80_win", @@ -287,11 +287,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "gm_ge_army_Leopard1a1a2_win", // Leopard 1A1A2 "gm_ge_army_Leopard1a3a1_win" // Leopard 1A3A1 ]; diff --git a/Missionframework/presets/players/rhs_afrf.sqf b/Missionframework/presets/players/rhs_afrf.sqf index 86a337382..ca11a46eb 100644 --- a/Missionframework/presets/players/rhs_afrf.sqf +++ b/Missionframework/presets/players/rhs_afrf.sqf @@ -2,7 +2,7 @@ File: rhs_afrf.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-14 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "rhs_gaz66_r142_msv"; // This is the FOB as a vehicle. -Arsenal_typename = "O_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "rhs_gaz66_ap2_msv"; // This is the mobile respawn (and medical) truck. -huron_typename = "RHS_Mi8mt_vvs"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "rhs_msv_emr_armoredcrew"; // This defines the crew for vehicles. -pilot_classname = "rhs_pilot_combat_heli"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "rhs_ka60_grey"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "rhs_kamaz5350_flatbed_vdv"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_forest_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_forest_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "rhs_prv13"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "rhs_gaz66_r142_msv"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "O_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "rhs_gaz66_ap2_msv"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "RHS_Mi8mt_vvs"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "rhs_msv_emr_armoredcrew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "rhs_pilot_combat_heli"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "rhs_ka60_grey"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "O_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "rhs_kamaz5350_flatbed_vdv"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_forest_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_forest_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "rhs_prv13"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["rhs_vdv_rifleman_lite",15,0,0], // Rifleman (Light) ["rhs_vdv_rifleman",20,0,0], // Rifleman ["rhs_vdv_LAT",30,0,0], // Rifleman (LAT) @@ -73,7 +73,7 @@ infantry_units = [ ["rhs_pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["O_Quadbike_01_F",50,0,25], // Quad Bike ["rhs_uaz_vdv",50,0,45], // UAZ ["rhs_uaz_open_vdv",50,0,45], // UAZ (Open) @@ -100,7 +100,7 @@ light_vehicles = [ ["O_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["rhs_bmp1k_vdv",200,40,100], // BMP-1K ["rhs_bmp2k_vdv",240,150,100], // BMP-2K ["rhs_bmd2m",260,170,120], // BMD-2M (Berezhok) @@ -116,7 +116,7 @@ heavy_vehicles = [ ["rhs_2s3_tv",600,1250,300] // 2S3M1 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["O_UAV_01_F",75,0,25], // AR-2 Tayran ["O_UAV_06_F",80,0,30], // AL-6 Jinaah (Cargo) ["rhs_ka60_c",200,0,100], // KA-60 @@ -131,7 +131,7 @@ air_vehicles = [ ["rhs_mig29s_vvsc",1250,1250,450] // Mig-29S ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["RHS_NSV_TriPod_VDV",25,40,0], // NSV Low Tripod ["rhs_KORD_high_VDV",25,40,0], // KORD High Tripod ["RHS_AGS30_TriPod_VDV",25,60,0], // AGS30 Low Tripod @@ -143,7 +143,7 @@ static_vehicles = [ ["rhs_D30_at_vdv",100,200,0] // D-30 AT ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -222,17 +222,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -254,7 +254,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "rhs_vdv_sergeant ", "rhs_vdv_rifleman", "rhs_vdv_LAT", @@ -268,7 +268,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "rhs_vdv_sergeant ", "rhs_vdv_rifleman", "rhs_vdv_LAT", @@ -282,7 +282,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "rhs_vdv_sergeant ", "rhs_vdv_rifleman", "rhs_vdv_LAT", @@ -294,7 +294,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "rhs_vdv_sergeant ", "rhs_vdv_rifleman", "rhs_vdv_LAT", @@ -306,7 +306,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "rhs_vdv_recon_sergeant", "rhs_vdv_rifleman", "rhs_vdv_recon_grenadier", @@ -320,7 +320,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "rhs_vdv_recon_rifleman", "rhs_vdv_recon_rifleman", "rhs_vdv_recon_rifleman_lat", @@ -334,11 +334,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhs_t80ue1", // T-80UE1 "rhs_t90a_tv", // T-90A "rhs_t90sab_tv", // T-90SA (2016) diff --git a/Missionframework/presets/players/rhs_usaf_des.sqf b/Missionframework/presets/players/rhs_usaf_des.sqf index de8c14f43..148904446 100644 --- a/Missionframework/presets/players/rhs_usaf_des.sqf +++ b/Missionframework/presets/players/rhs_usaf_des.sqf @@ -2,7 +2,7 @@ File: rhs_usaf_des.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,26 +25,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "rhsusf_M1078A1P2_B_D_CP_fmtv_usarmy"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. -huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "rhsusf_army_ocp_combatcrewman"; // This defines the crew for vehicles. -pilot_classname = "rhsusf_army_ocp_helipilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V3_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "rhsusf_M1078A1P2_B_D_CP_fmtv_usarmy"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "rhsusf_M1085A1P2_B_D_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "RHS_CH_47F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "rhsusf_army_ocp_combatcrewman"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "rhsusf_army_ocp_helipilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "RHS_MELB_MH6M"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "rhsusf_M977A4_BKIT_usarmy_d"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -54,7 +54,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["rhsusf_army_ocp_riflemanl",15,0,0], // Rifleman (Light) ["rhsusf_army_ocp_rifleman",20,0,0], // Rifleman ["rhsusf_army_ocp_riflemanat",30,0,0], // Rifleman (AT) @@ -83,7 +83,7 @@ infantry_units = [ ["rhsusf_airforce_jetpilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["rhsusf_mrzr4_d",75,0,25], // MRZR 4 ["rhsusf_m1025_d",100,0,50], // M1025A2 @@ -120,7 +120,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["rhsusf_m113d_usarmy",200,40,100], // M113A3 (M2) ["rhsusf_m113d_usarmy_MK19",200,60,100], // M113A3 (Mk19) ["rhsusf_m113d_usarmy_medical",200,0,100], // M113A3 (Medical) @@ -133,7 +133,7 @@ heavy_vehicles = [ ["rhsusf_m109d_usarmy",600,1250,300] // M109A6 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["RHS_MELB_MH6M",200,0,100], // MH-6M Little Bird @@ -177,7 +177,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["RHS_M2StaticMG_MiniTripod_D",25,40,0], // Mk2 HMG .50 ["RHS_M2StaticMG_D",25,40,0], // Mk2 HMG .50 (Raised) ["RHS_MK19_TriPod_D",25,60,0], // Mk19 GMG 20mm @@ -188,7 +188,7 @@ static_vehicles = [ ["B_SAM_System_03_F",250,500,0] // MIM-145 Defender ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V3_F",0,0,0], ["Land_Cargo_Patrol_V3_F",0,0,0], ["Land_Cargo_Tower_V3_F",0,0,0], @@ -267,17 +267,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -316,7 +316,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_rifleman", "rhsusf_army_ocp_rifleman", @@ -330,7 +330,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_riflemanat", "rhsusf_army_ocp_riflemanat", @@ -344,7 +344,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_rifleman", "rhsusf_army_ocp_rifleman", @@ -356,7 +356,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_rifleman", "rhsusf_army_ocp_rifleman", @@ -368,7 +368,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "rhsusf_usmc_recon_marpat_d_teamleader", "rhsusf_usmc_recon_marpat_d_rifleman", "rhsusf_usmc_recon_marpat_d_rifleman", @@ -382,7 +382,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", @@ -396,11 +396,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "rhsusf_m1a1aim_tuski_d", // M1A1SA (Tusk I) "rhsusf_m1a2sep1tuskiid_usarmy", // M1A2SEPv1 (Tusk II) diff --git a/Missionframework/presets/players/rhs_usaf_wdl.sqf b/Missionframework/presets/players/rhs_usaf_wdl.sqf index 49e9fdca5..d275110cd 100644 --- a/Missionframework/presets/players/rhs_usaf_wdl.sqf +++ b/Missionframework/presets/players/rhs_usaf_wdl.sqf @@ -2,7 +2,7 @@ File: rhs_usaf_wdl.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,26 +25,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "rhsusf_M1078A1P2_B_WD_CP_fmtv_usarmy"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. -huron_typename = "RHS_CH_47F"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "rhsusf_army_ocp_combatcrewman"; // This defines the crew for vehicles. -pilot_classname = "rhsusf_army_ocp_helipilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "RHS_MELB_MH6M"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "rhsusf_M1078A1P2_B_WD_CP_fmtv_usarmy"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "rhsusf_M1085A1P2_B_WD_Medical_fmtv_usarmy"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "RHS_CH_47F"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "rhsusf_army_ocp_combatcrewman"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "rhsusf_army_ocp_helipilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "RHS_MELB_MH6M"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "B_Boat_Transport_01_F"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "rhsusf_M977A4_BKIT_usarmy_wd"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_RepairDepot_01_tan_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "B_Radar_System_01_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -54,7 +54,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["rhsusf_army_ocp_riflemanl",15,0,0], // Rifleman (Light) ["rhsusf_army_ocp_rifleman",20,0,0], // Rifleman ["rhsusf_army_ocp_riflemanat",30,0,0], // Rifleman (AT) @@ -83,7 +83,7 @@ infantry_units = [ ["rhsusf_airforce_jetpilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["rhsusf_m1025_w",100,0,50], // M1025A2 ["rhsusf_m1025_w_m2",100,40,50], // M1025A2 (M2) @@ -113,7 +113,7 @@ light_vehicles = [ ["B_SDV_01_F",150,0,50] // SDV ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["rhsusf_m113_usarmy",200,40,100], // M113A3 (M2) ["rhsusf_m113_usarmy_MK19",200,60,100], // M113A3 (Mk19) ["rhsusf_m113_usarmy_medical",200,0,100], // M113A3 (Medical) @@ -126,7 +126,7 @@ heavy_vehicles = [ ["rhsusf_m109_usarmy",600,1250,300] // M109A6 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["B_UAV_01_F",75,0,25], // AR-2 Darter ["B_UAV_06_F",80,0,30], // AL-6 Pelican (Cargo) ["RHS_MELB_MH6M",200,0,100], // MH-6M Little Bird @@ -170,7 +170,7 @@ air_vehicles = [ ["B_T_VTOL_01_vehicle_F",750,0,500] // V-44 X Blackfish (Vehicle) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["RHS_M2StaticMG_MiniTripod_WD",25,40,0], // Mk2 HMG .50 ["RHS_M2StaticMG_WD",25,40,0], // Mk2 HMG .50 (Raised) ["RHS_MK19_TriPod_WD",25,60,0], // Mk19 GMG 20mm @@ -181,7 +181,7 @@ static_vehicles = [ ["B_SAM_System_03_F",250,500,0] // MIM-145 Defender ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -260,17 +260,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -306,7 +306,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_rifleman", "rhsusf_army_ocp_rifleman", @@ -320,7 +320,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_riflemanat", "rhsusf_army_ocp_riflemanat", @@ -334,7 +334,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_rifleman", "rhsusf_army_ocp_rifleman", @@ -346,7 +346,7 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "rhsusf_army_ocp_teamleader", "rhsusf_army_ocp_rifleman", "rhsusf_army_ocp_rifleman", @@ -358,7 +358,7 @@ blufor_squad_aa = [ ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "rhsusf_usmc_recon_marpat_wd_teamleader", "rhsusf_usmc_recon_marpat_wd_rifleman", "rhsusf_usmc_recon_marpat_wd_rifleman", @@ -372,7 +372,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", "rhsusf_army_ocp_rifleman_101st", @@ -386,11 +386,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "rhsusf_mkvsoc", // Mk.V SOCOM "rhsusf_m1a1aim_tuski_wd", // M1A1SA (Tusk I) "rhsusf_m1a2sep1tuskiiwd_usarmy", // M1A2SEPv1 (Tusk II) diff --git a/Missionframework/presets/players/sfp_des.sqf b/Missionframework/presets/players/sfp_des.sqf index 926e59ff0..b0793bb0f 100644 --- a/Missionframework/presets/players/sfp_des.sqf +++ b/Missionframework/presets/players/sfp_des.sqf @@ -2,7 +2,7 @@ File: sfp_des.sqf Author: Dahlgren - https://github.com/Dahlgren Date: 2017-07-24 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "sfp_tgb1112"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "sfp_patgb203_ambulance"; // This is the mobile respawn (and medical) truck. -huron_typename = "sfp_hkp4"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "sfp_m90d_crew"; // This defines the crew for vehicles. -pilot_classname = "sfp_m90w_pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "sfp_hkp9"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "sfp_tgb1112"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "sfp_patgb203_ambulance"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "sfp_hkp4"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "sfp_m90d_crew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "sfp_m90w_pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "sfp_hkp9"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["sfp_m90d_rifleman_tshirt",15,0,0], // Rifleman (Light) ["sfp_m90d_rifleman_ak5",20,0,0], // Rifleman ["sfp_m90d_at_specialist_pskott86",30,0,0], // Rifleman (AT) @@ -77,7 +77,7 @@ infantry_units = [ ["sfp_m90w_pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["sfp_tgb16_desert",100,0,50], // Tgb 16 ["sfp_tgb16_rws",100,40,50], // Tgb 16 (RWS) @@ -90,13 +90,13 @@ light_vehicles = [ ["sfp_strb90_rws",200,80,75] // Strb 90 (RWS) ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["sfp_strf90c_desert",200,40,100], // Strf 90 ["sfp_lvkv90c_desert",200,60,100], // Lvkv 90 ["sfp_strv122",400,350,225] // Strb 122 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["sfp_uav01",80,0,30], // UAV 01 Ugglan ["sfp_uav03",75,0,25], // UAV 03 Örnen ["sfp_uav_skeldar",80,0,30], // UAV Skeldar @@ -112,7 +112,7 @@ air_vehicles = [ ["sfp_jas39_rb15",1250,1500,450] // JAS 39 (Rb15) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["sfp_ksp88",25,40,0], // Ksp 88 ["sfp_grsp",25,60,0], // Grsp ["sfp_rbs17",30,60,0], // RBS 17 @@ -125,7 +125,7 @@ static_vehicles = [ ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -204,17 +204,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -237,7 +237,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "sfp_m90d_squadleader", "sfp_m90d_automaticrifleman_ksp90", "sfp_m90d_rifleman_ak5", @@ -249,7 +249,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "sfp_m90d_squadleader", "sfp_m90d_machinegunner_ksp58", "sfp_m90d_at_specialist_grg86", @@ -261,7 +261,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "sfp_m90d_teamleader", "sfp_m90d_at_specialist_grg86", "sfp_m90d_at_loader_grg86", @@ -269,12 +269,12 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ // No man portable AA in SFP ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "sfp_m90d_sog_teamleader", "sfp_m90d_sog_ksp90", "sfp_m90d_sog_explosive_specialist", @@ -284,7 +284,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad. -blufor_squad_para = [ +KPLIB_b_squadPara = [ "sfp_m90d_sog_teamleader", "sfp_m90d_sog_ksp90", "sfp_m90d_sog_explosive_specialist", @@ -294,11 +294,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "sfp_strf90c_desert", // Strf 90 "sfp_lvkv90c_desert", // Lvkv 90 "sfp_strv122", // Strv 122 diff --git a/Missionframework/presets/players/sfp_wdl.sqf b/Missionframework/presets/players/sfp_wdl.sqf index 9190341f4..b6a2d3abc 100644 --- a/Missionframework/presets/players/sfp_wdl.sqf +++ b/Missionframework/presets/players/sfp_wdl.sqf @@ -2,7 +2,7 @@ File: sfp_des.sqf Author: Dahlgren - https://github.com/Dahlgren Date: 2017-07-24 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "sfp_tgb1112"; // This is the FOB as a vehicle. -Arsenal_typename = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "sfp_patgb203_ambulance"; // This is the mobile respawn (and medical) truck. -huron_typename = "sfp_hkp4"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "sfp_m90w_crew"; // This defines the crew for vehicles. -pilot_classname = "sfp_m90w_pilot"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "sfp_hkp9"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "Land_Cargo_HQ_V1_F"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "sfp_tgb1112"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "B_supplyCrate_F"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "sfp_patgb203_ambulance"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "sfp_hkp4"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "sfp_m90w_crew"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "sfp_m90w_pilot"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "sfp_hkp9"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "sfp_strb90"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "sfp_tgb40"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "Land_CarService_F"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "Land_Radar_Small_F"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "Land_HelipadSquare_F"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "Land_TentHangar_V1_F"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["sfp_m90w_rifleman_tshirt",15,0,0], // Rifleman (Light) ["sfp_m90w_rifleman_ak5",20,0,0], // Rifleman ["sfp_m90w_at_specialist_pskott86",30,0,0], // Rifleman (AT) @@ -77,7 +77,7 @@ infantry_units = [ ["sfp_m90w_pilot",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["B_Quadbike_01_F",50,0,25], // Quad Bike ["sfp_tgb16",100,0,50], // Tgb 16 ["sfp_tgb16_rws",100,40,50], // Tgb 16 (RWS) @@ -103,13 +103,13 @@ light_vehicles = [ ["sfp_rbb_norrkoping",1000,1000,300] // HMS Norrkoping ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["sfp_strf90c",200,40,100], // Strf 90 ["sfp_lvkv90c",200,60,100], // Lvkv 90 ["sfp_strv122",400,350,225] // Strv 122 ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["sfp_uav01",80,0,30], // UAV 01 Ugglan ["sfp_uav03",75,0,25], // UAV 03 Örnen ["sfp_uav_skeldar",80,0,30], // UAV Skeldar @@ -125,7 +125,7 @@ air_vehicles = [ ["sfp_jas39_rb15",1250,1500,450] // JAS 39 (Rb15) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["sfp_ksp88",25,40,0], // Ksp 88 ["sfp_grsp",25,60,0], // Grsp ["sfp_rbs17",30,60,0], // RBS 17 @@ -138,7 +138,7 @@ static_vehicles = [ ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["Land_Cargo_House_V1_F",0,0,0], ["Land_Cargo_Patrol_V1_F",0,0,0], ["Land_Cargo_Tower_V1_F",0,0,0], @@ -217,17 +217,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -250,7 +250,7 @@ support_vehicles = [ */ // Light infantry squad. -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "sfp_m90w_squadleader", "sfp_m90w_automaticrifleman_ksp90", "sfp_m90w_rifleman_ak5", @@ -262,7 +262,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad. -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "sfp_m90w_squadleader", "sfp_m90w_machinegunner_ksp58", "sfp_m90w_at_specialist_grg86", @@ -274,7 +274,7 @@ blufor_squad_inf = [ ]; // AT specialists squad. -blufor_squad_at = [ +KPLIB_b_squadAT = [ "sfp_m90w_teamleader", "sfp_m90w_at_specialist_grg86", "sfp_m90w_at_loader_grg86", @@ -282,12 +282,12 @@ blufor_squad_at = [ ]; // AA specialists squad. -blufor_squad_aa = [ +KPLIB_b_squadAA = [ // No man portable AA in SFP ]; // Force recon squad. -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "sfp_m90w_sog_teamleader", "sfp_m90w_sog_ksp90", "sfp_m90w_sog_explosive_specialist", @@ -297,7 +297,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad. -blufor_squad_para = [ +KPLIB_b_squadPara = [ "sfp_m90w_sog_teamleader", "sfp_m90w_sog_ksp90", "sfp_m90w_sog_explosive_specialist", @@ -307,11 +307,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "sfp_strf90c", // Strf 90 "sfp_lvkv90c", // Lvkv 90 "sfp_strv122", // Strv 122 diff --git a/Missionframework/presets/players/unsung.sqf b/Missionframework/presets/players/unsung.sqf index 053d5ace4..b45d6c003 100644 --- a/Missionframework/presets/players/unsung.sqf +++ b/Missionframework/presets/players/unsung.sqf @@ -2,7 +2,7 @@ File: unsung.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-06-04 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -21,26 +21,26 @@ The same classnames for different purposes may cause various unpredictable issues with player actions. Or not, just don't try! */ -FOB_typename = "LAND_sb_bunker_main"; // This is the main FOB HQ building. -FOB_box_typename = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. -FOB_truck_typename = "uns_M35A2_fuel"; // This is the FOB as a vehicle. -Arsenal_typename = "uns_resupply_crate_US"; // This is the virtual arsenal as portable supply crates. -Respawn_truck_typename = "uns_M577_amb"; // This is the mobile respawn (and medical) truck. -huron_typename = "uns_h21c"; // This is Spartan 01, a multipurpose mobile respawn as a helicopter. -crewman_classname = "uns_US_25ID_STY3"; // This defines the crew for vehicles. -pilot_classname = "uns_pilot1"; // This defines the pilot for helicopters. -KPLIB_little_bird_classname = "uns_H13_transport_CAV"; // These are the little birds which spawn on the Freedom or at Chimera base. -KPLIB_boat_classname = "UNS_Zodiac_W"; // These are the boats which spawn at the stern of the Freedom. -KPLIB_truck_classname = "uns_M35A2_Open"; // These are the trucks which are used in the logistic convoy system. -KPLIB_small_storage_building = "ContainmentArea_02_sand_F"; // A small storage area for resources. -KPLIB_large_storage_building = "ContainmentArea_01_sand_F"; // A large storage area for resources. -KPLIB_recycle_building = "uns_motorpool1_repair"; // The building defined to unlock FOB recycling functionality. -KPLIB_air_vehicle_building = "LAND_uns_signaltower"; // The building defined to unlock FOB air vehicle functionality. -KPLIB_heli_slot_building = "LAND_uns_Heli_pad"; // The helipad used to increase the GLOBAL rotary-wing cap. -KPLIB_plane_slot_building = "UNS_Hanger_repair"; // The hangar used to increase the GLOBAL fixed-wing cap. -KPLIB_supply_crate = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. -KPLIB_ammo_crate = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. -KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This defines the fuel crates. +KPLIB_b_fobBuilding = "LAND_sb_bunker_main"; // This is the main FOB HQ building. +KPLIB_b_fobBox = "B_Slingload_01_Cargo_F"; // This is the FOB as a container. +KPLIB_b_fobTruck = "uns_M35A2_fuel"; // This is the FOB as a vehicle. +KPLIB_b_arsenal = "uns_resupply_crate_US"; // This is the virtual arsenal as portable supply crates. +KPLIB_b_mobileRespawn = "uns_M577_amb"; // This is the mobile respawn (and medical) truck. +KPLIB_b_potato01 = "uns_h21c"; // This is Potato 01, a multipurpose mobile respawn as a helicopter. +KPLIB_b_crewUnit = "uns_US_25ID_STY3"; // This defines the crew for vehicles. +KPLIB_b_heliPilotUnit = "uns_pilot1"; // This defines the pilot for helicopters. +KPLIB_b_addHeli = "uns_H13_transport_CAV"; // These are the additional helicopters which spawn on the Freedom or at Chimera base. +KPLIB_b_addBoat = "UNS_Zodiac_W"; // These are the boats which spawn at the stern of the Freedom. +KPLIB_b_logiTruck = "uns_M35A2_Open"; // These are the trucks which are used in the logistic convoy system. +KPLIB_b_smallStorage = "ContainmentArea_02_sand_F"; // A small storage area for resources. +KPLIB_b_largeStorage = "ContainmentArea_01_sand_F"; // A large storage area for resources. +KPLIB_b_logiStation = "uns_motorpool1_repair"; // The building defined to unlock FOB recycling functionality. +KPLIB_b_airControl = "LAND_uns_signaltower"; // The building defined to unlock FOB air vehicle functionality. +KPLIB_b_slotHeli = "LAND_uns_Heli_pad"; // The helipad used to increase the GLOBAL rotary-wing cap. +KPLIB_b_slotPlane = "UNS_Hanger_repair"; // The hangar used to increase the GLOBAL fixed-wing cap. +KPLIB_b_crateSupply = "CargoNet_01_box_F"; // This defines the supply crates, as in resources. +KPLIB_b_crateAmmo = "B_CargoNet_01_ammo_F"; // This defines the ammunition crates. +KPLIB_b_crateFuel = "CargoNet_01_barrels_F"; // This defines the fuel crates. /* --- Friendly classnames --- @@ -50,7 +50,7 @@ KPLIB_fuel_crate = "CargoNet_01_barrels_F"; // This The above example is the NATO IFV-6a Cheetah, it costs 300 supplies, 150 ammunition and 150 fuel to build. IMPORTANT: The last element inside each array must have no comma at the end! */ -infantry_units = [ +KPLIB_b_infantry = [ ["uns_US_25ID_STY3",15,0,0], // Sentry ["uns_US_25ID_RF6",20,0,0], // Rifleman ["uns_US_25ID_AT",30,0,0], // Rifleman (AT) @@ -74,7 +74,7 @@ infantry_units = [ ["uns_pil1",10,0,0] // Pilot ]; -light_vehicles = [ +KPLIB_b_vehLight = [ ["uns_m274",50,0,25], // M-274 Mule ["uns_m274_m60",50,25,25], // M-274 Mule (M60) ["uns_willys",75,0,50], // M-151 MUTT @@ -91,7 +91,7 @@ light_vehicles = [ ["uns_PBR_M10",200,80,75] // PBR Mk. II (M10 Flamethrower) ]; -heavy_vehicles = [ +KPLIB_b_vehHeavy = [ ["uns_xm706e2",100,50,100], // XM-706-E2 Commando ["uns_xm706e1",100,60,100], // XM-706-E1 Commando (30 cal) ["uns_M113_30cal",200,75,100], // M-113 ACAV (30 cal) @@ -112,7 +112,7 @@ heavy_vehicles = [ ["uns_m110sp",600,750,300] // M-110 Self-Propelled Gun ]; -air_vehicles = [ +KPLIB_b_vehAir = [ ["uns_H13_transport_CAV",100,0,80], // UH-13B ["uns_H13_amphib_CAV",100,0,80], // OH-13C CSAR ["uns_H13_medevac_CAV",100,0,80], // MH-13E Medevac @@ -149,7 +149,7 @@ air_vehicles = [ ["uns_F4E_CAS",800,600,400] // F-4E Phantom II (CAS) ]; -static_vehicles = [ +KPLIB_b_vehStatic = [ ["uns_US_SearchLight",20,0,0], // Searchlight ["uns_m60_low",25,40,0], // M60 7.62mm (low) ["uns_m60_high",25,40,0], // M60 7.62mm (high) @@ -166,7 +166,7 @@ static_vehicles = [ ["Uns_M114_artillery",100,200,0] // M-114A1 155mm Howitzer ]; -buildings = [ +KPLIB_b_objectsDeco = [ ["uns_FlagCarrierUS",0,0,0], ["uns_FlagCarrier101AB",0,0,0], ["uns_FlagCarrier25ID",0,0,0], @@ -277,17 +277,17 @@ buildings = [ ["Land_ClutterCutter_large_F",0,0,0] ]; -support_vehicles = [ - [Arsenal_typename,100,200,0], - [Respawn_truck_typename,200,0,100], - [FOB_box_typename,300,500,0], - [FOB_truck_typename,300,500,75], - [KPLIB_small_storage_building,0,0,0], - [KPLIB_large_storage_building,0,0,0], - [KPLIB_recycle_building,250,0,0], - [KPLIB_air_vehicle_building,1000,0,0], - [KPLIB_heli_slot_building,250,0,0], - [KPLIB_plane_slot_building,500,0,0], +KPLIB_b_vehSupport = [ + [KPLIB_b_arsenal,100,200,0], + [KPLIB_b_mobileRespawn,200,0,100], + [KPLIB_b_fobBox,300,500,0], + [KPLIB_b_fobTruck,300,500,75], + [KPLIB_b_smallStorage,0,0,0], + [KPLIB_b_largeStorage,0,0,0], + [KPLIB_b_logiStation,250,0,0], + [KPLIB_b_airControl,1000,0,0], + [KPLIB_b_slotHeli,250,0,0], + [KPLIB_b_slotPlane,500,0,0], ["ACE_medicalSupplyCrate_advanced",50,0,0], ["ACE_Box_82mm_Mo_HE",50,40,0], ["ACE_Box_82mm_Mo_Smoke",50,10,0], @@ -310,7 +310,7 @@ support_vehicles = [ */ // Light infantry squad -blufor_squad_inf_light = [ +KPLIB_b_squadLight = [ "uns_US_25ID_SL", "uns_US_25ID_RF6", "uns_US_25ID_RF6", @@ -324,7 +324,7 @@ blufor_squad_inf_light = [ ]; // Heavy infantry squad -blufor_squad_inf = [ +KPLIB_b_squadInf = [ "uns_US_25ID_SL", "uns_US_25ID_AT", "uns_US_25ID_AT", @@ -338,7 +338,7 @@ blufor_squad_inf = [ ]; // AT specialists squad -blufor_squad_at = [ +KPLIB_b_squadAT = [ "uns_US_25ID_SL", "uns_US_25ID_RF6", "uns_US_25ID_RF6", @@ -350,7 +350,7 @@ blufor_squad_at = [ ]; // AA specialists squad -blufor_squad_aa = [ +KPLIB_b_squadAA = [ "uns_US_25ID_SL", "uns_US_25ID_RF6", "uns_US_25ID_RF6", @@ -362,7 +362,7 @@ blufor_squad_aa = [ ]; // Force recon squad -blufor_squad_recon = [ +KPLIB_b_squadRecon = [ "uns_men_US_1AC_SL", "uns_men_US_1AC_TPR1", "uns_men_US_1AC_TPR2", @@ -376,7 +376,7 @@ blufor_squad_recon = [ ]; // Paratroopers squad (The units of this squad will automatically get parachutes on build) -blufor_squad_para = [ +KPLIB_b_squadPara = [ "uns_men_US_5SFG_SP13", "uns_men_US_5SFG_SP13", "uns_men_US_5SFG_SP13", @@ -390,11 +390,11 @@ blufor_squad_para = [ ]; /* - --- Elite vehicles --- + --- Vehicles to unlock --- Classnames below have to be unlocked by capturing military bases. Which base locks a vehicle is randomized on the first start of the campaign. */ -elite_vehicles = [ +KPLIB_b_vehToUnlock = [ "uns_A1J_CAS", // A-1H Skyraider (CAS) "uns_A7_CAS", // A-7D Corsair II (CAS) "uns_F4E_CAS", // F-4E Phantom II (CAS) From 388291932fb78a9c0bb84f6594059d2506f82c25 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 25 May 2020 14:15:19 +0200 Subject: [PATCH 054/115] Resistance preset variable rename --- Missionframework/presets/resistance/apex.sqf | 32 +++++++++---------- .../presets/resistance/cup_napa.sqf | 32 +++++++++---------- .../presets/resistance/cup_takistan.sqf | 32 +++++++++---------- .../presets/resistance/custom.sqf | 32 +++++++++---------- .../presets/resistance/germany.sqf | 32 +++++++++---------- .../presets/resistance/middle_eastern.sqf | 32 +++++++++---------- Missionframework/presets/resistance/racs.sqf | 32 +++++++++---------- .../presets/resistance/rhs_gref.sqf | 32 +++++++++---------- .../presets/resistance/unsung.sqf | 32 +++++++++---------- 9 files changed, 144 insertions(+), 144 deletions(-) diff --git a/Missionframework/presets/resistance/apex.sqf b/Missionframework/presets/resistance/apex.sqf index b88c6b048..d9e99a019 100644 --- a/Missionframework/presets/resistance/apex.sqf +++ b/Missionframework/presets/resistance/apex.sqf @@ -2,7 +2,7 @@ File: apex.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-08 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -17,7 +17,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "I_C_Soldier_Bandit_1_F", "I_C_Soldier_Bandit_2_F", "I_C_Soldier_Bandit_3_F", @@ -29,7 +29,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = [ +KPLIB_r_vehicles = [ "I_C_Offroad_02_LMG_F", "I_C_Offroad_02_AT_F" ]; @@ -40,7 +40,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["arifle_AKM_F","30Rnd_762x39_Mag_F",4,"",""], ["arifle_AKS_F","30Rnd_545x39_Mag_F",4,"",""], ["hgun_PDW2000_F","30Rnd_9x21_Mag",4,"",""], @@ -49,7 +49,7 @@ KPLIB_guerilla_weapons_1 = [ ["SMG_05_F","30Rnd_9x21_Mag_SMG_02",4,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["arifle_Katiba_F","30Rnd_65x39_caseless_green",4,"optic_ACO_grn",""], ["arifle_Mk20_plain_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], ["arifle_TRG21_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], @@ -58,7 +58,7 @@ KPLIB_guerilla_weapons_2 = [ ["srifle_DMR_06_olive_F","20Rnd_762x51_Mag",5,"optic_Hamr","bipod_01_F_blk"] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["arifle_CTAR_blk_F","30Rnd_580x42_Mag_F",4,"optic_MRCO",""], ["arifle_SPAR_01_blk_F","30Rnd_556x45_Stanag",4,"optic_MRCO",""], ["arifle_SPAR_03_blk_F","20Rnd_762x51_Mag",5,"optic_MRCO",""], @@ -70,7 +70,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "U_C_Poloshirt_blue", "U_C_Poloshirt_burgundy", "U_C_Poloshirt_salmon", @@ -87,7 +87,7 @@ KPLIB_guerilla_uniforms_1 = [ "U_Marshal" ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "U_I_C_Soldier_Bandit_1_F", "U_I_C_Soldier_Bandit_2_F", "U_I_C_Soldier_Bandit_3_F", @@ -103,7 +103,7 @@ KPLIB_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_Guerrilla_6_1", @@ -116,7 +116,7 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -131,7 +131,7 @@ KPLIB_guerilla_vests_1 = [ "V_BandollierB_ghex_F" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -144,7 +144,7 @@ KPLIB_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -157,7 +157,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "", @@ -182,7 +182,7 @@ KPLIB_guerilla_headgear_1 = [ "H_Cap_blk" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -200,7 +200,7 @@ KPLIB_guerilla_headgear_2 = [ "H_MilCap_dgtl" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -214,7 +214,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/cup_napa.sqf b/Missionframework/presets/resistance/cup_napa.sqf index f3ac6ba8d..3f9cde61b 100644 --- a/Missionframework/presets/resistance/cup_napa.sqf +++ b/Missionframework/presets/resistance/cup_napa.sqf @@ -2,7 +2,7 @@ File: cup_napa.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-21 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,7 +19,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "CUP_I_GUE_Soldier_AR", "CUP_I_GUE_Engineer", "CUP_I_GUE_Commander", @@ -31,7 +31,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = [ +KPLIB_r_vehicles = [ "CUP_I_Datsun_PK_Random", "CUP_I_Datsun_PK_Random", "CUP_I_Datsun_PK_Random", @@ -52,7 +52,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["CUP_srifle_CZ550","CUP_5x_22_LR_17_HMR_M",10,"",""], ["CUP_srifle_CZ550_rail","CUP_5x_22_LR_17_HMR_M",10,"optic_mrco",""], ["CUP_srifle_LeeEnfield","CUP_10x_303_M",10,"",""], @@ -61,7 +61,7 @@ KPLIB_guerilla_weapons_1 = [ ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], ["CUP_arifle_AKM","CUP_30Rnd_762x39_AK47_M",4,"cup_optic_pso_1_ak_open",""], @@ -70,7 +70,7 @@ KPLIB_guerilla_weapons_2 = [ ["CUP_smg_SA61","CUP_50Rnd_B_765x17_Ball_M",5,"",""] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["CUP_arifle_AK47_Early","CUP_30Rnd_762x39_AK47_M",4,"",""], ["CUP_arifle_AK74M","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], ["CUP_arifle_AK74M_GL","CUP_30Rnd_545x39_AK74M_M",4,"cup_optic_kobra",""], @@ -82,7 +82,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "CUP_U_I_Villager_03", "CUP_U_I_Woodlander03", "CUP_U_I_Woodlander_02", @@ -95,7 +95,7 @@ KPLIB_guerilla_uniforms_1 = [ ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "CUP_I_B_PMC_Unit_20", "CUP_I_B_PMC_Unit_19", "CUP_I_B_PMC_Unit_11", @@ -106,7 +106,7 @@ KPLIB_guerilla_uniforms_2 = [ "CUP_I_B_PMC_Unit_22" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "CUP_U_I_GUE_Flecktarn2", "CUP_U_I_GUE_Flecktarn3", "CUP_U_I_GUE_Flecktarn", @@ -119,7 +119,7 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "CUP_V_I_Guerilla_Jacket", "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", @@ -135,7 +135,7 @@ KPLIB_guerilla_vests_1 = [ "V_BandollierB_ghex_F" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "V_TacVestIR_blk", "V_Chestrig_rgr", "V_Chestrig_khk", @@ -149,7 +149,7 @@ KPLIB_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "V_TacVest_oli", "CUP_V_RUS_Smersh_2", "CUP_V_I_Carrier_Belt", @@ -160,7 +160,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "", @@ -179,7 +179,7 @@ KPLIB_guerilla_headgear_1 = [ "CUP_H_C_Beanie_04" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -197,7 +197,7 @@ KPLIB_guerilla_headgear_2 = [ "H_MilCap_dgtl" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "H_Shemag_olive", "H_Shemag_olive_hs", "H_Shemag_olive", @@ -209,7 +209,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/cup_takistan.sqf b/Missionframework/presets/resistance/cup_takistan.sqf index c7e8c35b5..04631f93a 100644 --- a/Missionframework/presets/resistance/cup_takistan.sqf +++ b/Missionframework/presets/resistance/cup_takistan.sqf @@ -2,7 +2,7 @@ File: cup_takistan.sqf Author: Eogos - https://github.com/Eogos Date: 2019-07-15 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,7 +19,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "CUP_I_TK_GUE_Soldier_MG", "CUP_I_TK_GUE_Mechanic", "CUP_I_TK_GUE_Commander", @@ -31,7 +31,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = [ +KPLIB_r_vehicles = [ "CUP_I_Datsun_PK_TK", "CUP_I_Hilux_AGS30_TK", "CUP_I_Hilux_DSHKM_TK", @@ -55,7 +55,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["bnae_mk1_virtual","10Rnd_303_Magazine",8,"",""], ["bnae_mk1_t_virtual","10Rnd_303_Magazine",8,"bnae_scope_v3_virtual",""], ["bnae_m97_virtual","6Rnd_Slug_Magazine",10,"",""], @@ -66,7 +66,7 @@ KPLIB_guerilla_weapons_1 = [ ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["bnae_mk1_t_virtual","10Rnd_303_Magazine",8,"bnae_scope_v3_virtual",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"cup_optic_kobra",""], @@ -75,7 +75,7 @@ KPLIB_guerilla_weapons_2 = [ ["CUP_arifle_RPK74","CUP_75Rnd_TE4_LRT4_Green_Tracer_545x39_RPK_M",3,"",""] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["CUP_arifle_FNFAL","CUP_20Rnd_762x51_FNFAL_M",5,"",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"",""], ["CUP_arifle_AK47","CUP_30Rnd_762x39_AK47_M",6,"cup_optic_kobra",""], @@ -87,7 +87,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "CUP_O_TKI_Khet_Jeans_04", "CUP_O_TKI_Khet_Jeans_03", "CUP_O_TKI_Khet_Jeans_02", @@ -105,7 +105,7 @@ KPLIB_guerilla_uniforms_1 = [ ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "U_BG_Guerilla2_3", "U_BG_Guerilla2_1", "U_BG_Guerilla2_1", @@ -121,7 +121,7 @@ KPLIB_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_Guerrilla_6_1", @@ -134,7 +134,7 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -165,7 +165,7 @@ KPLIB_guerilla_vests_1 = [ "CUP_V_OI_TKI_Jacket5_04" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -180,7 +180,7 @@ KPLIB_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -198,7 +198,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "CUP_H_TKI_Lungee_Open_01", "CUP_H_TK_Lungee", "CUP_H_TKI_Lungee_Open_02", @@ -232,7 +232,7 @@ KPLIB_guerilla_headgear_1 = [ "CUP_H_TKI_SkullCap_06" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "CUP_H_TKI_Lungee_Open_01", "CUP_H_TK_Lungee", "CUP_H_TKI_Lungee_Open_02", @@ -266,7 +266,7 @@ KPLIB_guerilla_headgear_2 = [ "CUP_H_TKI_SkullCap_06" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "CUP_H_TKI_Lungee_Open_01", "CUP_H_TK_Lungee", "CUP_H_TKI_Lungee_Open_02", @@ -301,7 +301,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/custom.sqf b/Missionframework/presets/resistance/custom.sqf index b0d67803d..d7205db4c 100644 --- a/Missionframework/presets/resistance/custom.sqf +++ b/Missionframework/presets/resistance/custom.sqf @@ -2,7 +2,7 @@ File: custom.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-07 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -17,7 +17,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "I_G_Soldier_AR_F", "I_G_engineer_F", "I_G_officer_F", @@ -29,7 +29,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = [ +KPLIB_r_vehicles = [ "I_G_Offroad_01_armed_F", "I_G_Offroad_01_AT_F" ]; @@ -40,7 +40,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["arifle_AKM_F","30Rnd_762x39_Mag_F",4,"",""], ["arifle_AKS_F","30Rnd_545x39_Mag_F",4,"",""], ["hgun_PDW2000_F","30Rnd_9x21_Mag",4,"",""], @@ -49,7 +49,7 @@ KPLIB_guerilla_weapons_1 = [ ["SMG_05_F","30Rnd_9x21_Mag_SMG_02",4,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["arifle_Katiba_F","30Rnd_65x39_caseless_green",4,"optic_ACO_grn",""], ["arifle_Mk20_plain_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], ["arifle_TRG21_F","30Rnd_556x45_Stanag",4,"optic_ACO_grn",""], @@ -58,7 +58,7 @@ KPLIB_guerilla_weapons_2 = [ ["srifle_DMR_06_olive_F","20Rnd_762x51_Mag",5,"optic_Hamr","bipod_01_F_blk"] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["arifle_CTAR_blk_F","30Rnd_580x42_Mag_F",4,"optic_MRCO",""], ["arifle_SPAR_01_blk_F","30Rnd_556x45_Stanag",4,"optic_MRCO",""], ["arifle_SPAR_03_blk_F","20Rnd_762x51_Mag",5,"optic_MRCO",""], @@ -70,7 +70,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "U_C_Poloshirt_blue", "U_C_Poloshirt_burgundy", "U_C_Poloshirt_salmon", @@ -87,7 +87,7 @@ KPLIB_guerilla_uniforms_1 = [ "U_Marshal" ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "U_I_C_Soldier_Bandit_1_F", "U_I_C_Soldier_Bandit_2_F", "U_I_C_Soldier_Bandit_3_F", @@ -103,7 +103,7 @@ KPLIB_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_Guerrilla_6_1", @@ -116,7 +116,7 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -131,7 +131,7 @@ KPLIB_guerilla_vests_1 = [ "V_BandollierB_ghex_F" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -144,7 +144,7 @@ KPLIB_guerilla_vests_2 = [ "V_HarnessOGL_ghex_F" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -157,7 +157,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "", @@ -182,7 +182,7 @@ KPLIB_guerilla_headgear_1 = [ "H_Cap_blk" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -200,7 +200,7 @@ KPLIB_guerilla_headgear_2 = [ "H_MilCap_dgtl" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -214,7 +214,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/germany.sqf b/Missionframework/presets/resistance/germany.sqf index aba299445..214d49ed9 100644 --- a/Missionframework/presets/resistance/germany.sqf +++ b/Missionframework/presets/resistance/germany.sqf @@ -2,7 +2,7 @@ File: custom.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -17,7 +17,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "I_G_Soldier_AR_F", "I_G_engineer_F", "I_G_officer_F", @@ -29,7 +29,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = []; +KPLIB_r_vehicles = []; /* Guerilla Equipment There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ @@ -37,19 +37,19 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["gm_mp2a1_blk","gm_32Rnd_9x19mm_B_DM51_mp2_blk",4,"",""], ["gm_mp2a1_blk","gm_32Rnd_9x19mm_B_DM51_mp2_blk",4,"",""], ["gm_mpiaks74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["gm_mpiaks74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""], ["gm_mpiak74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""], ["gm_mpiak74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["gm_mpiak74n_prp","gm_30Rnd_545x39mm_B_7N6_ak74_prp",4,"",""], ["gm_g3a3_blk","gm_20Rnd_762x51mm_B_T_DM21_g3_blk",4,"",""], ["gm_g3a3_blk","gm_20Rnd_762x51mm_B_T_DM21_g3_blk",4,"",""], @@ -58,7 +58,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "gm_gc_civ_uniform_man_01_80_blu", "gm_gc_civ_uniform_man_02_80_brn", "gm_ge_civ_uniform_blouse_80_gry", @@ -66,7 +66,7 @@ KPLIB_guerilla_uniforms_1 = [ "U_C_Mechanic_01_F" ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "gm_gc_civ_uniform_man_01_80_blu", "gm_gc_civ_uniform_man_02_80_brn", "gm_ge_civ_uniform_blouse_80_gry", @@ -76,7 +76,7 @@ KPLIB_guerilla_uniforms_2 = [ "U_C_WorkerCoveralls" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "gm_gc_civ_uniform_man_01_80_blu", "gm_gc_civ_uniform_man_02_80_brn", "gm_ge_civ_uniform_blouse_80_gry", @@ -93,7 +93,7 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -103,7 +103,7 @@ KPLIB_guerilla_vests_1 = [ "V_BandollierB_blk" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -113,7 +113,7 @@ KPLIB_guerilla_vests_2 = [ "gm_ge_bgs_vest_80_rifleman" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -122,7 +122,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "", @@ -135,7 +135,7 @@ KPLIB_guerilla_headgear_1 = [ "H_Hat_Safari_sand_F" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "", "", "", @@ -154,7 +154,7 @@ KPLIB_guerilla_headgear_2 = [ "H_Bandanna_khk" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "", "", "", @@ -177,7 +177,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/middle_eastern.sqf b/Missionframework/presets/resistance/middle_eastern.sqf index df50d5ca6..772766b21 100644 --- a/Missionframework/presets/resistance/middle_eastern.sqf +++ b/Missionframework/presets/resistance/middle_eastern.sqf @@ -2,7 +2,7 @@ File: middle_eastern.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-09 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,7 +19,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "LOP_AM_Infantry_SL", "LOP_AM_Infantry_Rifleman", "LOP_AM_Infantry_Rifleman_2", @@ -31,7 +31,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = [ +KPLIB_r_vehicles = [ "LOP_AM_UAZ_DshKM" ]; @@ -41,13 +41,13 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",4,"",""], ["rhs_weap_aks74u","rhs_30rnd_545x39_AK",4,"",""], ["LOP_Weap_LeeEnfield","LOP_10rnd_77mm_mag",3,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",4,"",""], ["rhs_weap_akm","rhs_30rnd_762x39mm",4,"",""], ["rhs_weap_akms","rhs_30rnd_762x39mm",4,"",""], @@ -56,7 +56,7 @@ KPLIB_guerilla_weapons_2 = [ ["LOP_Weap_LeeEnfield_railed","LOP_10rnd_77mm_mag",3,"optic_ACO_grn",""] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"",""], ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"",""], ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_ekp1",""], @@ -66,7 +66,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "LOP_U_TAK_Civ_Fatigue_01", "LOP_U_TAK_Civ_Fatigue_02", "LOP_U_TAK_Civ_Fatigue_04", @@ -84,7 +84,7 @@ KPLIB_guerilla_uniforms_1 = [ "LOP_U_TAK_Civ_Fatigue_16" ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "LOP_U_TAK_Civ_Fatigue_01", "LOP_U_TAK_Civ_Fatigue_02", "LOP_U_TAK_Civ_Fatigue_04", @@ -102,7 +102,7 @@ KPLIB_guerilla_uniforms_2 = [ "LOP_U_TAK_Civ_Fatigue_16" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "LOP_U_TAK_Civ_Fatigue_01", "LOP_U_TAK_Civ_Fatigue_02", "LOP_U_TAK_Civ_Fatigue_04", @@ -121,11 +121,11 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "", "V_LegStrapBag_black_F", "V_LegStrapBag_coyote_F", @@ -133,7 +133,7 @@ KPLIB_guerilla_vests_2 = [ "LOP_6sh46" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "", "V_LegStrapBag_black_F", "V_LegStrapBag_coyote_F", @@ -145,7 +145,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "H_HeadBandage_clean_F", @@ -160,7 +160,7 @@ KPLIB_guerilla_headgear_1 = [ "H_Bandanna_camo" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "", "H_HeadBandage_clean_F", "H_HeadBandage_stained_F", @@ -175,7 +175,7 @@ KPLIB_guerilla_headgear_2 = [ "LOP_H_Turban_mask" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "LOP_H_Turban", "LOP_H_Turban_mask", "H_Shemag_olive", @@ -191,6 +191,6 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "" ]; diff --git a/Missionframework/presets/resistance/racs.sqf b/Missionframework/presets/resistance/racs.sqf index fef923016..f046f8942 100644 --- a/Missionframework/presets/resistance/racs.sqf +++ b/Missionframework/presets/resistance/racs.sqf @@ -2,7 +2,7 @@ File: racs.sqf Author: PSYKO-nz - https://github.com/PSYKO-nz Date: 2018-02-19 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -17,7 +17,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "LOP_RACS_Infantry_MG", "LOP_RACS_Infantry_Engineer", "LOP_RACS_Infantry_TL", @@ -29,7 +29,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = [ +KPLIB_r_vehicles = [ "LOP_RACS_Landrover_M2", "LOP_RACS_Offroad_M2" ]; @@ -40,7 +40,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["rhs_weap_Izh","rhsgref_1Rnd_00Buck",20,"",""], ["rhs_weap_m38","rhsgref_5rnd_762x54_m38",6,"",""], ["rhs_weap_m38_rail","rhsgref_5rnd_762x54_m38",6,"",""], @@ -49,7 +49,7 @@ KPLIB_guerilla_weapons_1 = [ ["rhs_weap_makarov_pm","rhs_mag_9x18_8_57N181S",5,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",3,"",""], ["rhs_weap_akm","rhs_30rnd_762x39mm",3,"",""], ["rhs_weap_akms","rhs_30rnd_762x39mm",3,"",""], @@ -58,7 +58,7 @@ KPLIB_guerilla_weapons_2 = [ ["rhs_weap_svds","rhs_10rnd_762x54mmR_7N1",3,"rhs_acc_pso1m2",""] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"rhs_acc_pkas",""], ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"rhs_acc_ekp8_02",""], ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_pkas",""], @@ -70,23 +70,23 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "LOP_U_RACS_Fatigue_01", "LOP_U_RACS_Fatigue_01_slv" ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "LOP_U_RACS_Fatigue_01", "LOP_U_RACS_Fatigue_01_slv" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "LOP_U_RACS_Fatigue_01", "LOP_U_RACS_Fatigue_01_slv" ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -105,7 +105,7 @@ KPLIB_guerilla_vests_1 = [ "rhs_6sh46" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -122,7 +122,7 @@ KPLIB_guerilla_vests_2 = [ "V_TacChestrig_oli_F" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -139,7 +139,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "", @@ -150,7 +150,7 @@ KPLIB_guerilla_headgear_1 = [ ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -170,7 +170,7 @@ KPLIB_guerilla_headgear_2 = [ "LOP_H_6B27M_ess_RACS" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -193,7 +193,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/rhs_gref.sqf b/Missionframework/presets/resistance/rhs_gref.sqf index aecac2d61..31f3429ac 100644 --- a/Missionframework/presets/resistance/rhs_gref.sqf +++ b/Missionframework/presets/resistance/rhs_gref.sqf @@ -2,7 +2,7 @@ File: rhs_gref.sqf Author: FatRefrigerator - https://github.com/FatRefrigerator Date: 2017-10-11 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -18,7 +18,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "I_G_Soldier_AR_F", "I_G_engineer_F", "I_G_officer_F", @@ -30,7 +30,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = [ +KPLIB_r_vehicles = [ "rhsgref_ins_g_uaz_dshkm_chdkz" ]; @@ -40,7 +40,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["rhs_weap_Izh","rhsgref_1Rnd_00Buck",20,"",""], ["rhs_weap_m38","rhsgref_5rnd_762x54_m38",6,"",""], ["rhs_weap_m38_rail","rhsgref_5rnd_762x54_m38",6,"",""], @@ -49,7 +49,7 @@ KPLIB_guerilla_weapons_1 = [ ["rhs_weap_makarov_pm","rhs_mag_9x18_8_57N181S",5,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["rhs_weap_ak74","rhs_30rnd_545x39_AK",3,"",""], ["rhs_weap_akm","rhs_30rnd_762x39mm",3,"",""], ["rhs_weap_akms","rhs_30rnd_762x39mm",3,"",""], @@ -58,7 +58,7 @@ KPLIB_guerilla_weapons_2 = [ ["rhs_weap_svds","rhs_10rnd_762x54mmR_7N1",3,"rhs_acc_pso1m2",""] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["rhs_weap_ak103","rhs_30rnd_762x39mm",4,"rhs_acc_pkas",""], ["rhs_weap_ak104","rhs_30rnd_762x39mm",4,"rhs_acc_ekp8_02",""], ["rhs_weap_ak105","rhs_30rnd_545x39_AK",4,"rhs_acc_pkas",""], @@ -70,7 +70,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "U_I_C_Soldier_Bandit_1_F", "U_I_C_Soldier_Bandit_2_F", "U_I_C_Soldier_Bandit_3_F", @@ -83,7 +83,7 @@ KPLIB_guerilla_uniforms_1 = [ "U_BG_Guerilla2_3" ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "U_BG_Guerrilla_6_1", "U_BG_Guerilla1_1", "U_I_C_Soldier_Para_1_F", @@ -97,7 +97,7 @@ KPLIB_guerilla_uniforms_2 = [ "U_I_G_resistanceLeader_F" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "rhsgref_uniform_reed", "rhsgref_uniform_woodland_olive", "rhsgref_uniform_flecktarn", @@ -106,7 +106,7 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "V_LegStrapBag_coyote_F", "V_LegStrapBag_olive_F", "V_LegStrapBag_black_F", @@ -125,7 +125,7 @@ KPLIB_guerilla_vests_1 = [ "rhs_6sh46" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "V_Chestrig_rgr", "V_Chestrig_khk", "V_Chestrig_oli", @@ -142,7 +142,7 @@ KPLIB_guerilla_vests_2 = [ "V_TacChestrig_oli_F" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "V_TacVest_brn", "V_TacVest_khk", "V_TacVest_oli", @@ -159,7 +159,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "", @@ -180,7 +180,7 @@ KPLIB_guerilla_headgear_1 = [ "H_Cap_blk" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "H_Bandanna_blu", "H_Bandanna_sand", "H_Bandanna_gry", @@ -194,7 +194,7 @@ KPLIB_guerilla_headgear_2 = [ "rhsgref_fieldcap_ttsko_urban" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "H_ShemagOpen_khk", "H_ShemagOpen_tan", "H_Shemag_olive", @@ -211,7 +211,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", diff --git a/Missionframework/presets/resistance/unsung.sqf b/Missionframework/presets/resistance/unsung.sqf index 17658b2b7..f8abdcc98 100644 --- a/Missionframework/presets/resistance/unsung.sqf +++ b/Missionframework/presets/resistance/unsung.sqf @@ -2,7 +2,7 @@ File: unsung.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-07-25 - Last Update: 2020-05-18 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -17,7 +17,7 @@ /* Classnames of the guerilla faction which is friendly or hostile, depending on the civil reputation Standard loadout of the units will be replaced with a scripted one, which depends on the guerilla strength, after spawn */ -KPLIB_guerilla_units = [ +KPLIB_r_units = [ "uns_men_ARVNci_HMG", "uns_men_ARVNci_S2", "uns_men_ARVNci_SL", @@ -29,7 +29,7 @@ KPLIB_guerilla_units = [ ]; // Armed vehicles -KPLIB_guerilla_vehicles = []; +KPLIB_r_vehicles = []; /* Guerilla Equipment There are 3 tiers for every category. If the strength of the guerillas will increase, they'll have higher tier equipment. */ @@ -37,7 +37,7 @@ There are 3 tiers for every category. If the strength of the guerillas will incr /* Weapons - You've to add the weapons as array like ["Weaponclassname","Magazineclassname","magazine amount","optic","tripod"] You can leave optic and tripod empty with "" */ -KPLIB_guerilla_weapons_1 = [ +KPLIB_r_weapons_1 = [ ["uns_ak47","uns_ak47mag",4,"",""], ["uns_PPS52","uns_k50mag",4,"",""], ["uns_owen","uns_owenmag",4,"",""], @@ -46,7 +46,7 @@ KPLIB_guerilla_weapons_1 = [ ["uns_m1carbine","uns_m1carbinemag",4,"",""] ]; -KPLIB_guerilla_weapons_2 = [ +KPLIB_r_weapons_2 = [ ["uns_m2carbine","uns_m2carbinemag",4,"",""], ["uns_akm","uns_ak47mag",4,"",""], ["uns_DP28_base","uns_47Rnd_DP28",4,"",""], @@ -55,7 +55,7 @@ KPLIB_guerilla_weapons_2 = [ ["uns_mas36","uns_mas36mag",4,"",""] ]; -KPLIB_guerilla_weapons_3 = [ +KPLIB_r_weapons_3 = [ ["uns_akm_drum","uns_75Rnd_akdr",4,"",""], ["uns_sa58p","uns_sa58mag",4,"",""], ["uns_PK","uns_100Rnd_762x54_PK",1,"",""], @@ -68,7 +68,7 @@ KPLIB_guerilla_weapons_3 = [ ]; // Uniforms -KPLIB_guerilla_uniforms_1 = [ +KPLIB_r_uniforms_1 = [ "U_C_Man_casual_4_F", "U_C_Man_casual_5_F", "U_C_Man_casual_6_F", @@ -81,7 +81,7 @@ KPLIB_guerilla_uniforms_1 = [ "UNS_VC_U" ]; -KPLIB_guerilla_uniforms_2 = [ +KPLIB_r_uniforms_2 = [ "U_BG_Guerilla2_1", "U_BG_Guerilla2_3", "U_BG_Guerilla3_1", @@ -94,7 +94,7 @@ KPLIB_guerilla_uniforms_2 = [ "U_I_C_Soldier_Para_5_F" ]; -KPLIB_guerilla_uniforms_3 = [ +KPLIB_r_uniforms_3 = [ "U_BG_Guerilla1_1", "U_BG_Guerilla1_2_F", "U_BG_leader", @@ -108,7 +108,7 @@ KPLIB_guerilla_uniforms_3 = [ ]; // Vests -KPLIB_guerilla_vests_1 = [ +KPLIB_r_vests_1 = [ "UNS_VC_B1", "UNS_VC_S2", "V_BandollierB_blk", @@ -125,7 +125,7 @@ KPLIB_guerilla_vests_1 = [ "V_Pocketed_olive_F" ]; -KPLIB_guerilla_vests_2 = [ +KPLIB_r_vests_2 = [ "UNS_ANZAC_VEST_C", "UNS_ANZAC_VEST", "UNS_M1956_M14", @@ -145,7 +145,7 @@ KPLIB_guerilla_vests_2 = [ "V_HarnessOGL_gry" ]; -KPLIB_guerilla_vests_3 = [ +KPLIB_r_vests_3 = [ "UNS_M1956_M1", "UNS_M1956_M2", "UNS_M1956_M3", @@ -163,7 +163,7 @@ KPLIB_guerilla_vests_3 = [ ]; // Headgear -KPLIB_guerilla_headgear_1 = [ +KPLIB_r_headgear_1 = [ "", "", "", @@ -173,7 +173,7 @@ KPLIB_guerilla_headgear_1 = [ "UNS_Conehat_VC" ]; -KPLIB_guerilla_headgear_2 = [ +KPLIB_r_headgear_2 = [ "H_Bandanna_khk", "UNS_Boonie_VC", "UNS_Headband_BK", @@ -188,7 +188,7 @@ KPLIB_guerilla_headgear_2 = [ "uns_vc_headband_blue" ]; -KPLIB_guerilla_headgear_3 = [ +KPLIB_r_headgear_3 = [ "UNS_Boonie_6", "UNS_Boonie_ERDL", "UNS_Boonie_ERDL3", @@ -206,7 +206,7 @@ KPLIB_guerilla_headgear_3 = [ ]; // Facegear. Applies for tier 2 and 3. -KPLIB_guerilla_facegear = [ +KPLIB_r_facegear = [ "", "", "", From dbf99477022d4b6f496fa11cc18518257bbfbad7 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 25 May 2020 14:15:35 +0200 Subject: [PATCH 055/115] Code adjustments due to preset variable rename --- .../functions/fn_addActionsFob.sqf | 6 +- .../functions/fn_addActionsPlayer.sqf | 4 +- Missionframework/functions/fn_createCrate.sqf | 6 +- .../functions/fn_forceBluforCrew.sqf | 4 +- .../functions/fn_getCrateHeight.sqf | 8 +- Missionframework/functions/fn_getFobName.sqf | 4 +- .../functions/fn_getMilitaryId.sqf | 6 +- .../functions/fn_getMobileRespawns.sqf | 4 +- Missionframework/functions/fn_getSaveData.sqf | 12 +- .../functions/fn_getStoragePositions.sqf | 6 +- Missionframework/functions/fn_potatoScan.sqf | 4 +- Missionframework/functions/fn_setFobMass.sqf | 6 +- .../functions/fn_setVehicleSeized.sqf | 4 +- Missionframework/functions/fn_sortStorage.sqf | 8 +- .../functions/fn_spawnCivilians.sqf | 4 +- .../functions/fn_spawnGuerillaGroup.sqf | 14 +-- Missionframework/kp_objectInits.sqf | 12 +- Missionframework/presets/init_presets.sqf | 110 +++++++++--------- .../scripts/client/actions/do_recycle.sqf | 10 +- .../client/actions/do_repackage_fob.sqf | 6 +- .../client/actions/recycle_manager.sqf | 2 +- .../ammoboxes/ammobox_action_manager.sqf | 6 +- .../scripts/client/build/do_build.sqf | 30 ++--- .../scripts/client/build/do_sector_build.sqf | 2 +- .../scripts/client/build/open_build_menu.sqf | 28 ++--- .../client/commander/open_logistic.sqf | 2 +- .../client/commander/open_production.sqf | 2 +- .../client/markers/empty_vehicles_marker.sqf | 4 +- .../scripts/client/markers/fob_markers.sqf | 2 +- .../scripts/client/misc/playerNamespace.sqf | 6 +- .../remotecall/remote_call_prisonner.sqf | 2 +- .../scripts/client/spawn/redeploy_manager.sqf | 2 +- .../scripts/client/tutorial/fn_tutorial.fsm | 4 +- .../scripts/client/ui/cinematic_camera.sqf | 2 +- .../scripts/client/ui/end_screen.sqf | 4 +- .../scripts/client/ui/ui_manager.sqf | 12 +- .../scripts/server/ai/prisonner_ai.sqf | 2 +- .../convoy/logistic_convoy_ambush.sqf | 12 +- .../asymmetric/random/sector_guerilla.sqf | 4 +- .../scripts/server/base/huron_manager.sqf | 44 +++---- .../scripts/server/base/startgame.sqf | 2 +- .../server/base/startvehicle_spawn.sqf | 6 +- .../server/civinformant/civinfo_loop.sqf | 2 +- .../civrep/wounded/civrep_wounded_civs.sqf | 2 +- .../server/game/check_victory_conditions.sqf | 4 +- .../scripts/server/game/save_manager.sqf | 36 +++--- .../scripts/server/game/zeus_synchro.sqf | 4 +- .../patrols/manage_one_civilian_patrol.sqf | 6 +- .../remotecall/add_logiTruck_remote_call.sqf | 6 +- .../remotecall/build_fac_remote_call.sqf | 8 +- .../remotecall/build_fob_remote_call.sqf | 2 +- .../server/remotecall/build_remote_call.sqf | 6 +- .../remotecall/cancel_build_remote_call.sqf | 10 +- .../remotecall/del_logiTruck_remote_call.sqf | 14 +-- .../server/remotecall/recycle_remote_call.sqf | 10 +- .../server/resources/manage_logistics.sqf | 44 +++---- .../server/resources/manage_resources.sqf | 16 +-- .../resources/recalculate_resources.sqf | 14 +-- .../server/secondary/convoy_hijack.sqf | 2 +- .../server/secondary/search_and_rescue.sqf | 4 +- .../server/sector/attack_in_progress_fob.sqf | 2 +- .../sector/attack_in_progress_sector.sqf | 8 +- .../scripts/server/sector/fn_destroyFob.sqf | 6 +- .../server/sector/fn_spawnSectorCrates.sqf | 4 +- .../scripts/shared/kill_manager.sqf | 2 +- Missionframework/stringtable.xml | 2 +- 66 files changed, 316 insertions(+), 316 deletions(-) diff --git a/Missionframework/functions/fn_addActionsFob.sqf b/Missionframework/functions/fn_addActionsFob.sqf index 052070908..b890075f0 100644 --- a/Missionframework/functions/fn_addActionsFob.sqf +++ b/Missionframework/functions/fn_addActionsFob.sqf @@ -2,7 +2,7 @@ File: fn_addActionsFob.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-04-13 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,7 +23,7 @@ if (isNull _object) exitWith {["Null object given"] call BIS_fnc_error; false}; if (isNil "FOB_build_in_progress") then {FOB_build_in_progress = false;}; -if ((typeOf _obj) isEqualTo FOB_typename) exitWith { +if ((typeOf _obj) isEqualTo KPLIB_b_fobBuilding) exitWith { _obj addAction [ ["", localize "STR_FOB_REPACKAGE", " "] joinString "", "scripts\client\actions\do_repackage_fob.sqf", @@ -38,7 +38,7 @@ if ((typeOf _obj) isEqualTo FOB_typename) exitWith { true }; -if ((typeOf _obj) in [FOB_box_typename, FOB_truck_typename]) exitWith { +if ((typeOf _obj) in [KPLIB_b_fobBox, KPLIB_b_fobTruck]) exitWith { _obj addAction [ ["", localize "STR_FOB_ACTION", " "] joinString "", "scripts\client\build\do_build_fob.sqf", diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index ed57880ea..7d3fca41f 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -2,7 +2,7 @@ File: fn_addActionsPlayer.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-05-17 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -169,7 +169,7 @@ _player addAction [ _player addAction [ ["", localize "STR_SECSTORAGEBUILD_ACTION", ""] joinString "", "scripts\client\build\do_sector_build.sqf", - [KPLIB_small_storage_building], + [KPLIB_b_smallStorage], -770, false, true, diff --git a/Missionframework/functions/fn_createCrate.sqf b/Missionframework/functions/fn_createCrate.sqf index 503f381aa..4802a2b04 100644 --- a/Missionframework/functions/fn_createCrate.sqf +++ b/Missionframework/functions/fn_createCrate.sqf @@ -2,14 +2,14 @@ File: fn_createCrate.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-11 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: Spawns a resource crate of given type and with given amount at given position. Parameter(s): - _resource - Type of resource [STRING, defaults to KPLIB_supply_crate] + _resource - Type of resource [STRING, defaults to KPLIB_b_crateSupply] _amount - Resource amount [NUMBER, defaults to 100] _pos - Position where to spawn the crate [POSITION, defaults to getPos player] @@ -18,7 +18,7 @@ */ params [ - ["_resource", KPLIB_supply_crate, [""]], + ["_resource", KPLIB_b_crateSupply, [""]], ["_amount", 100, [0]], ["_pos", getPos player, [[]], [2, 3]] ]; diff --git a/Missionframework/functions/fn_forceBluforCrew.sqf b/Missionframework/functions/fn_forceBluforCrew.sqf index 2c28209d3..71608f0f8 100644 --- a/Missionframework/functions/fn_forceBluforCrew.sqf +++ b/Missionframework/functions/fn_forceBluforCrew.sqf @@ -2,7 +2,7 @@ File: fn_forceBluforCrew.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -31,7 +31,7 @@ if ((side _grp) != KPLIB_side_friendly) then { _grp = createGroup [KPLIB_side_friendly, true]; while {count units _grp < 3} do { - [crewman_classname, getPos _veh, _grp] call KPLIB_fnc_createManagedUnit; + [KPLIB_b_crewUnit, getPos _veh, _grp] call KPLIB_fnc_createManagedUnit; }; ((units _grp) select 0) moveInDriver _veh; ((units _grp) select 1) moveInGunner _veh; diff --git a/Missionframework/functions/fn_getCrateHeight.sqf b/Missionframework/functions/fn_getCrateHeight.sqf index 47585a541..2900c629d 100644 --- a/Missionframework/functions/fn_getCrateHeight.sqf +++ b/Missionframework/functions/fn_getCrateHeight.sqf @@ -2,7 +2,7 @@ File: fn_getCrateHeight.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-26 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -24,9 +24,9 @@ if (_crateClass isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_erro private _height = 0; switch (_crateClass) do { - case KPLIB_supply_crate: {_height = 0.4;}; - case KPLIB_ammo_crate: {_height = 0.6;}; - case KPLIB_fuel_crate: {_height = 0.3;}; + case KPLIB_b_crateSupply: {_height = 0.4;}; + case KPLIB_b_crateAmmo: {_height = 0.6;}; + case KPLIB_b_crateFuel: {_height = 0.3;}; default {_height = 0.6;}; }; diff --git a/Missionframework/functions/fn_getFobName.sqf b/Missionframework/functions/fn_getFobName.sqf index 8da59a444..5a1a971ec 100644 --- a/Missionframework/functions/fn_getFobName.sqf +++ b/Missionframework/functions/fn_getFobName.sqf @@ -2,7 +2,7 @@ File: fn_getFobName.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2020-05-17 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,4 +19,4 @@ params [ ["_fob", [0, 0, 0], [[]], [2, 3]] ]; -military_alphabet param [KPLIB_sectors_fob findIf {(_x distance2d _fob) < 100}, ""] +KPLIB_militaryAlphabet param [KPLIB_sectors_fob findIf {(_x distance2d _fob) < 100}, ""] diff --git a/Missionframework/functions/fn_getMilitaryId.sqf b/Missionframework/functions/fn_getMilitaryId.sqf index dc32f5001..e7a3fb5d0 100644 --- a/Missionframework/functions/fn_getMilitaryId.sqf +++ b/Missionframework/functions/fn_getMilitaryId.sqf @@ -2,7 +2,7 @@ File: fn_getMilitaryId.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-09-14 - Last Update: 2019-12-06 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -23,7 +23,7 @@ if (_number isEqualTo -1) exitWith {["No valid number given"] call BIS_fnc_error _number = _number + 1; private _return = []; -private _alphabetCount = count military_alphabet; +private _alphabetCount = count KPLIB_militaryAlphabet; private _remain = 0; while {_number > 0} do { @@ -34,4 +34,4 @@ while {_number > 0} do { reverse _return; -(_return apply {military_alphabet select _x}) joinString " " +(_return apply {KPLIB_militaryAlphabet select _x}) joinString " " diff --git a/Missionframework/functions/fn_getMobileRespawns.sqf b/Missionframework/functions/fn_getMobileRespawns.sqf index 918e092e3..177431008 100644 --- a/Missionframework/functions/fn_getMobileRespawns.sqf +++ b/Missionframework/functions/fn_getMobileRespawns.sqf @@ -2,7 +2,7 @@ File: fn_getMobileRespawns.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-11-25 - Last Update: 2019-12-05 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -16,7 +16,7 @@ */ private _respawn_trucks = vehicles select { - (typeOf _x) in [Respawn_truck_typename, huron_typename] && + (typeOf _x) in [KPLIB_b_mobileRespawn, KPLIB_b_potato01] && {alive _x} && {_x distance2d startbase > 500} && {abs (speed _x) < 5} && diff --git a/Missionframework/functions/fn_getSaveData.sqf b/Missionframework/functions/fn_getSaveData.sqf index 5ecccfdd3..fe48f0565 100644 --- a/Missionframework/functions/fn_getSaveData.sqf +++ b/Missionframework/functions/fn_getSaveData.sqf @@ -2,7 +2,7 @@ File: fn_getSaveData.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-29 - Last Update: 2020-05-17 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -87,7 +87,7 @@ private ["_savedPos", "_savedVecDir", "_savedVecUp", "_class", "_hasCrew"]; // Only save player side, seized or captured objects if ( - (!(_class in civilian_vehicles) || {_x getVariable ["KPLIB_seized", false]}) && + (!(_class in KPLIB_c_vehicles) || {_x getVariable ["KPLIB_seized", false]}) && (!((toLower _class) in KPLIB_o_allVeh_classes) || {_x getVariable ["KPLIB_captured", false]}) ) then { _objectsToSave pushBack [_class, _savedPos, _savedVecDir, _savedVecUp, _hasCrew]; @@ -111,9 +111,9 @@ private ["_supplyValue", "_ammoValue", "_fuelValue"]; // Sum all stored resources of current storage { switch ((typeOf _x)) do { - case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateSupply: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateAmmo: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateFuel: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _x); @@ -168,7 +168,7 @@ private _stats = [ stats_secondary_objectives, stats_sectors_liberated, stats_sectors_lost, - stats_spartan_respawns, + stats_potato_respawns, stats_supplies_produced, stats_supplies_spent, stats_vehicles_recycled diff --git a/Missionframework/functions/fn_getStoragePositions.sqf b/Missionframework/functions/fn_getStoragePositions.sqf index fcdfcb36b..5db3811b5 100644 --- a/Missionframework/functions/fn_getStoragePositions.sqf +++ b/Missionframework/functions/fn_getStoragePositions.sqf @@ -2,7 +2,7 @@ File: fn_getStoragePositions.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-03-27 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -22,8 +22,8 @@ params [ if (isNull _storage) exitWith {["Null object given"] call BIS_fnc_error; [[], 0]}; private _data = [ - [KPLIB_small_storage_building, [KPLIB_small_storage_positions, 4]], - [KPLIB_large_storage_building, [KPLIB_large_storage_positions, 6.5]] + [KPLIB_b_smallStorage, [KPLIB_small_storage_positions, 4]], + [KPLIB_b_largeStorage, [KPLIB_large_storage_positions, 6.5]] ] select {(typeOf _storage) isEqualTo (_x select 0)}; if (_data isEqualTo []) exitWith {["No valid storage object given"] call BIS_fnc_error; [[], 0]}; diff --git a/Missionframework/functions/fn_potatoScan.sqf b/Missionframework/functions/fn_potatoScan.sqf index 911660e92..77f70bb68 100644 --- a/Missionframework/functions/fn_potatoScan.sqf +++ b/Missionframework/functions/fn_potatoScan.sqf @@ -2,7 +2,7 @@ File: fn_potatoScan.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2019-12-07 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -15,7 +15,7 @@ Potato 01 [OBJECT] */ -private _potatoes = vehicles select {typeof _x == huron_typename && alive _x}; +private _potatoes = vehicles select {typeof _x == KPLIB_b_potato01 && alive _x}; if !(_potatoes isEqualTo []) then { _potatoes select 0 } else { diff --git a/Missionframework/functions/fn_setFobMass.sqf b/Missionframework/functions/fn_setFobMass.sqf index 383f53c4b..f2c941067 100644 --- a/Missionframework/functions/fn_setFobMass.sqf +++ b/Missionframework/functions/fn_setFobMass.sqf @@ -2,11 +2,11 @@ File: fn_setFobMass.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-12-02 - Last Update: 2020-04-06 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: - Sets mass of FOB box to Max slingload weight of "huron_typename" lowered by 100. + Sets mass of FOB box to Max slingload weight of "KPLIB_b_potato01" lowered by 100. If max slingload mass is lower than 1000 its set to 1000. If it is higher than 3000 it's set to 3000. @@ -23,7 +23,7 @@ params [ if (isNull _box) exitWith {["Null object given"] call BIS_fnc_error; false}; -private _boxMass = getNumber(configFile >> "CfgVehicles" >> huron_typename >> "slingLoadMaxCargoMass") - 100; +private _boxMass = getNumber(configFile >> "CfgVehicles" >> KPLIB_b_potato01 >> "slingLoadMaxCargoMass") - 100; _boxMass = 1000 max (_boxMass min 3000); if (local _box) then { diff --git a/Missionframework/functions/fn_setVehicleSeized.sqf b/Missionframework/functions/fn_setVehicleSeized.sqf index bee722382..4318ff6c8 100644 --- a/Missionframework/functions/fn_setVehicleSeized.sqf +++ b/Missionframework/functions/fn_setVehicleSeized.sqf @@ -2,7 +2,7 @@ File: fn_setVehicleSeized.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-20 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -24,7 +24,7 @@ if (isNull _veh) exitWith {["Null object given"] call BIS_fnc_error; false}; private _type = typeOf _veh; -if !(_type in civilian_vehicles) exitWith {false}; +if !(_type in KPLIB_c_vehicles) exitWith {false}; if !(_veh getVariable ["KPLIB_seized", false]) then { _veh setVariable ["KPLIB_seized", true, true]; diff --git a/Missionframework/functions/fn_sortStorage.sqf b/Missionframework/functions/fn_sortStorage.sqf index 52c061e24..627122b2f 100644 --- a/Missionframework/functions/fn_sortStorage.sqf +++ b/Missionframework/functions/fn_sortStorage.sqf @@ -2,7 +2,7 @@ File: fn_sortStorage.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-06-09 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -27,9 +27,9 @@ private _fuel = 0; { switch (typeOf _x) do { - case KPLIB_supply_crate: {_supply = _supply + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_ammo_crate: {_ammo = _ammo + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_fuel_crate: {_fuel = _fuel + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateSupply: {_supply = _supply + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateAmmo: {_ammo = _ammo + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateFuel: {_fuel = _fuel + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; detach _x; diff --git a/Missionframework/functions/fn_spawnCivilians.sqf b/Missionframework/functions/fn_spawnCivilians.sqf index 1b488c142..88f52e60b 100644 --- a/Missionframework/functions/fn_spawnCivilians.sqf +++ b/Missionframework/functions/fn_spawnCivilians.sqf @@ -2,7 +2,7 @@ File: fn_spawnCivilians.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-17 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -40,7 +40,7 @@ for "_i" from 1 to _amount do { _civs pushBack ( [ - selectRandom civilians, + selectRandom KPLIB_c_units, [(((_sPos select 0) + (75 * _spread)) - (random (150 * _spread))), (((_sPos select 1) + (75 * _spread)) - (random (150 * _spread))), 0], _grp ] call KPLIB_fnc_createManagedUnit diff --git a/Missionframework/functions/fn_spawnGuerillaGroup.sqf b/Missionframework/functions/fn_spawnGuerillaGroup.sqf index fef5d3766..aecfbcc8c 100644 --- a/Missionframework/functions/fn_spawnGuerillaGroup.sqf +++ b/Missionframework/functions/fn_spawnGuerillaGroup.sqf @@ -2,7 +2,7 @@ File: fn_spawnGuerillaGroup.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-08 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -25,10 +25,10 @@ params [ private _tier = [] call KPLIB_fnc_getResistanceTier; private _cr_multi = [] call KPLIB_fnc_crGetMulti; if (_amount == 0) then {_amount = (6 + (round (random _cr_multi)) + (round (random _tier)));}; -private _weapons = missionNamespace getVariable ("KPLIB_guerilla_weapons_" + str _tier); -private _uniforms = missionNamespace getVariable ("KPLIB_guerilla_uniforms_" + str _tier); -private _vests = missionNamespace getVariable ("KPLIB_guerilla_vests_" + str _tier); -private _headgear = missionNamespace getVariable ("KPLIB_guerilla_headgear_" + str _tier); +private _weapons = missionNamespace getVariable ("KPLIB_r_weapons_" + str _tier); +private _uniforms = missionNamespace getVariable ("KPLIB_r_uniforms_" + str _tier); +private _vests = missionNamespace getVariable ("KPLIB_r_vests_" + str _tier); +private _headgear = missionNamespace getVariable ("KPLIB_r_headgear_" + str _tier); // Spawn guerilla units private _grp = createGroup [KPLIB_side_resistance, true]; @@ -36,7 +36,7 @@ private _unit = objNull; private _weapon = []; for "_i" from 1 to _amount do { // Create unit - _unit = [selectRandom KPLIB_guerilla_units, _pos, _grp, "PRIVATE", 5] call KPLIB_fnc_createManagedUnit; + _unit = [selectRandom KPLIB_r_units, _pos, _grp, "PRIVATE", 5] call KPLIB_fnc_createManagedUnit; // Clear inventory removeAllWeapons _unit; @@ -54,7 +54,7 @@ for "_i" from 1 to _amount do { _unit addItemToUniform "MiniGrenade"; _unit addVest (selectRandom _vests); _unit addHeadgear (selectRandom _headgear); - if (_tier > 1) then {_unit addGoggles (selectRandom KPLIB_guerilla_facegear);}; + if (_tier > 1) then {_unit addGoggles (selectRandom KPLIB_r_facegear);}; // Add standard items _unit linkItem "ItemMap"; diff --git a/Missionframework/kp_objectInits.sqf b/Missionframework/kp_objectInits.sqf index 780bd8c5c..3d487fadd 100644 --- a/Missionframework/kp_objectInits.sqf +++ b/Missionframework/kp_objectInits.sqf @@ -39,12 +39,12 @@ KPLIB_objectInits = [ // Add ViV and build action to FOB box/truck [ - [FOB_box_typename, FOB_truck_typename], + [KPLIB_b_fobBox, KPLIB_b_fobTruck], { [_this] spawn { params ["_fobBox"]; waitUntil {sleep 0.1; time > 0}; - if ((typeOf _fobBox) isEqualTo FOB_box_typename) then { + if ((typeOf _fobBox) isEqualTo KPLIB_b_fobBox) then { [_fobBox] call KPLIB_fnc_setFobMass; [_fobBox] remoteExecCall ["KPLIB_fnc_setLoadableViV", 0, _fobBox]; }; @@ -55,7 +55,7 @@ KPLIB_objectInits = [ // Add FOB building damage handler override and repack action [ - [FOB_typename], + [KPLIB_b_fobBuilding], { _this addEventHandler ["HandleDamage", {0}]; [_this] spawn { @@ -68,7 +68,7 @@ KPLIB_objectInits = [ // Add ViV action to Arsenal crate [ - [Arsenal_typename], + [KPLIB_b_arsenal], { [_this] spawn { params ["_arsenal"]; @@ -80,13 +80,13 @@ KPLIB_objectInits = [ // Add storage type variable to built storage areas (only for FOB built/loaded ones) [ - [KPLIB_small_storage_building, KPLIB_large_storage_building], + [KPLIB_b_smallStorage, KPLIB_b_largeStorage], {_this setVariable ["KPLIB_storage_type", 0, true];} ], // Add ACE variables to corresponding building types [ - [KPLIB_recycle_building], + [KPLIB_b_logiStation], {_this setVariable ["ace_isRepairFacility", 1, true];} ], [ diff --git a/Missionframework/presets/init_presets.sqf b/Missionframework/presets/init_presets.sqf index 32b44f168..91e154ac9 100644 --- a/Missionframework/presets/init_presets.sqf +++ b/Missionframework/presets/init_presets.sqf @@ -91,16 +91,16 @@ switch (KPLIB_presetCivilians) do { // Prices for the blufor infantry squads (supplies, ammo, fuel) KPLIB_b_allSquads = [ - [blufor_squad_inf_light,200,0,0], - [blufor_squad_inf,300,0,0], - [blufor_squad_at,200,250,0], - [blufor_squad_aa,200,250,0], - [blufor_squad_recon,250,0,0], - [blufor_squad_para,200,0,0] + [KPLIB_b_squadLight,200,0,0], + [KPLIB_b_squadInf,300,0,0], + [KPLIB_b_squadAT,200,250,0], + [KPLIB_b_squadAA,200,250,0], + [KPLIB_b_squadRecon,250,0,0], + [KPLIB_b_squadPara,200,0,0] ]; // Squad names for build menu -squads_names = [ +KPLIB_b_squadNames = [ localize "STR_LIGHT_RIFLE_SQUAD", localize "STR_RIFLE_SQUAD", localize "STR_AT_SQUAD", @@ -110,7 +110,7 @@ squads_names = [ ]; // Classnames of objects which should be ignored when building -KPLIB_ignore_colisions_when_building = [ +KPLIB_b_collisionIgnoreObjects = [ "Land_HelipadSquare_F", "Land_TentHangar_V1_F", "Land_runway_edgelight", @@ -166,20 +166,20 @@ KPLIB_ignore_colisions_when_building = [ Checking all preset arrays for missing mods and sort out not available classnames */ // Blufor -infantry_units = infantry_units select {[( _x select 0)] call KPLIB_fnc_checkClass}; -light_vehicles = light_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -heavy_vehicles = heavy_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -air_vehicles = air_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -static_vehicles = static_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -buildings = buildings select {[( _x select 0)] call KPLIB_fnc_checkClass}; -support_vehicles = support_vehicles select {[( _x select 0)] call KPLIB_fnc_checkClass}; -blufor_squad_inf_light = blufor_squad_inf_light select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_inf = blufor_squad_inf select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_at = blufor_squad_at select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_aa = blufor_squad_aa select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_recon = blufor_squad_recon select {[_x] call KPLIB_fnc_checkClass}; -blufor_squad_para = blufor_squad_para select {[_x] call KPLIB_fnc_checkClass}; -elite_vehicles = elite_vehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_b_infantry = KPLIB_b_infantry select {[( _x select 0)] call KPLIB_fnc_checkClass}; +KPLIB_b_vehLight = KPLIB_b_vehLight select {[( _x select 0)] call KPLIB_fnc_checkClass}; +KPLIB_b_vehHeavy = KPLIB_b_vehHeavy select {[( _x select 0)] call KPLIB_fnc_checkClass}; +KPLIB_b_vehAir = KPLIB_b_vehAir select {[( _x select 0)] call KPLIB_fnc_checkClass}; +KPLIB_b_vehStatic = KPLIB_b_vehStatic select {[( _x select 0)] call KPLIB_fnc_checkClass}; +KPLIB_b_objectsDeco = KPLIB_b_objectsDeco select {[( _x select 0)] call KPLIB_fnc_checkClass}; +KPLIB_b_vehSupport = KPLIB_b_vehSupport select {[( _x select 0)] call KPLIB_fnc_checkClass}; +KPLIB_b_squadLight = KPLIB_b_squadLight select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_b_squadInf = KPLIB_b_squadInf select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_b_squadAT = KPLIB_b_squadAT select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_b_squadAA = KPLIB_b_squadAA select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_b_squadRecon = KPLIB_b_squadRecon select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_b_squadPara = KPLIB_b_squadPara select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_b_vehToUnlock = KPLIB_b_vehToUnlock select {[_x] call KPLIB_fnc_checkClass}; // Opfor KPLIB_o_militiaInfantry = KPLIB_o_militiaInfantry select {[_x] call KPLIB_fnc_checkClass}; @@ -193,12 +193,12 @@ KPLIB_o_helicopters = KPLIB_o_helicopters select {[_x] KPLIB_o_planes = KPLIB_o_planes select {[_x] call KPLIB_fnc_checkClass}; // Resistance -KPLIB_guerilla_units = KPLIB_guerilla_units select {[_x] call KPLIB_fnc_checkClass}; -KPLIB_guerilla_vehicles = KPLIB_guerilla_vehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_r_units = KPLIB_r_units select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_r_vehicles = KPLIB_r_vehicles select {[_x] call KPLIB_fnc_checkClass}; // Civilians -civilians = civilians select {[_x] call KPLIB_fnc_checkClass}; -civilian_vehicles = civilian_vehicles select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_c_units = KPLIB_c_units select {[_x] call KPLIB_fnc_checkClass}; +KPLIB_c_vehicles = KPLIB_c_vehicles select {[_x] call KPLIB_fnc_checkClass}; // Misc KPLIB_transportConfigs = KPLIB_transportConfigs select {[_x select 0] call KPLIB_fnc_checkClass}; @@ -208,48 +208,48 @@ KPLIB_aiResupplySources = KPLIB_aiResupplySources select {[_x] Fetch arrays with only classnames from the blufor preset build arrays Beware that all classnames are converted to lowercase. Important for e.g. `in` checks, as it's case-sensitive. */ -KPLIB_b_infantry_classes = infantry_units apply {toLower (_x select 0)}; -KPLIB_b_light_classes = light_vehicles apply {toLower (_x select 0)}; -KPLIB_b_heavy_classes = heavy_vehicles apply {toLower (_x select 0)}; -KPLIB_b_air_classes = air_vehicles apply {toLower (_x select 0)}; -KPLIB_b_static_classes = static_vehicles apply {toLower (_x select 0)}; -KPLIB_b_buildings_classes = buildings apply {toLower (_x select 0)}; -KPLIB_b_support_classes = support_vehicles apply {toLower (_x select 0)}; +KPLIB_b_inf_classes = KPLIB_b_infantry apply {toLower (_x select 0)}; +KPLIB_b_light_classes = KPLIB_b_vehLight apply {toLower (_x select 0)}; +KPLIB_b_heavy_classes = KPLIB_b_vehHeavy apply {toLower (_x select 0)}; +KPLIB_b_air_classes = KPLIB_b_vehAir apply {toLower (_x select 0)}; +KPLIB_b_static_classes = KPLIB_b_vehStatic apply {toLower (_x select 0)}; +KPLIB_b_deco_classes = KPLIB_b_objectsDeco apply {toLower (_x select 0)}; +KPLIB_b_support_classes = KPLIB_b_vehSupport apply {toLower (_x select 0)}; KPLIB_transport_classes = KPLIB_transportConfigs apply {toLower (_x select 0)}; -KPLIB_b_infantry_classes append (blufor_squad_inf_light + blufor_squad_inf + blufor_squad_at + blufor_squad_aa + blufor_squad_recon + blufor_squad_para); -KPLIB_b_infantry_classes = KPLIB_b_infantry_classes apply {toLower _x}; -KPLIB_b_infantry_classes = KPLIB_b_infantry_classes arrayIntersect KPLIB_b_infantry_classes; +KPLIB_b_inf_classes append (KPLIB_b_squadLight + KPLIB_b_squadInf + KPLIB_b_squadAT + KPLIB_b_squadAA + KPLIB_b_squadRecon + KPLIB_b_squadPara); +KPLIB_b_inf_classes = KPLIB_b_inf_classes apply {toLower _x}; +KPLIB_b_inf_classes = KPLIB_b_inf_classes arrayIntersect KPLIB_b_inf_classes; /* Opfor squad compositions */ -KPLIB_o_squadStd = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_heavyGunner, KPLIB_o_medic, KPLIB_o_marksman, KPLIB_o_grenadier, KPLIB_o_riflemanLAT]; -KPLIB_o_squadInf = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_heavyGunner, KPLIB_o_heavyGunner, KPLIB_o_marksman, KPLIB_o_sharpshooter, KPLIB_o_sniper]; -KPLIB_o_squadTank = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_riflemanLAT, KPLIB_o_riflemanLAT, KPLIB_o_atSpecialist, KPLIB_o_atSpecialist, KPLIB_o_atSpecialist]; -KPLIB_o_squadAir = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_riflemanLAT, KPLIB_o_riflemanLAT, KPLIB_o_aaSpecialist, KPLIB_o_aaSpecialist, KPLIB_o_aaSpecialist]; +KPLIB_o_squadStd = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_heavyGunner, KPLIB_o_medic, KPLIB_o_marksman, KPLIB_o_grenadier, KPLIB_o_riflemanLAT]; +KPLIB_o_squadInf = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_heavyGunner, KPLIB_o_heavyGunner, KPLIB_o_marksman, KPLIB_o_sharpshooter, KPLIB_o_sniper]; +KPLIB_o_squadTank = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_riflemanLAT, KPLIB_o_riflemanLAT, KPLIB_o_atSpecialist, KPLIB_o_atSpecialist, KPLIB_o_atSpecialist]; +KPLIB_o_squadAir = [KPLIB_o_squadLeader, KPLIB_o_medic, KPLIB_o_machinegunner, KPLIB_o_riflemanLAT, KPLIB_o_riflemanLAT, KPLIB_o_aaSpecialist, KPLIB_o_aaSpecialist, KPLIB_o_aaSpecialist]; /* Liberation specific collections */ -KPLIB_buildList = [[], infantry_units, light_vehicles, heavy_vehicles, air_vehicles, static_vehicles, buildings, support_vehicles, KPLIB_b_allSquads]; -KPLIB_crates = [KPLIB_supply_crate, KPLIB_ammo_crate, KPLIB_fuel_crate]; -KPLIB_airSlots = [KPLIB_heli_slot_building, KPLIB_plane_slot_building]; -KPLIB_storageBuildings = [KPLIB_small_storage_building, KPLIB_large_storage_building]; -KPLIB_upgradeBuildings = [KPLIB_recycle_building, KPLIB_air_vehicle_building, KPLIB_heli_slot_building, KPLIB_plane_slot_building]; -KPLIB_aiResupplySources append [Respawn_truck_typename, huron_typename, Arsenal_typename]; +KPLIB_buildList = [[], KPLIB_b_infantry, KPLIB_b_vehLight, KPLIB_b_vehHeavy, KPLIB_b_vehAir, KPLIB_b_vehStatic, KPLIB_b_objectsDeco, KPLIB_b_vehSupport, KPLIB_b_allSquads]; +KPLIB_crates = [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]; +KPLIB_airSlots = [KPLIB_b_slotHeli, KPLIB_b_slotPlane]; +KPLIB_storageBuildings = [KPLIB_b_smallStorage, KPLIB_b_largeStorage]; +KPLIB_upgradeBuildings = [KPLIB_b_logiStation, KPLIB_b_airControl, KPLIB_b_slotHeli, KPLIB_b_slotPlane]; +KPLIB_aiResupplySources append [KPLIB_b_mobileRespawn, KPLIB_b_potato01, KPLIB_b_arsenal]; -KPLIB_crates = KPLIB_crates apply {toLower _x}; -KPLIB_airSlots = KPLIB_airSlots apply {toLower _x}; -KPLIB_storageBuildings = KPLIB_storageBuildings apply {toLower _x}; -KPLIB_upgradeBuildings = KPLIB_upgradeBuildings apply {toLower _x}; -KPLIB_aiResupplySources = KPLIB_aiResupplySources apply {toLower _x}; +KPLIB_crates = KPLIB_crates apply {toLower _x}; +KPLIB_airSlots = KPLIB_airSlots apply {toLower _x}; +KPLIB_storageBuildings = KPLIB_storageBuildings apply {toLower _x}; +KPLIB_upgradeBuildings = KPLIB_upgradeBuildings apply {toLower _x}; +KPLIB_aiResupplySources = KPLIB_aiResupplySources apply {toLower _x}; /* Classname collections */ // All land vehicle classnames -KPLIB_allLandVeh_classes = [[], [huron_typename]] select (huron_typename isKindOf "Air");; +KPLIB_allLandVeh_classes = [[], [KPLIB_b_potato01]] select (KPLIB_b_potato01 isKindOf "Air");; { KPLIB_allLandVeh_classes append _x; } forEach [ @@ -266,7 +266,7 @@ KPLIB_allLandVeh_classes = [[], [huron_typename]] select (huron_typename isKindO KPLIB_allLandVeh_classes = KPLIB_allLandVeh_classes arrayIntersect KPLIB_allLandVeh_classes; // All air vehicle classnames -KPLIB_allAirVeh_classes = [[], [huron_typename]] select (huron_typename isKindOf "Air"); +KPLIB_allAirVeh_classes = [[], [KPLIB_b_potato01]] select (KPLIB_b_potato01 isKindOf "Air"); { KPLIB_allAirVeh_classes append _x; } forEach [KPLIB_o_helicopters apply {toLower _x}, KPLIB_o_planes apply {toLower _x}, KPLIB_b_air_classes, KPLIB_b_support_classes select {_x isKindOf "Air"}]; @@ -310,10 +310,10 @@ KPLIB_typeAirClasses = +KPLIB_b_air_classes; case (_x isKindOf "Air"): {KPLIB_typeAirClasses pushBack _x}; default {KPLIB_typeLightClasses pushBack _x}; }; -} forEach (KPLIB_b_support_classes + [toLower huron_typename]); +} forEach (KPLIB_b_support_classes + [toLower KPLIB_b_potato01]); // Military alphabet used for FOBs and convois -military_alphabet = ["Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-Ray", "Yankee", "Zulu"]; +KPLIB_militaryAlphabet = ["Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-Ray", "Yankee", "Zulu"]; // Misc variables markers_reset = [99999,99999,0]; diff --git a/Missionframework/scripts/client/actions/do_recycle.sqf b/Missionframework/scripts/client/actions/do_recycle.sqf index 45e6c730a..f21201c06 100644 --- a/Missionframework/scripts/client/actions/do_recycle.sqf +++ b/Missionframework/scripts/client/actions/do_recycle.sqf @@ -12,7 +12,7 @@ private _ammoMulti = 0.5; private _fuelMulti = 0.5; if !( - ((toLower _type) in KPLIB_b_buildings_classes) || + ((toLower _type) in KPLIB_b_deco_classes) || ((toLower _type) in KPLIB_storageBuildings) || ((toLower _type) in KPLIB_upgradeBuildings) || (_type in KPLIB_ace_crates) || @@ -61,7 +61,7 @@ if ((toLower _type) in KPLIB_o_allVeh_classes) then { _price_f = round (150 * _fuelMulti); }; } else { - private _objectinfo = ((light_vehicles + heavy_vehicles + air_vehicles + static_vehicles + support_vehicles + buildings) select {_type == (_x select 0)}) select 0; + private _objectinfo = ((KPLIB_b_vehLight + KPLIB_b_vehHeavy + KPLIB_b_vehAir + KPLIB_b_vehStatic + KPLIB_b_vehSupport + KPLIB_b_objectsDeco) select {_type == (_x select 0)}) select 0; _price_s = round ((_objectinfo select 1) * KPLIB_recycling_percentage * _suppMulti); _price_a = round ((_objectinfo select 2) * KPLIB_recycling_percentage * _ammoMulti); _price_f = round ((_objectinfo select 3) * KPLIB_recycling_percentage * _fuelMulti); @@ -80,17 +80,17 @@ waitUntil {sleep 0.1; !dialog || !alive player || dorecycle != 0}; if (dialog) then {closeDialog 0}; if (dorecycle == 1 && !(isnull _vehToRecycle) && alive _vehToRecycle) then { - if (!(KPLIB_recycle_building_near) && ((_price_s + _price_a + _price_f) > 0)) exitWith {hint localize "STR_NORECBUILDING_ERROR";}; + if (!(KPLIB_b_logiStation_near) && ((_price_s + _price_a + _price_f) > 0)) exitWith {hint localize "STR_NORECBUILDING_ERROR";}; private _storage_areas = (([] call KPLIB_fnc_getNearestFob) nearobjects (KPLIB_fob_range * 1.2)) select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; private _crateSum = (ceil (_price_s / 100)) + (ceil (_price_a / 100)) + (ceil (_price_f / 100)); private _spaceSum = 0; { - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; diff --git a/Missionframework/scripts/client/actions/do_repackage_fob.sqf b/Missionframework/scripts/client/actions/do_repackage_fob.sqf index 9f61fa28f..3b0a1278b 100644 --- a/Missionframework/scripts/client/actions/do_repackage_fob.sqf +++ b/Missionframework/scripts/client/actions/do_repackage_fob.sqf @@ -17,7 +17,7 @@ if (dorepackage > 0) then { publicVariable "KPLIB_clearances"; }; - {deleteVehicle _x} forEach (((getPos player) nearobjects [FOB_typename, 250]) select {getObjectType _x >= 8}); + {deleteVehicle _x} forEach (((getPos player) nearobjects [KPLIB_b_fobBuilding, 250]) select {getObjectType _x >= 8}); sleep 0.5; @@ -28,12 +28,12 @@ if (dorepackage > 0) then { }; if (dorepackage == 1) then { - private _fobbox = FOB_box_typename createVehicle _spawnpos; + private _fobbox = KPLIB_b_fobBox createVehicle _spawnpos; [_fobbox] call KPLIB_fnc_addObjectInit; }; if (dorepackage == 2) then { - private _fobTruck = FOB_truck_typename createVehicle _spawnpos; + private _fobTruck = KPLIB_b_fobTruck createVehicle _spawnpos; [_fobTruck] call KPLIB_fnc_addObjectInit; }; hint localize "STR_FOB_REPACKAGE_HINT"; diff --git a/Missionframework/scripts/client/actions/recycle_manager.sqf b/Missionframework/scripts/client/actions/recycle_manager.sqf index 9d9bf9761..27fa1f296 100644 --- a/Missionframework/scripts/client/actions/recycle_manager.sqf +++ b/Missionframework/scripts/client/actions/recycle_manager.sqf @@ -20,7 +20,7 @@ while {true} do { if ([4] call KPLIB_fnc_hasPermission) then { private _detected_vehicles = (getPos player) nearObjects veh_action_detect_distance select { (((toLower (typeof _x)) in _recycleable_classnames && (({alive _x} count (crew _x)) == 0 || unitIsUAV _x) && (locked _x == 0 || locked _x == 1)) || - (toLower (typeOf _x)) in KPLIB_b_buildings_classes || + (toLower (typeOf _x)) in KPLIB_b_deco_classes || (((toLower (typeOf _x)) in KPLIB_storageBuildings) && ((_x getVariable ["KPLIB_storage_type",-1]) == 0)) || (toLower (typeOf _x)) in KPLIB_upgradeBuildings || (typeOf _x) in KPLIB_ace_crates) && diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index bc1a8fd02..6586b6eda 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -85,11 +85,11 @@ while {true} do { _area_load = count (attachedObjects _x); if (!(_next_area in _managed_areas) && (_area_load > 0)) then { - _action_id = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_SUPPLY" + "",{[KPLIB_supply_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-504,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; + _action_id = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_SUPPLY" + "",{[KPLIB_b_crateSupply, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-504,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_supply_unstore_action", _action_id, false]; - _action_id2 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_AMMO" + "",{[KPLIB_ammo_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-505,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; + _action_id2 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_AMMO" + "",{[KPLIB_b_crateAmmo, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-505,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_ammo_unstore_action", _action_id2, false]; - _action_id3 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_FUEL" + "",{[KPLIB_fuel_crate, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-506,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; + _action_id3 = _next_area addAction ["" + localize "STR_ACTION_UNSTORE_FUEL" + "",{[KPLIB_b_crateFuel, (_this select 0), true] call KPLIB_fnc_crateFromStorage;},"",-506,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_fuel_unstore_action", _action_id3, false]; _action_id4 = _next_area addAction ["" + localize "STR_ACTION_SORT_STORAGE" + "",{[(_this select 0)] call KPLIB_fnc_sortStorage;},"",-507,true,true,"","build_confirmed == 0 && (_this distance _target < 12) && (vehicle player == player)"]; _next_area setVariable ["KP_storage_sort_action", _action_id4, false]; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 10825b261..59f58f4f6 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -32,7 +32,7 @@ while { true } do { build_invalid = 0; _classname = ""; if ( buildtype == 99 ) then { - _classname = FOB_typename; + _classname = KPLIB_b_fobBuilding; } else { _classname = ((KPLIB_buildList select buildtype) select buildindex) select 0; _price_s = ((KPLIB_buildList select buildtype) select buildindex) select 1; @@ -57,13 +57,13 @@ while { true } do { if ( buildtype == 8 ) then { _pos = [(getpos player select 0) + 1,(getpos player select 1) + 1, 0]; _grp = createGroup KPLIB_side_friendly; - _grp setGroupId [format ["%1 %2",squads_names select buildindex, groupId _grp]]; + _grp setGroupId [format ["%1 %2",KPLIB_b_squadNames select buildindex, groupId _grp]]; _idx = 0; { _unitrank = "private"; if(_idx == 0) then { _unitrank = "sergeant"; }; if(_idx == 1) then { _unitrank = "corporal"; }; - if (_classname isEqualTo blufor_squad_para) then { + if (_classname isEqualTo KPLIB_b_squadPara) then { _x createUnit [_pos, _grp,"this addMPEventHandler [""MPKilled"", {_this spawn kill_manager}]; removeBackpackGlobal this; this addBackpackGlobal ""B_parachute""", 0.5, _unitrank]; } else { _x createUnit [_pos, _grp,"this addMPEventHandler [""MPKilled"", {_this spawn kill_manager}];", 0.5, _unitrank]; @@ -89,7 +89,7 @@ while { true } do { if (buildtype == 6 ) then { _idactplacebis = player addAction ["" + localize "STR_PLACEMENT_BIS" + " ",{build_confirmed = 2; repeatbuild = true; hint localize "STR_CONFIRM_HINT";},"",-785,false,false,"","build_invalid == 0 && build_confirmed == 1"]; }; - if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_recycle_building || _classname isEqualTo KPLIB_air_vehicle_building) then { + if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_b_logiStation || _classname isEqualTo KPLIB_b_airControl) then { _idactsnap = player addAction ["" + localize "STR_GRID" + "",{gridmode = gridmode + 1;},"",-735,false,false,"","build_confirmed == 1"]; _idactvector = player addAction ["" + localize "STR_VECACTION" + "",{KP_vector = !KP_vector;},"",-800,false,false,"","build_confirmed == 1"]; }; @@ -126,7 +126,7 @@ while { true } do { }; _actualdir = ((getdir player) + build_rotation); if ( _classname == "Land_Cargo_Patrol_V1_F" || _classname == "Land_PortableLight_single_F" ) then { _actualdir = _actualdir + 180 }; - if ( _classname == FOB_typename ) then { _actualdir = _actualdir + 270 }; + if ( _classname == KPLIB_b_fobBuilding ) then { _actualdir = _actualdir + 270 }; while { _actualdir > 360 } do { _actualdir = _actualdir - 360 }; while { _actualdir < 0 } do { _actualdir = _actualdir + 360 }; @@ -156,12 +156,12 @@ while { true } do { _truepos = [_truepos select 0, _truepos select 1, (_truepos select 2) + build_elevation]; _near_objects = (_truepos nearobjects ["AllVehicles", _dist]) ; - _near_objects = _near_objects + (_truepos nearobjects [FOB_box_typename, _dist]); - _near_objects = _near_objects + (_truepos nearobjects [Arsenal_typename, _dist]); + _near_objects = _near_objects + (_truepos nearobjects [KPLIB_b_fobBox, _dist]); + _near_objects = _near_objects + (_truepos nearobjects [KPLIB_b_arsenal, _dist]); _near_objects_25 = (_truepos nearobjects ["AllVehicles", 50]) ; - _near_objects_25 = _near_objects_25 + (_truepos nearobjects [FOB_box_typename, 50]); - _near_objects_25 = _near_objects_25 + (_truepos nearobjects [Arsenal_typename, 50]); + _near_objects_25 = _near_objects_25 + (_truepos nearobjects [KPLIB_b_fobBox, 50]); + _near_objects_25 = _near_objects_25 + (_truepos nearobjects [KPLIB_b_arsenal, 50]); if( buildtype != 6 ) then { _near_objects = _near_objects + (_truepos nearobjects ["Static", _dist]); @@ -171,7 +171,7 @@ while { true } do { private _remove_objects = []; { private _typeOfX = typeOf _x; - if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_ignore_colisions_when_building) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { + if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_b_collisionIgnoreObjects) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { _remove_objects pushback _x; }; } foreach _near_objects; @@ -179,7 +179,7 @@ while { true } do { private _remove_objects_25 = []; { private _typeOfX = typeOf _x; - if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_ignore_colisions_when_building) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { + if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_b_collisionIgnoreObjects) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { _remove_objects_25 pushback _x; }; } foreach _near_objects_25; @@ -214,7 +214,7 @@ while { true } do { _vehicle setpos _truepos; }; }; - if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_recycle_building || _classname isEqualTo KPLIB_air_vehicle_building) then { + if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_b_logiStation || _classname isEqualTo KPLIB_b_airControl) then { if (KP_vector) then { _vehicle setVectorUp [0,0,1]; } else { @@ -278,10 +278,10 @@ while { true } do { _spaceSum = 0; { - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -313,7 +313,7 @@ while { true } do { [_vehicle] call KPLIB_fnc_clearCargo; - if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_recycle_building || _classname isEqualTo KPLIB_air_vehicle_building) then { + if (buildtype == 6 || buildtype == 99 || (toLower _classname) in KPLIB_storageBuildings || _classname isEqualTo KPLIB_b_logiStation || _classname isEqualTo KPLIB_b_airControl) then { if (KP_vector) then { _vehicle setVectorUp [0,0,1]; } else { diff --git a/Missionframework/scripts/client/build/do_sector_build.sqf b/Missionframework/scripts/client/build/do_sector_build.sqf index 3b350700f..970dbdc72 100644 --- a/Missionframework/scripts/client/build/do_sector_build.sqf +++ b/Missionframework/scripts/client/build/do_sector_build.sqf @@ -1,6 +1,6 @@ private ["_vector", "_idactcancel", "_idactplace", "_idactvector", "_ghost_spot", "_truedir", "_dist", "_truepos", "_sectorpos", "_building"]; -if (((_this select 3) select 0) == KPLIB_small_storage_building) then { +if (((_this select 3) select 0) == KPLIB_b_smallStorage) then { _truepos = []; diff --git a/Missionframework/scripts/client/build/open_build_menu.sqf b/Missionframework/scripts/client/build/open_build_menu.sqf index 80fda36c8..f4670a462 100644 --- a/Missionframework/scripts/client/build/open_build_menu.sqf +++ b/Missionframework/scripts/client/build/open_build_menu.sqf @@ -52,17 +52,17 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { _entrytext = getText (_cfg >> _classnamevar >> "displayName"); switch (_classnamevar) do { - case FOB_box_typename: {_entrytext = localize "STR_FOBBOX";}; - case Arsenal_typename: {if (KPLIB_mobilearsenal) then {_entrytext = localize "STR_ARSENAL_BOX";};}; - case Respawn_truck_typename: {if (KPLIB_mobilerespawn) then {_entrytext = localize "STR_RESPAWN_TRUCK";};}; - case FOB_truck_typename: {_entrytext = localize "STR_FOBTRUCK";}; + case KPLIB_b_fobBox: {_entrytext = localize "STR_FOBBOX";}; + case KPLIB_b_arsenal: {if (KPLIB_mobilearsenal) then {_entrytext = localize "STR_ARSENAL_BOX";};}; + case KPLIB_b_mobileRespawn: {if (KPLIB_mobilerespawn) then {_entrytext = localize "STR_RESPAWN_TRUCK";};}; + case KPLIB_b_fobTruck: {_entrytext = localize "STR_FOBTRUCK";}; case "Flag_White_F": {_entrytext = localize "STR_INDIV_FLAG";}; - case KPLIB_small_storage_building: {_entrytext = localize "STR_SMALL_STORAGE";}; - case KPLIB_large_storage_building: {_entrytext = localize "STR_LARGE_STORAGE";}; - case KPLIB_recycle_building: {_entrytext = localize "STR_RECYCLE_BUILDING";}; - case KPLIB_air_vehicle_building: {_entrytext = localize "STR_HELI_BUILDING";}; - case KPLIB_heli_slot_building: {_entrytext = localize "STR_HELI_SLOT";}; - case KPLIB_plane_slot_building: {_entrytext = localize "STR_PLANE_SLOT";}; + case KPLIB_b_smallStorage: {_entrytext = localize "STR_SMALL_STORAGE";}; + case KPLIB_b_largeStorage: {_entrytext = localize "STR_LARGE_STORAGE";}; + case KPLIB_b_logiStation: {_entrytext = localize "STR_RECYCLE_BUILDING";}; + case KPLIB_b_airControl: {_entrytext = localize "STR_HELI_BUILDING";}; + case KPLIB_b_slotHeli: {_entrytext = localize "STR_HELI_SLOT";}; + case KPLIB_b_slotPlane: {_entrytext = localize "STR_PLANE_SLOT";}; default {}; }; @@ -74,8 +74,8 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { }; lnbSetPicture [110, [((lnbSize 110) select 0) - 1, 0],_icon]; } else { - if ( ((lnbSize 110) select 0) <= count squads_names ) then { - _squadname = squads_names select ((lnbSize 110) select 0); + if ( ((lnbSize 110) select 0) <= count KPLIB_b_squadNames ) then { + _squadname = KPLIB_b_squadNames select ((lnbSize 110) select 0); } else { _squadname = ""; }; @@ -128,14 +128,14 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { ((_build_item select 3 == 0 ) || ((_build_item select 3) <= ((_actual_fob select 0) select 3))) ) then { if ((toLower (_build_item select 0)) in KPLIB_b_air_classes && !([_build_item select 0] call KPLIB_fnc_isClassUAV)) then { - if (KPLIB_air_vehicle_building_near && + if (KPLIB_b_airControl_near && ((((_build_item select 0) isKindOf "Helicopter") && (KPLIB_heli_count < KPLIB_heli_slots)) || (((_build_item select 0) isKindOf "Plane") && (KPLIB_plane_count < KPLIB_plane_slots))) ) then { _affordable = true; }; } else { - if (!((toLower (_build_item select 0)) in KPLIB_airSlots) || (((toLower (_build_item select 0)) in KPLIB_airSlots) && KPLIB_air_vehicle_building_near)) then { + if (!((toLower (_build_item select 0)) in KPLIB_airSlots) || (((toLower (_build_item select 0)) in KPLIB_airSlots) && KPLIB_b_airControl_near)) then { _affordable = true; }; }; diff --git a/Missionframework/scripts/client/commander/open_logistic.sqf b/Missionframework/scripts/client/commander/open_logistic.sqf index bc4345028..e27469c80 100644 --- a/Missionframework/scripts/client/commander/open_logistic.sqf +++ b/Missionframework/scripts/client/commander/open_logistic.sqf @@ -13,7 +13,7 @@ _nearfob = [] call KPLIB_fnc_getNearestFob; _logi_destinations = []; { - _logi_destinations pushBack [(format ["FOB %1", military_alphabet select _forEachIndex]), (_x select 0), (_x select 1), (_x select 2), (_x select 3)]; + _logi_destinations pushBack [(format ["FOB %1", KPLIB_militaryAlphabet select _forEachIndex]), (_x select 0), (_x select 1), (_x select 2), (_x select 3)]; } forEach KPLIB_fob_resources; { diff --git a/Missionframework/scripts/client/commander/open_production.sqf b/Missionframework/scripts/client/commander/open_production.sqf index 23a653892..b80a95a1c 100644 --- a/Missionframework/scripts/client/commander/open_production.sqf +++ b/Missionframework/scripts/client/commander/open_production.sqf @@ -64,7 +64,7 @@ while {dialog && (alive player)} do { ctrlSetText [75804, _sectorType]; if ((count (_selectedSector select 3)) > 0) then { - _storage = ((nearestObjects [((_selectedSector select 3) select 0), [KPLIB_small_storage_building], 25]) select 0); + _storage = ((nearestObjects [((_selectedSector select 3) select 0), [KPLIB_b_smallStorage], 25]) select 0); _crateCount = count (attachedObjects _storage); _crateMax = count (KPLIB_small_storage_positions); diff --git a/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf b/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf index 98723e5b2..a1e5fa183 100644 --- a/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf +++ b/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf @@ -6,8 +6,8 @@ _cfg = configFile >> "cfgVehicles"; _vehtomark = []; _support_to_skip = [ - KPLIB_recycle_building, - KPLIB_air_vehicle_building, + KPLIB_b_logiStation, + KPLIB_b_airControl, "B_Slingload_01_Repair_F", "B_Slingload_01_Fuel_F", "B_Slingload_01_Ammo_F" diff --git a/Missionframework/scripts/client/markers/fob_markers.sqf b/Missionframework/scripts/client/markers/fob_markers.sqf index 7fa5ef0b1..b2444439d 100644 --- a/Missionframework/scripts/client/markers/fob_markers.sqf +++ b/Missionframework/scripts/client/markers/fob_markers.sqf @@ -17,7 +17,7 @@ while {true} do { _marker setMarkerTypeLocal "b_hq"; _marker setMarkerSizeLocal [1.5, 1.5]; _marker setMarkerPosLocal (KPLIB_sectors_fob select _idx); - _marker setMarkerTextLocal format ["FOB %1",military_alphabet select _idx]; + _marker setMarkerTextLocal format ["FOB %1",KPLIB_militaryAlphabet select _idx]; _marker setMarkerColorLocal "ColorYellow"; _markers pushback _marker; }; diff --git a/Missionframework/scripts/client/misc/playerNamespace.sqf b/Missionframework/scripts/client/misc/playerNamespace.sqf index 2c1b607c4..b10a58614 100644 --- a/Missionframework/scripts/client/misc/playerNamespace.sqf +++ b/Missionframework/scripts/client/misc/playerNamespace.sqf @@ -2,7 +2,7 @@ File: playerNamespace.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-12 - Last Update: 2020-05-17 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -44,12 +44,12 @@ while {true} do { // Is near an arsenal object if (KPLIB_mobilearsenal) then { - player setVariable ["KPLIB_isNearArsenal", !(((player nearObjects [Arsenal_typename, 5]) select {getObjectType _x >= 8}) isEqualTo [])]; + player setVariable ["KPLIB_isNearArsenal", !(((player nearObjects [KPLIB_b_arsenal, 5]) select {getObjectType _x >= 8}) isEqualTo [])]; }; // Is near a mobile respawn if (KPLIB_mobilerespawn) then { - player setVariable ["KPLIB_isNearMobRespawn", !((player nearEntities [[Respawn_truck_typename, huron_typename], 10]) isEqualTo [])]; + player setVariable ["KPLIB_isNearMobRespawn", !((player nearEntities [[KPLIB_b_mobileRespawn, KPLIB_b_potato01], 10]) isEqualTo [])]; }; // Is near startbase diff --git a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf index 957193fa4..340876c4b 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf @@ -17,7 +17,7 @@ _unit enableAI "MOVE"; sleep 2; [_unit, ""] remoteExecCall ["switchMove"]; -if ( typeof _unit == pilot_classname ) exitWith {}; +if ( typeof _unit == KPLIB_b_heliPilotUnit ) exitWith {}; waitUntil { sleep 5; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 0650c5924..ece12f9df 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -83,7 +83,7 @@ while {true} do { choiceslist = [[_basenamestr, getposATL startbase]]; for [{_idx=0},{_idx < count KPLIB_sectors_fob},{_idx=_idx+1}] do { - choiceslist = choiceslist + [[format ["FOB %1 - %2", (military_alphabet select _idx),mapGridPosition (KPLIB_sectors_fob select _idx)],KPLIB_sectors_fob select _idx]]; + choiceslist = choiceslist + [[format ["FOB %1 - %2", (KPLIB_militaryAlphabet select _idx),mapGridPosition (KPLIB_sectors_fob select _idx)],KPLIB_sectors_fob select _idx]]; }; if (KPLIB_mobilerespawn) then { diff --git a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm index 1e02244dd..05f87472d 100644 --- a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm +++ b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm @@ -519,7 +519,7 @@ class FSM " allPlayers," \n " [""KPLIB_Tasks_Tutorial_Fob_01a"", ""KPLIB_Tasks_Tutorial_Fob""]," \n " """"," \n - " [(base_boxspawn nearObjects [FOB_box_typename, 10]) select 0, true]," \n + " [(base_boxspawn nearObjects [KPLIB_b_fobBox, 10]) select 0, true]," \n " ""ASSIGNED""," \n " 0," \n " true," \n @@ -553,7 +553,7 @@ class FSM " allPlayers," \n " [""KPLIB_Tasks_Tutorial_Fob_01b"", ""KPLIB_Tasks_Tutorial_Fob""]," \n " """"," \n - " [(base_boxspawn nearObjects [FOB_box_typename, 10]) select 0, true]," \n + " [(base_boxspawn nearObjects [KPLIB_b_fobBox, 10]) select 0, true]," \n " ""ASSIGNED""," \n " 0," \n " true," \n diff --git a/Missionframework/scripts/client/ui/cinematic_camera.sqf b/Missionframework/scripts/client/ui/cinematic_camera.sqf index fed11860f..c8e908e98 100644 --- a/Missionframework/scripts/client/ui/cinematic_camera.sqf +++ b/Missionframework/scripts/client/ui/cinematic_camera.sqf @@ -258,7 +258,7 @@ while { cinematic_camera_started } do { } else { _nearfobs = KPLIB_sectors_fob select {_x distance _position < 300}; if ( count _nearfobs > 0 ) then { - _nearest_sector = format [ "FOB %1", military_alphabet select ( KPLIB_sectors_fob find ( _nearfobs select 0 ) ) ]; + _nearest_sector = format [ "FOB %1", KPLIB_militaryAlphabet select ( KPLIB_sectors_fob find ( _nearfobs select 0 ) ) ]; }; }; }; diff --git a/Missionframework/scripts/client/ui/end_screen.sqf b/Missionframework/scripts/client/ui/end_screen.sqf index fff3dcc58..6a24f1c67 100644 --- a/Missionframework/scripts/client/ui/end_screen.sqf +++ b/Missionframework/scripts/client/ui/end_screen.sqf @@ -34,7 +34,7 @@ params [ "_stats_secondary_objectives", "_stats_sectors_liberated", "_stats_sectors_lost", - "_stats_spartan_respawns", + "_stats_potato_respawns", "_stats_supplies_produced", "_stats_supplies_spent", "_stats_vehicles_recycled", @@ -141,7 +141,7 @@ if (dialog) then {sleep 3}; [692, format [localize "STR_STATS_REINFORCEMENTS", _stats_reinforcements_called]] call _addReportLine; [693, format [localize "STR_STATS_COMBATREADINESS", round _stats_readiness_earned]] call _addReportLine; [694, format [localize "STR_STATS_IEDS", _stats_ieds_detonated]] call _addReportLine; -[695, format [localize "STR_STATS_POTATO", _stats_spartan_respawns]] call _addReportLine; +[695, format [localize "STR_STATS_POTATO", _stats_potato_respawns]] call _addReportLine; [696, format [localize "STR_STATS_RABBITS", _stats_rabbits_killed], true] call _addReportLine; [] call _cleanPage; diff --git a/Missionframework/scripts/client/ui/ui_manager.sqf b/Missionframework/scripts/client/ui/ui_manager.sqf index b54b530ac..0df2b2f24 100644 --- a/Missionframework/scripts/client/ui/ui_manager.sqf +++ b/Missionframework/scripts/client/ui/ui_manager.sqf @@ -14,8 +14,8 @@ KPLIB_ui_notif = ""; KPLIB_supplies = 0; KPLIB_ammo = 0; KPLIB_fuel = 0; -KPLIB_air_vehicle_building_near = false; -KPLIB_recycle_building_near = false; +KPLIB_b_airControl_near = false; +KPLIB_b_logiStation_near = false; waitUntil { !isNil "synchro_done" }; waitUntil { synchro_done }; @@ -74,15 +74,15 @@ while {true} do { KPLIB_fuel = _fuel; }; // TODO this is used by build scripts, move to relevant places - KPLIB_air_vehicle_building_near = _hasAir; - KPLIB_recycle_building_near = _hasRecycling; + KPLIB_b_airControl_near = _hasAir; + KPLIB_b_logiStation_near = _hasRecycling; } else { _showResources = false; KPLIB_supplies = 0; KPLIB_ammo = 0; KPLIB_fuel = 0; - KPLIB_air_vehicle_building_near = false; - KPLIB_recycle_building_near = false; + KPLIB_b_airControl_near = false; + KPLIB_b_logiStation_near = false; }; if (_overlayVisible) then { diff --git a/Missionframework/scripts/server/ai/prisonner_ai.sqf b/Missionframework/scripts/server/ai/prisonner_ai.sqf index 0dfa5857e..7e3b84a45 100644 --- a/Missionframework/scripts/server/ai/prisonner_ai.sqf +++ b/Missionframework/scripts/server/ai/prisonner_ai.sqf @@ -11,7 +11,7 @@ if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == KPLIB_side_e if (alive _unit) then { removeAllWeapons _unit; - if (typeof _unit != pilot_classname) then { + if (typeof _unit != KPLIB_b_heliPilotUnit) then { removeHeadgear _unit; }; removeBackpack _unit; diff --git a/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf b/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf index 7390bcf25..3a4623c1d 100644 --- a/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf +++ b/Missionframework/scripts/server/asymmetric/convoy/logistic_convoy_ambush.sqf @@ -24,7 +24,7 @@ KPLIB_convoy_ambush_inProgress = true; private _vehicleArray = []; for "_i" from 1 to (_convoy select 1) do { - private _veh = createVehicle [KPLIB_truck_classname, getPos _roadObj, [], 50, "NONE"]; + private _veh = createVehicle [KPLIB_b_logiTruck, getPos _roadObj, [], 50, "NONE"]; _veh setDir (getDir _roadObj); { private _damage = random 0.6; @@ -38,7 +38,7 @@ for "_i" from 1 to (_convoy select 1) do { } forEach ((getAllHitPointsDamage _veh) select 0); _vehicleArray pushBack _veh; - private _driver = createVehicle [crewman_classname, getPos _veh, [], 12, "NONE"]; + private _driver = createVehicle [KPLIB_b_crewUnit, getPos _veh, [], 12, "NONE"]; _driver setDamage 1; }; if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1 ambush: truck spawning done", (_convoy select 0)], "ASYMMETRIC"] call KPLIB_fnc_log;}; @@ -54,7 +54,7 @@ while {_supplies > 0} do { _amount = _supplies; }; _supplies = _supplies - _amount; - private _crate = [KPLIB_supply_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateSupply, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; _crate setPos (_crate getPos [random 60, random 360]); _crateArray pushBack [_crate]; }; @@ -65,7 +65,7 @@ while {_ammo > 0} do { _amount = _ammo; }; _ammo = _ammo - _amount; - private _crate = [KPLIB_ammo_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateAmmo, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; _crate setPos (_crate getPos [random 60, random 360]); _crateArray pushBack [_crate]; }; @@ -76,7 +76,7 @@ while {_fuel > 0} do { _amount = _fuel; }; _fuel = _fuel - _amount; - private _crate = [KPLIB_fuel_crate, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateFuel, _amount, getPos _roadObj] call KPLIB_fnc_createCrate; _crate setPos (_crate getPos [random 60, random 360]); _crateArray pushBack [_crate]; }; @@ -125,7 +125,7 @@ if ((_waitingTime <= 0) && (({alive _x} count (units _grp)) > 0)) then { }; } forEach (units _grp); { - if ((typeOf (_x select 0)) == KPLIB_ammo_crate) then { + if ((typeOf (_x select 0)) == KPLIB_b_crateAmmo) then { _gain = _gain + 3; } else { _gain = _gain + 2; diff --git a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf index 73e083258..191772829 100644 --- a/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf +++ b/Missionframework/scripts/server/asymmetric/random/sector_guerilla.sqf @@ -76,8 +76,8 @@ _spawnedGroups pushBack _grp; sleep 30; -if (((random 100) <= 25) && !(KPLIB_guerilla_vehicles isEqualTo [])) then { - private _vehicle = (selectRandom KPLIB_guerilla_vehicles) createVehicle _startpos; +if (((random 100) <= 25) && !(KPLIB_r_vehicles isEqualTo [])) then { + private _vehicle = (selectRandom KPLIB_r_vehicles) createVehicle _startpos; [_vehicle] call KPLIB_fnc_allowCrewInImmobile; private _grp = [_startpos, 2] call KPLIB_fnc_spawnGuerillaGroup; diff --git a/Missionframework/scripts/server/base/huron_manager.sqf b/Missionframework/scripts/server/base/huron_manager.sqf index 45885266a..e92615f38 100644 --- a/Missionframework/scripts/server/base/huron_manager.sqf +++ b/Missionframework/scripts/server/base/huron_manager.sqf @@ -1,40 +1,40 @@ waitUntil {!isNil "save_is_loaded"}; waitUntil {save_is_loaded}; -huron = objNull; +KPLIB_potato01 = objNull; -// Detect possible huron from loaded save data -private _savedHuron = vehicles select {(toLower (typeOf _x)) isEqualTo (toLower huron_typename)}; -if !(_savedHuron isEqualTo []) then { - huron = _savedHuron select 0; +// Detect possible Potato 01 from loaded save data +private _savedPotato = vehicles select {(toLower (typeOf _x)) isEqualTo (toLower KPLIB_b_potato01)}; +if !(_savedPotato isEqualTo []) then { + KPLIB_potato01 = _savedPotato select 0; }; while {true} do { // Spawn new huron if not loaded or destroyed if !(alive huron) then { - huron = huron_typename createVehicle [(getposATL huronspawn) select 0, (getposATL huronspawn) select 1, ((getposATL huronspawn) select 2) + 0.2]; - huron enableSimulationGlobal false; - huron allowdamage false; - huron setDir (getDir huronspawn); - huron setPosATL (getposATL huronspawn); - huron setDamage 0; + KPLIB_potato01 = KPLIB_b_potato01 createVehicle [(getposATL huronspawn) select 0, (getposATL huronspawn) select 1, ((getposATL huronspawn) select 2) + 0.2]; + KPLIB_potato01 enableSimulationGlobal false; + KPLIB_potato01 allowdamage false; + KPLIB_potato01 setDir (getDir huronspawn); + KPLIB_potato01 setPosATL (getposATL huronspawn); + KPLIB_potato01 setDamage 0; sleep 0.5; - huron enableSimulationGlobal true; - huron setDamage 0; - huron allowdamage true; - [huron] call KPLIB_fnc_addObjectInit; + KPLIB_potato01 enableSimulationGlobal true; + KPLIB_potato01 setDamage 0; + KPLIB_potato01 allowdamage true; + [KPLIB_potato01] call KPLIB_fnc_addObjectInit; }; - [huron] call KPLIB_fnc_clearCargo; - huron setVariable ["ace_medical_isMedicalVehicle", true, true]; - publicVariable "huron"; + [KPLIB_potato01] call KPLIB_fnc_clearCargo; + KPLIB_potato01 setVariable ["ace_medical_isMedicalVehicle", true, true]; + publicVariable "KPLIB_potato01"; // Wait until huron is destroyed to respawn it - waitUntil {sleep 5; !alive huron}; - stats_spartan_respawns = stats_spartan_respawns + 1; + waitUntil {sleep 5; !alive KPLIB_potato01}; + stats_potato_respawns = stats_potato_respawns + 1; sleep 10; // Delete wreck, if near startbase - if (huron distance startbase < 500) then { - deletevehicle huron; + if (KPLIB_potato01 distance startbase < 500) then { + deletevehicle KPLIB_potato01; }; }; diff --git a/Missionframework/scripts/server/base/startgame.sqf b/Missionframework/scripts/server/base/startgame.sqf index dd8f530be..e80d20654 100644 --- a/Missionframework/scripts/server/base/startgame.sqf +++ b/Missionframework/scripts/server/base/startgame.sqf @@ -19,7 +19,7 @@ if (KPLIB_sectors_fob isEqualTo []) then { // Spawn FOB box and wait until the first FOB was built private _fobbox = objNull; while {KPLIB_sectors_fob isEqualTo []} do { - _fobbox = ([FOB_box_typename, FOB_truck_typename] select KPLIB_fob_vehicle) createVehicle (getposATL base_boxspawn); + _fobbox = ([KPLIB_b_fobBox, KPLIB_b_fobTruck] select KPLIB_fob_vehicle) createVehicle (getposATL base_boxspawn); _fobbox setdir getDir base_boxspawn; _fobbox setposATL (getposATL base_boxspawn); [_fobbox, true] call KPLIB_fnc_clearCargo; diff --git a/Missionframework/scripts/server/base/startvehicle_spawn.sqf b/Missionframework/scripts/server/base/startvehicle_spawn.sqf index 2407678a8..639776db5 100644 --- a/Missionframework/scripts/server/base/startvehicle_spawn.sqf +++ b/Missionframework/scripts/server/base/startvehicle_spawn.sqf @@ -12,7 +12,7 @@ E.g. the variables of the grasscutter placeholder objects for the little birds are named "littlebird_0", "littlebird_1", etc. - while the variable from the preset is KPLIB_little_bird_classname. + while the variable from the preset is KPLIB_b_addHeli. This leads to the entry below. You can also remove unwanted start vehicles by deleting the corresponding line @@ -46,6 +46,6 @@ private _veh = objNull; [_veh] call KPLIB_fnc_addObjectInit; }; } forEach [ - ["littlebird_", KPLIB_little_bird_classname], - ["boat_", KPLIB_boat_classname] + ["littlebird_", KPLIB_b_addHeli], + ["boat_", KPLIB_b_addBoat] ]; diff --git a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf index 6398569e5..e15baf963 100644 --- a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf +++ b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf @@ -20,7 +20,7 @@ while {true} do { private _house = (nearestObjects [[((markerPos _sector select 0) - 100 + (random 200)), ((markerPos _sector select 1) - 100 + (random 200))],["House", "Building"], 100]) select 0; private _grp = createGroup [KPLIB_side_civilian, true]; - private _informant = [selectRandom civilians, markerPos _sector, _grp] call KPLIB_fnc_createManagedUnit; + private _informant = [selectRandom KPLIB_c_units, markerPos _sector, _grp] call KPLIB_fnc_createManagedUnit; private _waiting_time = KPLIB_civinfo_duration; _informant setPos (selectRandom (_house buildingPos -1)); diff --git a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf index 182993d21..8719aa18d 100644 --- a/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf +++ b/Missionframework/scripts/server/civrep/wounded/civrep_wounded_civs.sqf @@ -14,7 +14,7 @@ for "_i" from 1 to _count do { while {(surfaceIsWater _pos) || ((count ([_pos, 30] call KPLIB_fnc_getNearbyPlayers)) > 0)} do { _pos = (markerPos _sector) getPos [(50 + (random 200)), (random 360)]; }; - private _civ = [selectRandom civilians, _pos, _grp] call KPLIB_fnc_createManagedUnit; + private _civ = [selectRandom KPLIB_c_units, _pos, _grp] call KPLIB_fnc_createManagedUnit; _civ setDir (random 360); {_civ disableAI _x} forEach ["ANIM", "TARGET", "AUTOTARGET", "MOVE"]; removeAllItems _civ; diff --git a/Missionframework/scripts/server/game/check_victory_conditions.sqf b/Missionframework/scripts/server/game/check_victory_conditions.sqf index b29ae82f4..bdef5c640 100644 --- a/Missionframework/scripts/server/game/check_victory_conditions.sqf +++ b/Missionframework/scripts/server/game/check_victory_conditions.sqf @@ -43,7 +43,7 @@ if ([] call KPLIB_victoryCheck && KPLIB_endgame != 1) then { publicstats pushback stats_secondary_objectives; publicstats pushback stats_sectors_liberated; publicstats pushback stats_sectors_lost; - publicstats pushback stats_spartan_respawns; + publicstats pushback stats_potato_respawns; publicstats pushback stats_supplies_produced; publicstats pushback stats_supplies_spent; publicstats pushback stats_vehicles_recycled; @@ -95,7 +95,7 @@ if ([] call KPLIB_victoryCheck && KPLIB_endgame != 1) then { [format ["Hostile reinforcements called: %1", stats_reinforcements_called], "MISSION END"] call KPLIB_fnc_log; [format ["Total combat readiness raised: %1", round stats_readiness_earned], "MISSION END"] call KPLIB_fnc_log; [format ["IEDs detonated: %1", stats_ieds_detonated], "MISSION END"] call KPLIB_fnc_log; - [format ["Number of Potato 01 losses: %1", stats_spartan_respawns], "MISSION END"] call KPLIB_fnc_log; + [format ["Number of Potato 01 losses: %1", stats_potato_respawns], "MISSION END"] call KPLIB_fnc_log; [format ["Rabbits killed: %1", _rabbits], "MISSION END"] call KPLIB_fnc_log; ["------------------------------------", "MISSION END"] call KPLIB_fnc_log; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 0a234c822..593eae0bf 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -33,7 +33,7 @@ if (hasInterface) then { }; // All classnames of objects which should be saved -KPLIB_classnamesToSave = [toLower FOB_typename, toLower huron_typename]; +KPLIB_classnamesToSave = [toLower KPLIB_b_fobBuilding, toLower KPLIB_b_potato01]; /* --- Locals --- @@ -44,7 +44,7 @@ private _aiGroups = []; // Current campaign date and time private _dateTime = []; // Vehicles which shouldn't be handled in the kill manager -private _noKillHandler = [toLower FOB_typename, toLower huron_typename]; +private _noKillHandler = [toLower KPLIB_b_fobBuilding, toLower KPLIB_b_potato01]; // All objects which should be loaded/saved private _objectsToSave = []; // All storages which are handled for resource persistence @@ -97,13 +97,13 @@ resources_intel = 0; save_is_loaded = false; // Add all buildings for saving and kill manager ignore -_noKillHandler append KPLIB_b_buildings_classes; -KPLIB_classnamesToSave append KPLIB_b_buildings_classes; +_noKillHandler append KPLIB_b_deco_classes; +KPLIB_classnamesToSave append KPLIB_b_deco_classes; KPLIB_classnamesToSave append KPLIB_b_allVeh_classes; // Add opfor and civilian vehicles for saving KPLIB_classnamesToSave append KPLIB_o_allVeh_classes; -KPLIB_classnamesToSave append civilian_vehicles; +KPLIB_classnamesToSave append KPLIB_c_vehicles; // Remove duplicates KPLIB_classnamesToSave = KPLIB_classnamesToSave arrayIntersect KPLIB_classnamesToSave; @@ -147,7 +147,7 @@ stats_resistance_teamkills_by_players = 0; stats_secondary_objectives = 0; stats_sectors_liberated = 0; stats_sectors_lost = 0; -stats_spartan_respawns = 0; +stats_potato_respawns = 0; stats_supplies_produced = 0; stats_supplies_spent = 0; stats_vehicles_recycled = 0; @@ -227,7 +227,7 @@ if (!isNil "_saveData") then { stats_secondary_objectives = _stats select 32; stats_sectors_liberated = _stats select 33; stats_sectors_lost = _stats select 34; - stats_spartan_respawns = _stats select 35; + stats_potato_respawns = _stats select 35; stats_supplies_produced = _stats select 36; stats_supplies_spent = _stats select 37; stats_vehicles_recycled = _stats select 38; @@ -266,7 +266,7 @@ if (!isNil "_saveData") then { stats_civilians_killed_by_players = _stats select 10; stats_sectors_liberated = _stats select 11; stats_playtime = _stats select 12; - stats_spartan_respawns = _stats select 13; + stats_potato_respawns = _stats select 13; stats_secondary_objectives = _stats select 14; stats_hostile_battlegroups = _stats select 15; stats_ieds_detonated = _stats select 16; @@ -321,13 +321,13 @@ if (!isNil "_saveData") then { // This will be removed if we reach a 0.96.7 due to more released Arma 3 DLCs until we finish 0.97.0 if !(((_saveData select 0) select 0) isEqualType 0) then { // Pre 0.96.5 compatibility with repair building, as it was replaced by default with a different classname - if ((KPLIB_recycle_building != "Land_CarService_F") && (_class == "Land_CarService_F")) then { - _class = KPLIB_recycle_building; + if ((KPLIB_b_logiStation != "Land_CarService_F") && (_class == "Land_CarService_F")) then { + _class = KPLIB_b_logiStation; }; // Pre 0.96.5 compatibility with air building, as it was replaced by default with a different classname - if ((KPLIB_air_vehicle_building != "Land_Radar_Small_F") && (_class == "Land_Radar_Small_F")) then { - _class = KPLIB_air_vehicle_building; + if ((KPLIB_b_airControl != "Land_Radar_Small_F") && (_class == "Land_Radar_Small_F")) then { + _class = KPLIB_b_airControl; }; }; @@ -360,7 +360,7 @@ if (!isNil "_saveData") then { }; // Set civilian vehicle as seized - if (_class in civilian_vehicles) then { + if (_class in KPLIB_c_vehicles) then { _object setVariable ["KPLIB_seized", true, true]; }; @@ -439,7 +439,7 @@ if (!isNil "_saveData") then { _storage params ["_pos", "_dir", "_vecUp"]; // Create object without damage handling and simulation - _object = createVehicle [KPLIB_small_storage_building, _pos, [], 0, "CAN_COLLIDE"]; + _object = createVehicle [KPLIB_b_smallStorage, _pos, [], 0, "CAN_COLLIDE"]; _object enableSimulationGlobal false; _object allowdamage false; @@ -507,14 +507,14 @@ publicVariable "KPLIB_sectors_fob"; publicVariable "KPLIB_clearances"; // Check for deleted military sectors or deleted classnames in the locked vehicles array -KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {((_x select 0) in elite_vehicles) && ((_x select 1) in KPLIB_sectors_military)}; +KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {((_x select 0) in KPLIB_b_vehToUnlock) && ((_x select 1) in KPLIB_sectors_military)}; // Remove links for vehicles of possibly removed mods KPLIB_vehicle_to_military_base_links = KPLIB_vehicle_to_military_base_links select {[_x select 0] call KPLIB_fnc_checkClass}; // Check for additions in the locked vehicles array private _lockedVehCount = count KPLIB_vehicle_to_military_base_links; -if ((_lockedVehCount < (count KPLIB_sectors_military)) && (_lockedVehCount < (count elite_vehicles))) then { +if ((_lockedVehCount < (count KPLIB_sectors_military)) && (_lockedVehCount < (count KPLIB_b_vehToUnlock))) then { private _assignedVehicles = []; private _assignedBases = []; private _nextVehicle = ""; @@ -526,8 +526,8 @@ if ((_lockedVehCount < (count KPLIB_sectors_military)) && (_lockedVehCount < (co } forEach KPLIB_vehicle_to_military_base_links; // Add new entries, when there are elite vehicles and military sectors are not yet assigned - while {((count _assignedVehicles) < (count elite_vehicles)) && ((count _assignedBases) < (count KPLIB_sectors_military))} do { - _nextVehicle = selectRandom (elite_vehicles - _assignedVehicles); + while {((count _assignedVehicles) < (count KPLIB_b_vehToUnlock)) && ((count _assignedBases) < (count KPLIB_sectors_military))} do { + _nextVehicle = selectRandom (KPLIB_b_vehToUnlock - _assignedVehicles); _nextBase = selectRandom (KPLIB_sectors_military - _assignedBases); _assignedVehicles pushBack _nextVehicle; _assignedBases pushBack _nextBase; diff --git a/Missionframework/scripts/server/game/zeus_synchro.sqf b/Missionframework/scripts/server/game/zeus_synchro.sqf index 14b0dd1a8..a64d87234 100644 --- a/Missionframework/scripts/server/game/zeus_synchro.sqf +++ b/Missionframework/scripts/server/game/zeus_synchro.sqf @@ -1,7 +1,7 @@ -waitUntil {!isNil "huron_typename"}; +waitUntil {!isNil "KPLIB_b_potato01"}; // Classnames of objects which should be added as editable for Zeus -private _vehicleClassnames = [toLower huron_typename]; +private _vehicleClassnames = [toLower KPLIB_b_potato01]; { _vehicleClassnames append _x; } forEach [ diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index 96298de99..37d2fcefa 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -26,7 +26,7 @@ while { KPLIB_endgame == 0 } do { if ( random 100 < 33) then { _civnumber = 1 + (floor (random 2)); while { count units _grp < _civnumber } do { - [selectRandom civilians, markerPos _spawnsector, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; + [selectRandom KPLIB_c_units, markerPos _spawnsector, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; }; _grpspeed = "LIMITED"; } else { @@ -39,8 +39,8 @@ while { KPLIB_endgame == 0 } do { _spawnpos = getpos _nearestroad; - [selectRandom civilians, _spawnpos, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; - _civveh = (selectRandom civilian_vehicles) createVehicle _spawnpos; + [selectRandom KPLIB_c_units, _spawnpos, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; + _civveh = (selectRandom KPLIB_c_vehicles) createVehicle _spawnpos; _civveh setpos _spawnpos; _civveh addMPEventHandler ['MPKilled', {_this spawn kill_manager}]; _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_friendly ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; diff --git a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf index 756281f89..6fd9a92e2 100644 --- a/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/add_logiTruck_remote_call.sqf @@ -25,7 +25,7 @@ if ((_price_s > _supplies) || (_price_a > _ammo) || (_price_f > _fuel)) exitWith private _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KPLIB_supply_crate: { + case KPLIB_b_crateSupply: { if (_price_s > 0) then { if (_crateValue > _price_s) then { _crateValue = _crateValue - _price_s; @@ -38,7 +38,7 @@ if ((_price_s > _supplies) || (_price_a > _ammo) || (_price_f > _fuel)) exitWith }; }; }; - case KPLIB_ammo_crate: { + case KPLIB_b_crateAmmo: { if (_price_a > 0) then { if (_crateValue > _price_a) then { _crateValue = _crateValue - _price_a; @@ -51,7 +51,7 @@ if ((_price_s > _supplies) || (_price_a > _ammo) || (_price_f > _fuel)) exitWith }; }; }; - case KPLIB_fuel_crate: { + case KPLIB_b_crateFuel: { if (_price_f > 0) then { if (_crateValue > _price_f) then { _crateValue = _crateValue - _price_f; diff --git a/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf b/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf index ad5427b4f..2e3f393fb 100644 --- a/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/build_fac_remote_call.sqf @@ -22,7 +22,7 @@ switch (_fac) do { stats_ammo_spent = stats_ammo_spent + _price_a; stats_fuel_spent = stats_fuel_spent + _price_f; - private _storage = nearestObjects [(markerPos (_x select 1)), [KPLIB_small_storage_building], 100]; + private _storage = nearestObjects [(markerPos (_x select 1)), [KPLIB_b_smallStorage], 100]; _storage = _storage select {(_x getVariable ["KPLIB_storage_type",-1]) == 1}; if ((count _storage) == 0) exitWith {}; _storage = (_storage select 0); @@ -33,7 +33,7 @@ switch (_fac) do { private _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KPLIB_supply_crate: { + case KPLIB_b_crateSupply: { if (_price_s > 0) then { if (_crateValue > _price_s) then { _crateValue = _crateValue - _price_s; @@ -46,7 +46,7 @@ switch (_fac) do { }; }; }; - case KPLIB_ammo_crate: { + case KPLIB_b_crateAmmo: { if (_price_a > 0) then { if (_crateValue > _price_a) then { _crateValue = _crateValue - _price_a; @@ -59,7 +59,7 @@ switch (_fac) do { }; }; }; - case KPLIB_fuel_crate: { + case KPLIB_b_crateFuel: { if (_price_f > 0) then { if (_crateValue > _price_f) then { _crateValue = _crateValue - _price_f; diff --git a/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf b/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf index f1d650fd6..8aa3eb187 100644 --- a/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/build_fob_remote_call.sqf @@ -9,7 +9,7 @@ publicVariable "KPLIB_sectors_fob"; if ( _create_fob_building ) then { _fob_pos = [ (_new_fob select 0) + 15, (_new_fob select 1) + 2, 0 ]; [_fob_pos, 20, true] call KPLIB_fnc_createClearance; - _fob_building = FOB_typename createVehicle _fob_pos; + _fob_building = KPLIB_b_fobBuilding createVehicle _fob_pos; _fob_building setpos _fob_pos; _fob_building setVectorUp [0,0,1]; sleep 1; diff --git a/Missionframework/scripts/server/remotecall/build_remote_call.sqf b/Missionframework/scripts/server/remotecall/build_remote_call.sqf index 5448971ac..b28ba386e 100644 --- a/Missionframework/scripts/server/remotecall/build_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/build_remote_call.sqf @@ -17,7 +17,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KPLIB_supply_crate: { + case KPLIB_b_crateSupply: { if (_price_s > 0) then { if (_crateValue > _price_s) then { _crateValue = _crateValue - _price_s; @@ -30,7 +30,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { }; }; }; - case KPLIB_ammo_crate: { + case KPLIB_b_crateAmmo: { if (_price_a > 0) then { if (_crateValue > _price_a) then { _crateValue = _crateValue - _price_a; @@ -43,7 +43,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { }; }; }; - case KPLIB_fuel_crate: { + case KPLIB_b_crateFuel: { if (_price_f > 0) then { if (_crateValue > _price_f) then { _crateValue = _crateValue - _price_f; diff --git a/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf b/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf index 9b02395d9..392e8f910 100644 --- a/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/cancel_build_remote_call.sqf @@ -5,10 +5,10 @@ params ["_price_s", "_price_a", "_price_f", "_storage_areas"]; if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { { private _space = 0; - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; @@ -18,7 +18,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_s; }; _price_s = _price_s - _amount; - private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateSupply, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -29,7 +29,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_a; }; _price_a = _price_a - _amount; - private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateAmmo, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -40,7 +40,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_f; }; _price_f = _price_f - _amount; - private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateFuel, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; diff --git a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf index 23cb9f8ec..8f566e85f 100644 --- a/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/del_logiTruck_remote_call.sqf @@ -19,10 +19,10 @@ private _crateSum = (ceil(_price_s / 100)) + (ceil(_price_a / 100)) + (ceil(_pri private _spaceSum = 0; { - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -31,10 +31,10 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe { private _space = 0; - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; @@ -44,7 +44,7 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe _amount = _price_s; }; _price_s = _price_s - _amount; - private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateSupply, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -55,7 +55,7 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe _amount = _price_a; }; _price_a = _price_a - _amount; - private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateAmmo, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -66,7 +66,7 @@ if (_spaceSum < _crateSum) exitWith {(localize "STR_LOGISTIC_NOSPACE") remoteExe _amount = _price_f; }; _price_f = _price_f - _amount; - private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateFuel, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; diff --git a/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf b/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf index acf5ba6e1..520c53600 100644 --- a/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/recycle_remote_call.sqf @@ -9,10 +9,10 @@ deleteVehicle _object_recycled; if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { { private _space = 0; - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; @@ -22,7 +22,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_s; }; _price_s = _price_s - _amount; - private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateSupply, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -33,7 +33,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_a; }; _price_a = _price_a - _amount; - private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateAmmo, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; @@ -44,7 +44,7 @@ if ((_price_s > 0) || (_price_a > 0) || (_price_f > 0)) then { _amount = _price_f; }; _price_f = _price_f - _amount; - private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateFuel, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _space = _space - 1; }; diff --git a/Missionframework/scripts/server/resources/manage_logistics.sqf b/Missionframework/scripts/server/resources/manage_logistics.sqf index 9bfc2e33e..29b2be1df 100644 --- a/Missionframework/scripts/server/resources/manage_logistics.sqf +++ b/Missionframework/scripts/server/resources/manage_logistics.sqf @@ -25,7 +25,7 @@ while {KPLIB_endgame == 0} do { if ((_x select 8) > 1) then { switch (_x select 7) do {case 1: {_locPos = 2; _locRes = 4;}; case 3: {_locPos = 3; _locRes = 5;};}; switch (_x select 9) do {case 2: {_x set [9,0];}; case 3: {_x set [9,1];};}; - private _storage_areas = nearestObjects [(_x select _locPos), [KPLIB_small_storage_building, KPLIB_large_storage_building], 150]; + private _storage_areas = nearestObjects [(_x select _locPos), [KPLIB_b_smallStorage, KPLIB_b_largeStorage], 150]; if (((_x select 9) == 0) && !((_x select 6) isEqualTo [0,0,0])) then { @@ -35,10 +35,10 @@ while {KPLIB_endgame == 0} do { if (_toProcess > 3) then {_toProcess = 3;}; private _spaceSum = 0; { - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -51,10 +51,10 @@ while {KPLIB_endgame == 0} do { while {_processed < _toProcess} do { { private _space = 0; - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; @@ -68,7 +68,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateSupply, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -85,7 +85,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1) - _amount, (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateAmmo, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -102,7 +102,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2) - _amount] ]; - private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateFuel, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -127,9 +127,9 @@ while {KPLIB_endgame == 0} do { { { switch ((typeOf _x)) do { - case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateSupply: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateAmmo: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateFuel: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _x); @@ -209,7 +209,7 @@ while {KPLIB_endgame == 0} do { private _crateValue = _x getVariable ["KPLIB_crate_value",0]; switch ((typeOf _x)) do { - case KPLIB_supply_crate: { + case KPLIB_b_crateSupply: { if (_getSupply > 0) then { if (_crateValue > _getSupply) then { _crateValue = _crateValue - _getSupply; @@ -222,7 +222,7 @@ while {KPLIB_endgame == 0} do { }; }; }; - case KPLIB_ammo_crate: { + case KPLIB_b_crateAmmo: { if (_getAmmo > 0) then { if (_crateValue > _getAmmo) then { _crateValue = _crateValue - _getAmmo; @@ -235,7 +235,7 @@ while {KPLIB_endgame == 0} do { }; }; }; - case KPLIB_fuel_crate: { + case KPLIB_b_crateFuel: { if (_getFuel > 0) then { if (_crateValue > _getFuel) then { _crateValue = _crateValue - _getFuel; @@ -351,7 +351,7 @@ while {KPLIB_endgame == 0} do { if ((_x select 8) > 1) then { _locPos = switch (_x select 7) do {case 5: {2}; case 6: {3};}; _x set [9,0]; - private _storage_areas = nearestObjects [(_x select _locPos), [KPLIB_small_storage_building, KPLIB_large_storage_building], 150]; + private _storage_areas = nearestObjects [(_x select _locPos), [KPLIB_b_smallStorage, KPLIB_b_largeStorage], 150]; if ((count (_storage_areas)) == 0) exitWith {_x set [9,2];}; @@ -359,10 +359,10 @@ while {KPLIB_endgame == 0} do { if (_toProcess > 3) then {_toProcess = 3;}; private _spaceSum = 0; { - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _spaceSum = _spaceSum + (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _spaceSum = _spaceSum + (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; } forEach _storage_areas; @@ -375,10 +375,10 @@ while {KPLIB_endgame == 0} do { while {_processed < _toProcess} do { { private _space = 0; - if (typeOf _x == KPLIB_large_storage_building) then { + if (typeOf _x == KPLIB_b_largeStorage) then { _space = (count KPLIB_large_storage_positions) - (count (attachedObjects _x)); }; - if (typeOf _x == KPLIB_small_storage_building) then { + if (typeOf _x == KPLIB_b_smallStorage) then { _space = (count KPLIB_small_storage_positions) - (count (attachedObjects _x)); }; @@ -392,7 +392,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KPLIB_supply_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateSupply, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -409,7 +409,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1) - _amount, (((_tempLogistics select _currentIndex) select 6) select 2)] ]; - private _crate = [KPLIB_ammo_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateAmmo, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; @@ -426,7 +426,7 @@ while {KPLIB_endgame == 0} do { (((_tempLogistics select _currentIndex) select 6) select 1), (((_tempLogistics select _currentIndex) select 6) select 2) - _amount] ]; - private _crate = [KPLIB_fuel_crate, _amount, getPos _x] call KPLIB_fnc_createCrate; + private _crate = [KPLIB_b_crateFuel, _amount, getPos _x] call KPLIB_fnc_createCrate; [_crate, _x] call KPLIB_fnc_crateToStorage; _processed = _processed + 1; _space = _space - 1; diff --git a/Missionframework/scripts/server/resources/manage_resources.sqf b/Missionframework/scripts/server/resources/manage_resources.sqf index 8f91429bd..f86e05556 100644 --- a/Missionframework/scripts/server/resources/manage_resources.sqf +++ b/Missionframework/scripts/server/resources/manage_resources.sqf @@ -29,7 +29,7 @@ while {KPLIB_endgame == 0} do { private _fuelValue = 0; private _time = _x select 8; - private _storage = nearestObjects [(markerPos (_x select 1)), [KPLIB_small_storage_building], 100]; + private _storage = nearestObjects [(markerPos (_x select 1)), [KPLIB_b_smallStorage], 100]; _storage = _storage select {(_x getVariable ["KPLIB_storage_type",-1]) == 1}; if ((count _storage) > 0) then { _storage = (_storage select 0); @@ -41,11 +41,11 @@ while {KPLIB_endgame == 0} do { _time = KPLIB_production_interval; if (((count (attachedObjects _storage)) < 12) && !((_x select 7) == 3)) then { - private _crateType = KPLIB_supply_crate; + private _crateType = KPLIB_b_crateSupply; switch (_x select 7) do { - case 1: {_crateType = KPLIB_ammo_crate; stats_ammo_produced = stats_ammo_produced + 100;}; - case 2: {_crateType = KPLIB_fuel_crate; stats_fuel_produced = stats_fuel_produced + 100;}; - default {_crateType = KPLIB_supply_crate; stats_supplies_produced = stats_supplies_produced + 100;}; + case 1: {_crateType = KPLIB_b_crateAmmo; stats_ammo_produced = stats_ammo_produced + 100;}; + case 2: {_crateType = KPLIB_b_crateFuel; stats_fuel_produced = stats_fuel_produced + 100;}; + default {_crateType = KPLIB_b_crateSupply; stats_supplies_produced = stats_supplies_produced + 100;}; }; private _crate = [_crateType, 100, getPosATL _storage] call KPLIB_fnc_createCrate; @@ -58,9 +58,9 @@ while {KPLIB_endgame == 0} do { { switch ((typeOf _x)) do { - case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateSupply: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateAmmo: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateFuel: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _storage); diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index 8b21baf80..98f5dd64a 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -28,11 +28,11 @@ while {true} do { { private _fob_buildings = _x nearobjects KPLIB_fob_range; private _storage_areas = _fob_buildings select {(_x getVariable ["KPLIB_storage_type",-1]) == 0}; - private _heliSlots = {(typeOf _x) == KPLIB_heli_slot_building;} count _fob_buildings; - private _planeSlots = {(typeOf _x) == KPLIB_plane_slot_building;} count _fob_buildings; - private _hasAirBuilding = {(typeOf _x) == KPLIB_air_vehicle_building;} count _fob_buildings; + private _heliSlots = {(typeOf _x) == KPLIB_b_slotHeli;} count _fob_buildings; + private _planeSlots = {(typeOf _x) == KPLIB_b_slotPlane;} count _fob_buildings; + private _hasAirBuilding = {(typeOf _x) == KPLIB_b_airControl;} count _fob_buildings; if (_hasAirBuilding > 0) then {_hasAirBuilding = true;} else {_hasAirBuilding = false;}; - private _hasRecBuilding = {(typeOf _x) == KPLIB_recycle_building;} count _fob_buildings; + private _hasRecBuilding = {(typeOf _x) == KPLIB_b_logiStation;} count _fob_buildings; if (_hasRecBuilding > 0) then {_hasRecBuilding = true;} else {_hasRecBuilding = false;}; private _supplyValue = 0; @@ -42,9 +42,9 @@ while {true} do { { { switch ((typeOf _x)) do { - case KPLIB_supply_crate: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_ammo_crate: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; - case KPLIB_fuel_crate: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateSupply: {_supplyValue = _supplyValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateAmmo: {_ammoValue = _ammoValue + (_x getVariable ["KPLIB_crate_value",0]);}; + case KPLIB_b_crateFuel: {_fuelValue = _fuelValue + (_x getVariable ["KPLIB_crate_value",0]);}; default {[format ["Invalid object (%1) at storage area", (typeOf _x)], "ERROR"] call KPLIB_fnc_log;}; }; } forEach (attachedObjects _x); diff --git a/Missionframework/scripts/server/secondary/convoy_hijack.sqf b/Missionframework/scripts/server/secondary/convoy_hijack.sqf index 9289d1765..828b87a68 100644 --- a/Missionframework/scripts/server/secondary/convoy_hijack.sqf +++ b/Missionframework/scripts/server/secondary/convoy_hijack.sqf @@ -31,7 +31,7 @@ private _boxes_loaded = 0; while { _boxes_loaded < _boxes_amount } do { _boxes_loaded = _boxes_loaded + 1; sleep 0.5; - private _next_box = [KPLIB_ammo_crate, 100, _spawnpos getPos [15, 135]] call KPLIB_fnc_createCrate; + private _next_box = [KPLIB_b_crateAmmo, 100, _spawnpos getPos [15, 135]] call KPLIB_fnc_createCrate; sleep 0.5; [_next_box, 50] call _load_box_fnc; }; diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index 355a54628..71145fd97 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -18,10 +18,10 @@ _helofire setpos (getpos _helowreck); private _pilotsGrp = createGroup [KPLIB_side_enemy, true]; private _pilotsPos = (getpos _helowreck) getPos [25, random 360]; -[pilot_classname, _pilotsPos, _pilotsGrp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; +[KPLIB_b_heliPilotUnit, _pilotsPos, _pilotsGrp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; sleep 0.2; -[pilot_classname, _pilotsPos getPos [1, random 360], _pilotsGrp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; +[KPLIB_b_heliPilotUnit, _pilotsPos getPos [1, random 360], _pilotsGrp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; sleep 2; private _pilotUnits = units _pilotsGrp; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf index 94271d0ff..cf2413126 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf @@ -10,7 +10,7 @@ if ( KPLIB_blufor_defenders ) then { _grp = creategroup [KPLIB_side_friendly, true]; { [_x, _thispos, _grp] call KPLIB_fnc_createManagedUnit; - } foreach blufor_squad_inf; + } foreach KPLIB_b_squadInf; sleep 3; _grp setBehaviour "COMBAT"; }; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf index beb03fd3f..829108c5d 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf @@ -6,9 +6,9 @@ sleep 5; _ownership = [ markerpos _sector ] call KPLIB_fnc_getSectorOwnership; if ( _ownership != KPLIB_side_enemy ) exitWith {}; -_squad_type = blufor_squad_inf_light; +_squad_type = KPLIB_b_squadLight; if ( _sector in KPLIB_sectors_military ) then { - _squad_type = blufor_squad_inf; + _squad_type = KPLIB_b_squadInf; }; if ( KPLIB_blufor_defenders ) then { @@ -59,9 +59,9 @@ if ( KPLIB_endgame == 0 ) then { { detach _x; deleteVehicle _x; - } forEach (attachedObjects ((nearestObjects [((_x select 3) select 0), [KPLIB_small_storage_building], 10]) select 0)); + } forEach (attachedObjects ((nearestObjects [((_x select 3) select 0), [KPLIB_b_smallStorage], 10]) select 0)); - deleteVehicle ((nearestObjects [((_x select 3) select 0), [KPLIB_small_storage_building], 10]) select 0); + deleteVehicle ((nearestObjects [((_x select 3) select 0), [KPLIB_b_smallStorage], 10]) select 0); }; KPLIB_production = KPLIB_production - [_x]; }; diff --git a/Missionframework/scripts/server/sector/fn_destroyFob.sqf b/Missionframework/scripts/server/sector/fn_destroyFob.sqf index 3435f0d83..26343d734 100644 --- a/Missionframework/scripts/server/sector/fn_destroyFob.sqf +++ b/Missionframework/scripts/server/sector/fn_destroyFob.sqf @@ -2,7 +2,7 @@ File: fn_destroyFob.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-28 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -20,8 +20,8 @@ params [ ["_fobPos", [], [[]]] ]; -private _buildings = [toLower FOB_typename]; -_buildings append KPLIB_b_buildings_classes; +private _buildings = [toLower KPLIB_b_fobBuilding]; +_buildings append KPLIB_b_deco_classes; { if ((toLower (typeOf _x)) in _buildings) then { diff --git a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf index eb05d95ed..1fb778e36 100644 --- a/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf +++ b/Missionframework/scripts/server/sector/fn_spawnSectorCrates.sqf @@ -2,7 +2,7 @@ File: fn_spawnSectorCrates.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-28 - Last Update: 2020-05-10 + Last Update: 2020-05-25 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -34,7 +34,7 @@ if !(_sector in KPLIB_sectorCratesSpawned) then { for "_i" from 1 to _amount do { while {_spawnPos isEqualTo []} do { _j = _j + 1; - _spawnPos = ((markerPos _sector) getPos [random 50, random 360]) findEmptyPosition [10, 40, KPLIB_ammo_crate]; + _spawnPos = ((markerPos _sector) getPos [random 50, random 360]) findEmptyPosition [10, 40, KPLIB_b_crateAmmo]; if (_j isEqualTo 10) exitWith {}; }; if !(_spawnPos isEqualTo []) then { diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index e3fc938b3..f1633503b 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -145,7 +145,7 @@ if (isServer) then { }; } else { // Civilian vehicle casualty - if (typeOf _unit in civilian_vehicles) then { + if (typeOf _unit in KPLIB_c_vehicles) then { stats_civilian_vehicles_killed = stats_civilian_vehicles_killed + 1; // Destroyed by player diff --git a/Missionframework/stringtable.xml b/Missionframework/stringtable.xml index adfe848a3..d63066c20 100644 --- a/Missionframework/stringtable.xml +++ b/Missionframework/stringtable.xml @@ -39,7 +39,7 @@ Turkish | Updated: pre 0.96.8 Carbneth - https://github.com/Carbneth - Czech | Updated: pre 0.96.8 + Czech | Updated: 0.96.8 MJVEVERUSKA - https://github.com/MJVEVERUSKA --> From 956d9646c78709346a349a7ec6050b225ed93608 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Wed, 3 Jun 2020 17:54:07 +0200 Subject: [PATCH 056/115] Removed RHS T-14 in presets --- Missionframework/presets/enemies/rhs_afrf.sqf | 5 ++--- Missionframework/presets/players/rhs_afrf.sqf | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Missionframework/presets/enemies/rhs_afrf.sqf b/Missionframework/presets/enemies/rhs_afrf.sqf index 3733d91fe..54d7cc045 100644 --- a/Missionframework/presets/enemies/rhs_afrf.sqf +++ b/Missionframework/presets/enemies/rhs_afrf.sqf @@ -2,7 +2,7 @@ File: rhs_afrf.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-07 - Last Update: 2020-05-15 + Last Update: 2020-06-03 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -80,8 +80,7 @@ KPLIB_o_armyVehicles = [ "rhs_t80", // T80 "rhs_t80", // T80 "rhs_t90a_tv", // T90A - "rhs_t90sab_tv", // T90SA (2016) - "rhs_t14_tv" // T-14 + "rhs_t90sab_tv" // T90SA (2016) ]; // All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels). diff --git a/Missionframework/presets/players/rhs_afrf.sqf b/Missionframework/presets/players/rhs_afrf.sqf index ca11a46eb..484574110 100644 --- a/Missionframework/presets/players/rhs_afrf.sqf +++ b/Missionframework/presets/players/rhs_afrf.sqf @@ -2,7 +2,7 @@ File: rhs_afrf.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-14 - Last Update: 2020-05-25 + Last Update: 2020-06-03 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -111,7 +111,6 @@ KPLIB_b_vehHeavy = [ ["rhs_t80ue1",400,350,250], // T-80UE1 ["rhs_t90a_tv",500,400,300], // T-90A ["rhs_t90sab_tv",600,400,300], // T-90SA (2016) - ["rhs_t14_tv",600,500,400], // T-14 ["rhs_2s1_tv",600,1000,300], // 2S1 ["rhs_2s3_tv",600,1250,300] // 2S3M1 ]; @@ -342,7 +341,6 @@ KPLIB_b_vehToUnlock = [ "rhs_t80ue1", // T-80UE1 "rhs_t90a_tv", // T-90A "rhs_t90sab_tv", // T-90SA (2016) - "rhs_t14_tv", // T-14 "rhs_2s1_tv", // 2S1 "rhs_2s3_tv", // 2S3M1 "rhs_mi28n_vvsc", // Mi-28N From a6fb990a9484e97147f6105bb7b31518748308f9 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Mon, 22 Jun 2020 21:34:02 +0200 Subject: [PATCH 057/115] Missing `};` in civinfo_escort.sqf closes #807 --- Missionframework/scripts/client/civinformant/civinfo_escort.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf index 6ed517566..35c425c5c 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf @@ -6,7 +6,7 @@ if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_escort called on: %1 - Para waitUntil {sleep 0.5; local _informant || !alive _informant}; -if !(alive _informant) exitWith {if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_escort exited by: %1 - Informant isn't alive", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if !(alive _informant) exitWith {if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_escort exited by: %1 - Informant isn't alive", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];};}; private _is_near_fob = false; From ee0124decaf9fd39984af24fb093f3b396b1d23b Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 23 Jun 2020 09:49:13 +0200 Subject: [PATCH 058/115] Missing `}` in civinfo_task.sqf --- .../scripts/server/civinformant/tasks/civinfo_task.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf index efa20b63c..d271a4fce 100644 --- a/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf +++ b/Missionframework/scripts/server/civinformant/tasks/civinfo_task.sqf @@ -3,7 +3,7 @@ if (KPLIB_civinfo_debug > 0) then {[format ["civinfo_task.sqf spawned on: %1", d private _spawn_marker = [2000,999999,false] call KPLIB_fnc_getOpforSpawnPoint; private _roadObj = [markerPos _spawn_marker, 400, []] call BIS_fnc_nearestRoad; -if (isNull _roadObj) exitWith {if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> no road found", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; +if (isNull _roadObj) exitWith {if (KPLIB_civinfo_debug > 0) then {["civinfo_task.sqf -> no road found", "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];};}; private _veh = createVehicle [KPLIB_o_mrap, getPos _roadObj, [], 0, "NONE"]; _veh setDir (getDir _roadObj); From 554ad8fcdbbda68d1d74adbf3b7827d3c40e1e80 Mon Sep 17 00:00:00 2001 From: Dubjunk Date: Wed, 8 Jul 2020 07:04:23 +0200 Subject: [PATCH 059/115] first version of the crate carrying --- .../scripts/client/ammoboxes/ammobox_action_manager.sqf | 6 ++++++ Missionframework/stringtable.xml | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index 6586b6eda..d1b076c9f 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -57,10 +57,14 @@ while {true} do { _b_action_id2 = _next_box addAction ["" + localize "STR_ACTION_STORE_CRATE" + "",{[(_this select 0), (nearestObjects [player,KPLIB_storageBuildings,20]) select 0,true] call KPLIB_fnc_crateToStorage;},"",-502,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id3 = _next_box addAction ["" + localize "STR_ACTION_CRATE_VALUE" + "",{[_this select 0] call KPLIB_fnc_checkCrateValue;uiSleep 3; hint "";},"",-503,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id4 = _next_box addAction ["" + localize "STR_ACTION_CRATE_PUSH" + "",{(_this select 0) setPos ((_this select 0) getPos [1, (player getDir (_this select 0))]);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; + _b_action_id5 = _next_box addAction ["" + localize "STR_ACTION_CRATE_CARRY" + "",{(_this select 0) attachTo [(_this select 1), [0, 1, 0]];},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && (isNull attachedTo _target)"]; + _b_action_id6 = _next_box addAction ["" + localize "STR_ACTION_CRATE_DROP" + "",{detach (_this select 0);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && (_this isEqualTo (attachedTo _target))"]; _next_box setVariable ["KPLIB_ammo_box_action", _b_action_id1, false]; _next_box setVariable ["KP_crate_store_action", _b_action_id2, false]; _next_box setVariable ["KP_crate_value_action", _b_action_id3, false]; _next_box setVariable ["KP_crate_push_action", _b_action_id4, false]; + _next_box setVariable ["KP_crate_carry_action", _b_action_id5, false]; + _next_box setVariable ["KP_crate_drop_action", _b_action_id6, false]; _managed_boxes pushback _next_box; }; @@ -75,6 +79,8 @@ while {true} do { _next_box removeAction (_next_box getVariable ["KP_crate_store_action", -1]); _next_box removeAction (_next_box getVariable ["KP_crate_value_action", -1]); _next_box removeAction (_next_box getVariable ["KP_crate_push_action", -1]); + _next_box removeAction (_next_box getVariable ["KP_crate_carry_action", -1]); + _next_box removeAction (_next_box getVariable ["KP_crate_drop_action", -1]); } } foreach _managed_boxes; diff --git a/Missionframework/stringtable.xml b/Missionframework/stringtable.xml index d63066c20..04b9f3ec7 100644 --- a/Missionframework/stringtable.xml +++ b/Missionframework/stringtable.xml @@ -5092,6 +5092,14 @@ -- 군수물품 밀기 -- TLAČIT KRABICI + + -- CARRY CRATE + -- KISTE TRAGEN + + + -- DROP CRATE + -- KISTE ABLEGEN + -- STACK AND SORT -- STAPELN UND SORTIEREN From b2a8914ce090f435be2436e1a0f9931e9c92ad8c Mon Sep 17 00:00:00 2001 From: Dubjunk Date: Wed, 8 Jul 2020 08:58:33 +0200 Subject: [PATCH 060/115] crate carrying v2 --- .../functions/fn_addActionsPlayer.sqf | 18 +++++++++++++++++- .../ammoboxes/ammobox_action_manager.sqf | 2 -- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index 5c16a595e..083914c71 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -2,7 +2,7 @@ File: fn_addActionsPlayer.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-05-25 + Last Update: 2020-07-08 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -370,4 +370,20 @@ _player addAction [ " ]; +// Drop crate +_player addAction [ + "", localize "STR_ACTION_CRATE_DROP", ""] joinString "", + {detach ((attachedObjects (_this select 1)) select 0)}, + nil, + -504, + true, + false, + "", + " + alive _originalTarget + && {build_confirmed isEqualTo 0} + && {(typeOf ((attachedObjects _target) select 0)) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]} + " +]; + true diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index d1b076c9f..7256b8098 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -58,13 +58,11 @@ while {true} do { _b_action_id3 = _next_box addAction ["" + localize "STR_ACTION_CRATE_VALUE" + "",{[_this select 0] call KPLIB_fnc_checkCrateValue;uiSleep 3; hint "";},"",-503,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id4 = _next_box addAction ["" + localize "STR_ACTION_CRATE_PUSH" + "",{(_this select 0) setPos ((_this select 0) getPos [1, (player getDir (_this select 0))]);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id5 = _next_box addAction ["" + localize "STR_ACTION_CRATE_CARRY" + "",{(_this select 0) attachTo [(_this select 1), [0, 1, 0]];},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && (isNull attachedTo _target)"]; - _b_action_id6 = _next_box addAction ["" + localize "STR_ACTION_CRATE_DROP" + "",{detach (_this select 0);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && (_this isEqualTo (attachedTo _target))"]; _next_box setVariable ["KPLIB_ammo_box_action", _b_action_id1, false]; _next_box setVariable ["KP_crate_store_action", _b_action_id2, false]; _next_box setVariable ["KP_crate_value_action", _b_action_id3, false]; _next_box setVariable ["KP_crate_push_action", _b_action_id4, false]; _next_box setVariable ["KP_crate_carry_action", _b_action_id5, false]; - _next_box setVariable ["KP_crate_drop_action", _b_action_id6, false]; _managed_boxes pushback _next_box; }; From a0369f42d54a9c59d4b914e66eb814922d13c09a Mon Sep 17 00:00:00 2001 From: Dubjunk <31448659+Dubjunk@users.noreply.github.com> Date: Wed, 8 Jul 2020 09:32:03 +0200 Subject: [PATCH 061/115] updatet crate postition while carrying --- .../scripts/client/ammoboxes/ammobox_action_manager.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index 7256b8098..792c58882 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -57,7 +57,7 @@ while {true} do { _b_action_id2 = _next_box addAction ["" + localize "STR_ACTION_STORE_CRATE" + "",{[(_this select 0), (nearestObjects [player,KPLIB_storageBuildings,20]) select 0,true] call KPLIB_fnc_crateToStorage;},"",-502,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id3 = _next_box addAction ["" + localize "STR_ACTION_CRATE_VALUE" + "",{[_this select 0] call KPLIB_fnc_checkCrateValue;uiSleep 3; hint "";},"",-503,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id4 = _next_box addAction ["" + localize "STR_ACTION_CRATE_PUSH" + "",{(_this select 0) setPos ((_this select 0) getPos [1, (player getDir (_this select 0))]);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; - _b_action_id5 = _next_box addAction ["" + localize "STR_ACTION_CRATE_CARRY" + "",{(_this select 0) attachTo [(_this select 1), [0, 1, 0]];},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && (isNull attachedTo _target)"]; + _b_action_id5 = _next_box addAction ["" + localize "STR_ACTION_CRATE_CARRY" + "",{(_this select 0) attachTo [(_this select 1), [0, 2, 1]];},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && (isNull attachedTo _target)"]; _next_box setVariable ["KPLIB_ammo_box_action", _b_action_id1, false]; _next_box setVariable ["KP_crate_store_action", _b_action_id2, false]; _next_box setVariable ["KP_crate_value_action", _b_action_id3, false]; From dee28f53aae4323a7a01953aad02f0cda1926071 Mon Sep 17 00:00:00 2001 From: Dubjunk Date: Fri, 10 Jul 2020 10:10:23 +0200 Subject: [PATCH 062/115] changelog update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e1a70d89..72df1238e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 0.96.8 (TBD) * Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA) +* Added: Ability to carry ressource crates. * Tweaked: Splitted the config file in seperate files, as it was getting quite big. * Tweaked: Unified the prefix of all variables to `KPLIB_`. * Tweaked: Arsenal presets are now in the presets folder. From 16cea460db0f6ed39948062e44cda1fcf5d194b6 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 5 Aug 2020 18:37:50 +0200 Subject: [PATCH 063/115] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81f977340..753b1bf80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # Changelog ## 0.96.8 (TBD) -* Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA) * Tweaked: Splitted the config file in seperate files, as it was getting quite big. * Tweaked: Unified the prefix of all variables to `KPLIB_`. * Tweaked: Arsenal presets are now in the presets folder. @@ -16,6 +15,7 @@ ## 0.96.7a (2020-08-06) * Added: Contact DLC static weapon backpacks to default blacklist. +* Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA) * Removed: T-14 from RHS AFRF preset. * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. * Fixed: Civilian Informant side mission didn't worked due to script error. From d08a01fcf2f48f1bc4a6b18a20c7a8bdc434988a Mon Sep 17 00:00:00 2001 From: Wyqer Date: Thu, 6 Aug 2020 15:18:44 +0200 Subject: [PATCH 064/115] Renamed objectinits, created KPLIB_whitelist file --- Missionframework/KPLIB_config.sqf | 20 +---------- ..._objectInits.sqf => KPLIB_objectInits.sqf} | 0 Missionframework/KPLIB_whitelists.sqf | 35 +++++++++++++++++++ .../functions/fn_addObjectInit.sqf | 4 +-- Missionframework/init.sqf | 3 +- Missionframework/onPlayerRespawn.sqf | 2 +- .../client/commander/enforce_whitelist.sqf | 13 +------ .../scripts/client/misc/playerNamespace.sqf | 4 +-- Missionframework/whitelist.sqf | 21 ----------- 9 files changed, 44 insertions(+), 58 deletions(-) rename Missionframework/{kp_objectInits.sqf => KPLIB_objectInits.sqf} (100%) create mode 100644 Missionframework/KPLIB_whitelists.sqf delete mode 100644 Missionframework/whitelist.sqf diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 9d834fd89..092462dcb 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -2,7 +2,7 @@ File: KPLIB_config.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-16 - Last Update: 2020-05-22 + Last Update: 2020-08-06 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -360,21 +360,3 @@ KPLIB_surrender_chance = 80; KPLIB_battlegroup_clearance = [ "song_bin_tanh" ]; - -/* Slot independent commander action access. -The Steam UIDs entered in this array will allow corresponding players to access the commander actions (rights, production, etc.), -even if they are not in the commander slot. */ -KPLIB_commander_actions = [ - /* - Example: - "1324678", - "5468711", - "2156347" - */ -]; - -/* Whitelist for BI support framework access. -Same format as for the commander actions. */ -KPLIB_supportModule_whitelist = [ - -]; diff --git a/Missionframework/kp_objectInits.sqf b/Missionframework/KPLIB_objectInits.sqf similarity index 100% rename from Missionframework/kp_objectInits.sqf rename to Missionframework/KPLIB_objectInits.sqf diff --git a/Missionframework/KPLIB_whitelists.sqf b/Missionframework/KPLIB_whitelists.sqf new file mode 100644 index 000000000..16f09decc --- /dev/null +++ b/Missionframework/KPLIB_whitelists.sqf @@ -0,0 +1,35 @@ +/* + File: KPLIB_whitelists.sqf + Author: KP Liberation Dev Team - https://github.com/KillahPotatoes + Date: 2020-07-06 + Last Update: 2020-07-06 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Arrays of steam IDs for granting access to several features/mechanics. + All IDs have to be added as string. + + To retrieve steam IDs this site might be handy: https://steamid.io/ + + Example: + KPLIB_whitelist_cmdrSlot = [ + "123445245", + "235245345", + "456454443" + ]; +*/ + +// Access to the commander slot. +KPLIB_whitelist_cmdrSlot = [ + +]; + +// Access the commander actions (rights, production, etc.), even if the corresponding player is not in the commander slot. +KPLIB_whitelist_cmdrActions = [ + +]; + +// Whitelist for BI support framework access. +KPLIB_whitelist_supportModule = [ + +]; diff --git a/Missionframework/functions/fn_addObjectInit.sqf b/Missionframework/functions/fn_addObjectInit.sqf index df60272fc..bcdd87a99 100644 --- a/Missionframework/functions/fn_addObjectInit.sqf +++ b/Missionframework/functions/fn_addObjectInit.sqf @@ -2,11 +2,11 @@ File: fn_addObjectInit.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-05-08 - Last Update: 2020-04-29 + Last Update: 2020-07-06 License: MIT License - http://www.opensource.org/licenses/MIT Description: - Applies code from kp_objectInits.sqf to given object. Returns true if some code was applied, false if object has no KPLIB init code. + Applies code from KPLIB_objectInits.sqf to given object. Returns true if some code was applied, false if object has no KPLIB init code. Parameter(s): _object - Object which should get init code applied, if there is any defined [OBJECT, defaults to objNull] diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index e17d84d01..3ed806426 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -13,11 +13,12 @@ if (isDedicated) then {debug_source = "Server";} else {debug_source = name playe [] call KPLIB_fnc_initSectors; if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; [] call compile preprocessFileLineNumbers "KPLIB_config.sqf"; +[] call compile preprocessFileLineNumbers "KPLIB_whitelists.sqf"; [] call compile preprocessFileLineNumbers "KPLIB_transportConfigs.sqf"; [] call compile preprocessFileLineNumbers "KPLIB_classnameLists.sqf"; [] call compile preprocessFileLineNumbers "scripts\shared\fetch_params.sqf"; [] call compile preprocessFileLineNumbers "presets\init_presets.sqf"; -[] call compile preprocessFileLineNumbers "kp_objectInits.sqf"; +[] call compile preprocessFileLineNumbers "KPLIB_objectInits.sqf"; // Activate selected player menu. If CBA isn't loaded -> fallback to GREUH if (KPPLM_CBA && KPLIB_param_playerMenu) then { diff --git a/Missionframework/onPlayerRespawn.sqf b/Missionframework/onPlayerRespawn.sqf index bea644c1c..5039709b8 100644 --- a/Missionframework/onPlayerRespawn.sqf +++ b/Missionframework/onPlayerRespawn.sqf @@ -22,7 +22,7 @@ if (isNil "KPLIB_respawn_loadout") then { // Support Module handling if ([ false, - player isEqualTo ([] call KPLIB_fnc_getCommander) || (getPlayerUID player) in KPLIB_supportModule_whitelist, + player isEqualTo ([] call KPLIB_fnc_getCommander) || (getPlayerUID player) in KPLIB_whitelist_supportModule, true ] select KPLIB_param_supportModule) then { waitUntil {!isNil "KPLIB_param_supportModule_req" && !isNil "KPLIB_param_supportModule_arty" && time > 5}; diff --git a/Missionframework/scripts/client/commander/enforce_whitelist.sqf b/Missionframework/scripts/client/commander/enforce_whitelist.sqf index 97966a7ff..8283df592 100644 --- a/Missionframework/scripts/client/commander/enforce_whitelist.sqf +++ b/Missionframework/scripts/client/commander/enforce_whitelist.sqf @@ -1,23 +1,12 @@ scriptName "[KPLIB] Enforce Whitelist"; -[] call compile preprocessFileLineNumbers "whitelist.sqf"; - if (!KPLIB_param_cmdrWhitelist) exitWith {}; waitUntil {alive player}; sleep 1; if (player isEqualTo ([] call KPLIB_fnc_getCommander) && !(serverCommandAvailable "#kick")) then { - - private _match = false; - - [] call { - if ((getPlayerUID player) in KPLIB_whitelisted_steamids) exitWith {_match = true;}; - if ((name player) in KPLIB_whitelisted_names) exitWith {_match = true;}; - if (!((squadParams player) isEqualTo []) && {(((squadParams player) select 0) select 0) in KPLIB_whitelisted_tags}) exitWith {_match = true;}; - }; - - if (!_match) then { + if !((getPlayerUID player) in KPLIB_whitelist_cmdrSlot) then { sleep 1; endMission "END1"; }; diff --git a/Missionframework/scripts/client/misc/playerNamespace.sqf b/Missionframework/scripts/client/misc/playerNamespace.sqf index c4d0a88ce..91867733b 100644 --- a/Missionframework/scripts/client/misc/playerNamespace.sqf +++ b/Missionframework/scripts/client/misc/playerNamespace.sqf @@ -2,7 +2,7 @@ File: playerNamespace.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-12 - Last Update: 2020-05-25 + Last Update: 2020-07-06 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -37,7 +37,7 @@ while {true} do { player setVariable ["KPLIB_fobPos", _fobPos]; // Direct acces due to config, commander or admin - player setVariable ["KPLIB_hasDirectAccess", (getPlayerUID player) in KPLIB_commander_actions || {player == ([] call KPLIB_fnc_getCommander)} || {serverCommandAvailable "#kick"}]; + player setVariable ["KPLIB_hasDirectAccess", (getPlayerUID player) in KPLIB_whitelist_cmdrActions || {player == ([] call KPLIB_fnc_getCommander)} || {serverCommandAvailable "#kick"}]; // Outside of startbase "safezone" player setVariable ["KPLIB_isAwayFromStart", (player distance2d startbase) > 1000]; diff --git a/Missionframework/whitelist.sqf b/Missionframework/whitelist.sqf deleted file mode 100644 index ad2bb2c33..000000000 --- a/Missionframework/whitelist.sqf +++ /dev/null @@ -1,21 +0,0 @@ -// Here you can allow people to use the commander slot. It will only be enforced if you activate the related mission option. -// When editing be careful with quotes and commas - -// Allowed team tags, as defined in your team's squad.xml -// This isn't very secure but efficient to whitelist a lot of people at once. -KPLIB_whitelisted_tags = [ - -]; - -// Allowed individual players based on their SteamID64. This is the most secure way to do. -// For example: "76561198016642627" -// To know that information: https://steamid.io/ -KPLIB_whitelisted_steamids = [ - -]; - -// Allowed individual player names. Note that this method is not very secure contrary to SteamIDs. -// For exemple: "Zbug" -KPLIB_whitelisted_names = [ - -]; From e2ce53d532ba10d6318036452f6d4f3b2bf900bc Mon Sep 17 00:00:00 2001 From: Wyqer Date: Thu, 6 Aug 2020 15:19:07 +0200 Subject: [PATCH 065/115] Increased task draw distance in description --- Missionframework/description.ext | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/description.ext b/Missionframework/description.ext index 39429266b..3eb3d5e27 100644 --- a/Missionframework/description.ext +++ b/Missionframework/description.ext @@ -2,7 +2,7 @@ File: description.ext Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2017-10-16 - Last Update: 2020-05-11 + Last Update: 2020-07-06 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -205,7 +205,7 @@ taskManagement_propagate = 1; // 3D marker maximum draw distance in meters. // Within this range, unassigned tasks are drawn on screen. -taskManagement_drawDist = 5000; +taskManagement_drawDist = 10000; /* From ff3e83134b3da1d8a0144012ecfa0bfd816dff09 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Thu, 6 Aug 2020 15:19:26 +0200 Subject: [PATCH 066/115] Changed variable name for param key and init done --- Missionframework/KPLIB_config.sqf | 2 +- Missionframework/functions/fn_getSaveableParam.sqf | 10 +++++----- Missionframework/init.sqf | 2 +- Missionframework/scripts/shared/fetch_params.sqf | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 092462dcb..50a0ea766 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -166,7 +166,7 @@ KPLIB_color_enemyActive = "ColorRED"; KPLIB_save_key = "KP_LIBERATION_" + (toUpper worldName) + "_SAVEGAME"; // Name of the parameter save data variable inside of the [ServerProfileName].vars.Arma3Profile file. -KPLIB_paramSaveKey = "KP_LIBERATION_" + (toUpper worldName) + "_SAVE_PARAMS"; +KPLIB_save_paramKey = "KP_LIBERATION_" + (toUpper worldName) + "_SAVE_PARAMS"; // Interval in seconds for automatic save. KPLIB_save_interval = 60; diff --git a/Missionframework/functions/fn_getSaveableParam.sqf b/Missionframework/functions/fn_getSaveableParam.sqf index b6bc20441..3f29998a8 100644 --- a/Missionframework/functions/fn_getSaveableParam.sqf +++ b/Missionframework/functions/fn_getSaveableParam.sqf @@ -2,7 +2,7 @@ File: fn_getSaveableParam.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2018-01-27 - Last Update: 2020-05-10 + Last Update: 2020-08-06 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -37,7 +37,7 @@ switch (_action) do { // Save to profileNamespace case 0: { _value = [_paramName, _defaultValue] call bis_fnc_getParamValue; - private _savedParams = profileNamespace getVariable KPLIB_paramSaveKey; + private _savedParams = profileNamespace getVariable KPLIB_save_paramKey; if(isNil "_savedParams") then { if (KPLIB_savegame_debug > 0) then {["Param save data is corrupted, creating new.", "PARAM"] call KPLIB_fnc_log;}; @@ -58,16 +58,16 @@ switch (_action) do { }; // Save params to profile namespace - profileNamespace setVariable [KPLIB_paramSaveKey, _savedParams]; + profileNamespace setVariable [KPLIB_save_paramKey, _savedParams]; saveProfileNamespace; }; // Load from profileNamespace case 1: { - private _savedParams = profileNamespace getVariable KPLIB_paramSaveKey; + private _savedParams = profileNamespace getVariable KPLIB_save_paramKey; if(isNil "_savedParams") then { if (KPLIB_savegame_debug > 0) then {["Param save data is corrupted, can't load!", "PARAM"] call KPLIB_fnc_log;}; // Fix param save data - profileNamespace setVariable [KPLIB_paramSaveKey, []]; + profileNamespace setVariable [KPLIB_save_paramKey, []]; if (KPLIB_savegame_debug > 0) then {[format ["No saved value for param: %1, fetching value.", _paramName], "PARAM"] call KPLIB_fnc_log;}; _value = [_paramName, _defaultValue] call bis_fnc_getParamValue; } else { diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index 3ed806426..ff347b3ce 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -11,7 +11,7 @@ enableSaving [false, false]; if (isDedicated) then {debug_source = "Server";} else {debug_source = name player;}; [] call KPLIB_fnc_initSectors; -if (!isServer) then {waitUntil {!isNil "KP_serverParamsFetched"};}; +if (!isServer) then {waitUntil {!isNil "KPLIB_param_serverInitDone"};}; [] call compile preprocessFileLineNumbers "KPLIB_config.sqf"; [] call compile preprocessFileLineNumbers "KPLIB_whitelists.sqf"; [] call compile preprocessFileLineNumbers "KPLIB_transportConfigs.sqf"; diff --git a/Missionframework/scripts/shared/fetch_params.sqf b/Missionframework/scripts/shared/fetch_params.sqf index 07e5e0fb1..5a4cd79ad 100644 --- a/Missionframework/scripts/shared/fetch_params.sqf +++ b/Missionframework/scripts/shared/fetch_params.sqf @@ -109,8 +109,8 @@ if(isServer) then { GREUH_allow_mapmarkers = KPLIB_param_mapMarkers; publicVariable "GREUH_allow_mapmarkers"; GREUH_allow_platoonview = KPLIB_param_mapMarkers; publicVariable "GREUH_allow_platoonview"; - KP_serverParamsFetched = true; - publicVariable "KP_serverParamsFetched"; + KPLIB_param_serverInitDone = true; + publicVariable "KPLIB_param_serverInitDone"; [format ["----- Server finished parameter initialization - Time needed: %1 seconds", diag_ticktime - _start], "PARAM"] call KPLIB_fnc_log; }; From 3509824ef7ee8c64bc45208af120ee95de8bf8fb Mon Sep 17 00:00:00 2001 From: Wyqer Date: Wed, 16 Sep 2020 19:10:15 +0200 Subject: [PATCH 067/115] Variable names in new arsenal presets updated --- .../presets/arsenal/vanilla_aaf.sqf | 10 +++---- .../presets/arsenal/vanilla_csat_ghex.sqf | 22 +++++++------- .../presets/arsenal/vanilla_csat_hex.sqf | 20 ++++++------- .../presets/arsenal/vanilla_ldf.sqf | 30 +++++++++---------- .../presets/arsenal/vanilla_nato_mtp.sqf | 18 +++++------ .../presets/arsenal/vanilla_nato_tropic.sqf | 26 ++++++++-------- .../presets/arsenal/vanilla_nato_wdl.sqf | 22 +++++++------- 7 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Missionframework/presets/arsenal/vanilla_aaf.sqf b/Missionframework/presets/arsenal/vanilla_aaf.sqf index 983039d72..1e24093a2 100644 --- a/Missionframework/presets/arsenal/vanilla_aaf.sqf +++ b/Missionframework/presets/arsenal/vanilla_aaf.sqf @@ -1,6 +1,6 @@ /* AAF Arsenal Preset - Last Update: 2020-09-12 + Last Update: 2020-09-16 Needed: - None Optional: @@ -9,7 +9,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // Primary "hgun_PDW2000_F", // PDW2000 9 mm "arifle_Mk20_F", // Mk20 5.56 mm (Camo) @@ -30,11 +30,11 @@ GRLIB_arsenal_weapons = [ "launch_MRAWS_olive_rail_F" // MAAWS Mk4 Mod 0 (Olive) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -228,7 +228,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_Parachute", // Steerable Parachute "B_AssaultPack_dgtl", // Assault Pack (Digital) "B_FieldPack_blk", // Field Pack (Black) diff --git a/Missionframework/presets/arsenal/vanilla_csat_ghex.sqf b/Missionframework/presets/arsenal/vanilla_csat_ghex.sqf index 3e074fc41..b6fdfdb02 100644 --- a/Missionframework/presets/arsenal/vanilla_csat_ghex.sqf +++ b/Missionframework/presets/arsenal/vanilla_csat_ghex.sqf @@ -1,6 +1,6 @@ /* CSAT Green Hex Arsenal Preset - Last Update: 2020-08-17 + Last Update: 2020-09-16 Needed: - None Optional: @@ -9,7 +9,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // Primary "SMG_02_F", // Sting 9 mm "arifle_SDAR_F", // SDAR 5.56 mm @@ -22,11 +22,11 @@ GRLIB_arsenal_weapons = [ "arifle_CTAR_GL_blk_F", // CAR-95 GL 5.8 mm (Black) "arifle_CTARS_blk_F", // CAR-95-1 5.8mm (Black) "arifle_ARX_ghex_F", // Type 115 6.5 mm (Green Hex) - + // Handgun "hgun_Rook40_F", // Rook-40 9 mm "hgun_Pistol_heavy_02_F", // Zubr .45 ACP - + // Launcher "launch_RPG32_ghex_F", // RPG-42 Alamut (Green Hex) "launch_O_Titan_ghex_F", // Titan MPRL (Green Hex) @@ -34,11 +34,11 @@ GRLIB_arsenal_weapons = [ "launch_O_Vorona_green_F" // 9M135 Vorona (Green) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -52,7 +52,7 @@ GRLIB_arsenal_items = [ "MineDetector", // Mine Detector "Rangefinder", // Rangefinder "ToolKit", // Toolkit - + // Faction Specific Items "O_UavTerminal", // UAV Terminal [CSAT] "Laserdesignator_02_ghex_F", // Laser Designator (Green Hex) @@ -66,7 +66,7 @@ GRLIB_arsenal_items = [ "U_O_T_Sniper_F", // Ghillie Suit (Green Hex) [CSAT] "U_O_T_FullGhillie_tna_F", // Full Ghillie (Jungle) [CSAT] "U_O_V_Soldier_Viper_F", // Special Purpose Suit (Green Hex) - + // Headgear "H_Beret_ocamo", // Beret [CSAT] "H_Beret_CSAT_01_F", // Beret (Red) [CSAT] @@ -103,7 +103,7 @@ GRLIB_arsenal_items = [ "G_Shades_Red", // Shades (Red) "G_AirPurifyingRespirator_02_black_F", // APR (Black) [CSAT] "G_AirPurifyingRespirator_02_olive_F", // APR (Olive) [CSAT] - + // Vests "V_TacVest_oli", // Tactical Vest (Olive) "V_Chestrig_khk", // Chest Rig (Khaki) @@ -115,7 +115,7 @@ GRLIB_arsenal_items = [ "V_Safety_orange_F", // Safety Vest (Orange) "V_Safety_yellow_F", // Safety Vest (Yellow) "V_DeckCrew_green_F", // Deck Crew Vest (Green) - + // Items "acc_pointer_IR", // IR Laser Pointer "acc_flashlight", // Flashlight @@ -243,7 +243,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_Parachute", // Steerable Parachute "B_FieldPack_blk", // Field Pack (Black) "B_FieldPack_ghex_F", // Field Pack (Green Hex) diff --git a/Missionframework/presets/arsenal/vanilla_csat_hex.sqf b/Missionframework/presets/arsenal/vanilla_csat_hex.sqf index 827b83dc9..2c346261e 100644 --- a/Missionframework/presets/arsenal/vanilla_csat_hex.sqf +++ b/Missionframework/presets/arsenal/vanilla_csat_hex.sqf @@ -1,6 +1,6 @@ /* CSAT Hex Arsenal Preset - Last Update: 2020-08-17 + Last Update: 2020-09-16 Needed: - None Optional: @@ -9,7 +9,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // Primary "arifle_Katiba_F", // Katiba 6.5 mm "arifle_Katiba_C_F", // Katiba Carbine 6.5 mm @@ -23,11 +23,11 @@ GRLIB_arsenal_weapons = [ "srifle_DMR_05_blk_F", // Cyrus 9.3 mm (Black) "MMG_01_hex_F", // Navid 9.3 mm (Hex) "arifle_ARX_hex_F", // Type 115 6.5 mm (Hex) - + // Handgun "hgun_Rook40_F", // Rook-40 9 mm "hgun_Pistol_heavy_02_F", // Zubr .45 ACP - + // Launcher "launch_RPG32_F", // RPG-42 Alamut "launch_O_Titan_F", // Titan MPRL (Hex) @@ -35,11 +35,11 @@ GRLIB_arsenal_weapons = [ "launch_O_Vorona_brown_F" // 9M135 Vorona (Brown) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -53,7 +53,7 @@ GRLIB_arsenal_items = [ "MineDetector", // Mine Detector "Rangefinder", // Rangefinder "ToolKit", // Toolkit - + // Faction Specific Items "O_UavTerminal", // UAV Terminal [CSAT] "Laserdesignator_02", // Laser Designator (Hex) @@ -112,7 +112,7 @@ GRLIB_arsenal_items = [ "G_Shades_Red", // Shades (Red) "G_AirPurifyingRespirator_02_black_F", // APR (Black) [CSAT] "G_AirPurifyingRespirator_02_sand_F", // APR (Sand) [CSAT] - + // Vests "V_Chestrig_khk", // Chest Rig (Khaki) "V_HarnessOGL_brn", // LBV Grenadier Harness @@ -127,7 +127,7 @@ GRLIB_arsenal_items = [ "V_Safety_orange_F", // Safety Vest (Orange) "V_Safety_yellow_F", // Safety Vest (Yellow) "V_DeckCrew_green_F", // Deck Crew Vest (Green) - + // Items "acc_pointer_IR", // IR Laser Pointer "acc_flashlight", // Flashlight @@ -257,7 +257,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_Parachute", // Steerable Parachute "B_AssaultPack_ocamo", // Assault Pack (Hex) "B_Carryall_cbr", // Carryall Backpack (Coyote) diff --git a/Missionframework/presets/arsenal/vanilla_ldf.sqf b/Missionframework/presets/arsenal/vanilla_ldf.sqf index 2d0411842..6cf9e5e43 100644 --- a/Missionframework/presets/arsenal/vanilla_ldf.sqf +++ b/Missionframework/presets/arsenal/vanilla_ldf.sqf @@ -1,6 +1,6 @@ /* LDF Arsenal Preset - Last Update: 2020-08-17 + Last Update: 2020-09-16 Needed: - None Optional: @@ -9,7 +9,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // Primary "SMG_03C_black", // ADR-97C 5.7 mm (Black) "SMG_03C_TR_black", // ADR-97C TR 5.7 mm (Black) @@ -22,10 +22,10 @@ GRLIB_arsenal_weapons = [ "arifle_MSBS65_Mark_black_F", // Promet MR 6.5 mm (Black) "arifle_MSBS65_UBS_F", // Promet SG 6.5 mm "arifle_MSBS65_UBS_black_F", // Promet SG 6.5 mm (Black) - + // Handgun "hgun_Pistol_heavy_01_green_F", // 4-five .45 ACP (Green) - + // Launcher "launch_NLAW_F", // PCML "launch_I_Titan_eaf_F", // Titan MPRL (Geometric) @@ -33,11 +33,11 @@ GRLIB_arsenal_weapons = [ "launch_MRAWS_green_F" // MAAWS Mk4 Mod 1 (Green) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -51,13 +51,13 @@ GRLIB_arsenal_items = [ "MineDetector", // Mine Detector "Rangefinder", // Rangefinder "ToolKit", // Toolkit - + // Faction Specific Items "I_E_UavTerminal", // UAV Terminal [LDF] "Laserdesignator_03", // Laser Designator (Sand) "NVGoggles_INDEP", // NV Goggles (Green) "NVGogglesB_grn_F", // ENVG-II (Green) - + // Uniforms "U_B_PilotCoveralls", // Pilot Coveralls [NATO] "U_C_CBRN_Suit_01_White_F", // CBRN Suit (White) @@ -82,7 +82,7 @@ GRLIB_arsenal_items = [ "H_PilotHelmetHeli_I_E", // Heli Pilot Helmet [LDF] "H_MilCap_eaf", // Military Cap [LDF] "H_PilotHelmetFighter_I_E", // Pilot Helmet [LDF] - + // Facegear "G_Aviator", // Aviator Glasses "G_Combat", // Combat Goggles @@ -110,15 +110,15 @@ GRLIB_arsenal_items = [ "V_Chestrig_blk", // Chest Rig (Black) "V_BandollierB_oli", // Slash Bandolier (Olive) "V_CarrierRigKBT_01_light_EAF_F", // Modular Carrier Lite (Geometric) - "V_CarrierRigKBT_01_light_Olive_F", // Modular Carrier Lite (Olive) + "V_CarrierRigKBT_01_light_Olive_F", // Modular Carrier Lite (Olive) "V_CarrierRigKBT_01_heavy_EAF_F", // Modular Carrier GL Rig (Geometric) - "V_CarrierRigKBT_01_heavy_Olive_F", // Modular Carrier GL Rig (Olive) + "V_CarrierRigKBT_01_heavy_Olive_F", // Modular Carrier GL Rig (Olive) "V_CarrierRigKBT_01_EAF_F", // Modular Carrier Vest (Geometric) - "V_CarrierRigKBT_01_Olive_F", // Modular Carrier Vest (Olive) + "V_CarrierRigKBT_01_Olive_F", // Modular Carrier Vest (Olive) "V_Safety_orange_F", // Safety Vest (Orange) "V_Safety_yellow_F", // Safety Vest (Yellow) "V_DeckCrew_yellow_F", // Deck Crew Vest (Yellow) - + // Items "acc_pointer_IR", // IR Laser Pointer "acc_flashlight", // Flashlight @@ -131,7 +131,7 @@ GRLIB_arsenal_items = [ "optic_SOS", // MOS "bipod_01_f_blk", // Bipod (Black) [NATO] "muzzle_snds_H", // Sound Suppressor (6.5 mm) - "muzzle_snds_65_TI_blk_F", // Stealth Sound Suppressor (6.5 mm, Black) + "muzzle_snds_65_TI_blk_F", // Stealth Sound Suppressor (6.5 mm, Black) "muzzle_snds_h_mg_blk_f", // Sound Suppressor LMG (6.5 mm, Black) "muzzle_snds_570", // Sound Suppressor (5.7 mm) "optic_nvs", // NVS @@ -240,7 +240,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_Parachute", // Steerable Parachute "B_AssaultPack_eaf_F", // Assault Pack (Geometric) "B_Carryall_eaf_F", // Carryall Backpack (Geometric) diff --git a/Missionframework/presets/arsenal/vanilla_nato_mtp.sqf b/Missionframework/presets/arsenal/vanilla_nato_mtp.sqf index db185777a..ad4c1c837 100644 --- a/Missionframework/presets/arsenal/vanilla_nato_mtp.sqf +++ b/Missionframework/presets/arsenal/vanilla_nato_mtp.sqf @@ -1,6 +1,6 @@ /* NATO MTP Arsenal Preset - Last Update: 2020-08-17 + Last Update: 2020-09-16 Needed: - None Optional: @@ -9,7 +9,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // Primary "arifle_MX_F", // MX 6.5 mm "arifle_MX_GL_F", // MX 3GL 6.5 mm @@ -22,11 +22,11 @@ GRLIB_arsenal_weapons = [ "MMG_02_sand_F", // SPMG .338 (Sand) "srifle_DMR_02_sniper_F", // MAR-10 .338 (Sand) "srifle_DMR_03_tan_F", // Mk-I EMR 7.62 mm (Sand) - + // Handgun "hgun_P07_F", // P07 9 mm "hgun_Pistol_heavy_01_F", // 4-five .45 ACP - + // Launcher "launch_B_Titan_F", // Titan MPRL (Sand) "launch_B_Titan_short_F", // Titan MPRL Compact (Sand) @@ -34,11 +34,11 @@ GRLIB_arsenal_weapons = [ "launch_MRAWS_sand_F" // MAAWS Mk4 Mod 1 (Sand) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -52,7 +52,7 @@ GRLIB_arsenal_items = [ "MineDetector", // Mine Detector "Rangefinder", // Rangefinder "ToolKit", // Toolkit - + // Faction Specific Items "B_UavTerminal", // UAV Terminal [NATO] "Laserdesignator", // Laser Designator (Sand) @@ -134,7 +134,7 @@ GRLIB_arsenal_items = [ "V_Safety_orange_F", // Safety Vest (Orange) "V_Safety_yellow_F", // Safety Vest (Yellow) "V_DeckCrew_yellow_F", // Deck Crew Vest (Yellow) - + // Items "acc_pointer_IR", // IR Laser Pointer "acc_flashlight", // Flashlight @@ -268,7 +268,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_AssaultPack_blk", // Assault Pack (Black) "B_AssaultPack_rgr", // Assault Pack (Green) "B_AssaultPack_mcamo", // Assault Pack (MTP) diff --git a/Missionframework/presets/arsenal/vanilla_nato_tropic.sqf b/Missionframework/presets/arsenal/vanilla_nato_tropic.sqf index bfd1b21f3..0d4cb6f7b 100644 --- a/Missionframework/presets/arsenal/vanilla_nato_tropic.sqf +++ b/Missionframework/presets/arsenal/vanilla_nato_tropic.sqf @@ -1,6 +1,6 @@ /* NATO Tropic Arsenal Preset - Last Update: 2020-08-12 + Last Update: 2020-09-16 Needed: - None Optional: @@ -9,7 +9,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // Primary "arifle_MX_khk_F", // MX 6.5 mm (Khaki) "arifle_MX_GL_khk_F", // MX 3GL 6.5 mm (Khaki) @@ -30,11 +30,11 @@ GRLIB_arsenal_weapons = [ "arifle_SPAR_02_khk_F", // SPAR-16S 5.56 mm (Khaki) "arifle_SPAR_03_blk_F", // SPAR-17 7.62 mm (Black) "arifle_SPAR_03_khk_F", // SPAR-17 7.62 mm (Khaki) - + // Handgun "hgun_P07_khk_F", // P07 9 mm (Khaki) "hgun_Pistol_heavy_01_F", // 4-five .45 ACP - + // Launcher "launch_NLAW_F", // PCML "launch_B_Titan_tna_F", // Titan MPRL (Tropic) @@ -42,11 +42,11 @@ GRLIB_arsenal_weapons = [ "launch_MRAWS_green_F" // MAAWS Mk4 Mod 1 (Green) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -60,7 +60,7 @@ GRLIB_arsenal_items = [ "MineDetector", // Mine Detector "Rangefinder", // Rangefinder "ToolKit", // Toolkit - + // Faction Specific Items "B_UavTerminal", // UAV Terminal [NATO] "Laserdesignator_01_khk_F", // Laser Designator (Khaki) @@ -114,7 +114,7 @@ GRLIB_arsenal_items = [ "G_Combat_Goggles_tna_F", // Combat Goggles (Green) "G_Balaclava_TI_tna_F", // Stealth Balaclava (Green) "G_Balaclava_TI_G_tna_F", // Stealth Balaclava (Green, Goggles) - + // Vests "V_PlateCarrierGL_tna_F", // Carrier GL Rig (Tropic) "V_PlateCarrier1_tna_F", // Carrier Lite (Tropic) @@ -131,7 +131,7 @@ GRLIB_arsenal_items = [ "V_Safety_orange_F", // Safety Vest (Orange) "V_Safety_yellow_F", // Safety Vest (Yellow) "V_DeckCrew_yellow_F", // Deck Crew Vest (Yellow) - + // Items "acc_pointer_IR", // IR Laser Pointer "acc_flashlight", // Flashlight @@ -155,9 +155,9 @@ GRLIB_arsenal_items = [ "bipod_01_f_blk", // Bipod (Black) [NATO] "bipod_01_F_khk", // Bipod (Khaki) [NATO] "muzzle_snds_H", // Sound Suppressor (6.5 mm) - "muzzle_snds_H_khk_F", // Sound Suppressor (6.5 mm, Khaki) + "muzzle_snds_H_khk_F", // Sound Suppressor (6.5 mm, Khaki) "muzzle_snds_338_black", // Sound Suppressor (.338, Black) - "muzzle_snds_338_green", // Sound Suppressor (.338, Green) + "muzzle_snds_338_green", // Sound Suppressor (.338, Green) "muzzle_snds_b", // Sound Suppressor (7.62 mm) "muzzle_snds_b_khk_f", // Sound Suppressor (7.62 mm, Khaki) "muzzle_snds_m", // Sound Suppressor (5.56 mm) @@ -165,7 +165,7 @@ GRLIB_arsenal_items = [ "optic_nvs", // NVS "optic_tws", // TWS "optic_tws_mg", // TWS MG - + // ACE Items "ACE_acc_pointer_green", // Laser Pointer (green) "ACE_adenosine", // Adenosine autoinjector @@ -268,7 +268,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_AssaultPack_blk", // Assault Pack (Black) "B_AssaultPack_rgr", // Assault Pack (Green) "B_AssaultPack_tna_F", // Assault Pack (Tropic) diff --git a/Missionframework/presets/arsenal/vanilla_nato_wdl.sqf b/Missionframework/presets/arsenal/vanilla_nato_wdl.sqf index 6bd09e552..aad3c7817 100644 --- a/Missionframework/presets/arsenal/vanilla_nato_wdl.sqf +++ b/Missionframework/presets/arsenal/vanilla_nato_wdl.sqf @@ -1,6 +1,6 @@ /* NATO Woodland Arsenal Preset - Last Update: 2020-08-12 + Last Update: 2020-09-16 Needed: - None Optional: @@ -9,7 +9,7 @@ - TFAR - https://steamcommunity.com/sharedfiles/filedetails/?id=894678801 */ -GRLIB_arsenal_weapons = [ +KPLIB_arsenalWeapons = [ // Primary "arifle_MX_Black_F", // MX 6.5 mm (Black) "arifle_MX_GL_Black_F", // MX 3GL 6.5 mm (Black) @@ -22,11 +22,11 @@ GRLIB_arsenal_weapons = [ "MMG_02_black_F", // SPMG .338 (Black) "srifle_DMR_02_F", // MAR-10 .338 (Black) "srifle_DMR_03_F", // Mk-I EMR 7.62 mm (Black) - + // Handgun "hgun_P07_khk_F", // P07 9 mm (Khaki) "hgun_Pistol_heavy_01_F", // 4-five .45 ACP - + // Launcher "launch_NLAW_F", // PCML "launch_B_Titan_tna_F", // Titan MPRL (Tropic) @@ -34,11 +34,11 @@ GRLIB_arsenal_weapons = [ "launch_MRAWS_green_F" // MAAWS Mk4 Mod 1 (Green) ]; -GRLIB_arsenal_magazines = [ +KPLIB_arsenalMagazines = [ ]; -GRLIB_arsenal_items = [ +KPLIB_arsenalItems = [ // Vanilla Standard Items "Binocular", // Binoculars "DroneDetector", // Drone Detector @@ -52,7 +52,7 @@ GRLIB_arsenal_items = [ "MineDetector", // Mine Detector "Rangefinder", // Rangefinder "ToolKit", // Toolkit - + // Faction Specific Items "B_UavTerminal", // UAV Terminal [NATO] "Laserdesignator_01_khk_F", // Laser Designator (Khaki) @@ -97,7 +97,7 @@ GRLIB_arsenal_items = [ "G_Squares", // Square Spectacles "G_Tactical_Clear", // Tactical Glasses "G_Tactical_Black", // Tactical Shades - + // Vests "V_PlateCarrierGL_wdl", // Carrier GL Rig (Woodland) "V_PlateCarrier1_wdl", // Carrier Lite (Woodland) @@ -110,7 +110,7 @@ GRLIB_arsenal_items = [ "V_Safety_orange_F", // Safety Vest (Orange) "V_Safety_yellow_F", // Safety Vest (Yellow) "V_DeckCrew_yellow_F", // Deck Crew Vest (Yellow) - + // Items "acc_pointer_IR", // IR Laser Pointer "acc_flashlight", // Flashlight @@ -135,7 +135,7 @@ GRLIB_arsenal_items = [ "optic_nvs", // NVS "optic_tws", // TWS "optic_tws_mg", // TWS MG - + // ACE Items "ACE_acc_pointer_green", // Laser Pointer (green) "ACE_adenosine", // Adenosine autoinjector @@ -238,7 +238,7 @@ GRLIB_arsenal_items = [ "tf_rf7800str" // PF-7800S-TR ]; -GRLIB_arsenal_backpacks = [ +KPLIB_arsenalBackpacks = [ "B_AssaultPack_blk", // Assault Pack (Black) "B_AssaultPack_rgr", // Assault Pack (Green) "B_AssaultPack_wdl_F", // Assault Pack (Woodland) From 667dbbabc21a2a04dcf695f8f995f1eb2edcca1f Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 20 Sep 2020 10:53:46 +0200 Subject: [PATCH 068/115] Some more variable adjustments from backport 7a --- .../functions/curator/fn_requestZeus.sqf | 4 +- .../ui/fn_overlayUpdateResources.sqf | 11 ++-- Missionframework/presets/init_presets.sqf | 57 ------------------- .../scripts/client/build/do_build.sqf | 4 +- .../scripts/client/init_client.sqf | 2 +- .../scripts/client/spawn/redeploy_manager.sqf | 2 +- .../scripts/server/base/huron_manager.sqf | 2 +- .../server/sector/fn_sectorMonitor.fsm | 6 +- .../scripts/shared/fetch_params.sqf | 3 +- 9 files changed, 18 insertions(+), 73 deletions(-) diff --git a/Missionframework/functions/curator/fn_requestZeus.sqf b/Missionframework/functions/curator/fn_requestZeus.sqf index e25c9692f..69113f61f 100644 --- a/Missionframework/functions/curator/fn_requestZeus.sqf +++ b/Missionframework/functions/curator/fn_requestZeus.sqf @@ -2,7 +2,7 @@ File: fn_requestZeus.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-08-07 - Last Update: 2020-08-07 + Last Update: 2020-09-16 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -19,6 +19,6 @@ params [ ["_player", player, [objNull]] ]; -[true, "KPLIB_createZeus", [_player, KP_liberation_limited_zeus]] remoteExecCall ["BIS_fnc_callScriptedEventHandler", 2]; +[true, "KPLIB_createZeus", [_player, KPLIB_param_zeusLimited]] remoteExecCall ["BIS_fnc_callScriptedEventHandler", 2]; true diff --git a/Missionframework/functions/ui/fn_overlayUpdateResources.sqf b/Missionframework/functions/ui/fn_overlayUpdateResources.sqf index 589cd5278..819c3a8aa 100644 --- a/Missionframework/functions/ui/fn_overlayUpdateResources.sqf +++ b/Missionframework/functions/ui/fn_overlayUpdateResources.sqf @@ -3,7 +3,7 @@ File: fn_overlayUpdateResources.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-01 - Last Update: 2020-09-12 + Last Update: 2020-09-16 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -38,11 +38,12 @@ if (!_show) exitWith { }; if (_updateValues) then { + _resourceArea = [(_resourceArea select [4]), _resourceArea] select KPLIB_resources_global; - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_FOB) ctrlSetText toUpper (_resourceArea select [4]); - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_SUPPLIES) ctrlSetText str floor KP_liberation_supplies; - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_AMMO) ctrlSetText str floor KP_liberation_ammo; - (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_FUEL) ctrlSetText str floor KP_liberation_fuel; + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_FOB) ctrlSetText toUpper _resourceArea; + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_SUPPLIES) ctrlSetText str floor KPLIB_supplies; + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_AMMO) ctrlSetText str floor KPLIB_ammo; + (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_FUEL) ctrlSetText str floor KPLIB_fuel; (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_UNITCAP) ctrlSetText ([unitcap, "/", [] call KPLIB_fnc_getLocalCap] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_HELIPAD) ctrlSetText ([KPLIB_heli_count, "/", KPLIB_heli_slots] joinString ""); (_overlay displayCtrl IDC_OVERLAY_RSC_LABEL_PLANE) ctrlSetText ([KPLIB_plane_count, "/", KPLIB_plane_slots] joinString ""); diff --git a/Missionframework/presets/init_presets.sqf b/Missionframework/presets/init_presets.sqf index e7bb2c3e0..2fac49860 100644 --- a/Missionframework/presets/init_presets.sqf +++ b/Missionframework/presets/init_presets.sqf @@ -1,6 +1,4 @@ -KPLIB_initPresets = false; - private _start = diag_ticktime; if (isServer) then { ["----- Server starts preset initialization -----", "PRESETS"] call KPLIB_fnc_log; @@ -109,59 +107,6 @@ KPLIB_b_squadNames = [ localize "STR_PARA_SQUAD" ]; -// Classnames of objects which should be ignored when building -KPLIB_b_collisionIgnoreObjects = [ - "Land_HelipadSquare_F", - "Land_TentHangar_V1_F", - "Land_runway_edgelight", - "Land_runway_edgelight_blue_F", - "Land_Flush_Light_green_F", - "Land_Flush_Light_red_F", - "Land_Flush_Light_yellow_F", - "TMR_Autorest_Georef", - "Flag_NATO_F", - "Flag_White_F", - "Flag_RedCrystal_F", - "CamoNet_BLUFOR_F", - "CamoNet_BLUFOR_open_F", - "CamoNet_BLUFOR_big_F", - "Land_PortableLight_single_F", - "Land_PortableLight_double_F", - "Land_HelipadCircle_F", - "Land_HelipadRescue_F", - "Helipad", - "LAND_uns_Heli_pad", - "LAND_uns_evac_pad", - "PortableHelipadLight_01_blue_F", - "PortableHelipadLight_01_green_F", - "PortableHelipadLight_01_red_F", - "Land_BagFence_Round_F", - "Land_BagFence_Short_F", - "Land_BagFence_Long_F", - "Land_BagFence_Corner_F", - "Land_BagFence_End_F", - "Land_Sign_WarningMilitaryArea_F", - "Land_Sign_WarningMilAreaSmall_F", - "Land_Sign_WarningMilitaryVehicles_F", - "Land_Razorwire_F", - "Sign_Sphere100cm_F", - "Land_ClutterCutter_large_F", - "Land_HighVoltageColumnWire_F", - "Land_PowerWireBig_left_F", - "B_HMG_01_F", // Mk30A HMG .50 - "B_HMG_01_high_F", // Mk30 HMG .50 (Raised) - "B_HMG_01_A_F", // Mk30 HMG .50 (Autonomous) - "B_GMG_01_F", // Mk32A GMG 20mm - "B_GMG_01_high_F", // Mk32 GMG 20mm (Raised) - "B_GMG_01_A_F", // Mk32 GMG 20mm (Autonomous) - "B_static_AT_F", // Static Titan Launcher (AT) - "B_static_AA_F", // Static Titan Launcher (AA) - "B_Mortar_01_F", // Mk6 Mortar - "ACE_friesAnchorBar", // ACE FRIES - "ACE_friesGantryReverse", // ACE FRIES - "ACE_friesGantry" // ACE FRIES -]; - /* Checking all preset arrays for missing mods and sort out not available classnames */ @@ -321,6 +266,4 @@ zeropos = [0,0,0]; KPLIB_sarWreck = "Land_Wreck_Heli_Attack_01_F"; KPLIB_sarFire = "test_EmptyObjectForFireBig"; -KPLIB_initPresets = true; - if (isServer) then {[format ["----- Preset initialization finished. Time needed: %1 seconds -----", diag_ticktime - _start], "PRESETS"] call KPLIB_fnc_log;}; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 728d91121..300744057 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -171,7 +171,7 @@ while { true } do { private _remove_objects = []; { private _typeOfX = typeOf _x; - if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_b_collisionIgnoreObjects) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { + if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_collisionIgnoreObjects) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { _remove_objects pushback _x; }; } foreach _near_objects; @@ -179,7 +179,7 @@ while { true } do { private _remove_objects_25 = []; { private _typeOfX = typeOf _x; - if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_b_collisionIgnoreObjects) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { + if ((_x isKindOf "Animal") || (_typeOfX in KPLIB_collisionIgnoreObjects) || (_typeOfX isKindOf "CAManBase") || (isPlayer _x) || (_x == _vehicle) || ((toLower (typeOf _vehicle)) in KPLIB_b_static_classes)) then { _remove_objects_25 pushback _x; }; } foreach _near_objects_25; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index f268d4765..adb30622f 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -61,7 +61,7 @@ execVM "scripts\client\ui\intro.sqf"; // Commander init if (player isEqualTo ([] call KPLIB_fnc_getCommander)) then { // Start tutorial - if (KP_liberation_tutorial) then { + if (KPLIB_param_tutorial) then { [] call KPLIB_fnc_tutorial; }; // Request Zeus if enabled diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 5f5ef6cac..cb7877496 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -138,7 +138,7 @@ while {true} do { _alti = 30; }; // Disable if sector is under attack - if (!KPLIB_respawnOnAttackedSectors && {_objectpos in KPLIB_sectorsUnderAttack}) then { + if (!KPLIB_param_attackedFobRespawn && {_objectpos in KPLIB_sectorsUnderAttack}) then { (DEPLOY_DISPLAY displayCtrl DEPLOY_BUTTON_IDC) ctrlSetText localize "STR_DEPLOY_UNDERATTACK"; (DEPLOY_DISPLAY displayCtrl DEPLOY_BUTTON_IDC) ctrlEnable false; } else { diff --git a/Missionframework/scripts/server/base/huron_manager.sqf b/Missionframework/scripts/server/base/huron_manager.sqf index f06c23dcc..995924949 100644 --- a/Missionframework/scripts/server/base/huron_manager.sqf +++ b/Missionframework/scripts/server/base/huron_manager.sqf @@ -11,7 +11,7 @@ if !(_savedPotato isEqualTo []) then { while {true} do { // Spawn new huron if not loaded or destroyed - if !(alive huron) then { + if !(alive KPLIB_potato01) then { KPLIB_potato01 = KPLIB_b_potato01 createVehicle [(getposATL huronspawn) select 0, (getposATL huronspawn) select 1, ((getposATL huronspawn) select 2) + 0.2]; KPLIB_potato01 enableSimulationGlobal false; KPLIB_potato01 allowdamage false; diff --git a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm index 127767b1c..daec4c020 100644 --- a/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm +++ b/Missionframework/scripts/server/sector/fn_sectorMonitor.fsm @@ -52,7 +52,7 @@ link23[] = {20,21}; link24[] = {21,15}; link25[] = {22,23}; globals[] = {0.000000,0,0,0,0,640,480,1,27,6316128,1,-462.464111,712.458435,919.987671,76.941620,1232,884,1}; -window[] = {2,-1,-1,-1,-1,863,104,1544,104,3,1250}; +window[] = {2,-1,-1,-1,-1,915,156,1596,156,3,1250}; *//*%FSM*/ class FSM { @@ -182,7 +182,7 @@ class FSM to="Get_adjusted_sector"; precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"_opforCount = [] call KPLIB_fnc_getOpforCap;" \n - "_opforCount < GRLIB_sector_cap"/*%FSM*/; + "_opforCount < KPLIB_cap_enemySide"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -368,4 +368,4 @@ class FSM "Exit_1", }; }; -/*%FSM*/ +/*%FSM*/ \ No newline at end of file diff --git a/Missionframework/scripts/shared/fetch_params.sqf b/Missionframework/scripts/shared/fetch_params.sqf index 067d3fa10..c2c0839e6 100644 --- a/Missionframework/scripts/shared/fetch_params.sqf +++ b/Missionframework/scripts/shared/fetch_params.sqf @@ -86,6 +86,7 @@ if(isServer) then { GET_PARAM_BOOL(KPLIB_param_mobileRespawn, "MobileRespawn", 1); GET_PARAM(KPLIB_param_mobileRespawnCooldown, "RespawnCooldown", 900); GET_PARAM_BOOL(KPLIB_param_mobileArsenal, "MobileArsenal", 1); + GET_PARAM_BOOL(KPLIB_param_attackedFobRespawn, "AttackedSectorRespawn", 0); GET_PARAM_BOOL(KPLIB_param_logistic, "AiLogistics", 1); GET_PARAM_BOOL(KPLIB_param_buildingDamaged, "CR_Building", 0); GET_PARAM(KPLIB_param_halo, "HaloJump", 1); @@ -394,7 +395,7 @@ if (!isDedicated && hasInterface) then { _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_ATTACKEDSECTORRESPAWN"; - _value = if (KPLIB_respawnOnAttackedSectors) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; + _value = if (KPLIB_param_attackedFobRespawn) then {localize "STR_PARAMS_ENABLED";} else {localize "STR_PARAMS_DISABLED";}; _text = _text + format ["%1
%2

", _param, _value]; _param = localize "STR_PARAMS_AILOGISTICS"; From eabe07e8c826bd3f8845aae226c66b68798d01ef Mon Sep 17 00:00:00 2001 From: Wyqer Date: Sun, 20 Sep 2020 10:54:43 +0200 Subject: [PATCH 069/115] Collision ignore list for building to classnameLists --- Missionframework/KPLIB_classnameLists.sqf | 55 ++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/Missionframework/KPLIB_classnameLists.sqf b/Missionframework/KPLIB_classnameLists.sqf index 3b2fccdc7..aa82f4da9 100644 --- a/Missionframework/KPLIB_classnameLists.sqf +++ b/Missionframework/KPLIB_classnameLists.sqf @@ -2,7 +2,7 @@ File: KPLIB_lists.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-10 - Last Update: 2020-09-16 + Last Update: 2020-09-20 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -431,3 +431,56 @@ KPLIB_intelBuildingClasses = [ KPLIB_radioTowerClassnames = [ "Land_Communication_F" ]; + +// Classnames of objects which should be ignored when building +KPLIB_collisionIgnoreObjects = [ + "Land_HelipadSquare_F", + "Land_TentHangar_V1_F", + "Land_runway_edgelight", + "Land_runway_edgelight_blue_F", + "Land_Flush_Light_green_F", + "Land_Flush_Light_red_F", + "Land_Flush_Light_yellow_F", + "TMR_Autorest_Georef", + "Flag_NATO_F", + "Flag_White_F", + "Flag_RedCrystal_F", + "CamoNet_BLUFOR_F", + "CamoNet_BLUFOR_open_F", + "CamoNet_BLUFOR_big_F", + "Land_PortableLight_single_F", + "Land_PortableLight_double_F", + "Land_HelipadCircle_F", + "Land_HelipadRescue_F", + "Helipad", + "LAND_uns_Heli_pad", + "LAND_uns_evac_pad", + "PortableHelipadLight_01_blue_F", + "PortableHelipadLight_01_green_F", + "PortableHelipadLight_01_red_F", + "Land_BagFence_Round_F", + "Land_BagFence_Short_F", + "Land_BagFence_Long_F", + "Land_BagFence_Corner_F", + "Land_BagFence_End_F", + "Land_Sign_WarningMilitaryArea_F", + "Land_Sign_WarningMilAreaSmall_F", + "Land_Sign_WarningMilitaryVehicles_F", + "Land_Razorwire_F", + "Sign_Sphere100cm_F", + "Land_ClutterCutter_large_F", + "Land_HighVoltageColumnWire_F", + "Land_PowerWireBig_left_F", + "B_HMG_01_F", // Mk30A HMG .50 + "B_HMG_01_high_F", // Mk30 HMG .50 (Raised) + "B_HMG_01_A_F", // Mk30 HMG .50 (Autonomous) + "B_GMG_01_F", // Mk32A GMG 20mm + "B_GMG_01_high_F", // Mk32 GMG 20mm (Raised) + "B_GMG_01_A_F", // Mk32 GMG 20mm (Autonomous) + "B_static_AT_F", // Static Titan Launcher (AT) + "B_static_AA_F", // Static Titan Launcher (AA) + "B_Mortar_01_F", // Mk6 Mortar + "ACE_friesAnchorBar", // ACE FRIES + "ACE_friesGantryReverse", // ACE FRIES + "ACE_friesGantry" // ACE FRIES +]; From 81c8ab689b0c2c05bb317633b9b525f02f764715 Mon Sep 17 00:00:00 2001 From: Dubjunk Date: Wed, 23 Sep 2020 09:52:28 +0200 Subject: [PATCH 070/115] suggestions by @Wyqer --- Missionframework/functions/fn_addActionsPlayer.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index 083914c71..60dade3d7 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -2,7 +2,7 @@ File: fn_addActionsPlayer.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-07-08 + Last Update: 2020-09-23 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -372,8 +372,8 @@ _player addAction [ // Drop crate _player addAction [ - "", localize "STR_ACTION_CRATE_DROP", ""] joinString "", - {detach ((attachedObjects (_this select 1)) select 0)}, + ["", localize "STR_ACTION_CRATE_DROP", ""] joinString "", + {detach ((attachedObjects _originalTarget) select {(typeOf _x) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]})}, nil, -504, true, @@ -382,7 +382,7 @@ _player addAction [ " alive _originalTarget && {build_confirmed isEqualTo 0} - && {(typeOf ((attachedObjects _target) select 0)) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]} + && {!((((attachedObjects _originalTarget) apply {typeOf _x}) arrayIntersect [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]) isEqualTo [])} " ]; From 81c56e682f84ddb70760c8bda8bf624010184460 Mon Sep 17 00:00:00 2001 From: Wyqer Date: Wed, 23 Sep 2020 16:17:51 +0200 Subject: [PATCH 071/115] Fixed chernarus winter/summer ignored buildings --- CHANGELOG.md | 1 + Missionframework/scripts/server/civrep/init_buildings.sqf | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index feb17334a..197c9ce58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. * Fixed: FOB truck got mass set, but should've just apply to FOB boxes. +* Fixed: Chernarus Winter (and summer) weren't recognized for ignored buildings list for civ rep loss. ## 0.96.7a (2020-09-12) * Added: Contact DLC static weapon backpacks to default blacklist. diff --git a/Missionframework/scripts/server/civrep/init_buildings.sqf b/Missionframework/scripts/server/civrep/init_buildings.sqf index 73c47e32b..318470425 100644 --- a/Missionframework/scripts/server/civrep/init_buildings.sqf +++ b/Missionframework/scripts/server/civrep/init_buildings.sqf @@ -2,7 +2,9 @@ private _start = diag_tickTime; if (isServer) then {["init_buildings.sqf initialising...", "CIVREP"] call KPLIB_fnc_log;}; switch (worldName) do { - case "Chernarus": {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\chernarus.sqf"}; + case "chernarus_summer": {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\chernarus.sqf"}; + case "Chernarus_Winter": {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\chernarus.sqf"}; + case "chernarus": {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\chernarus.sqf"}; case "cup_chernarus_A3": {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\chernarus2020.sqf"}; case "Enoch": {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\enoch.sqf"}; case "gm_weferlingen_summer": {call compile preprocessFileLineNumbers "scripts\server\civrep\ignored\gm_weferlingen_summer.sqf"}; From 737eeac9156547f119fcc9898ab8f5510ca9004c Mon Sep 17 00:00:00 2001 From: Lorenzo Date: Wed, 23 Sep 2020 20:30:36 +0200 Subject: [PATCH 072/115] [v0.96.8] update Italian localization update Italian localization --- Missionframework/stringtable.xml | 121 ++++++++++++++++++++++++++++++- 1 file changed, 120 insertions(+), 1 deletion(-) diff --git a/Missionframework/stringtable.xml b/Missionframework/stringtable.xml index 42771b35f..dbd98a68d 100644 --- a/Missionframework/stringtable.xml +++ b/Missionframework/stringtable.xml @@ -22,7 +22,7 @@ German | Updated: 0.96.8 Wyqer - https://github.com/Wyqer - Italian | Updated: pre 0.96.7a + Italian | Updated: 0.96.8 k4s0 - https://github.com/k4s0 Portuguese | Updated: pre 0.96.7a @@ -378,6 +378,7 @@ -- AUF FAHRZEUG LADEN -- CARGAR AL VEHÍCULO -- ЗАГРУЗИТЬ В ТРАНСПОРТ + -- CARICA SUL VEICOLO-- -- 차량에 적재 -- ARACA YÜKLE -- NALOŽIT DO VOZIDLA @@ -387,6 +388,7 @@ -- VON FAHRZEUG ABLADEN -- DESCARGAR DEL VEHÍCULO -- ВЫГРУЗИТЬ ИЗ ТРАНСПОРТА + -- SCARICA DAL VEICOLO -- -- 차량에서 하역 -- ARAÇTAN İNDİR -- VYLOŽENÍ Z VOZIDLA @@ -396,6 +398,7 @@ -- KEIN TRANSPORTFAHRZEUG IN DER NÄHE -- NO HAY VEHÍCULOS DE TRANSPORTE CERCA -- НЕТ ТРАНСПОРТА ПОБЛИЗОСТИ + -- NESSUN VEICOLO DA TRASPORTO NELLE VICINANZE -- -- 주변에 수송차량이 없습니다. -- YAKINLARDA NAKLİYE ARACI YOK -- NELZE NALOŽIT @@ -518,6 +521,7 @@ FOB Container Contenedor de FOB FOB Контейнер + FOB Container 前哨部署柜 前線基地貨櫃 FOB Konteynırı @@ -2857,6 +2861,7 @@ Maximale Verzögerung zur Sektor Deaktivierung (Beginnt nach 5 Minuten seit Aktivierung) Máximo atraso de desactivación de sector (empieza a incrementar después del 5to minuto de activación) Максимальное время деактивации сектора (начинает увелич. после 5-ти минут активации) + Massimo ritardo di attivazione del settore(dopo 5 minuti inizia ad incrementare) Sektör kapanma üst limiti (Sektörün açılmasından 5 dakika sonra artmaya başlar) Maximální zpoždění deaktivace sektoru (začíná se zvyšovat po 5. aktivační minutě) @@ -2865,6 +2870,7 @@ Eingeschränkte Zeus Funktionen Interface de Zeus limitada Ограниченный интерфейс Zeus + Limita interfaccia Zeus 제한된 제우스 인터페이스 Sınırlı Zeus Arayüzü Omezené rozhraní Zeus @@ -2872,12 +2878,14 @@ Zeus for Commander Zeus für Kommandant + Zeus per Comandante Chance that enemies will stay in immobile/damaged vehicles Chance, dass Feinde in fahrunfähigen/beschädigten Fahrzeugen verbleiben Probabilidad de que los enemigos se quedarán dentro de un vehículo inmovilziado/dañado Шанс того, что враги будут оставаться в неподвижных/поврежденных автомобилях + Chance che un nemico rimanga su un veicolo immobile o danneggiato Düşmanların hasarlı araçların içinde kalma şansı Šance, že nepřátelé zůstanou v nepohyblivých / poškozených vozidlech @@ -6172,6 +6180,7 @@ Siegesbedingung Condición de Victoria Условие для победы + Condizioni di vittoria 승리 조건 Vítězství @@ -6180,6 +6189,7 @@ Alle Hauptstädte Todas las capitales Все столицы + Tutte le capitali 모든 대도시 Všechna hlavní města @@ -6188,6 +6198,7 @@ Alle Hauptstädte und Militärbasen Todas las capitales y bases militares Все столицы и военные базы + Tutte le capitali e le basi militari 모든 대도시 및 군사기지 Všechna hlavní města a vojenské základny @@ -6196,6 +6207,7 @@ Alle Hauptstädte und 60% der Sektoren Todas las capitales y 60% de los sectores Все столицы и 60% секторов + Tutte le capitali e il 60% dei settori 모든 대도시 및 60%의 거점 Všechna hlavní města a 60% sektoru @@ -6204,6 +6216,7 @@ Alle Hauptstädte und 80% der Sektoren TOdas las capitales y 80% de los sectores Все столицы и 80% секторов + Tutte le capitali e l'80% dei settori 모든 대도시 및 80%의 거점 Všechna hlavní města a 80% sektoru @@ -6212,6 +6225,7 @@ Alle Sektoren Todos los sectores Все секторы + Tutti i settori 모든 거점 Všechny sektory @@ -6220,6 +6234,7 @@ KAMPAGNE ABGESCHLOSSEN CAMPAÑA COMPLETA КАМПАНИЯ ВЫПОЛНЕНА + CAMPAGNA COMPLETATA 군사작전 완료 CAMPAIGN KOMPLET @@ -6228,6 +6243,7 @@ Du hast das Gebiet von der feindlichen Unterdrückung befreit. Haz liberado el área de la oposión enemiga. Вы освободили территорию от угнетения врага. + Hai liberato tutta l'area dall'oppressione nemica 당신은 적의 억압으로부터 이 지역을 해방시켰다. Osvobodili jste oblast od nepřátelského útlaku. @@ -6236,6 +6252,7 @@ Spielzeit: %1 Tage, %2 Stunden, %3 Minuten und %4 Sekunden Tiempo de juego: %1 días, %2 horas, %3 minutos y %4 segundos Игровое время: %1 дней, %2 часов, %3 минут и %4 секунд + 걸린 시간: %1 일, %2 시간, %3 분 and %4 초 Doba hraní: % 1 dny, % 2 hodiny, % 3 minuty a % 4 sekund @@ -6384,6 +6401,7 @@ Widerstandskämpfer getötet: %1 Combatientes de la resistencia eliminados: %1 Убито бойцов сопротивления: %1 + Combattente della resistenza ucciso: %1 적군 전투기 격추 : %1 Spojenci zabili: %1 @@ -6392,6 +6410,7 @@ Verbündete Widerstandskämpfer getötet: %1 Combatientes de la resistencia aliada eliminados: %1 Убито союзнических бойцов сопротивления: %1 + Combattente della resistenza alleato ucciso: %1 아군 전투기 격추 : %1 Spojenci zabití: %1 @@ -6400,6 +6419,7 @@ Verbündete Widerstandskämpfer von Spielern getötet: %1 Combatientes de la resistencia aliada eliminados por jugadores: %1 Убито союзнических бойцов сопротивления игроками: %1 + Combattente della resistenza alleato ucciso dal gicoatore: %1 플레이어에 의해 격추된 전투기 : %1 Spojenci zabití hráči: %1 @@ -6436,6 +6456,7 @@ Zivilisten versorgt: %1 Civiles curados: %1 Гражданских вылечено: %1 + Civile curato da: %1 민간인 치료 : %1 Uzdravení civilisté: %1 @@ -6444,6 +6465,7 @@ Zivile Fahrzeuge zerstört: %1 Vehículos civiles destruidos: %1 Транспорта гражданских уничтожено: %1 + Veicolo civile distrutto: %1 파괴된 민간인 차량 : %1 Civilní vozidla byla zničena: %1 @@ -6452,6 +6474,7 @@ Zivile Fahrzeuge von Spielern zerstört: %1 Vehículos civiles destruidos por jugadores: %1 Транспорта гражданских уничтожено игроками: %1 + Veicolo civile distrutto dal giocatore: %1 플레이어에 의해 파괴된 민간인 차량 : %1 Civilní vozidla zničená hráči: %1 @@ -6460,6 +6483,7 @@ Zivile Fahrzeuge beschlagnahmt: %1 Vehículos civiles capturados: %1 Транспорта гражданских захвачено: %1 + Veicolo civile sequestrato da: %1 민간인 차량 탈취 : %1 Krádež civilních vozidel: %1 @@ -6468,6 +6492,7 @@ Zivile Gebäude zerstört: %1 Edificios civiles destruidos: %1 Построек гражданских уничтожено: %1 + Edificio civile distrutto: %1 파괴된 민간 건물 : %1 Zničeno civilních budov: %1 @@ -6490,6 +6515,7 @@ Munition hergestellt: %1 Municiones producidas: %1 Произведено боеприпасов: %1 + Munizioni prodotte: %1 생산된 탄약 : %1 Výroba munice: %1 @@ -6498,6 +6524,7 @@ Munition verbraucht: %1 Municiones gastadas: %1 Боеприпасов потрачено: %1 + Munizioni spese: %1 사용된 탄약 : %1 Spotřeba munice: %1 @@ -6506,6 +6533,7 @@ Kraftstoff hergestellt: %1 Combustible producido: %1 Произведено топлива: %1 + Carburante prodotto: %1 생산된 기름 : %1 Výroba paliva: %1 @@ -6514,6 +6542,7 @@ Kraftstoff verbraucht: %1 Combustible gastado: %1 Топлива потрачено: %1 + Carburante speso: %1 사용된 기름 : %1 Spotřeba paliva: %1 @@ -6522,6 +6551,7 @@ Nachschub hergestellt: %1 Suministros producidos: %1 Произведено припасов: %1 + Rifornimenti creati: %1 생산된 보급품 : %1 Výroba surovin: %1 @@ -6530,6 +6560,7 @@ Nachschub verbraucht: %1 Suministros gastados: %1 Припасов потрачено: %1 + Rifornimenti spesi: %1 사용된 보급품 : %1 Spotřeba surovin: %1 @@ -6746,6 +6777,7 @@ -- Clear FOB area -- Limpiar área de FOB -- Очистить зону FOB + -- Pulisci area FOB -- FOB Gebiet räumen -- 전초기지 주변 정리 -- Vymazat zónu FOB @@ -6755,6 +6787,7 @@ FOB eingepackt.\nEventuelle Gebietsräumung wird zum Serverneustart rückgängig gemacht. FOB empacado. \nProbablemente el permiso de creación será revertido después de reiniciar el servidor. FOB свернуто.\nЕсли вы очищали место для FOB, оно будет восстановлено после перезапуска сервера. + FOB ripiegata.\nL'autorizzazione eventualmente creata verrà ripristinata al riavvio del server. FOB가 재포장됩니다. 이 상태로 서버 재시작시 이 부근의 건물이나 장비들은 사라집니다. FOB je zabalen.\Po restartování serveru bude pravděpodobně vytvořené oprávnění zrušeno. @@ -6763,6 +6796,7 @@ Dynamischer Nebel (A3 Vanilla) Niebla dinámica (A3 Default) Динамический туман (A3 Vanilla) + Nebbia dinamica (A3 Vanilla) 동적인 안개 (A3 Vanilla) Dynamická mlha (A3 Vanilla) @@ -6771,6 +6805,7 @@ Start-FOB bereitgestellt als Empezar con FOB proveído como Создать FOB в виде + Partenza con FOB dispiegata a 시작시 전초기지는 다음과 같이 제공됩니다. První FOB poskyzován jako @@ -6779,6 +6814,7 @@ FOB Container Contenedor FOB FOB Контейнер + FOB Container 전초기지 설치박스 FOB Kontejner @@ -6787,6 +6823,7 @@ FOB LKW Camión FOB FOB Грузовик + Camion FOB 전초기지 설치트럭 FOB Nákladní auto @@ -6794,232 +6831,277 @@ Client options variant Spielermenü Variante Variantes de opciones de cliente + Opzioni client Vybrat možnost klienta GREUH Extended Options GREUH Erweiterte Optionen GREHU Opciones Extendidas + GREHU Opzioni Avanzate GREUH Rozšířené možnosti KP Player Menu (requires CBA) KP Spielermenü (benötigt CBA) Menú de jugador KP (requiere CBA) + Menu di gioco KP (richiede CBA) KP Player Menu (vyžaduje CBA) Are you sure? Bist du sicher? ¿Estás seguro? + Sei sicuro? jsi si tím jistý? This will permanently remove a total of %1 terrain objects (houses, trees, fences, lamps, etc.) within a radius of %2m around %3. Dies wird insgesamt %1 Kartenobjekte (Häuser, Bäume, Zäune, Lampen, etc.) im Umkreis von %2m um %3 herum permanent entfernen. Esta acción removera permanentemente un total de %1 objetos de terreno (casas, árboles, bardas, lamparas, etc.) dentro de un radio de %2m alrededor de %3. + Questo rimuoverà permanentemente un totale di %1 oggetti del terreno (case, alberi, recinzioni, lampade, ecc.) Entro un raggio di %2m intorno a %3. Tím se trvale odstraní celkem %1 terénních objektů (domy, stromy, ploty, lampy atd.) V okruhu %2m kolem %3. Add enemies to Zeus editable objects Feindliche Einheiten für Zeus editierbar Agregar enemigos como objetos editables de Zeus + Aggiungi nemici come oggetti editabili da Zeus Přidejte nepřátele k upravitelným objektům Zeus Arma 3 High Command for Commander Arma 3 Oberbefehl für Kommandanten Arma 3 High Command para comandantes + Arma 3 High Command per il comandante Arma 3 Vrchní velení velitele Arma 3 High Command Arma 3 Oberbefehl Arma 3 High Command + Arma 4 High Command Arma 3 Vrchní velení velitele BI Support System access Zugriff auf BI Support System + BI Supporto di accesso al sistema BI Podpora přístupu do systému Commander and Whitelist Kommandant und Whitelist Velitel a whitelist + Comandante e Whitelist Everyone Jeder Každý + Tutti Weapon sway Waffenschwanken (Weapon sway) Zbraň houpat + Ondeggiamento arma (Weapon sway) Ingame Tutorial Tutorial im Spiel Výukový program Ingame + Tutorial in gioco Crate Kiste Bedna + Crea Surrendering Soldier Kapitulierender Soldat Vzdávající se voják + Soldato arrendevole Wounded Civilian Verwundeter Zivilist Zraněný civilista + Civile ferito KP Liberation Tutorial KP Liberation Tutorial KP Liberation Tutorial + KP liberation Tutorial Do you want to enable the interactive tutorial?<br/>It'll guide you through the aspects of the mission. Check your tasks area on the map for further information on each task.<br/><br/>(This popup can be disabled in the mission parameters) Möchtest du das interaktive Tutorial aktivieren?<br/>Es wird dich durch einzelnen Missionsaspekte führen. Prüfe die Aufgaben im Kartenbildschirm für weitere Informationen zu den einzelnen Aufgaben.<br/><br/>(Dieses Pop-Up kann in den Missionsparametern deaktiviert werden) Chcete povolit interaktivní výukový program?<br/>Provede vás aspekty mise. Další informace o jednotlivých úkolech naleznete v oblasti úkolů na mapě.<br/><br/>(Toto okno lze v parametrech mise deaktivovat) + Vuoi abilitare il tutorial interattivo?<br/>Ti guiderà attraverso gli aspetti della missione. Controlla la tua area delle attività sulla mappa per ulteriori informazioni su ciascuna attività<br/><br/>(questo popup può essere disabilitato nei parametri della missione) You've completed all currently available/implemented tutorials.<br/>Have a lot of fun with playing this mission.<br/><br/>Should you've questions or want to learn the more deeper mechanics, make sure you visit the <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki">KP Liberation Wiki</a>.<br/>We've also a <a href="https://discord.gg/Qk35Sw8">Discord Server</a> where hundreds of KP Libertion players are around. Du hast alle derzeit verfügbaren/implementierten Tutorials abgeschlossen.<br/>Wir wünschen dir sehr viel Spaß mit dem Spielen der Mission.<br/><br/>Solltest du Fragen haben oder die etwas über die tiefergehenden Mechaniken erfahren wollen, dann schaue als erstes in das <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki">KP Liberation Wiki</a>.<br/>Außerdem gibt es unseren <a href="https://discord.gg/Qk35Sw8">Discord Server</a>, wo hunderte von KP Liberation Spielern zu finden sind. Dokončili jste všechny aktuálně dostupné/implementované výukové programy.<br/> Užij si spoustu zábavy při hraní této mise.<br/><br/> Pokud máte dotazy nebo se chcete dozvědět hlubší mechaniku, ujistěte se, že navštívíte stránku <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki"> KP Osvobození Wiki</a>. <br/> Také jsme a <a href="https://discord.gg/Qk35Sw8">Discord Server</a> kde jsou kolem stovky hráčů KP Libertion. + Hai completato tutti i tutorial attualmente disponibili / implementati.<br/>Divertiti molto giocando a questa missione.<br/><br/>Se hai domande o vuoi imparare le meccaniche più approfondite, assicurati di visitare la <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki">KP Liberation Wiki</a>.<br/>Noi abbiamo anche un <a href="https://discord.gg/Qk35Sw8">Discord Server</a> dove troverai centinaia di giocatori della KP Libertion. KP Liberation Tutorial Tasks KP Liberation Tutorial Aufgaben KP osvobození Výuky + Missione KP Liberation Tutorial Tasks of the KP Liberation Tutorial.<br/>It'll create new tasks when the correct circumstances are reached and there are still tutorials available. Aufgaben des KP Liberation Tutorials.<br/>Es werden automatisch neue Aufgaben erstellt, sobald die entsprechenden Umstände eintreten und noch weitere Tutorials verfügbar sind. Úkoly KP Osvobození Tutorial.<br/>To bude vytvářet nové úkoly, když jsou dosaženy správné okolnosti a stále jsou k dispozici výukové programy. + Compiti del tutorial di KP Liberation.<br/> creerà nuovi compiti quando le circostanze corrette saranno raggiunte e ci saranno ancora tutorial disponibili. First FOB deployment Erste FOB errichten + Primo dispiegamento della FOB První nasazení FOB This tasks will guide you through the deployment of your first FOB and gathering the start resources. Diese Aufgaben werden dich durch die Bereitstellung deiner ersten FOB und dem Sammeln der Startressourcen führen. + Questo primo impiego ti guida nella creazione della prima FOB e ti insegnera ad acquisire le risorse iniziali. Tyto úkoly vás provedou nasazením prvního fob a shromažďováním počátečních prostředků. Transport FOB Container FOB Container transportieren Přepravní FOB kontejner + Trasporta container FOB This is your first FOB container, which allows you to deploy a FOB.<br/>You need to slingload it via the transport helicopter to a position at least 1km away from the operation base in order to deploy it. We recommend to build it in the vicinity of a factory.<br/>After you've transported the container to the desired position, head near to it and you'll get an scroll wheel action to place the FOB.<br/>We'll continue after you've deployed your first FOB. Dies ist dein erster FOB Container mit dem du eine FOB bereitstellen kannst.<br/>Diesen musst du als Außenlast mit dem Transporthelikopter zu einer Position mit mindestens 1km Abstand zur Operationsbasis bringen, um die FOB aufzubauen. Wir empfehlen die erste FOB in der Nähe eines Fabrik-Sektors zu errichten.<br/>Nachdem du den Container zur gewünschten Position gebracht hast, nähere dich ihm und du wirst eine Mausrad-Aktion erhalten, um die FOB aufzustellen.<br/>Wir fahren fort nachdem du deine erste FOB errichtet hast. + Questo è il tuo primo container FOB, che ti permetterà di dispiegare una FOB.<br/>È necessario caricarlo tramite l'elicottero da trasporto in una posizione ad almeno 1 km di distanza dalla base operativa per dispiegarlo. Si consiglia di costruirlo nelle vicinanze di una fabbrica.<br/>Dopo aver trasportato il contenitore nella posizione desiderata, avvicinati ad esso e otterrai un'azione della rotella di scorrimento per posizionare il FOB.<br/>Continueremo dopo che avrai distribuito il tuo primo FOB. Jedná se o váš první FOB kontejner, který vám umožní nasadit FOB.<br/> Musíte ho naložit transportním vrtulníkem na pozici, která je vzdálena alespoň 1 km od operační základny, abyste ji mohli nasadit. Doporučujeme jej postavit v blízkosti továrny.<br/> Po přepravě kontejneru do požadovaného místa zamiřte k němu a získáte akci rolovacího kolečka, která umístí FOB.<br/> Budeme pokračovat, až to provedete. Drive FOB Truck FOB Truck fahren Nákladní auto FOB + Guida il camion FOB This is your first FOB truck, which allows you to deploy a FOB.<br/>You need to drive it to a position at least 1km away from the operation base in order to deploy it. We recommend to build it in the vicinity of a factory.<br/>After you've driven the truck to the desired position, head near to it and you'll get an scroll wheel action to place the FOB.<br/>We'll continue after you've deployed your first FOB. Dies ist dein erster FOB LKW mit dem du eine FOB bereitstellen kannst.<br/>Diesen musst du zu einer Position mit mindestens 1km Abstand zur Operationsbasis fahren, um die FOB aufzubauen. Wir empfehlen die erste FOB in der Nähe eines Fabrik-Sektors zu errichten.<br/>Nachdem du den LKW zur gewünschten Position gebracht hast, nähere dich ihm und du wirst eine Mausrad-Aktion erhalten, um die FOB aufzustellen.<br/>Wir fahren fort nachdem du deine erste FOB errichtet hast. + Questo è il tuo primo camion FOB, che ti consente di distribuire un FOB.<br/>È necessario guidarlo in una posizione ad almeno 1 km dalla base operativa per poterlo distribuire. Si consiglia di costruirlo nelle vicinanze di una fabbrica.<br/>Dopo aver guidato il camion nella posizione desiderata, avvicinati ad esso e otterrai un'azione della rotella di scorrimento per posizionare il FOB.<br/>Continueremo dopo che avrai distribuito il tuo primo FOB. Jedná se o váš první FOB truck, který vám umožní nasadit FOB.<br/> Musíte ho dojet na pozici alespoň 1 km od operační základny, abyste ji mohli nasadit. Doporučujeme ji postavit v blízkosti továrny.<br/> Poté, co jste řídili vůz do požadovaného místa, zamiřte blízko k němu a dostanete akci rolovacího kolečka pro umístění FOB.<br/> Budeme pokračovat, až rozmístíte svůj první FOB. Build a storage area Baue einen Lagerbereich + Costruisci un'area di stoccaggio Vytvoření úložného prostoru Now you've access to the build menu via the scroll wheel actions.<br/>Use this action to place a storage area. You can find it in the support tab of the build menu.<br/>This is needed to store the resource crates we'll send to you after this task. Nun hast du Zugriff zum Baumenü über die Mausrad-Aktionen.<br/>Benutze diese Aktion, um einen Lagerbereich zu errichten. Die Lagerbereich sind im Unterstützungs-Reiter des Baumenüs.<br/>Dieser ist notwendig, um die Startressourcen, die wir dir im Anschluss an diese Aufgabe zukommen lassen, einzulagern. + Ora hai accesso al menu di costruzione tramite le azioni della rotella di scorrimento.<br/>Usa questa azione per posizionare un'area di stoccaggio. Puoi trovarlo nella scheda Supporto del menu di costruzione.<br/>Questo è necessario per memorizzare le casse di risorse che ti invieremo dopo questa attività. Nyní máte přístup k nabídce sestavení prostřednictvím akcí rolovacího kolečka.<br/> Tato akce slouží k umístění skladovacího prostoru. Najdete ji na kartě budovy v nabídce stavení.<br/> To je nutné k uložení beden prostředků, které vám pošleme po tomto úkolu. Collect start resources Sammle Startressourcen + Acquisisci risorse iniziali Shromáždit počáteční zdroje We've send you some start resource crates via paradrop. Collect them and store them in your storage area to add them to the FOB resource pool.<br/>Resources have always to be stored in such areas to use them for building. It's not enough to have them near the FOB. If you go near a crate you'll have a store and a push scroll wheel action, which will help you. Wir haben dir ein paar Kisten mit Startressourcen per Fallschirmabwurf zukommen lassen. Sammel sie ein und lagere sie in deinen Lagerbereich ein, um sie den verfügbaren Ressourcen der FOB hinzuzufügen.<br/>Ressourcen müssen übrigens immer in solche Bereiche eingelagert werden, damit sie zum bauen verwendet werden können. Es reicht nicht aus, die Kisten einfach in der Nähe der FOB zu haben. Bist du in der Nähe einer Kiste, hast du unter anderem eine "Einlagern" und "Schieben" Mausrad-Aktion, welche dir helfen werden. + Ti abbiamo inviato alcune casse di risorse iniziali tramite paradrop. Raccoglili e conservali nella tua area di stoccaggio per aggiungerli al pool di risorse FOB.<br/>Le risorse devono sempre essere immagazzinate in tali aree per usarle per la costruzione. Non basta averli vicino al FOB. Se ti avvicini a una cassa, avrai un negozio e una rotella di scorrimento, che ti aiuterà. Poslali jsme vám přes paradrop nějaké bedny se startem. Shromážděte je a uložte je do úložiště a přidejte je do fondu zdrojů FOB.<br/> Zdroje musí být vždy uloženy v těchto oblastech, aby je mohly používat pro stavbu. Nestačí je mít blízko FOB. Pokud se přiblížíte k bedně, budete mít možnost a akci push rolovacího kolečka, která vám pomůže. Capture your first factory Erobere deine erste Fabrik + Cattura la tua prima fabbrica Zachyťte svou první továrnu This tasks will guide you through the process of capturing a factory sector, take possible POWs, help possible wounded civilians and start the resource production. Diese Aufgaben werden dich durch die Eroberung eines Fabrik-Sektors, das Festnehmen möglicher Gefangener, der Betreuung möglicher verwundeter Zivilisten und den Start der Ressourcenproduktion führen. + Questi compiti ti guideranno attraverso il processo di cattura di un settore di fabbrica, prenderanno possibili prigionieri di guerra, aiuteranno possibili civili feriti e avvieranno la produzione di risorse. Tyto úkoly vás provedou procesem zachycení výrobního sektoru, vezmou možné válečné zajatce, pomohou zraněným civilistům a zahájí výrobu zdrojů. Approach a factory Nähere dich einer Fabrik + Avvicinamento ad una fabbrica Přistupte k továrně It's always a good decision to start your campaign with capturing a factory. That way you'll be able to produce more resources, which you'll need in order to build more vehicles and later air assets.<br/>We've marked up to three near factory sectors on the map for you. Decide by yourself, which one you want to approach.<br/>We'll continue, if you're near one of the marked factories.<br/><br/>More information about the different sector types can be found in our <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Sectors">Wiki</a>. Es ist immer eine gute Entscheidung die Kampagne mit der Eroberung einer Fabrik zu beginnen. Dadurch wirst du in der Lage sein weitere Ressourcen zu produzieren, um weitere Bodenfahrzeuge und später auch Luftfahrzeuge zu bauen.<br/>Wir haben bis zu drei nahe Fabriken für dich auf der Karte markiert. Entscheide selbst, welche du angehen möchtest.<br/>Wir fahren fort, wenn du in der Nähe einer der markierten Fabriken bist.<br/><br/>Mehr Informationen über die verschiedenen Sektortypen findest du in unserem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Sectors">Wiki</a>. + È sempre una buona decisione iniziare la tua campagna con l'acquisizione di una fabbrica. In questo modo sarai in grado di produrre più risorse, di cui avrai bisogno per costruire più veicoli e successivamente risorse aeree.<br/>Abbiamo contrassegnato per te fino a tre settori vicini alla fabbrica sulla mappa. Decidi da solo a quale ti vuoi avvicinare.<br/>Continueremo, se sei vicino a una delle fabbriche contrassegnate.<br/><br/>Maggiori informazioni sui diversi tipi di settore possono essere trovate nel nostro <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Sectors">Wiki</a>. Je vždy dobré začít kampaň se zachycením továrny. Tímto způsobem budete moci produkovat více zdrojů, které budete potřebovat, abyste mohli postavit více vozidel a později letecké prostředky.<br/> Označili jsme na mapě až tři blízké výrobní sektory. Rozhodněte se sami, který z nich chcete přistupovat.<br/> Budeme pokračovat, pokud jste poblíž jedné z označených továren.<br/><br/> Více informací o různých typech odvětví naleznete v našem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Sectors"> Wiki</a>. Conquer the factory Erobere die Fabrik + Conquistare una fabbrica Dobýt továrnu The factory is now activated and will spawn enemy defenders. A full sector activation might take up to 20 seconds, depending on the amount of player side units near the sector. The more troops, the faster it'll spawn. This is to avoid random spawning by e.g. helicopter or jet fly-bys.<br/><br/>Now you've to defeat the enemy garrison until they surrender. Die Fabrik ist nun aktiv und wird feindliche Verteidigungstruppen erzeugen. Eine vollständige Sektoraktivierung kann bis zu 20 Sekunden dauern, abhängig von der Menge an freundlichen Einheiten in der Nähe eine Sektors. Umso mehr Einheiten, umso schneller. Dies verhindert, dass zufällige Sektoren durch lediglich vorbeifliegende Helikopter oder Jets aktiviert werden.<br/><br/>Nun musst du die feindliche Garnison, bis zur Aufgabe, bekämpfen. + La fabbrica è ora attivata e genererà difensori nemici. Un'attivazione completa di un settore potrebbe richiedere fino a 20 secondi, a seconda della quantità di unità lato giocatore vicino al settore. Più truppe, più velocemente si genererà. Questo per evitare la deposizione delle uova casuale, ad es. voli in elicottero o jet.<br/><br/>Ora devi sconfiggere la guarnigione nemica finché non si arrendono. Továrna je nyní aktivována a bude plodit nepřátelské obránce. Úplná aktivace sektoru může trvat až 20 sekund, v závislosti na množství jednotek na straně hráče v blízkosti sektoru. Čím více vojáků, tím rychleji se vynoří. To má zabránit náhodnému tření např. vrtulník nebo tryskové přelety .<br/><br/> Nyní musíte porazit nepřátelskou posádku, dokud se nevzdají. Capture and care Gefangennahme und Versorgung + Cattura e utilizza Zachyťte a pečujte After capturing a sector there is a chance that enemies surrendered or wounded civilians are in need of medical aid.<br/>We've marked these for you this time. Normally you need to search the buildings for surrendering enemies and have a look on the map for small violet circles which gives a hint for wounded civilians.<br/><br/>Approach all of the markers to capture the enemies and provide medical assistance for the civilians. Nachdem ein Sektor erobert wurde, besteht die Chance, dass Feinde sich ergeben und verwundete Zivilisten medizinische Hilfe benötigen.<br/>Dieses mal haben wir diese für dich markiert. Normalerweise musst du die Gebäude nach sich ergebenen Feinden durchsuchen und auf der Karte nach kleinen violetten Markierungen schauen, welche dir einen Anhaltspunkt für verwundete Zivilisten gibt.<br/><br/>Nähere dich allen Markierungen, um Feinde gefangen zu nehmen und den Zivilisten zu helfen. + Dopo aver catturato un settore c'è la possibilità che i nemici si arrendano o i civili feriti abbiano bisogno di assistenza medica.<br/>We've marked these for you this time. Normally you need to search the buildings for surrendering enemies and have a look on the map for small violet circles which gives a hint for wounded civilians.<br/><br/>Avvicinati a tutti i segnalini per catturare i nemici e fornire assistenza medica ai civili. Po obsazení sektoru je šance, že nepřátelé, kteří se vzdali nebo budou zraněni civilisté, potřebují lékařskou pomoc.<br/> Tentokrát jsme je označili. Za normálních okolností je třeba hledat budovy pro odevzdání nepřátel a podívat se na mapě pro malé fialové kruhy, které dává náznak pro zraněné civilisty.<br/><br/> Přistupte ke všem značkám, abyste zachytili nepřátele a poskytli lékařskou pomoc civilistům. Build a storage area Baue einen Lagerbereich + Creare un'area di stoccaggio Vybudujte skladovací prostor You need to place down a storage area for each factory you conquer. Otherwise the factory won't be able to produce resources due to a lack of storage space.<br/>Use the scroll wheel action to place a storage area at the factory sector. Für jede eroberte Fabrik muss ein Lagerbereich errichtet werden. Andernfalls wird die Fabrik, aufgrund fehlendem Lagerplatz, keine Ressourcen produzieren können.<br/>Benutze die entsprechende Mausrad-Aktion, um einen Lagerbereich bei der Fabrik zu errichten. + Devi posizionare un'area di stoccaggio per ogni fabbrica che conquisti. In caso contrario, la fabbrica non sarà in grado di produrre risorse per mancanza di spazio di archiviazione.<br/>Utilizzare l'azione della rotella di scorrimento per posizionare un'area di stoccaggio nel settore della fabbrica. musíte umístit úložný prostor pro každou továrnu, kterou dobýváte. V opačném případě nebude továrna schopna vyrábět zdroje z důvodu nedostatku úložného prostoru.<br/> Pomocí akce rolovacího kolečka umístěte úložný prostor do výrobního sektoru. Start the production Starte die Produktion + Avvia la produzione Zahajte výrobu Now the factory is ready to start produce resources. Use the scroll-wheel action to open the production interface and start the production in the just conquered factory.<br/>More detailed information about the interface can be found in our <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Production">Wiki</a>. Nun ist die Fabrik dafür bereit, um Ressourcen zu produzieren. Benutze die Mausrad-Aktion, um das Produktionsinterface zu öffnen und die Produktion in der eroberten Fabrik zu starten.<br/>Detailliertere Informationen über das Produktionsinterface findest du in unserem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Production">Wiki</a>. + Ora la fabbrica è pronta per iniziare a produrre risorse. Usa l'azione della rotella di scorrimento per aprire l'interfaccia di produzione e avviare la produzione nella fabbrica appena conquistata.<br/>Informazioni più dettagliate sull'interfaccia possono essere trovate nel nostro <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Production">Wiki</a>. Nyní je továrna připravena začít vyrábět zdroje. Pomocí akce rolovacího kolečka otevřete výrobní rozhraní a začněte vyrábět v právě dobyté továrně.<br/> Podrobnější informace o rozhraní naleznete v našem <a href="https://github.com/KillahPotatoes/KP-Liberation/wiki/EN_Production">Wiki</a>. Direct arsenal access without KPLIB Loadout Dialog Direkter Arsenalzugang ohne KPLIB Loadout Dialog + Accesso diretto all'arsenale senza KPLIB Loadout Dialog UNDER ATTACK WIRD ANGEGRIFFEN + SOTTO ATTACCO @@ -7029,6 +7111,7 @@ -- KP 玩家選單 -- -- Menú de Jugador KP -- -- KP Spielermenü -- + -- KP Menu Giocatore -- -- KP Menu do Jogador -- -- KP Player Nabídka -- @@ -7037,6 +7120,7 @@ KP 玩家選單 Menú de Jugador KP KP Spielermenü + KP Menu Giocatore KP Menu do Jogador KP Player Nabídka @@ -7045,6 +7129,7 @@ 玩家資訊 Información de Jugador Spielerinformationen + Informazioni Giocatore Informação do Jogador Informace o hráči @@ -7053,6 +7138,7 @@ 階級 Rango: Dienstgrad: + Grado: Rank: Hodnost: @@ -7061,6 +7147,7 @@ 得分 Puntaje: Punkte: + Punteggio: Pontuação: Skóre: @@ -7069,6 +7156,7 @@ 遊戲時間 Tiempo de juego: Spielzeit: + Tempo di gioco: Tempo de jogo: Čas hraní: @@ -7077,6 +7165,7 @@ KP Ranks 模組未裝載 KP Ranks mod no ha sido cargado KP Ranks Mod nicht geladen + KP Ranks Mod non caricata O mod KP Ranks não está carregado KP Ranks mod nebyl načten @@ -7085,12 +7174,14 @@ 團隊管理 Administración de grupo Gruppenverwaltung + Gestione Gruppo Gerenciar Grupo Správa skupiny Create Erstellen + Crea Crear Criar Vytvořit @@ -7100,6 +7191,7 @@ 加入 Unirse Beitreten + Entra Juntar-se Připojit se @@ -7108,6 +7200,7 @@ 重新命名 Renombrar Umbenennen + Rinomina Renomear Přejmenovat @@ -7116,6 +7209,7 @@ 視距設定 Configuración de distancia de visión Sichtweiteneinstellungen + Visualizza settaggi distanza Distância de Visão Nastavení vzdálenosti @@ -7124,6 +7218,7 @@ m 步兵視野 m a pie m zu Fuß + m su piedi m A pé Pěšák @@ -7132,6 +7227,7 @@ m 地面載具視野 m en vehículos de tierra m in Bodenfahrzeugen + m nei veicoli di terra m em veículos terrestres Vozidla @@ -7140,6 +7236,7 @@ m 空中載具視野 m en vehículos de aire m in Luftfahrzeugen + m nei veivoli m em veículos aéreos Letectvo @@ -7148,6 +7245,7 @@ 細項設定 Configuración miscelanea Sonstige Einstellungen + Settaggi Vari Outras Configurações Různé nastavení @@ -7156,6 +7254,7 @@ 地形細節 Detalle de terreno: Terraindetail: + Dettaglio terreno: Detalhe do terreno: Detail terénu: @@ -7164,6 +7263,7 @@ 低 Bajo Niedrig + Basso Baixo Nízký @@ -7172,6 +7272,7 @@ 標準 Estandard Standard + Standard Padrão Normální @@ -7180,6 +7281,7 @@ 高 Alto Hoch + Alto Alto Vysoký @@ -7188,6 +7290,7 @@ 非常高 Muy alto Sehr Hoch + Molto Alto Muito Alto Velmi vysoký @@ -7196,6 +7299,7 @@ 極高 Ultra Ultra + Ultra Ultra Ultra @@ -7204,6 +7308,7 @@ 自動第三人稱視角 Cámara auto 3era persona: Auto 3rd-Person-Sicht: + Vista in 3° persona automatica Câmera auto em 3º pessoa: Pohled z třetí osoby: @@ -7212,6 +7317,7 @@ 關閉 Desabilitar Deaktiviert + Disattivo Desativado Zakázáno @@ -7220,6 +7326,7 @@ 空中載具 Vehículos de aire Luftfahrzeuge + Veivoli Veículos aéreos Letectvo @@ -7228,6 +7335,7 @@ 地面載具 Vehículos de tierra Bodenfahrzeuge + Veicoli di terra Veículos terrestres Pozemní vozidla @@ -7236,6 +7344,7 @@ 所有載具 Todos los vehículos Alle Fahrzeuge + Tutti i veicoli Todos os veículos Všechna vozidla @@ -7244,6 +7353,7 @@ 關閉文字聊天： Deshabilitar conversaciones de radio: KI Funk deaktivieren: + Disattiva chat radio: Desativar comm's de rádio: Zakázat rádiový chat: @@ -7252,6 +7362,7 @@ 否 No Nein + No Não Ne @@ -7260,6 +7371,7 @@ 只有語音通訊 Voz Stimme + Voce Voz hlas @@ -7268,6 +7380,7 @@ 語音+文字通訊 Voz + Chat Stimme + Chat + Voce + Chat Voz + Chat Hlas + chat @@ -7276,6 +7389,7 @@ 載具內音量： Volumen en vehículo: Lautstärke im Fahrzeug: + Suono dentro i veicoli: Volume dentro do veículo: Hlasitost ve vozidle: @@ -7284,6 +7398,7 @@ 使用 Aplicar Anwenden + Apllica Aplicar Potvrdit @@ -7292,6 +7407,7 @@ 如果你有使用ACE模組，聲音設定將會被ACE的覆蓋 Los ajustes de sonido han sido sobreescritos por ACE, si debieras usarlos. Die Lautstärkeanpassung wird durch ACE überschrieben, wenn du es nutzen solltest. + Le impostazioni audio sono sovrascritte dalla ACE, se decidi di utilizzarla O ajuste de som é sobrescrito pelo ACE se você usar ele. Úprava zvuku je přepsána ACE, pokud ji použijete. @@ -7300,6 +7416,7 @@ 你不是這個團隊的隊長 No eres el líder en el grupo. Du bist nicht der Anführer dieser Gruppe. + Non sei il leader di questo gruppo. Você não é o lider desse grupo. Nejste vůdce této skupiny. @@ -7308,12 +7425,14 @@ 陞階系統關閉 Sistema de niveles desactivado Levelsystem deaktiviert + sistema di livellamento disabilitato Sistema de níveis desativado Vyrovnávací systém zakázán KP Player Menu v1.0.2\nby Wyqer KP Spielermenü v1.0.2\nvon Wyqer + KP Player Menu v1.0.2\nby Wyqer Menú de Jugador KP v1.0.2\npor Wyqer KP Player Menu v1.0.2\nby Wyqer From 9e3188ea3512ca4918f29ec785d787382b2ab41f Mon Sep 17 00:00:00 2001 From: Wyqer Date: Fri, 25 Sep 2020 06:47:48 +0200 Subject: [PATCH 073/115] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 197c9ce58..60ac977c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## 0.96.8 (TBD) +* Updated: Italian localization. Thanks to [k4s0](https://github.com/k4s0) * Tweaked: Splitted the config file in seperate files, as it was getting quite big. * Tweaked: Unified the prefix of all variables to `KPLIB_`. * Tweaked: Arsenal presets are now in the presets folder. From 81affed86955205eed4496785ff412d8d044c370 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 26 Sep 2020 15:39:37 +0200 Subject: [PATCH 074/115] Support CBA Optics and MRT Accesories Obsoletes #833 --- .../scripts/client/misc/fn_initArsenal.sqf | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/Missionframework/scripts/client/misc/fn_initArsenal.sqf b/Missionframework/scripts/client/misc/fn_initArsenal.sqf index 249ccc3a7..1cda14ada 100644 --- a/Missionframework/scripts/client/misc/fn_initArsenal.sqf +++ b/Missionframework/scripts/client/misc/fn_initArsenal.sqf @@ -2,7 +2,7 @@ File: fn_initArsenal.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-05-11 - Last Update: 2020-09-16 + Last Update: 2020-09-26 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -81,6 +81,35 @@ if (KPLIB_param_useArsenalPreset) then { KPLIB_arsenalAllowed append _disposableLaunchers; }; + { + // Handle CBA optics, https://github.com/CBATeam/CBA_A3/wiki/Scripted-Optics + if (missionNamespace getVariable ["CBA_optics", false]) then { + private _pipOptic = CBA_optics_PIPOptics getVariable _x; + if (!isNil "_pipOptic") then { + KPLIB_arsenalAllowedExtension pushBackUnique _pipOptic; + }; + + private _nonPipOptic = CBA_optics_NonPIPOptics getVariable _x; + if (!isNil "_nonPipOptic") then { + KPLIB_arsenalAllowedExtension pushBackUnique _nonPipOptic; + }; + }; + + // Handle CBA (MRT) Accessories, https://github.com/CBATeam/CBA_A3/wiki/Accessory-Functions + private _itemCfg = configFile >> "CfgWeapons" >> "CUP_optic_ACOG_TA01B_OD_3D"; + if (!isNull _itemCfg) then { + private _nextItem = getText (_cfg >> "MRT_SwitchItemPrevClass"); + if (_nextItem != "") then { + KPLIB_arsenalAllowedExtension pushBackUnique _nextItem; + }; + + private _prevItem = getText (_cfg >> "MRT_SwitchItemNextClass"); + if (_prevItem != "") then { + KPLIB_arsenalAllowedExtension pushBackUnique _prevItem; + }; + }; + } forEach KPLIB_arsenalAllowed; + KPLIB_arsenalAllowed append KPLIB_arsenalAllowedExtension; if (KPLIB_ace && KPLIB_param_arsenalType) then {[player, KPLIB_arsenalAllowed, false] call ace_arsenal_fnc_addVirtualItems;}; From 0bd3fa153b7bb23ca4a1eb0137315e9d0e09be18 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 26 Sep 2020 15:46:45 +0200 Subject: [PATCH 075/115] Fix hardcoded class in MRT Accessory support --- Missionframework/scripts/client/misc/fn_initArsenal.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionframework/scripts/client/misc/fn_initArsenal.sqf b/Missionframework/scripts/client/misc/fn_initArsenal.sqf index 1cda14ada..8d1fe70f2 100644 --- a/Missionframework/scripts/client/misc/fn_initArsenal.sqf +++ b/Missionframework/scripts/client/misc/fn_initArsenal.sqf @@ -96,7 +96,7 @@ if (KPLIB_param_useArsenalPreset) then { }; // Handle CBA (MRT) Accessories, https://github.com/CBATeam/CBA_A3/wiki/Accessory-Functions - private _itemCfg = configFile >> "CfgWeapons" >> "CUP_optic_ACOG_TA01B_OD_3D"; + private _itemCfg = configFile >> "CfgWeapons" >> _x; if (!isNull _itemCfg) then { private _nextItem = getText (_cfg >> "MRT_SwitchItemPrevClass"); if (_nextItem != "") then { From 7d2fc424ed1648b5d796a7fcc495ae300afaa347 Mon Sep 17 00:00:00 2001 From: nicoman35 Date: Sun, 27 Sep 2020 00:41:46 +0200 Subject: [PATCH 076/115] minor bugfix --- Missionframework/scripts/server/resources/manage_logistics.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionframework/scripts/server/resources/manage_logistics.sqf b/Missionframework/scripts/server/resources/manage_logistics.sqf index 9f2d75125..d12bc3c27 100644 --- a/Missionframework/scripts/server/resources/manage_logistics.sqf +++ b/Missionframework/scripts/server/resources/manage_logistics.sqf @@ -294,7 +294,7 @@ while {KPLIB_endgame == 0} do { if (((_x select 8) <= ((ceil (((_x select 2) distance2D (_x select 3)) / 400)) - 3)) && ((_x select 8) >= 3) && !((_x select 6) isEqualTo [0,0,0]) && !KPLIB_convoy_ambush_inProgress && (KPLIB_civ_rep <= -25) && (((_x select 8) % 2) == 0)) then { private _dice = round (random 100); private _chance = KPLIB_convoy_ambush_chance; - if (chance > 0) then { + if (_chance > 0) then { _chance = _chance + ([] call KPLIB_fnc_crGetMulti); }; if (KPLIB_asymmetric_debug > 0) then {[format ["Logistic convoy %1: ambush possible - current ETA: %2 - Dice: %3 - Chance: %4", (_x select 0), (_x select 8), _dice, _chance], "ASYMMETRIC"] call KPLIB_fnc_log;}; From ec13e5a71f3d03b021f13928626179507b29b0a7 Mon Sep 17 00:00:00 2001 From: Dubjunk <31448659+Dubjunk@users.noreply.github.com> Date: Wed, 30 Sep 2020 21:31:59 +0200 Subject: [PATCH 077/115] some minor fixes --- Missionframework/functions/fn_addActionsPlayer.sqf | 2 +- .../scripts/client/ammoboxes/ammobox_action_manager.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index 60dade3d7..06bce9207 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -373,7 +373,7 @@ _player addAction [ // Drop crate _player addAction [ ["", localize "STR_ACTION_CRATE_DROP", ""] joinString "", - {detach ((attachedObjects _originalTarget) select {(typeOf _x) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]})}, + {detach (((attachedObjects player) select {(typeOf _x) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]}) select 0)}, nil, -504, true, diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index 792c58882..4d0695ab8 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -57,7 +57,7 @@ while {true} do { _b_action_id2 = _next_box addAction ["" + localize "STR_ACTION_STORE_CRATE" + "",{[(_this select 0), (nearestObjects [player,KPLIB_storageBuildings,20]) select 0,true] call KPLIB_fnc_crateToStorage;},"",-502,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id3 = _next_box addAction ["" + localize "STR_ACTION_CRATE_VALUE" + "",{[_this select 0] call KPLIB_fnc_checkCrateValue;uiSleep 3; hint "";},"",-503,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id4 = _next_box addAction ["" + localize "STR_ACTION_CRATE_PUSH" + "",{(_this select 0) setPos ((_this select 0) getPos [1, (player getDir (_this select 0))]);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; - _b_action_id5 = _next_box addAction ["" + localize "STR_ACTION_CRATE_CARRY" + "",{(_this select 0) attachTo [(_this select 1), [0, 2, 1]];},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && (isNull attachedTo _target)"]; + _b_action_id5 = _next_box addAction ["" + localize "STR_ACTION_CRATE_CARRY" + "",{(_this select 0) attachTo [(_this select 1), [0, 2, 1]];},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && {(((attachedObjects player) apply {typeOf _x}) arrayIntersect [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]) isEqualTo []}"]; _next_box setVariable ["KPLIB_ammo_box_action", _b_action_id1, false]; _next_box setVariable ["KP_crate_store_action", _b_action_id2, false]; _next_box setVariable ["KP_crate_value_action", _b_action_id3, false]; From 357b8a2942f25f3f61f63ff3349eb5b8a8c6cc99 Mon Sep 17 00:00:00 2001 From: spawnAjak <20494241+spawnAjak@users.noreply.github.com> Date: Tue, 27 Oct 2020 12:44:11 +0000 Subject: [PATCH 078/115] Update mission.sqm Updated username - too many were asking me if I like My Little Pony, what even?! --- Missionbasefiles/kp_liberation.pja310/mission.sqm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionbasefiles/kp_liberation.pja310/mission.sqm b/Missionbasefiles/kp_liberation.pja310/mission.sqm index 9e734fc47..8b8f3ad8b 100644 --- a/Missionbasefiles/kp_liberation.pja310/mission.sqm +++ b/Missionbasefiles/kp_liberation.pja310/mission.sqm @@ -3827,7 +3827,7 @@ class Mission dataType="Marker"; position[]={6960.8052,0,11203.651}; name="capture_45"; - text="Applejakerie Village"; + text="Ajak's Village"; type="n_art"; colorName="ColorEAST"; id=714; From 4a957d6253efcf4904e22e85139d08614025d057 Mon Sep 17 00:00:00 2001 From: Thatguy553 Date: Sun, 30 Oct 2022 02:19:23 -0400 Subject: [PATCH 079/115] Update setUnitLoadout to CBA_fnc_setLoadout - Updated open_arsenal.sqf and redeploy_manager.sqf to use CBA_fnc_setLoadout. - Created config file bool variable to allow easy change of CBA_fnc_setLoadout's third param to refill mags. --- Missionframework/kp_liberation_config.sqf | 1 + Missionframework/scripts/client/actions/open_arsenal.sqf | 2 +- Missionframework/scripts/client/spawn/redeploy_manager.sqf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Missionframework/kp_liberation_config.sqf b/Missionframework/kp_liberation_config.sqf index 0c993250b..3496d9b15 100644 --- a/Missionframework/kp_liberation_config.sqf +++ b/Missionframework/kp_liberation_config.sqf @@ -2,6 +2,7 @@ CONFIG FILE FOR KP LIBERATION https://github.com/KillahPotatoes/KP-Liberation */ +KP_liberation_fill_mags = true; // Vehicle classnames which also function as ACE medical vehicles. KP_liberation_medical_vehicles = [ diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index 225a5e43a..79a7d5f5c 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/Missionframework/scripts/client/actions/open_arsenal.sqf @@ -83,7 +83,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( load_loadout > 0 ) then { private _loaded_loadout = _loadouts_data select (lbCurSel 201); if (KP_liberation_ace && KP_liberation_arsenal_type) then { - player setUnitLoadout (_loaded_loadout select 1); + [player, _loaded_loadout select 1, KP_liberation_fill_mags] call CBA_fnc_setLoadout; } else { [player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory; }; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 1a09817ce..26a6d24c7 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -192,7 +192,7 @@ while {true} do { if ((lbCurSel 203) > 0) then { private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1); if (KP_liberation_ace && KP_liberation_arsenal_type) then { - player setUnitLoadout (_selectedLoadout select 1); + [player, _selectedLoadout select 1, KP_liberation_fill_mags] call CBA_fnc_setLoadout; } else { [player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory; }; From 604b7e24327ae42fa98681c9ee585b59bf415f5e Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Sat, 14 Oct 2023 14:07:00 -0400 Subject: [PATCH 080/115] Replace kill manager with cba server event --- .../functions/fn_createManagedUnit.sqf | 7 +++- .../functions/fn_handlePlacedZeusObject.sqf | 12 +++++- .../functions/fn_spawnVehicle.sqf | 12 +++++- Missionframework/init.sqf | 9 +++++ .../scripts/client/build/do_build.sqf | 12 +++++- .../scripts/server/battlegroup/spawn_air.sqf | 12 +++++- .../scripts/server/game/save_manager.sqf | 6 ++- .../server/patrols/send_paratroopers.sqf | 12 +++++- .../scripts/shared/kill_manager.sqf | 39 ++++++++----------- 9 files changed, 86 insertions(+), 35 deletions(-) diff --git a/Missionframework/functions/fn_createManagedUnit.sqf b/Missionframework/functions/fn_createManagedUnit.sqf index 0ccefdb97..cf9464e5a 100644 --- a/Missionframework/functions/fn_createManagedUnit.sqf +++ b/Missionframework/functions/fn_createManagedUnit.sqf @@ -34,7 +34,12 @@ isNil { private _groupTemp = createGroup [CIVILIAN, true]; _unit = _groupTemp createUnit [_type, _spawnPos, [], _placement, "FORM"]; - _unit addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; + _unit addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; + _unit setRank _rank; // Join to target group to preserve Side diff --git a/Missionframework/functions/fn_handlePlacedZeusObject.sqf b/Missionframework/functions/fn_handlePlacedZeusObject.sqf index 476e8e0d4..5417219c1 100644 --- a/Missionframework/functions/fn_handlePlacedZeusObject.sqf +++ b/Missionframework/functions/fn_handlePlacedZeusObject.sqf @@ -32,14 +32,22 @@ if (_vehicle) then { // Add kill manager and object init to possible crew units { - _x addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; + _x addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; [_x] call KPLIB_fnc_addObjectInit; } forEach (crew _obj); }; // Apply kill manager, if it's not a crate if !(_crate) then { - _obj addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; + _obj addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; } else { // Otherwise apply all needed values/functionalities _obj setMass 500; diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index e572ebfd1..c448299eb 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -84,11 +84,19 @@ if (_classname in KPLIB_o_militiaVehicles) then { private _crew = units (createVehicleCrew _newvehicle); _crew joinSilent _grp; sleep 0.1; - {_x addMPEventHandler ["MPKilled", {_this spawn kill_manager}];} forEach _crew; + {_x addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }];} forEach _crew; }; // Add MPKilled and GetIn EHs and enable damage again -_newvehicle addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; +_newvehicle addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; sleep 0.1; _newvehicle allowDamage true; _newvehicle setDamage 0; diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index 11c65b5ba..b45b1971e 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -60,6 +60,15 @@ if ((isNil {player getVariable "bis_revive_ehHandleHeal"} || isDedicated) && !(b [] call bis_fnc_reviveInit; }; +["KPLib_manageKills", +{ + params ["_unit","_killer"]; + [_unit,_killer] call kill_manager; +} +] call CBA_fnc_addEventHandler; + + + KPLIB_init = true; // Notify clients that server is ready diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 300744057..00ae7a6e6 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -332,8 +332,16 @@ while { true } do { _vehicle setDamage 0; if(buildtype != 6) then { - _vehicle addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; - { _x addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; } foreach (crew _vehicle); + _vehicle addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; + { _x addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; } foreach (crew _vehicle); }; }; diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index d12ccc4a6..d6504b050 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -18,9 +18,17 @@ for "_i" from 1 to _planes_number do { _plane = createVehicle [_class, _spawnPos, [], 0, "FLY"]; createVehicleCrew _plane; _plane flyInHeight (120 + (random 180)); - _plane addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; + _plane addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; [_plane] call KPLIB_fnc_addObjectInit; - {_x addMPEventHandler ["MPKilled", {_this spawn kill_manager}];} forEach (crew _plane); + {_x addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }];} forEach (crew _plane); (crew _plane) joinSilent _grp; sleep 1; }; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index b47059338..d3e14814f 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -356,7 +356,11 @@ if (!isNil "_saveData") then { // Apply kill manager handling, if not excluded if !((toLower _class) in _noKillHandler) then { - _object addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; + _object addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; }; // Set enemy vehicle as captured diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index eb898075c..98ccfdc39 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -26,8 +26,16 @@ if (isNull _chopper_type) then { _pilot_group = createGroup [KPLIB_side_enemy, true]; (crew _newvehicle) joinSilent _pilot_group; - _newvehicle addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; - {_x addMPEventHandler ["MPKilled", {_this spawn kill_manager}];} forEach (crew _newvehicle); + _newvehicle addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; + {_x addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }];} forEach (crew _newvehicle); } else { _newvehicle = _chopper_type; _pilot_group = group _newvehicle; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 5c9c39fe6..7e5bf9381 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -1,24 +1,9 @@ params ["_unit", "_killer"]; -if (isServer) then { + if (KPLIB_kill_debug > 0) then {[format ["Kill Manager executed - _unit: %1 (%2) - _killer: %3 (%4)", typeOf _unit, _unit, typeOf _killer, _killer], "KILL"] call KPLIB_fnc_log;}; - // Get Killer, when ACE enabled, via lastDamageSource - if (KPLIB_ace) then { - if (local _unit) then { - _killer = _unit getVariable ["ace_medical_lastDamageSource", _killer]; - if (KPLIB_kill_debug > 0) then {["_unit is local to server", "KILL"] call KPLIB_fnc_log;}; - } else { - if (KPLIB_kill_debug > 0) then {["_unit is not local to server", "KILL"] call KPLIB_fnc_log;}; - if (isNil "KPLIB_ace_killer") then {KPLIB_ace_killer = objNull;}; - waitUntil {sleep 0.5; !(isNull KPLIB_ace_killer)}; - if (KPLIB_kill_debug > 0) then {["KPLIB_ace_killer received on server", "KILL"] call KPLIB_fnc_log;}; - _killer = KPLIB_ace_killer; - KPLIB_ace_killer = objNull; - publicVariable "KPLIB_ace_killer"; - }; - }; // Failsafe if something gets killed before the save manager is finished if (isNil "infantry_weight") then {infantry_weight = 33}; @@ -158,11 +143,19 @@ if (isServer) then { }; }; }; -} else { - // Get Killer and send it to server, when ACE enabled, via lastDamageSource - if (KPLIB_ace && local _unit) then { - if (KPLIB_kill_debug > 0) then {[format ["_unit is local to: %1", debug_source], "KILL"] remoteExecCall ["KPLIB_fnc_log", 2];}; - KPLIB_ace_killer = _unit getVariable ["ace_medical_lastDamageSource", _killer]; - publicVariable "KPLIB_ace_killer"; + + // Body/wreck cleanup + + if (!isplayer _unit) then { + [{ + params ["_unit"]; + hideBody _unit; + [{ + params ["_unit"]; + deleteVehicle _unit; + }, [_unit], 10] call CBA_fnc_waitAndExecute; + + + }, [_unit], GRLIB_cleanup_delay] call CBA_fnc_waitAndExecute; }; -}; + From d90dd1874d07ac9973038d927c3f994171b6e4ba Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Sat, 14 Oct 2023 17:25:49 -0400 Subject: [PATCH 081/115] fix formatting --- Missionframework/functions/fn_createManagedUnit.sqf | 3 +-- Missionframework/functions/fn_handlePlacedZeusObject.sqf | 8 ++++---- Missionframework/functions/fn_spawnVehicle.sqf | 8 ++++---- Missionframework/scripts/client/build/do_build.sqf | 8 ++++---- Missionframework/scripts/server/battlegroup/spawn_air.sqf | 8 ++++---- Missionframework/scripts/server/game/save_manager.sqf | 4 ++-- .../scripts/server/patrols/send_paratroopers.sqf | 8 ++++---- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Missionframework/functions/fn_createManagedUnit.sqf b/Missionframework/functions/fn_createManagedUnit.sqf index cf9464e5a..2ac602127 100644 --- a/Missionframework/functions/fn_createManagedUnit.sqf +++ b/Missionframework/functions/fn_createManagedUnit.sqf @@ -35,8 +35,7 @@ isNil { _unit = _groupTemp createUnit [_type, _spawnPos, [], _placement, "FORM"]; _unit addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; diff --git a/Missionframework/functions/fn_handlePlacedZeusObject.sqf b/Missionframework/functions/fn_handlePlacedZeusObject.sqf index 5417219c1..cf7156780 100644 --- a/Missionframework/functions/fn_handlePlacedZeusObject.sqf +++ b/Missionframework/functions/fn_handlePlacedZeusObject.sqf @@ -33,8 +33,8 @@ if (_vehicle) then { // Add kill manager and object init to possible crew units { _x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; [_x] call KPLIB_fnc_addObjectInit; @@ -44,8 +44,8 @@ if (_vehicle) then { // Apply kill manager, if it's not a crate if !(_crate) then { _obj addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; } else { diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index c448299eb..c2c60b410 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -85,16 +85,16 @@ if (_classname in KPLIB_o_militiaVehicles) then { _crew joinSilent _grp; sleep 0.1; {_x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }];} forEach _crew; }; // Add MPKilled and GetIn EHs and enable damage again _newvehicle addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; sleep 0.1; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 00ae7a6e6..237936644 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -333,13 +333,13 @@ while { true } do { if(buildtype != 6) then { _vehicle addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; { _x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; } foreach (crew _vehicle); }; diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index d6504b050..96f550783 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -19,14 +19,14 @@ for "_i" from 1 to _planes_number do { createVehicleCrew _plane; _plane flyInHeight (120 + (random 180)); _plane addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; [_plane] call KPLIB_fnc_addObjectInit; {_x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }];} forEach (crew _plane); (crew _plane) joinSilent _grp; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index d3e14814f..9cdaaa6d3 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -357,8 +357,8 @@ if (!isNil "_saveData") then { // Apply kill manager handling, if not excluded if !((toLower _class) in _noKillHandler) then { _object addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; }; diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index 98ccfdc39..87654bd35 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -27,13 +27,13 @@ if (isNull _chopper_type) then { (crew _newvehicle) joinSilent _pilot_group; _newvehicle addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; {_x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }];} forEach (crew _newvehicle); } else { From 14e91b3d66394d8b2cdc91b8ade0ccff3d82023a Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Sat, 14 Oct 2023 17:34:17 -0400 Subject: [PATCH 082/115] change logic of cleanup --- Missionframework/scripts/shared/kill_manager.sqf | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 7e5bf9381..12eeccf7a 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -144,18 +144,14 @@ params ["_unit", "_killer"]; }; }; - // Body/wreck cleanup + // Body/wreck cleanup - if (!isplayer _unit) then { - [{ - params ["_unit"]; - hideBody _unit; + if (!isPlayer _unit) then { [{ params ["_unit"]; + if (_unit isKindOf "CAManBase") exitwith { + hideBody _unit; + } deleteVehicle _unit; - }, [_unit], 10] call CBA_fnc_waitAndExecute; - - - }, [_unit], GRLIB_cleanup_delay] call CBA_fnc_waitAndExecute; + }, [_unit], GRLIB_cleanup_delay] call CBA_fnc_waitAndExecute; }; - From 92ba009d4b89d913e25c2cc592f0d3fb5d297601 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Fri, 20 Oct 2023 19:17:38 -0400 Subject: [PATCH 083/115] fix missing ; and missing param Default corpse and wreck cleanup 20 minutes --- Missionframework/KPLIB_config.sqf | 3 +++ Missionframework/scripts/shared/kill_manager.sqf | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 50a0ea766..009636e26 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -360,3 +360,6 @@ KPLIB_surrender_chance = 80; KPLIB_battlegroup_clearance = [ "song_bin_tanh" ]; + +// Delay after death for wrecks and corpses to be deleted +KPLIB_cleanup_delay = 1200; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 12eeccf7a..e580212cb 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -151,7 +151,7 @@ params ["_unit", "_killer"]; params ["_unit"]; if (_unit isKindOf "CAManBase") exitwith { hideBody _unit; - } + }; deleteVehicle _unit; - }, [_unit], GRLIB_cleanup_delay] call CBA_fnc_waitAndExecute; + }, [_unit], KPLIB_cleanup_delay] call CBA_fnc_waitAndExecute; }; From 3a572cb7fb35b713da5af2cc0d7b7db9ae1076b2 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Sat, 21 Oct 2023 12:11:58 -0400 Subject: [PATCH 084/115] Initial Commit Fixed infantry battlegroups to not "lose" members, enable lambs reinforcements on them, change "reset" listener to server event --- Missionframework/CfgFunctions.hpp | 1 + .../fn_LAMBS_enableReinforcements.sqf | 27 ++++++++ .../scripts/server/ai/battlegroup_ai.sqf | 61 +++++++------------ .../server/battlegroup/spawn_battlegroup.sqf | 20 +++--- .../scripts/server/init_server.sqf | 8 +++ .../sector_liberated_remote_call.sqf | 2 +- .../server/sector/attack_in_progress_fob.sqf | 2 +- .../sector/attack_in_progress_sector.sqf | 2 +- 8 files changed, 70 insertions(+), 53 deletions(-) create mode 100644 Missionframework/functions/fn_LAMBS_enableReinforcements.sqf diff --git a/Missionframework/CfgFunctions.hpp b/Missionframework/CfgFunctions.hpp index 546eab183..2749daa07 100644 --- a/Missionframework/CfgFunctions.hpp +++ b/Missionframework/CfgFunctions.hpp @@ -65,6 +65,7 @@ class KPLIB { class isCapitalActive {}; class isClassUAV {}; class isRadio {}; + class lambs_enableReinforcements{}; class log {}; class potatoScan {}; class protectObject {}; diff --git a/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf b/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf new file mode 100644 index 000000000..330861ff6 --- /dev/null +++ b/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf @@ -0,0 +1,27 @@ +/* + File: fn_LAMBS_enableReinforcements.sqf + Author: Jenna + Date: 2023-10-21 + Last Update: 2023-10-21 + License: MIT License - http://www.opensource.org/licenses/MIT + + Description: + Enables LAMBS reinforcements + radio on a given group + + Parameter(s): + _grp - Group to enable features on [Group, defaults to grpNull] + + Returns: + Nothing +*/ + +params [ + ["_grp", grpNull, [grpNull]] +]; + +if (isNull _grp) exitwith { + ["Attempted to set LAMBS Reinforcements on null group.", "ERROR"] remoteExecCall ["KPLIB_fnc_log", 2]; +}; + +(leader _grp) setVariable ["lambs_danger_dangerRadio", true,true]; +_grp setVariable ["lambs_danger_enableGroupReinforce", true, true]; diff --git a/Missionframework/scripts/server/ai/battlegroup_ai.sqf b/Missionframework/scripts/server/ai/battlegroup_ai.sqf index ef4fef587..9f56c10ca 100644 --- a/Missionframework/scripts/server/ai/battlegroup_ai.sqf +++ b/Missionframework/scripts/server/ai/battlegroup_ai.sqf @@ -3,9 +3,6 @@ params [ ]; if (isNull _grp) exitWith {}; -if (isNil "reset_battlegroups_ai") then {reset_battlegroups_ai = false}; - -sleep (5 + (random 5)); private _objPos = [getPos (leader _grp)] call KPLIB_fnc_getNearestBluforObjective; @@ -13,41 +10,25 @@ private _objPos = [getPos (leader _grp)] call KPLIB_fnc_getNearestBluforObjectiv private _startpos = getPos (leader _grp); + private _waypoint = []; -while {((getPos (leader _grp)) distance _startpos) < 100} do { - - while {!((waypoints _grp) isEqualTo [])} do {deleteWaypoint ((waypoints _grp) select 0);}; - {_x doFollow leader _grp} forEach units _grp; - - _startpos = getPos (leader _grp); - - _waypoint = _grp addWaypoint [_objPos, 100]; - _waypoint setWaypointType "MOVE"; - _waypoint setWaypointSpeed "NORMAL"; - _waypoint setWaypointBehaviour "AWARE"; - _waypoint setWaypointCombatMode "YELLOW"; - _waypoint setWaypointCompletionRadius 30; - - _waypoint = _grp addWaypoint [_objPos, 100]; - _waypoint setWaypointType "SAD"; - _waypoint = _grp addWaypoint [_objPos, 100]; - _waypoint setWaypointType "SAD"; - _waypoint = _grp addWaypoint [_objPos, 100]; - _waypoint setWaypointType "SAD"; - _waypoint = _grp addWaypoint [_objPos, 100]; - _waypoint setWaypointType "CYCLE"; - - sleep 90; -}; - -waitUntil { - sleep 5; - (((units _grp) select {alive _x}) isEqualTo []) || reset_battlegroups_ai -}; - -sleep (5 + (random 5)); -reset_battlegroups_ai = false; - -if (!((units _grp) isEqualTo []) && (KPLIB_endgame == 0)) then { - [_grp] spawn battlegroup_ai; -}; +{ deleteWaypoint _x } forEachReversed waypoints _grp; +{_x doFollow leader _grp} forEach units _grp; + +_startpos = getPos (leader _grp); + +_waypoint = _grp addWaypoint [_objPos, 100]; +_waypoint setWaypointType "MOVE"; +_waypoint setWaypointSpeed "NORMAL"; +_waypoint setWaypointBehaviour "AWARE"; +_waypoint setWaypointCombatMode "YELLOW"; +_waypoint setWaypointCompletionRadius 30; + +_waypoint = _grp addWaypoint [_objPos, 100]; +_waypoint setWaypointType "SAD"; +_waypoint = _grp addWaypoint [_objPos, 100]; +_waypoint setWaypointType "SAD"; +_waypoint = _grp addWaypoint [_objPos, 100]; +_waypoint setWaypointType "SAD"; +_waypoint = _grp addWaypoint [_objPos, 100]; +_waypoint setWaypointType "CYCLE"; diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index c4e2ef9d5..4ae2912be 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -28,18 +28,18 @@ if !(_spawn_marker isEqualTo "") then { // Adjust target size for infantry _target_size = 12 max (_target_size * 4); + private _squadNumber = round (_target_size/8); + for "_i" from 1 to _squadNumber do { // Create infantry groups with up to 8 units per squad - private _grp = createGroup [KPLIB_side_enemy, true]; - for "_i" from 0 to (_target_size - 1) do { - if (_i > 0 && {(_i % 8) isEqualTo 0}) then { - _bg_groups pushBack _grp; - _grp = createGroup [KPLIB_side_enemy, true]; - }; + private _grp = createGroup [kplib_side_enemy, true]; + for "_i" from 0 to 7 do { [selectRandom _infClasses, markerPos _spawn_marker, _grp] call KPLIB_fnc_createManagedUnit; }; - [_grp] spawn battlegroup_ai; - _bg_groups pushBack _grp; + [_grp] call KPLIB_fnc_LAMBS_enableReinforcements; + [_grp] call battlegroup_ai; + _grp setVariable ["KPLIB_isBattleGroup",true]; + }; } else { private _vehicle_pool = [KPLIB_o_battleGrpVehicles, KPLIB_o_battleGrpVehiclesLight] select (KPLIB_enemyReadiness < 50); @@ -55,8 +55,8 @@ if !(_spawn_marker isEqualTo "") then { sleep 0.5; (crew _vehicle) joinSilent _nextgrp; - [_nextgrp] spawn battlegroup_ai; - _bg_groups pushback _nextgrp; + [_nextgrp] call battlegroup_ai; + _nextgrp setVariable ["KPLIB_isBattleGroup",true]; if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup)) then { if (_vehicle isKindOf "Air") then { diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index b4644d92d..f03c8d65f 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -126,3 +126,11 @@ execVM "scripts\server\offloading\group_diag.sqf"; if (KPLIB_param_restart > 0) then { execVM "scripts\server\game\server_restart.sqf"; }; + +["KPLIB_ResetBattleGroups", { + { + if (_x getVariable ["KPLIB_isBattleGroup",false]) then { + [_x] call battlegroup_ai; + } + } foreach allGroups; +}] call CBA_fnc_addEventHandler; diff --git a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf index 1996640e6..d3ebaf38d 100644 --- a/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf +++ b/Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf @@ -17,7 +17,7 @@ stats_readiness_earned = stats_readiness_earned + _KPLIB_enemyReadiness_increase KPLIB_sectors_player pushback _liberated_sector; publicVariable "KPLIB_sectors_player"; stats_sectors_liberated = stats_sectors_liberated + 1; -reset_battlegroups_ai = true; publicVariable "reset_battlegroups_ai"; +["KPLIB_ResetBattleGroups"] call CBA_fnc_serverEvent; if (_liberated_sector in KPLIB_sectors_factory) then { { diff --git a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf index e0485c6aa..72bc4f80a 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_fob.sqf @@ -49,7 +49,7 @@ if ( KPLIB_endgame == 0 ) then { sleep 3; KPLIB_sectors_fob = KPLIB_sectors_fob - [_thispos]; publicVariable "KPLIB_sectors_fob"; - reset_battlegroups_ai = true; + ["KPLIB_ResetBattleGroups"] call CBA_fnc_serverEvent; [_thispos] call KPLIB_fnc_destroyFob; [] spawn KPLIB_fnc_doSave; stats_fobs_lost = stats_fobs_lost + 1; diff --git a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf index 1a158bc2d..f10d2b254 100644 --- a/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf +++ b/Missionframework/scripts/server/sector/attack_in_progress_sector.sqf @@ -50,7 +50,7 @@ if ( KPLIB_endgame == 0 ) then { KPLIB_sectors_player = KPLIB_sectors_player - [ _sector ]; publicVariable "KPLIB_sectors_player"; [_sector, 2] remoteExec ["remote_call_sector"]; - reset_battlegroups_ai = true; + ["KPLIB_ResetBattleGroups"] call CBA_fnc_serverEvent; [] spawn KPLIB_fnc_doSave; stats_sectors_lost = stats_sectors_lost + 1; { From a2fa9c4d92b202d8edcbe5c3bd995e4d18c53e6c Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Sat, 21 Oct 2023 12:33:11 -0400 Subject: [PATCH 085/115] docblocked --- Missionframework/kp_liberation_config.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Missionframework/kp_liberation_config.sqf b/Missionframework/kp_liberation_config.sqf index 3496d9b15..83d7ec016 100644 --- a/Missionframework/kp_liberation_config.sqf +++ b/Missionframework/kp_liberation_config.sqf @@ -2,6 +2,8 @@ CONFIG FILE FOR KP LIBERATION https://github.com/KillahPotatoes/KP-Liberation */ + +// Fill magazines on loading loadout? KP_liberation_fill_mags = true; // Vehicle classnames which also function as ACE medical vehicles. From d09f767eb65dcf54a784a51481ddc5bfe83c7e32 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:37:38 -0400 Subject: [PATCH 086/115] caught more MPKilled's, killed them also updated docs --- Missionframework/functions/fn_spawnVehicle.sqf | 2 +- Missionframework/init.sqf | 8 -------- Missionframework/scripts/client/build/do_build.sqf | 6 +++--- Missionframework/scripts/client/init_client.sqf | 5 ++++- Missionframework/scripts/server/init_server.sqf | 9 +++++++++ .../server/patrols/manage_one_civilian_patrol.sqf | 2 +- .../scripts/server/secondary/search_and_rescue.sqf | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index c2c60b410..b192da43a 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -91,7 +91,7 @@ if (_classname in KPLIB_o_militiaVehicles) then { }];} forEach _crew; }; -// Add MPKilled and GetIn EHs and enable damage again +// Add Killed and GetIn EHs and enable damage again _newvehicle addEventHandler ["Killed", { params ["_unit", "_killer", "_instigator", "_useEffects"]; diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index b45b1971e..21a2da89b 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -60,14 +60,6 @@ if ((isNil {player getVariable "bis_revive_ehHandleHeal"} || isDedicated) && !(b [] call bis_fnc_reviveInit; }; -["KPLib_manageKills", -{ - params ["_unit","_killer"]; - [_unit,_killer] call kill_manager; -} -] call CBA_fnc_addEventHandler; - - KPLIB_init = true; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 237936644..003f611f0 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -51,7 +51,7 @@ while { true } do { if ( manned ) then { _grp = createGroup KPLIB_side_player; }; - _classname createUnit [_pos, _grp,"this addMPEventHandler [""MPKilled"", {_this spawn kill_manager}]", 0.5, "private"]; + _classname createUnit [_pos, _grp,"this addEventHandler [""Killed"", {[""KPLIB_manageKills"", _this] call CBA_fnc_serverEvent;}]", 0.5, "private"]; build_confirmed = 0; } else { if ( buildtype == 8 ) then { @@ -64,9 +64,9 @@ while { true } do { if(_idx == 0) then { _unitrank = "sergeant"; }; if(_idx == 1) then { _unitrank = "corporal"; }; if (_classname isEqualTo KPLIB_b_squadPara) then { - _x createUnit [_pos, _grp,"this addMPEventHandler [""MPKilled"", {_this spawn kill_manager}]; removeBackpackGlobal this; this addBackpackGlobal ""B_parachute""", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addEventHandler [""Killed"", {[""KPLIB_manageKills"", _this] call CBA_fnc_serverEvent;}]; removeBackpackGlobal this; this addBackpackGlobal ""B_parachute""", 0.5, _unitrank]; } else { - _x createUnit [_pos, _grp,"this addMPEventHandler [""MPKilled"", {_this spawn kill_manager}];", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addEventHandler [""Killed"", {[""KPLIB_manageKills"", _this] call CBA_fnc_serverEvent;}];", 0.5, _unitrank]; }; _idx = _idx + 1; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index adb30622f..1fc50a7aa 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -34,7 +34,10 @@ execVM "scripts\client\ui\ui_manager.sqf"; execVM "scripts\client\ui\tutorial_manager.sqf"; execVM "scripts\client\markers\update_production_sites.sqf"; -player addMPEventHandler ["MPKilled", {_this spawn kill_manager;}]; +player addEventHandler ["Killed", { + params ["_unit", "_killer", "_instigator", "_useEffects"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; player addEventHandler ["GetInMan", {[_this select 2] spawn kp_fuel_consumption;}]; player addEventHandler ["GetInMan", {[_this select 2] call KPLIB_fnc_setVehiclesSeized;}]; player addEventHandler ["GetInMan", {[_this select 2] call KPLIB_fnc_setVehicleCaptured;}]; diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index b4644d92d..da5ff35cf 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -116,6 +116,15 @@ execVM "scripts\server\asymmetric\init_module.sqf"; // Groupcheck for deletion when empty execVM "scripts\server\offloading\group_diag.sqf"; +// Server event(s) +["KPLib_manageKills", +{ + params ["_unit","_killer"]; + [_unit,_killer] call kill_manager; +} +] call CBA_fnc_addEventHandler; + + { if ((_x != player) && (_x distance (markerPos KPLIB_respawn_marker) < 200 )) then { deleteVehicle _x; diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index 414354d97..63448e7c7 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -42,7 +42,7 @@ while { KPLIB_endgame == 0 } do { [selectRandom KPLIB_c_units, _spawnpos, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; _civveh = (selectRandom KPLIB_c_vehicles) createVehicle _spawnpos; _civveh setpos _spawnpos; - _civveh addMPEventHandler ['MPKilled', {_this spawn kill_manager}]; + _civveh addEventHandler ["Killed", {["KPLIB_manageKills", _this] call CBA_fnc_serverEvent;}]; _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_player ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; ((units _grp) select 0) moveInDriver _civveh; ((units _grp) select 0) disableAI "FSM"; diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index 9964d31ac..9e072be1a 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -76,7 +76,7 @@ if ( KPLIB_enemyReadiness < 50 ) then { private _vehtospawn = []; private _spawnchances = [75,50,15]; {if (random 100 < _x) then {_vehtospawn pushBack (selectRandom _vehicle_pool);};} foreach _spawnchances; -{([(getpos _helowreck) getPos [30 + (random 30), random 360], _x, true] call KPLIB_fnc_spawnVehicle) addMPEventHandler ['MPKilled', {_this spawn kill_manager}]; } foreach _vehtospawn; +{([(getpos _helowreck) getPos [30 + (random 30), random 360], _x, true] call KPLIB_fnc_spawnVehicle) addEventHandler ["Killed", {["KPLIB_manageKills", _this] call CBA_fnc_serverEvent;}]; } foreach _vehtospawn; secondary_objective_position = getpos _helowreck; secondary_objective_position_marker = secondary_objective_position getPos [800, random 360]; From 677e127a37ea2eeb078c0ede4bd7e9c22d5dc369 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:23:38 -0400 Subject: [PATCH 087/115] fixed spawnvehicle, which was breaking spawn battlegroup spawn returns a script handle, not a vehicle, meaning vehicle battlegroups lose track of their spawned vehicles --- Missionframework/functions/fn_spawnVehicle.sqf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index e572ebfd1..e1273a6cf 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -27,7 +27,7 @@ params [ if (_pos isEqualTo [0, 0, 0]) exitWith {["No or zero pos given"] call BIS_fnc_error; objNull}; if (_classname isEqualTo "") exitWith {["Empty string given"] call BIS_fnc_error; objNull}; -if (!canSuspend) exitWith {_this spawn KPLIB_fnc_spawnVehicle}; + private _newvehicle = objNull; private _spawnpos = []; @@ -41,7 +41,7 @@ if (_precise) then { while {_spawnPos isEqualTo []} do { _i = _i + 1; _spawnpos = (_pos getPos [random 150, random 360]) findEmptyPosition [10, 100, _classname]; - if (_i isEqualTo 10) exitWith {}; + if (_i isEqualTo 10) exitWith {_spawnPos = zeroPos}; }; }; @@ -83,13 +83,11 @@ if (_classname in KPLIB_o_militiaVehicles) then { private _grp = createGroup [KPLIB_side_enemy, true]; private _crew = units (createVehicleCrew _newvehicle); _crew joinSilent _grp; - sleep 0.1; {_x addMPEventHandler ["MPKilled", {_this spawn kill_manager}];} forEach _crew; }; // Add MPKilled and GetIn EHs and enable damage again _newvehicle addMPEventHandler ["MPKilled", {_this spawn kill_manager}]; -sleep 0.1; _newvehicle allowDamage true; _newvehicle setDamage 0; From 6de426bab00537a4ee71ba0191a169dd983db27e Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 15:30:55 +0200 Subject: [PATCH 088/115] Build tool - update package-lock.json --- _tools/package-lock.json | 6283 +++++++++++++++++++++++++++++++++++++- 1 file changed, 6269 insertions(+), 14 deletions(-) diff --git a/_tools/package-lock.json b/_tools/package-lock.json index 63cc8bbb1..34b6754f1 100644 --- a/_tools/package-lock.json +++ b/_tools/package-lock.json @@ -1,7 +1,6262 @@ { "name": "kp_liberation", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "name": "kp_liberation", + "dependencies": { + "@types/del": "^3.0.1", + "@types/gulp": "^4.0.6", + "@types/gulp-replace": "0.0.31", + "@types/gulp-zip": "^4.0.0", + "@types/vinyl-paths": "0.0.31", + "del": "^3.0.0", + "gulp": "^4.0.2", + "gulp-armapbo": "^1.1.3", + "gulp-modify-file": "^1.0.1", + "gulp-replace": "^0.6.1", + "gulp-zip": "^4.2.0", + "smart-zip": "0.0.9", + "ts-node": "^4.1.0", + "typescript": "^2.9.2", + "vinyl-paths": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@types/del": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/del/-/del-3.0.1.tgz", + "integrity": "sha512-y6qRq6raBuu965clKgx6FHuiPu3oHdtmzMPXi8Uahsjdq1L6DL5fS/aY5/s71YwM7k6K1QIWvem5vNwlnNGIkQ==", + "dependencies": { + "@types/glob": "*" + } + }, + "node_modules/@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==" + }, + "node_modules/@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "dependencies": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/glob-stream": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-6.1.0.tgz", + "integrity": "sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==", + "dependencies": { + "@types/glob": "*", + "@types/node": "*" + } + }, + "node_modules/@types/gulp": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.6.tgz", + "integrity": "sha512-0E8/iV/7FKWyQWSmi7jnUvgXXgaw+pfAzEB06Xu+l0iXVJppLbpOye5z7E2klw5akXd+8kPtYuk65YBcZPM4ow==", + "dependencies": { + "@types/undertaker": "*", + "@types/vinyl-fs": "*", + "chokidar": "^2.1.2" + } + }, + "node_modules/@types/gulp-replace": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/@types/gulp-replace/-/gulp-replace-0.0.31.tgz", + "integrity": "sha512-dbgQ1u0N9ShXrzahBgQfMSu6qUh8nlTLt7whhQ0S0sEUHhV3scysppJ1UX0fl53PJENgAL99ueykddyrCaDt7g==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/gulp-zip": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/gulp-zip/-/gulp-zip-4.0.0.tgz", + "integrity": "sha512-fhCJBeogdaEEj1+J1r46EQUsiSToPA8A2E9fRLua9hCu3AIGJ3Rf0Yayl7ssnsIW6t2vmMgQLW6TWCakGkVfHw==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" + }, + "node_modules/@types/node": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.4.1.tgz", + "integrity": "sha512-9ESUxmXt1Isc1xKfDBZ7tpULyTPY5ZCywcfvQTXoLUqP+n4D+MBH+0n75hdzrcmfCc3eWByOi27+GLmMuAvcUA==" + }, + "node_modules/@types/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=" + }, + "node_modules/@types/strip-json-comments": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz", + "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==" + }, + "node_modules/@types/undertaker": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.2.tgz", + "integrity": "sha512-j4iepCSuY2JGW/hShVtUBagic0klYNFIXP7VweavnYnNC2EjiKxJFeaS9uaJmAT0ty9sQSqTS1aagWMZMV0HyA==", + "dependencies": { + "@types/undertaker-registry": "*" + } + }, + "node_modules/@types/undertaker-registry": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz", + "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==" + }, + "node_modules/@types/vinyl": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.3.tgz", + "integrity": "sha512-hrT6xg16CWSmndZqOTJ6BGIn2abKyTw0B58bI+7ioUoj3Sma6u8ftZ1DTI2yCaJamOVGLOnQWiPH3a74+EaqTA==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/vinyl-fs": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-2.4.11.tgz", + "integrity": "sha512-2OzQSfIr9CqqWMGqmcERE6Hnd2KY3eBVtFaulVo3sJghplUcaeMdL9ZjEiljcQQeHjheWY9RlNmumjIAvsBNaA==", + "dependencies": { + "@types/glob-stream": "*", + "@types/node": "*", + "@types/vinyl": "*" + } + }, + "node_modules/@types/vinyl-paths": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/@types/vinyl-paths/-/vinyl-paths-0.0.31.tgz", + "integrity": "sha512-sw1o+DVXwEuPN4YsirTYTSmtuTDeoyJU217CZ4EuJkerdo7h6lacj7wGUA6mQNl0YgYmu+pTM1FrusLhWlELWg==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/ansi-colors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", + "dependencies": { + "ansi-wrap": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ansi-cyan": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", + "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=", + "dependencies": { + "ansi-wrap": "0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "dependencies": { + "ansi-wrap": "0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ansi-red": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", + "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=", + "dependencies": { + "ansi-wrap": "0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dependencies": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "node_modules/anymatch/node_modules/normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dependencies": { + "remove-trailing-separator": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/append-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz", + "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=", + "dependencies": { + "buffer-equal": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" + }, + "node_modules/arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/arr-filter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz", + "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", + "dependencies": { + "make-iterator": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/arr-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz", + "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", + "dependencies": { + "make-iterator": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-initial": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", + "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", + "dependencies": { + "array-slice": "^1.0.0", + "is-number": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-initial/node_modules/is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-last": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz", + "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", + "dependencies": { + "is-number": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-last/node_modules/is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-slice": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", + "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-sort": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz", + "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==", + "dependencies": { + "default-compare": "^1.0.0", + "get-value": "^2.0.6", + "kind-of": "^5.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-sort/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dependencies": { + "array-uniq": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/async-done": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz", + "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.2", + "process-nextick-args": "^2.0.0", + "stream-exhaust": "^1.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/async-each": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" + }, + "node_modules/async-settle": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", + "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", + "dependencies": { + "async-done": "^1.2.2" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/atob": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", + "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=", + "bin": { + "atob": "bin/atob.js" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/bach": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz", + "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", + "dependencies": { + "arr-filter": "^1.1.1", + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "array-each": "^1.0.0", + "array-initial": "^1.0.0", + "array-last": "^1.1.1", + "async-done": "^1.2.2", + "async-settle": "^1.0.0", + "now-and-later": "^2.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "node_modules/base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dependencies": { + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/binary": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", + "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=", + "dependencies": { + "buffers": "~0.1.1", + "chainsaw": "~0.1.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/binaryextensions": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz", + "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=" + }, + "node_modules/brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz", + "integrity": "sha512-P4O8UQRdGiMLWSizsApmXVQDBS6KCt7dSexgLKBmH5Hr1CZq7vsnscFh8oR1sP1ab1Zj0uCHCEzZeV6SfUf3rA==", + "dependencies": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", + "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + }, + "node_modules/buffers": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", + "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", + "engines": { + "node": ">=0.2.0" + } + }, + "node_modules/cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dependencies": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/chainsaw": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", + "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=", + "dependencies": { + "traverse": ">=0.3.0 <0.4" + }, + "engines": { + "node": "*" + } + }, + "node_modules/chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dependencies": { + "ansi-styles": "^3.1.0", + "escape-string-regexp": "^1.0.5", + "supports-color": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chokidar": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", + "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", + "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies", + "dependencies": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + }, + "optionalDependencies": { + "fsevents": "^1.2.7" + } + }, + "node_modules/chokidar/node_modules/braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dependencies": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dependencies": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dependencies": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + } + }, + "node_modules/clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/clone-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", + "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + }, + "node_modules/cloneable-readable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz", + "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=", + "dependencies": { + "inherits": "^2.0.1", + "process-nextick-args": "^1.0.6", + "through2": "^2.0.1" + } + }, + "node_modules/cloneable-readable/node_modules/process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, + "node_modules/code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/collection-map": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", + "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", + "dependencies": { + "arr-map": "^2.0.2", + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dependencies": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dependencies": { + "color-name": "^1.1.1" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "node_modules/concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "engines": [ + "node >= 0.8" + ], + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/concat-stream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/concat-stream/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/concat-stream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/convert-source-map": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", + "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", + "dependencies": { + "safe-buffer": "~5.1.1" + } + }, + "node_modules/copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/copy-props": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", + "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "dependencies": { + "each-props": "^1.3.0", + "is-plain-object": "^2.0.1" + } + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "node_modules/d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dependencies": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, + "node_modules/dateformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=", + "engines": { + "node": "*" + } + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/default-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", + "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", + "dependencies": { + "kind-of": "^5.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/default-compare/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/default-resolution": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz", + "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "dependencies": { + "clone": "^1.0.2" + } + }, + "node_modules/define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dependencies": { + "object-keys": "^1.0.12" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dependencies": { + "is-descriptor": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/del": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", + "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", + "dependencies": { + "globby": "^6.1.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "p-map": "^1.1.1", + "pify": "^3.0.0", + "rimraf": "^2.2.8" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/del/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "engines": { + "node": ">=4" + } + }, + "node_modules/deprecated": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", + "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=", + "engines": { + "node": ">= 0.9" + } + }, + "node_modules/detect-file": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "dependencies": { + "readable-stream": "~1.1.9" + } + }, + "node_modules/duplexer2/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/duplexify": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "dependencies": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + } + }, + "node_modules/duplexify/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/duplexify/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/duplexify/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/each-props": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz", + "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", + "dependencies": { + "is-plain-object": "^2.0.1", + "object.defaults": "^1.1.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es5-ext": { + "version": "0.10.50", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz", + "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==", + "dependencies": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "^1.0.0" + } + }, + "node_modules/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "node_modules/es6-weak-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dependencies": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "dependencies": { + "homedir-polyfill": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dependencies": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dependencies": { + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "time-stamp": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dependencies": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=" + }, + "node_modules/find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dependencies": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/findup-sync": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", + "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "dependencies": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/findup-sync/node_modules/is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dependencies": { + "is-extglob": "^2.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fined": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", + "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", + "dependencies": { + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/flagged-respawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz", + "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/flush-write-stream": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", + "dependencies": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + } + }, + "node_modules/flush-write-stream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/flush-write-stream/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/flush-write-stream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "dependencies": { + "for-in": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dependencies": { + "map-cache": "^0.2.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fs-mkdirp-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", + "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", + "dependencies": { + "graceful-fs": "^4.1.11", + "through2": "^2.0.3" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "node_modules/fsevents": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", + "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "bundleDependencies": [ + "node-pre-gyp" + ], + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "nan": "^2.12.1", + "node-pre-gyp": "^0.12.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/fsevents/node_modules/abbrev": { + "version": "1.1.1", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/ansi-regex": { + "version": "2.1.1", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/aproba": { + "version": "1.2.0", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/are-we-there-yet": { + "version": "1.1.5", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "inBundle": true, + "optional": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "node_modules/fsevents/node_modules/balanced-match": { + "version": "1.0.0", + "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/brace-expansion": { + "version": "1.1.11", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "inBundle": true, + "optional": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/fsevents/node_modules/chownr": { + "version": "1.1.1", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/code-point-at": { + "version": "1.1.0", + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/concat-map": { + "version": "0.0.1", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/console-control-strings": { + "version": "1.1.0", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/core-util-is": { + "version": "1.0.2", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/debug": { + "version": "4.1.1", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", + "inBundle": true, + "optional": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/fsevents/node_modules/deep-extend": { + "version": "0.6.0", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/fsevents/node_modules/delegates": { + "version": "1.0.0", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/detect-libc": { + "version": "1.0.3", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "inBundle": true, + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/fsevents/node_modules/fs-minipass": { + "version": "1.2.5", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "inBundle": true, + "optional": true, + "dependencies": { + "minipass": "^2.2.1" + } + }, + "node_modules/fsevents/node_modules/fs.realpath": { + "version": "1.0.0", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/gauge": { + "version": "2.7.4", + "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", + "inBundle": true, + "optional": true, + "dependencies": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "node_modules/fsevents/node_modules/glob": { + "version": "7.1.3", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "inBundle": true, + "optional": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/fsevents/node_modules/has-unicode": { + "version": "2.0.1", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/iconv-lite": { + "version": "0.4.24", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "inBundle": true, + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/ignore-walk": { + "version": "3.0.1", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "inBundle": true, + "optional": true, + "dependencies": { + "minimatch": "^3.0.4" + } + }, + "node_modules/fsevents/node_modules/inflight": { + "version": "1.0.6", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "inBundle": true, + "optional": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/fsevents/node_modules/inherits": { + "version": "2.0.3", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/ini": { + "version": "1.3.5", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue", + "inBundle": true, + "optional": true, + "engines": { + "node": "*" + } + }, + "node_modules/fsevents/node_modules/is-fullwidth-code-point": { + "version": "1.0.0", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", + "inBundle": true, + "optional": true, + "dependencies": { + "number-is-nan": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/isarray": { + "version": "1.0.0", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/minimatch": { + "version": "3.0.4", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "inBundle": true, + "optional": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/fsevents/node_modules/minimist": { + "version": "0.0.8", + "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/minipass": { + "version": "2.3.5", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "inBundle": true, + "optional": true, + "dependencies": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "node_modules/fsevents/node_modules/minizlib": { + "version": "1.2.1", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "inBundle": true, + "optional": true, + "dependencies": { + "minipass": "^2.2.1" + } + }, + "node_modules/fsevents/node_modules/mkdirp": { + "version": "0.5.1", + "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", + "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", + "inBundle": true, + "optional": true, + "dependencies": { + "minimist": "0.0.8" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/fsevents/node_modules/ms": { + "version": "2.1.1", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/needle": { + "version": "2.3.0", + "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", + "inBundle": true, + "optional": true, + "dependencies": { + "debug": "^4.1.0", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + }, + "bin": { + "needle": "bin/needle" + }, + "engines": { + "node": ">= 4.4.x" + } + }, + "node_modules/fsevents/node_modules/node-pre-gyp": { + "version": "0.12.0", + "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", + "deprecated": "Please upgrade to @mapbox/node-pre-gyp: the non-scoped node-pre-gyp package is deprecated and only the @mapbox scoped package will recieve updates in the future", + "inBundle": true, + "optional": true, + "dependencies": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/fsevents/node_modules/nopt": { + "version": "4.0.1", + "integrity": "sha512-+5XZFpQZEY0cg5JaxLwGxDlKNKYxuXwGt8/Oi3UXm5/4ymrJve9d2CURituxv3rSrVCGZj4m1U1JlHTdcKt2Ng==", + "inBundle": true, + "optional": true, + "dependencies": { + "abbrev": "1", + "osenv": "^0.1.4" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, + "node_modules/fsevents/node_modules/npm-bundled": { + "version": "1.0.6", + "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/npm-packlist": { + "version": "1.4.1", + "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", + "inBundle": true, + "optional": true, + "dependencies": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, + "node_modules/fsevents/node_modules/npmlog": { + "version": "4.1.2", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "inBundle": true, + "optional": true, + "dependencies": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "node_modules/fsevents/node_modules/number-is-nan": { + "version": "1.0.1", + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/object-assign": { + "version": "4.1.1", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/once": { + "version": "1.4.0", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "inBundle": true, + "optional": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/fsevents/node_modules/os-homedir": { + "version": "1.0.2", + "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/os-tmpdir": { + "version": "1.0.2", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/osenv": { + "version": "0.1.5", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "inBundle": true, + "optional": true, + "dependencies": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "node_modules/fsevents/node_modules/path-is-absolute": { + "version": "1.0.1", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/process-nextick-args": { + "version": "2.0.0", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/rc": { + "version": "1.2.8", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "inBundle": true, + "optional": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/fsevents/node_modules/rc/node_modules/minimist": { + "version": "1.2.0", + "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/readable-stream": { + "version": "2.3.6", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "inBundle": true, + "optional": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/fsevents/node_modules/rimraf": { + "version": "2.6.3", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "inBundle": true, + "optional": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/fsevents/node_modules/safe-buffer": { + "version": "5.1.2", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/safer-buffer": { + "version": "2.1.2", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/sax": { + "version": "1.2.4", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/semver": { + "version": "5.7.0", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "inBundle": true, + "optional": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/fsevents/node_modules/set-blocking": { + "version": "2.0.0", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/signal-exit": { + "version": "3.0.2", + "integrity": "sha512-meQNNykwecVxdu1RlYMKpQx4+wefIYpmxi6gexo/KAbwquJrBUrBmKYJrE8KFkVQAAVWEnwNdu21PgrD77J3xA==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/string_decoder": { + "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "inBundle": true, + "optional": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/fsevents/node_modules/string-width": { + "version": "1.0.2", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "inBundle": true, + "optional": true, + "dependencies": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/strip-ansi": { + "version": "3.0.1", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "inBundle": true, + "optional": true, + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/strip-json-comments": { + "version": "2.0.1", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "inBundle": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fsevents/node_modules/tar": { + "version": "4.4.8", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "inBundle": true, + "optional": true, + "dependencies": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.4", + "minizlib": "^1.1.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + }, + "engines": { + "node": ">=4.5" + } + }, + "node_modules/fsevents/node_modules/util-deprecate": { + "version": "1.0.2", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/wide-align": { + "version": "1.1.3", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "inBundle": true, + "optional": true, + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/fsevents/node_modules/wrappy": { + "version": "1.0.2", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "inBundle": true, + "optional": true + }, + "node_modules/fsevents/node_modules/yallist": { + "version": "3.0.3", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "inBundle": true, + "optional": true + }, + "node_modules/fstream": { + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", + "integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=", + "dependencies": { + "graceful-fs": "~3.0.2", + "inherits": "~2.0.0", + "mkdirp": "0.5", + "rimraf": "2" + }, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/fstream/node_modules/graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js", + "dependencies": { + "natives": "^1.1.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "dependencies": { + "globule": "~0.1.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "node_modules/get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "engines": { + "node": ">=4" + } + }, + "node_modules/get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dependencies": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + } + }, + "node_modules/glob-parent/node_modules/is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dependencies": { + "is-extglob": "^2.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/glob-stream": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", + "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", + "dependencies": { + "extend": "^3.0.0", + "glob": "^7.1.1", + "glob-parent": "^3.1.0", + "is-negated-glob": "^1.0.0", + "ordered-read-streams": "^1.0.0", + "pumpify": "^1.3.5", + "readable-stream": "^2.1.5", + "remove-trailing-separator": "^1.0.1", + "to-absolute-glob": "^2.0.0", + "unique-stream": "^2.0.2" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/glob-stream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/glob-stream/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/glob-stream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/glob-watcher": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz", + "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==", + "dependencies": { + "anymatch": "^2.0.0", + "async-done": "^1.2.0", + "chokidar": "^2.0.0", + "is-negated-glob": "^1.0.0", + "just-debounce": "^1.0.0", + "object.defaults": "^1.1.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "dependencies": { + "find-index": "^0.1.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dependencies": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/global-prefix": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", + "dependencies": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dependencies": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/globby/node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/globule": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "dependencies": { + "glob": "~3.1.21", + "lodash": "~1.0.1", + "minimatch": "~0.2.11" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/globule/node_modules/glob": { + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "dependencies": { + "graceful-fs": "~1.2.0", + "inherits": "1", + "minimatch": "~0.2.11" + }, + "engines": { + "node": "*" + } + }, + "node_modules/globule/node_modules/graceful-fs": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", + "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=", + "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/globule/node_modules/inherits": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", + "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" + }, + "node_modules/globule/node_modules/lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=", + "engines": [ + "node", + "rhino" + ] + }, + "node_modules/globule/node_modules/minimatch": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue", + "dependencies": { + "lru-cache": "2", + "sigmund": "~1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/glogg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", + "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", + "dependencies": { + "sparkles": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==" + }, + "node_modules/gulp": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", + "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==", + "dependencies": { + "glob-watcher": "^5.0.3", + "gulp-cli": "^2.2.0", + "undertaker": "^1.2.1", + "vinyl-fs": "^3.0.0" + }, + "bin": { + "gulp": "bin/gulp.js" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp-armapbo": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gulp-armapbo/-/gulp-armapbo-1.1.3.tgz", + "integrity": "sha512-ZqbCDYU8sTBvp/JlSjSk8lhRXLUMpBYR7ZX2eerbQqsk/fd66nlwjrsL9SVgukISuClEFQv4BBmaokhAZq1LwA==", + "dependencies": { + "chalk": "^2.3.0", + "gulp-util": "^3.0.8", + "minimatch": "^3.0.4", + "single-line-log": "^1.1.2", + "vinyl": "^2.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/gulp-armapbo/node_modules/clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/gulp-armapbo/node_modules/clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=" + }, + "node_modules/gulp-armapbo/node_modules/replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp-armapbo/node_modules/vinyl": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", + "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", + "dependencies": { + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp-modify-file": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gulp-modify-file/-/gulp-modify-file-1.0.1.tgz", + "integrity": "sha512-toUFzkLlnz/CGLplG/+vl6zMT7U0ldbS6b6lT/aQ2u243wa4udMQwSPGPRAEdwaIbqZo34lqu4XRdPPx5iPCSQ==", + "dependencies": { + "gulp": "3.9.1", + "through2": "2.0.3" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/gulp-modify-file/node_modules/ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-modify-file/node_modules/chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dependencies": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-modify-file/node_modules/clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "engines": { + "node": "*" + } + }, + "node_modules/gulp-modify-file/node_modules/glob": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "dependencies": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^2.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/gulp-modify-file/node_modules/glob-stream": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "dependencies": { + "glob": "^4.3.1", + "glob2base": "^0.0.12", + "minimatch": "^2.0.1", + "ordered-read-streams": "^0.1.0", + "through2": "^0.6.1", + "unique-stream": "^1.0.0" + }, + "engines": { + "node": ">= 0.9" + } + }, + "node_modules/gulp-modify-file/node_modules/glob-stream/node_modules/through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dependencies": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + }, + "node_modules/gulp-modify-file/node_modules/glob-watcher": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", + "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "dependencies": { + "gaze": "^0.5.1" + }, + "engines": { + "node": ">= 0.9" + } + }, + "node_modules/gulp-modify-file/node_modules/graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js", + "dependencies": { + "natives": "^1.1.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/gulp-modify-file/node_modules/gulp": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", + "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", + "dependencies": { + "archy": "^1.0.0", + "chalk": "^1.0.0", + "deprecated": "^0.0.1", + "gulp-util": "^3.0.0", + "interpret": "^1.0.0", + "liftoff": "^2.1.0", + "minimist": "^1.1.0", + "orchestrator": "^0.3.0", + "pretty-hrtime": "^1.0.0", + "semver": "^4.1.0", + "tildify": "^1.0.0", + "v8flags": "^2.0.2", + "vinyl-fs": "^0.3.0" + }, + "bin": { + "gulp": "bin/gulp.js" + }, + "engines": { + "node": ">= 0.9" + } + }, + "node_modules/gulp-modify-file/node_modules/minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue", + "dependencies": { + "brace-expansion": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/gulp-modify-file/node_modules/minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "node_modules/gulp-modify-file/node_modules/ordered-read-streams": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", + "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=" + }, + "node_modules/gulp-modify-file/node_modules/semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/gulp-modify-file/node_modules/strip-bom": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", + "dependencies": { + "first-chunk-stream": "^1.0.0", + "is-utf8": "^0.2.0" + }, + "bin": { + "strip-bom": "cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-modify-file/node_modules/supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/gulp-modify-file/node_modules/unique-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", + "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=" + }, + "node_modules/gulp-modify-file/node_modules/v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "dependencies": { + "user-home": "^1.1.1" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/gulp-modify-file/node_modules/vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dependencies": { + "clone": "^0.2.0", + "clone-stats": "^0.0.1" + }, + "engines": { + "node": ">= 0.9" + } + }, + "node_modules/gulp-modify-file/node_modules/vinyl-fs": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", + "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "dependencies": { + "defaults": "^1.0.0", + "glob-stream": "^3.1.5", + "glob-watcher": "^0.0.6", + "graceful-fs": "^3.0.0", + "mkdirp": "^0.5.0", + "strip-bom": "^1.0.0", + "through2": "^0.6.1", + "vinyl": "^0.4.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp-modify-file/node_modules/vinyl-fs/node_modules/through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dependencies": { + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" + } + }, + "node_modules/gulp-replace": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.6.1.tgz", + "integrity": "sha1-Eb+Mj85TPjPi9qjy9DC5VboL4GY=", + "dependencies": { + "istextorbinary": "1.0.2", + "readable-stream": "^2.0.1", + "replacestream": "^4.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/gulp-replace/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/gulp-replace/node_modules/readable-stream": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz", + "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/gulp-replace/node_modules/string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5", + "dependencies": { + "array-differ": "^1.0.0", + "array-uniq": "^1.0.2", + "beeper": "^1.0.0", + "chalk": "^1.0.0", + "dateformat": "^2.0.0", + "fancy-log": "^1.1.0", + "gulplog": "^1.0.0", + "has-gulplog": "^0.1.0", + "lodash._reescape": "^3.0.0", + "lodash._reevaluate": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.template": "^3.0.0", + "minimist": "^1.1.0", + "multipipe": "^0.1.2", + "object-assign": "^3.0.0", + "replace-ext": "0.0.1", + "through2": "^2.0.0", + "vinyl": "^0.5.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/gulp-util/node_modules/ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-util/node_modules/chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dependencies": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gulp-util/node_modules/minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "node_modules/gulp-util/node_modules/supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/gulp-zip": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-4.2.0.tgz", + "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==", + "dependencies": { + "get-stream": "^3.0.0", + "plugin-error": "^0.1.2", + "through2": "^2.0.1", + "vinyl": "^2.1.0", + "yazl": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/gulp-zip/node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/gulp-zip/node_modules/clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=" + }, + "node_modules/gulp-zip/node_modules/replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp-zip/node_modules/vinyl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", + "dependencies": { + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp/node_modules/findup-sync": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", + "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", + "dependencies": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp/node_modules/gulp-cli": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz", + "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==", + "dependencies": { + "ansi-colors": "^1.0.1", + "archy": "^1.0.0", + "array-sort": "^1.0.0", + "color-support": "^1.1.3", + "concat-stream": "^1.6.0", + "copy-props": "^2.0.1", + "fancy-log": "^1.3.2", + "gulplog": "^1.0.0", + "interpret": "^1.1.0", + "isobject": "^3.0.1", + "liftoff": "^3.1.0", + "matchdep": "^2.0.0", + "mute-stdout": "^1.0.0", + "pretty-hrtime": "^1.0.0", + "replace-homedir": "^1.0.0", + "semver-greatest-satisfied-range": "^1.1.0", + "v8flags": "^3.0.1", + "yargs": "^7.1.0" + }, + "bin": { + "gulp": "bin/gulp.js" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/gulp/node_modules/liftoff": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz", + "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==", + "dependencies": { + "extend": "^3.0.0", + "findup-sync": "^3.0.0", + "fined": "^1.0.1", + "flagged-respawn": "^1.0.0", + "is-plain-object": "^2.0.4", + "object.map": "^1.0.0", + "rechoir": "^0.6.2", + "resolve": "^1.1.7" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "dependencies": { + "glogg": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "dependencies": { + "sparkles": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/has-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", + "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dependencies": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dependencies": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-values/node_modules/kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/homedir-polyfill": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", + "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "dependencies": { + "parse-passwd": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/hosted-git-info": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "node_modules/ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue", + "engines": { + "node": "*" + } + }, + "node_modules/interpret": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=" + }, + "node_modules/invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "dependencies": { + "is-relative": "^1.0.0", + "is-windows": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dependencies": { + "kind-of": "^6.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "node_modules/is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dependencies": { + "binary-extensions": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "node_modules/is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dependencies": { + "kind-of": "^6.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dependencies": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dependencies": { + "number-is-nan": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-negated-glob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", + "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-odd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz", + "integrity": "sha1-O4qTLrAos3dcObsJ6RdnrM22kIg=", + "dependencies": { + "is-number": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dependencies": { + "is-path-inside": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dependencies": { + "path-is-inside": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "dependencies": { + "is-unc-path": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-unc-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "dependencies": { + "unc-path-regex": "^0.1.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "node_modules/is-valid-glob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", + "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-windows": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz", + "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istextorbinary": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-1.0.2.tgz", + "integrity": "sha1-rOGTVNGpoBc+/rEITOD4ewrX3s8=", + "dependencies": { + "binaryextensions": "~1.0.0", + "textextensions": "~1.0.0" + }, + "engines": { + "node": ">=0.4" + } + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=" + }, + "node_modules/jszip": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz", + "integrity": "sha1-uI86ey5noqBIFSmCx6N1bZxIKPA=", + "dependencies": { + "pako": "~1.0.2" + } + }, + "node_modules/just-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", + "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=" + }, + "node_modules/kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/last-run": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz", + "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", + "dependencies": { + "default-resolution": "^2.0.0", + "es6-weak-map": "^2.0.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/lazy-cache": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz", + "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=", + "dependencies": { + "set-getter": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dependencies": { + "readable-stream": "^2.0.5" + }, + "engines": { + "node": ">= 0.6.3" + } + }, + "node_modules/lazystream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/lazystream/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/lazystream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dependencies": { + "invert-kv": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/lead": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", + "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=", + "dependencies": { + "flush-write-stream": "^1.0.2" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/liftoff": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz", + "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", + "dependencies": { + "extend": "^3.0.0", + "findup-sync": "^2.0.0", + "fined": "^1.0.1", + "flagged-respawn": "^1.0.0", + "is-plain-object": "^2.0.4", + "object.map": "^1.0.0", + "rechoir": "^0.6.2", + "resolve": "^1.1.7" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/load-json-file/node_modules/strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dependencies": { + "is-utf8": "^0.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" + }, + "node_modules/lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" + }, + "node_modules/lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" + }, + "node_modules/lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + }, + "node_modules/lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" + }, + "node_modules/lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" + }, + "node_modules/lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" + }, + "node_modules/lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + }, + "node_modules/lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" + }, + "node_modules/lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "dependencies": { + "lodash._root": "^3.0.0" + } + }, + "node_modules/lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + }, + "node_modules/lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + }, + "node_modules/lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dependencies": { + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" + } + }, + "node_modules/lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" + }, + "node_modules/lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "dependencies": { + "lodash._basecopy": "^3.0.0", + "lodash._basetostring": "^3.0.0", + "lodash._basevalues": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.restparam": "^3.0.0", + "lodash.templatesettings": "^3.0.0" + } + }, + "node_modules/lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "dependencies": { + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0" + } + }, + "node_modules/lru-cache": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", + "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" + }, + "node_modules/make-error": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.3.tgz", + "integrity": "sha512-j3dZCri3cCd23wgPqK/0/KvTN8R+W6fXDqQe8BNLbTpONjbA8SPaRr+q0BQq9bx3Q/+g68/gDIh9FW3by702Tg==" + }, + "node_modules/make-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz", + "integrity": "sha1-V7713IXSOSO6I3ZzJNjo+PPZaUs=", + "dependencies": { + "kind-of": "^3.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/make-iterator/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dependencies": { + "object-visit": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/match-stream": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz", + "integrity": "sha1-mesFAJOzTf+t5CG5rAtBCpz6F88=", + "dependencies": { + "buffers": "~0.1.1", + "readable-stream": "~1.0.0" + } + }, + "node_modules/matchdep": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz", + "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=", + "dependencies": { + "findup-sync": "^2.0.0", + "micromatch": "^3.0.4", + "resolve": "^1.4.0", + "stack-trace": "0.0.10" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/micromatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz", + "integrity": "sha512-ykttrLPQrz1PUJcXjwsTUjGoPJ64StIGNE2lGVD1c9CuguJ+L7/navsE8IcDNndOoCMvYV0qc/exfVbMHkUhvA==", + "dependencies": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.0", + "define-property": "^1.0.0", + "extend-shallow": "^2.0.1", + "extglob": "^2.0.2", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.0", + "nanomatch": "^1.2.5", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + }, + "node_modules/mixin-deep": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "deprecated": "Critical bug fixed in v2.0.1, please upgrade to the latest version.", + "dependencies": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/mixin-deep/node_modules/is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dependencies": { + "is-plain-object": "^2.0.4" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", + "dependencies": { + "minimist": "0.0.8" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "dependencies": { + "duplexer2": "0.0.2" + } + }, + "node_modules/mute-stdout": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz", + "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/nan": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "optional": true + }, + "node_modules/nanomatch": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz", + "integrity": "sha512-/5ldsnyurvEw7wNpxLFgjVvBLMta43niEYOy0CJ4ntcYSbx6bugRUTQeFb4BR/WanEL1o3aQgHuVLHQaB6tOqg==", + "dependencies": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "is-odd": "^1.0.0", + "kind-of": "^5.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nanomatch/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/natives": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz", + "integrity": "sha512-8eRaxn8u/4wN8tGkhlc2cgwwvOLMLUMUn4IYTexMgWd+LyUDfeXVkk2ygQR0hvIHbJQXgHujia3ieUUDwNGkEA==", + "deprecated": "This module relies on Node.js's internals and will break at some point. Do not use it, and update to graceful-fs@4.x." + }, + "node_modules/next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" + }, + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/normalize-package-data/node_modules/path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, + "node_modules/normalize-package-data/node_modules/resolve": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", + "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", + "dependencies": { + "path-parse": "^1.0.6" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/now-and-later": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz", + "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==", + "dependencies": { + "once": "^1.3.2" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dependencies": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dependencies": { + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dependencies": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.defaults": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", + "dependencies": { + "array-each": "^1.0.1", + "array-slice": "^1.0.0", + "for-own": "^1.0.0", + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object.map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", + "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", + "dependencies": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object.reduce": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz", + "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", + "dependencies": { + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/orchestrator": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", + "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "dependencies": { + "end-of-stream": "~0.1.5", + "sequencify": "~0.0.7", + "stream-consume": "~0.1.0" + } + }, + "node_modules/orchestrator/node_modules/end-of-stream": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "dependencies": { + "once": "~1.3.0" + } + }, + "node_modules/orchestrator/node_modules/once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/ordered-read-streams": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", + "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", + "dependencies": { + "readable-stream": "^2.0.1" + } + }, + "node_modules/ordered-read-streams/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/ordered-read-streams/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/ordered-read-streams/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dependencies": { + "lcid": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/over": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz", + "integrity": "sha1-8phS5w/X4l82DgE6jsRMgq7bVwg=", + "engines": { + "node": "*" + } + }, + "node_modules/p-map": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/pako": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==" + }, + "node_modules/parse-filepath": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", + "dependencies": { + "is-absolute": "^1.0.0", + "map-cache": "^0.2.0", + "path-root": "^0.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dependencies": { + "error-ex": "^1.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" + }, + "node_modules/path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dependencies": { + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" + }, + "node_modules/path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + }, + "node_modules/path-root": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", + "dependencies": { + "path-root-regex": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dependencies": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dependencies": { + "pinkie": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dependencies": { + "ansi-cyan": "^0.1.1", + "ansi-red": "^0.1.1", + "arr-diff": "^1.0.1", + "arr-union": "^2.0.1", + "extend-shallow": "^1.1.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/plugin-error/node_modules/arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dependencies": { + "arr-flatten": "^1.0.1", + "array-slice": "^0.2.3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/plugin-error/node_modules/arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/plugin-error/node_modules/array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/plugin-error/node_modules/extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dependencies": { + "kind-of": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/plugin-error/node_modules/kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pretty-hrtime": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + }, + "node_modules/pullstream": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz", + "integrity": "sha1-1vs79a7Wl+gxFQ6xACwlo/iuExQ=", + "dependencies": { + "over": ">= 0.0.5 < 1", + "readable-stream": "~1.0.31", + "setimmediate": ">= 1.0.2 < 2", + "slice-stream": ">= 1.0.0 < 2" + } + }, + "node_modules/pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/pumpify": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", + "dependencies": { + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" + } + }, + "node_modules/read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dependencies": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dependencies": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dependencies": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/readdirp/node_modules/braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dependencies": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dependencies": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dependencies": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/extend-shallow/node_modules/is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dependencies": { + "is-plain-object": "^2.0.4" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/readdirp/node_modules/micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dependencies": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/nanomatch": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dependencies": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readdirp/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/readdirp/node_modules/to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dependencies": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/readdirp/node_modules/to-regex/node_modules/regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dependencies": { + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dependencies": { + "resolve": "^1.1.6" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/regex-not": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz", + "integrity": "sha1-Qvg+OXcWIt+CawKvF2Ul1qXxV/k=", + "dependencies": { + "extend-shallow": "^2.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/remove-bom-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", + "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", + "dependencies": { + "is-buffer": "^1.1.5", + "is-utf8": "^0.2.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/remove-bom-stream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz", + "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=", + "dependencies": { + "remove-bom-buffer": "^3.0.0", + "safe-buffer": "^5.1.0", + "through2": "^2.0.3" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + }, + "node_modules/repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/replace-homedir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz", + "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=", + "dependencies": { + "homedir-polyfill": "^1.0.1", + "is-absolute": "^1.0.0", + "remove-trailing-separator": "^1.1.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/replacestream": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", + "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", + "dependencies": { + "escape-string-regexp": "^1.0.3", + "object-assign": "^4.0.1", + "readable-stream": "^2.0.2" + } + }, + "node_modules/replacestream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/replacestream/node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/replacestream/node_modules/readable-stream": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz", + "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/replacestream/node_modules/string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "node_modules/resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dependencies": { + "path-parse": "^1.0.5" + } + }, + "node_modules/resolve-dir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", + "dependencies": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve-options": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", + "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=", + "dependencies": { + "value-or-function": "^3.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", + "deprecated": "https://github.com/lydell/resolve-url#deprecated" + }, + "node_modules/ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "engines": { + "node": ">=0.12" + } + }, + "node_modules/rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "dependencies": { + "glob": "^7.0.5" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "node_modules/safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dependencies": { + "ret": "~0.1.10" + } + }, + "node_modules/semver": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/semver-greatest-satisfied-range": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz", + "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=", + "dependencies": { + "sver-compat": "^1.5.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/sequencify": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", + "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "node_modules/set-getter": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz", + "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=", + "dependencies": { + "to-object-path": "^0.3.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/set-value": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "deprecated": "Critical bug fixed in v3.0.1, please upgrade to the latest version.", + "dependencies": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "node_modules/sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" + }, + "node_modules/single-line-log": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz", + "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=", + "dependencies": { + "string-width": "^1.0.1" + } + }, + "node_modules/slice-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz", + "integrity": "sha1-WzO9ZvATsaf4ZGCwPUY97DmtPqA=", + "dependencies": { + "readable-stream": "~1.0.31" + } + }, + "node_modules/smart-zip": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/smart-zip/-/smart-zip-0.0.9.tgz", + "integrity": "sha1-BQbnL4AL+NfqOgYZIpztM2sdaP0=", + "dependencies": { + "jszip": "^2.5.0", + "unzip": "^0.1.11" + } + }, + "node_modules/snapdragon": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz", + "integrity": "sha1-4StUh/re0+PeoKyR6UAL91tAE3A=", + "dependencies": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dependencies": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dependencies": { + "kind-of": "^3.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon-util/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-resolve": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", + "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", + "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", + "dependencies": { + "atob": "^2.0.0", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz", + "integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==", + "dependencies": { + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", + "deprecated": "See https://github.com/lydell/source-map-url#deprecated" + }, + "node_modules/sparkles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", + "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" + }, + "node_modules/split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dependencies": { + "extend-shallow": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/split-string/node_modules/extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dependencies": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/split-string/node_modules/is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dependencies": { + "is-plain-object": "^2.0.4" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "engines": { + "node": "*" + } + }, + "node_modules/static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dependencies": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stream-consume": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz", + "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==" + }, + "node_modules/stream-exhaust": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", + "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==" + }, + "node_modules/stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" + }, + "node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "node_modules/string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dependencies": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dependencies": { + "has-flag": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/sver-compat": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz", + "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", + "dependencies": { + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/textextensions": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-1.0.2.tgz", + "integrity": "sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI=" + }, + "node_modules/through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "dependencies": { + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" + } + }, + "node_modules/through2-filter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", + "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", + "dependencies": { + "through2": "~2.0.0", + "xtend": "~4.0.0" + } + }, + "node_modules/through2/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/through2/node_modules/readable-stream": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz", + "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/through2/node_modules/string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/tildify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", + "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "dependencies": { + "os-homedir": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-absolute-glob": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", + "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", + "dependencies": { + "is-absolute": "^1.0.0", + "is-negated-glob": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-object-path/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz", + "integrity": "sha1-FTWL7kosg712N3uh3ASdDxiDeq4=", + "dependencies": { + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "regex-not": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dependencies": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-through": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", + "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", + "dependencies": { + "through2": "^2.0.3" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/traverse": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", + "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", + "engines": { + "node": "*" + } + }, + "node_modules/ts-node": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-4.1.0.tgz", + "integrity": "sha512-xcZH12oVg9PShKhy3UHyDmuDLV3y7iKwX25aMVPt1SIXSuAfWkFiGPEkg+th8R4YKW/QCxDoW7lJdb15lx6QWg==", + "dependencies": { + "arrify": "^1.0.0", + "chalk": "^2.3.0", + "diff": "^3.1.0", + "make-error": "^1.1.1", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "source-map-support": "^0.5.0", + "tsconfig": "^7.0.0", + "v8flags": "^3.0.0", + "yn": "^2.0.0" + }, + "bin": { + "_ts-node": "dist/_bin.js", + "ts-node": "dist/bin.js" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/ts-node/node_modules/minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "node_modules/tsconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz", + "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==", + "dependencies": { + "@types/strip-bom": "^3.0.0", + "@types/strip-json-comments": "0.0.30", + "strip-bom": "^3.0.0", + "strip-json-comments": "^2.0.0" + } + }, + "node_modules/type": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/type/-/type-1.0.1.tgz", + "integrity": "sha512-MAM5dBMJCJNKs9E7JXo4CXRAansRfG0nlJxW7Wf6GZzSOvH31zClSaHdIMWLehe/EGMBkqeC55rrkaOr5Oo7Nw==" + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + }, + "node_modules/typescript": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/undertaker": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz", + "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==", + "dependencies": { + "arr-flatten": "^1.0.1", + "arr-map": "^2.0.0", + "bach": "^1.0.0", + "collection-map": "^1.0.0", + "es6-weak-map": "^2.0.1", + "last-run": "^1.1.0", + "object.defaults": "^1.0.0", + "object.reduce": "^1.0.0", + "undertaker-registry": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/undertaker-registry": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz", + "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/union-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", + "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "dependencies": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/union-value/node_modules/set-value": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", + "deprecated": "Critical bug fixed in v3.0.1, please upgrade to the latest version.", + "dependencies": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unique-stream": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz", + "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==", + "dependencies": { + "json-stable-stringify-without-jsonify": "^1.0.1", + "through2-filter": "^3.0.0" + } + }, + "node_modules/unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dependencies": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value/node_modules/has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dependencies": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dependencies": { + "isarray": "1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value/node_modules/has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/unzip": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz", + "integrity": "sha1-iXScY7BY19kNYZ+GuYqhU107l/A=", + "dependencies": { + "binary": ">= 0.3.0 < 1", + "fstream": ">= 0.1.30 < 1", + "match-stream": ">= 0.0.2 < 1", + "pullstream": ">= 0.4.1 < 1", + "readable-stream": "~1.0.31", + "setimmediate": ">= 1.0.1 < 2" + } + }, + "node_modules/upath": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", + "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", + "engines": { + "node": ">=4", + "yarn": "*" + } + }, + "node_modules/urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "deprecated": "Please see https://github.com/lydell/urix#deprecated" + }, + "node_modules/use": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/use/-/use-2.0.2.tgz", + "integrity": "sha1-riig1y+TvyJCKhii43mZMRLeyOg=", + "dependencies": { + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "lazy-cache": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/use/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/use/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/use/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/use/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/use/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/use/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/use/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", + "bin": { + "user-home": "cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "node_modules/v8flags": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.1.tgz", + "integrity": "sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s=", + "dependencies": { + "homedir-polyfill": "^1.0.1" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/value-or-function": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", + "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "dependencies": { + "clone": "^1.0.0", + "clone-stats": "^0.0.1", + "replace-ext": "0.0.1" + }, + "engines": { + "node": ">= 0.9" + } + }, + "node_modules/vinyl-fs": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", + "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==", + "dependencies": { + "fs-mkdirp-stream": "^1.0.0", + "glob-stream": "^6.1.0", + "graceful-fs": "^4.0.0", + "is-valid-glob": "^1.0.0", + "lazystream": "^1.0.0", + "lead": "^1.0.0", + "object.assign": "^4.0.4", + "pumpify": "^1.3.5", + "readable-stream": "^2.3.3", + "remove-bom-buffer": "^3.0.0", + "remove-bom-stream": "^1.2.0", + "resolve-options": "^1.1.0", + "through2": "^2.0.0", + "to-through": "^2.0.0", + "value-or-function": "^3.0.0", + "vinyl": "^2.0.0", + "vinyl-sourcemap": "^1.1.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vinyl-fs/node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/vinyl-fs/node_modules/clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=" + }, + "node_modules/vinyl-fs/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/vinyl-fs/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/vinyl-fs/node_modules/replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vinyl-fs/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/vinyl-fs/node_modules/vinyl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", + "dependencies": { + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vinyl-paths": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl-paths/-/vinyl-paths-2.1.0.tgz", + "integrity": "sha1-AIIEN8ujgmLO+IAthA+T4zku5Es=", + "dependencies": { + "through2": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/vinyl-sourcemap": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", + "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", + "dependencies": { + "append-buffer": "^1.0.2", + "convert-source-map": "^1.5.0", + "graceful-fs": "^4.1.6", + "normalize-path": "^2.1.1", + "now-and-later": "^2.0.0", + "remove-bom-buffer": "^3.0.0", + "vinyl": "^2.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vinyl-sourcemap/node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/vinyl-sourcemap/node_modules/clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=" + }, + "node_modules/vinyl-sourcemap/node_modules/normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dependencies": { + "remove-trailing-separator": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/vinyl-sourcemap/node_modules/replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vinyl-sourcemap/node_modules/vinyl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", + "dependencies": { + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "node_modules/wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dependencies": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "node_modules/xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "node_modules/yargs": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "dependencies": { + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" + } + }, + "node_modules/yargs-parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", + "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "dependencies": { + "camelcase": "^3.0.0" + } + }, + "node_modules/yazl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz", + "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==", + "dependencies": { + "buffer-crc32": "~0.2.3" + } + }, + "node_modules/yn": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz", + "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=", + "engines": { + "node": ">=4" + } + } + }, "dependencies": { "@types/del": { "version": "3.0.1", @@ -1684,22 +7939,22 @@ "bundled": true, "optional": true }, - "string-width": { - "version": "1.0.2", + "string_decoder": { + "version": "1.1.1", "bundled": true, "optional": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "safe-buffer": "~5.1.0" } }, - "string_decoder": { - "version": "1.1.1", + "string-width": { + "version": "1.0.2", "bundled": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "strip-ansi": { @@ -4334,6 +10589,11 @@ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -4344,11 +10604,6 @@ "strip-ansi": "^3.0.0" } }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", From b3c628ec9a98647e464389644a7f4852d56b459c Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 15:39:36 +0200 Subject: [PATCH 089/115] Refactor build tool into a subdirectory, move build output to repo root --- .github/workflows/main.yml | 4 +- _tools/{ => build-tool}/.gitignore | 2 +- _tools/{ => build-tool}/README.md | 2 +- _tools/{ => build-tool}/gulpfile.ts | 20 +++---- _tools/{ => build-tool}/package-lock.json | 66 +++++++++++++++++++++ _tools/{ => build-tool}/package.json | 0 _tools/{ => build-tool}/src/Config.ts | 0 _tools/{ => build-tool}/src/KpSteam.ts | 0 _tools/{ => build-tool}/src/MissionPaths.ts | 0 _tools/{ => build-tool}/src/index.ts | 0 _tools/{ => build-tool}/tsconfig.json | 0 build.bat | 2 +- 12 files changed, 81 insertions(+), 15 deletions(-) rename _tools/{ => build-tool}/.gitignore (58%) rename _tools/{ => build-tool}/README.md (99%) rename _tools/{ => build-tool}/gulpfile.ts (90%) rename _tools/{ => build-tool}/package-lock.json (98%) rename _tools/{ => build-tool}/package.json (100%) rename _tools/{ => build-tool}/src/Config.ts (100%) rename _tools/{ => build-tool}/src/KpSteam.ts (100%) rename _tools/{ => build-tool}/src/MissionPaths.ts (100%) rename _tools/{ => build-tool}/src/index.ts (100%) rename _tools/{ => build-tool}/tsconfig.json (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20c910e56..55b0ea3ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@master - - uses: docker://node:10-alpine + - uses: docker://node:20-alpine name: Setup Node - name: Install dependencies @@ -26,5 +26,5 @@ jobs: - uses: actions/upload-artifact@master with: name: PBO-Files - path: _tools/build/pbo + path: build/pbo diff --git a/_tools/.gitignore b/_tools/build-tool/.gitignore similarity index 58% rename from _tools/.gitignore rename to _tools/build-tool/.gitignore index 63368e1a8..e8f314157 100644 --- a/_tools/.gitignore +++ b/_tools/build-tool/.gitignore @@ -1,3 +1,3 @@ # Node node_modules/ -npm-debug.log* \ No newline at end of file +npm-debug.log* diff --git a/_tools/README.md b/_tools/build-tool/README.md similarity index 99% rename from _tools/README.md rename to _tools/build-tool/README.md index f7930d00e..b13c80a8d 100644 --- a/_tools/README.md +++ b/_tools/build-tool/README.md @@ -2,7 +2,7 @@ ## Requirements -nodejs version >=7. +nodejs version >=16. ## Usage diff --git a/_tools/gulpfile.ts b/_tools/build-tool/gulpfile.ts similarity index 90% rename from _tools/gulpfile.ts rename to _tools/build-tool/gulpfile.ts index 2fdc32e30..e41f42dc8 100644 --- a/_tools/gulpfile.ts +++ b/_tools/build-tool/gulpfile.ts @@ -11,16 +11,16 @@ import { resolve } from "path"; import { MissionPaths, uploadLegacy } from "./src"; import { Preset, FolderStructureInfo } from "./src"; - -const presets: Preset[] = require('./_presets.json'); +const repoRoot = resolve('..', '..'); +const presets: Preset[] = require('../_presets.json'); /** * Mission folders configuration */ const paths: FolderStructureInfo = { - frameworkFolder: resolve('..', 'Missionframework'), - missionsFolder: resolve('..', 'Missionbasefiles'), - workDir: resolve("./build") + frameworkFolder: resolve(repoRoot, 'Missionframework'), + missionsFolder: resolve(repoRoot, 'Missionbasefiles'), + workDir: resolve(repoRoot, "build") }; @@ -122,12 +122,12 @@ for (let preset of presets) { gulp.task('zip_' + taskName, () => { return gulp.src([ - resolve('..', './userconfig/**/*'), - resolve('..', 'LICENSE.md'), - resolve('..', 'README.md'), - resolve('..', 'CHANGELOG.md') + resolve(repoRoot, './userconfig/**/*'), + resolve(repoRoot, 'LICENSE.md'), + resolve(repoRoot, 'README.md'), + resolve(repoRoot, 'CHANGELOG.md') ], { - base: resolve('..') // Change base dir to have correct relative paths in ZIP + base: resolve(repoRoot) // Change base dir to have correct relative paths in ZIP }) .pipe( gulp.src( diff --git a/_tools/package-lock.json b/_tools/build-tool/package-lock.json similarity index 98% rename from _tools/package-lock.json rename to _tools/build-tool/package-lock.json index 34b6754f1..85b000f99 100644 --- a/_tools/package-lock.json +++ b/_tools/build-tool/package-lock.json @@ -7540,21 +7540,25 @@ "dependencies": { "abbrev": { "version": "1.1.1", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "bundled": true, "optional": true }, "ansi-regex": { "version": "2.1.1", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", "bundled": true, "optional": true }, "aproba": { "version": "1.2.0", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "bundled": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "bundled": true, "optional": true, "requires": { @@ -7564,11 +7568,13 @@ }, "balanced-match": { "version": "1.0.0", + "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==", "bundled": true, "optional": true }, "brace-expansion": { "version": "1.1.11", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "bundled": true, "optional": true, "requires": { @@ -7578,31 +7584,37 @@ }, "chownr": { "version": "1.1.1", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "bundled": true, "optional": true }, "code-point-at": { "version": "1.1.0", + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", "bundled": true, "optional": true }, "concat-map": { "version": "0.0.1", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "bundled": true, "optional": true }, "console-control-strings": { "version": "1.1.0", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", "bundled": true, "optional": true }, "core-util-is": { "version": "1.0.2", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", "bundled": true, "optional": true }, "debug": { "version": "4.1.1", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "bundled": true, "optional": true, "requires": { @@ -7611,21 +7623,25 @@ }, "deep-extend": { "version": "0.6.0", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "bundled": true, "optional": true }, "delegates": { "version": "1.0.0", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", "bundled": true, "optional": true }, "detect-libc": { "version": "1.0.3", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", "bundled": true, "optional": true }, "fs-minipass": { "version": "1.2.5", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "bundled": true, "optional": true, "requires": { @@ -7634,11 +7650,13 @@ }, "fs.realpath": { "version": "1.0.0", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "bundled": true, "optional": true }, "gauge": { "version": "2.7.4", + "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", "bundled": true, "optional": true, "requires": { @@ -7654,6 +7672,7 @@ }, "glob": { "version": "7.1.3", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "bundled": true, "optional": true, "requires": { @@ -7667,11 +7686,13 @@ }, "has-unicode": { "version": "2.0.1", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", "bundled": true, "optional": true }, "iconv-lite": { "version": "0.4.24", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "bundled": true, "optional": true, "requires": { @@ -7680,6 +7701,7 @@ }, "ignore-walk": { "version": "3.0.1", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "bundled": true, "optional": true, "requires": { @@ -7688,6 +7710,7 @@ }, "inflight": { "version": "1.0.6", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "bundled": true, "optional": true, "requires": { @@ -7697,16 +7720,19 @@ }, "inherits": { "version": "2.0.3", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "bundled": true, "optional": true }, "ini": { "version": "1.3.5", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "bundled": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", "bundled": true, "optional": true, "requires": { @@ -7715,11 +7741,13 @@ }, "isarray": { "version": "1.0.0", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", "bundled": true, "optional": true }, "minimatch": { "version": "3.0.4", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "bundled": true, "optional": true, "requires": { @@ -7728,11 +7756,13 @@ }, "minimist": { "version": "0.0.8", + "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==", "bundled": true, "optional": true }, "minipass": { "version": "2.3.5", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "bundled": true, "optional": true, "requires": { @@ -7742,6 +7772,7 @@ }, "minizlib": { "version": "1.2.1", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "bundled": true, "optional": true, "requires": { @@ -7750,6 +7781,7 @@ }, "mkdirp": { "version": "0.5.1", + "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", "bundled": true, "optional": true, "requires": { @@ -7758,11 +7790,13 @@ }, "ms": { "version": "2.1.1", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "bundled": true, "optional": true }, "needle": { "version": "2.3.0", + "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "bundled": true, "optional": true, "requires": { @@ -7773,6 +7807,7 @@ }, "node-pre-gyp": { "version": "0.12.0", + "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "bundled": true, "optional": true, "requires": { @@ -7790,6 +7825,7 @@ }, "nopt": { "version": "4.0.1", + "integrity": "sha512-+5XZFpQZEY0cg5JaxLwGxDlKNKYxuXwGt8/Oi3UXm5/4ymrJve9d2CURituxv3rSrVCGZj4m1U1JlHTdcKt2Ng==", "bundled": true, "optional": true, "requires": { @@ -7799,11 +7835,13 @@ }, "npm-bundled": { "version": "1.0.6", + "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "bundled": true, "optional": true }, "npm-packlist": { "version": "1.4.1", + "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "bundled": true, "optional": true, "requires": { @@ -7813,6 +7851,7 @@ }, "npmlog": { "version": "4.1.2", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "bundled": true, "optional": true, "requires": { @@ -7824,16 +7863,19 @@ }, "number-is-nan": { "version": "1.0.1", + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", "bundled": true, "optional": true }, "object-assign": { "version": "4.1.1", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "bundled": true, "optional": true }, "once": { "version": "1.4.0", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "bundled": true, "optional": true, "requires": { @@ -7842,16 +7884,19 @@ }, "os-homedir": { "version": "1.0.2", + "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", "bundled": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "bundled": true, "optional": true }, "osenv": { "version": "0.1.5", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "bundled": true, "optional": true, "requires": { @@ -7861,16 +7906,19 @@ }, "path-is-absolute": { "version": "1.0.1", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "bundled": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "bundled": true, "optional": true }, "rc": { "version": "1.2.8", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "bundled": true, "optional": true, "requires": { @@ -7882,6 +7930,7 @@ "dependencies": { "minimist": { "version": "1.2.0", + "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", "bundled": true, "optional": true } @@ -7889,6 +7938,7 @@ }, "readable-stream": { "version": "2.3.6", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "bundled": true, "optional": true, "requires": { @@ -7903,6 +7953,7 @@ }, "rimraf": { "version": "2.6.3", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "bundled": true, "optional": true, "requires": { @@ -7911,36 +7962,43 @@ }, "safe-buffer": { "version": "5.1.2", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "bundled": true, "optional": true }, "safer-buffer": { "version": "2.1.2", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "bundled": true, "optional": true }, "sax": { "version": "1.2.4", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "bundled": true, "optional": true }, "semver": { "version": "5.7.0", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "bundled": true, "optional": true }, "set-blocking": { "version": "2.0.0", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "bundled": true, "optional": true }, "signal-exit": { "version": "3.0.2", + "integrity": "sha512-meQNNykwecVxdu1RlYMKpQx4+wefIYpmxi6gexo/KAbwquJrBUrBmKYJrE8KFkVQAAVWEnwNdu21PgrD77J3xA==", "bundled": true, "optional": true }, "string_decoder": { "version": "1.1.1", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "bundled": true, "optional": true, "requires": { @@ -7949,6 +8007,7 @@ }, "string-width": { "version": "1.0.2", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", "bundled": true, "optional": true, "requires": { @@ -7959,6 +8018,7 @@ }, "strip-ansi": { "version": "3.0.1", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "bundled": true, "optional": true, "requires": { @@ -7967,11 +8027,13 @@ }, "strip-json-comments": { "version": "2.0.1", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", "bundled": true, "optional": true }, "tar": { "version": "4.4.8", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "bundled": true, "optional": true, "requires": { @@ -7986,11 +8048,13 @@ }, "util-deprecate": { "version": "1.0.2", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "bundled": true, "optional": true }, "wide-align": { "version": "1.1.3", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "bundled": true, "optional": true, "requires": { @@ -7999,11 +8063,13 @@ }, "wrappy": { "version": "1.0.2", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "bundled": true, "optional": true }, "yallist": { "version": "3.0.3", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "bundled": true, "optional": true } diff --git a/_tools/package.json b/_tools/build-tool/package.json similarity index 100% rename from _tools/package.json rename to _tools/build-tool/package.json diff --git a/_tools/src/Config.ts b/_tools/build-tool/src/Config.ts similarity index 100% rename from _tools/src/Config.ts rename to _tools/build-tool/src/Config.ts diff --git a/_tools/src/KpSteam.ts b/_tools/build-tool/src/KpSteam.ts similarity index 100% rename from _tools/src/KpSteam.ts rename to _tools/build-tool/src/KpSteam.ts diff --git a/_tools/src/MissionPaths.ts b/_tools/build-tool/src/MissionPaths.ts similarity index 100% rename from _tools/src/MissionPaths.ts rename to _tools/build-tool/src/MissionPaths.ts diff --git a/_tools/src/index.ts b/_tools/build-tool/src/index.ts similarity index 100% rename from _tools/src/index.ts rename to _tools/build-tool/src/index.ts diff --git a/_tools/tsconfig.json b/_tools/build-tool/tsconfig.json similarity index 100% rename from _tools/tsconfig.json rename to _tools/build-tool/tsconfig.json diff --git a/build.bat b/build.bat index 73f40efe1..8a32a549a 100644 --- a/build.bat +++ b/build.bat @@ -10,7 +10,7 @@ if ERRORLEVEL 1 ( ) rem CD into build tool directory -cd %~dp0_tools +cd %~dp0_tools/build-tool rem Install dependencies and build missions call npm install --loglevel=error From e0bd26a16022dc118845db0d5b0dccbfde43e6b4 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 15:44:27 +0200 Subject: [PATCH 090/115] Build tool - Silent npm install, npm audit fix --- _tools/build-tool/package-lock.json | 2429 ++++++++------------------- build.bat | 2 +- 2 files changed, 697 insertions(+), 1734 deletions(-) diff --git a/_tools/build-tool/package-lock.json b/_tools/build-tool/package-lock.json index 85b000f99..23d97e720 100644 --- a/_tools/build-tool/package-lock.json +++ b/_tools/build-tool/package-lock.json @@ -59,13 +59,14 @@ } }, "node_modules/@types/gulp": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.6.tgz", - "integrity": "sha512-0E8/iV/7FKWyQWSmi7jnUvgXXgaw+pfAzEB06Xu+l0iXVJppLbpOye5z7E2klw5akXd+8kPtYuk65YBcZPM4ow==", + "version": "4.0.16", + "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.16.tgz", + "integrity": "sha512-yY3XJjYejEzIQqLt6ZXaOZ/jynVxUe7Km33XA1/sU2zfZ2AeFDragIcT+i53a+j7eoWPgVeikhFvtC0gCteBdA==", "dependencies": { - "@types/undertaker": "*", + "@types/node": "*", + "@types/undertaker": ">=1.2.6", "@types/vinyl-fs": "*", - "chokidar": "^2.1.2" + "chokidar": "^3.3.1" } }, "node_modules/@types/gulp-replace": { @@ -84,6 +85,139 @@ "@types/node": "*" } }, + "node_modules/@types/gulp/node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@types/gulp/node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@types/gulp/node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@types/gulp/node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/@types/gulp/node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@types/gulp/node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/@types/gulp/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/gulp/node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@types/gulp/node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/@types/gulp/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/@types/gulp/node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -105,17 +239,19 @@ "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==" }, "node_modules/@types/undertaker": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.2.tgz", - "integrity": "sha512-j4iepCSuY2JGW/hShVtUBagic0klYNFIXP7VweavnYnNC2EjiKxJFeaS9uaJmAT0ty9sQSqTS1aagWMZMV0HyA==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.10.tgz", + "integrity": "sha512-UzbgxdP5Zn0UlaLGF8CxXGpP7MCu/Y/b/24Kj3dK0J3+xOSmAGJw4JJKi21avFNuUviG59BMBUdrcL+KX+z7BA==", "dependencies": { - "@types/undertaker-registry": "*" + "@types/node": "*", + "@types/undertaker-registry": "*", + "async-done": "~1.3.2" } }, "node_modules/@types/undertaker-registry": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.3.tgz", + "integrity": "sha512-9wabQxkMB6Nb6FuPxvLQiMLBT2KkJXxgC9RoehnSSCvVzrag5GKxI5pekcgnMcZaGupuJOd0CLT+8ZwHHlG5vQ==" }, "node_modules/@types/vinyl": { "version": "2.0.3", @@ -454,14 +590,14 @@ } }, "node_modules/atob": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", - "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "bin": { "atob": "bin/atob.js" }, "engines": { - "node": ">= 0.4.0" + "node": ">= 4.5.0" } }, "node_modules/bach": { @@ -538,6 +674,15 @@ "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz", "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=" }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, "node_modules/brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", @@ -548,13 +693,12 @@ } }, "node_modules/braces": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz", - "integrity": "sha512-P4O8UQRdGiMLWSizsApmXVQDBS6KCt7dSexgLKBmH5Hr1CZq7vsnscFh8oR1sP1ab1Zj0uCHCEzZeV6SfUf3rA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dependencies": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", - "define-property": "^1.0.0", "extend-shallow": "^2.0.1", "fill-range": "^4.0.0", "isobject": "^3.0.1", @@ -649,9 +793,9 @@ } }, "node_modules/chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies", "dependencies": { "anymatch": "^2.0.0", @@ -670,26 +814,6 @@ "fsevents": "^1.2.7" } }, - "node_modules/chokidar/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -948,12 +1072,20 @@ } }, "node_modules/copy-props": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", - "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz", + "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==", "dependencies": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" + "each-props": "^1.3.2", + "is-plain-object": "^5.0.0" + } + }, + "node_modules/copy-props/node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "engines": { + "node": ">=0.10.0" } }, "node_modules/core-util-is": { @@ -995,9 +1127,9 @@ } }, "node_modules/decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "engines": { "node": ">=0.10" } @@ -1100,9 +1232,9 @@ } }, "node_modules/diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "engines": { "node": ">=0.3.1" } @@ -1342,9 +1474,9 @@ } }, "node_modules/extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "node_modules/extend-shallow": { "version": "2.0.1", @@ -1388,6 +1520,12 @@ "node": ">= 0.10" } }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "node_modules/fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -1559,12 +1697,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", - "bundleDependencies": [ - "node-pre-gyp" - ], + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", "hasInstallScript": true, "optional": true, @@ -1572,166 +1707,80 @@ "darwin" ], "dependencies": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" }, "engines": { - "node": ">=4.0" - } - }, - "node_modules/fsevents/node_modules/abbrev": { - "version": "1.1.1", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/ansi-regex": { - "version": "2.1.1", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "inBundle": true, - "optional": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 4.0" } }, - "node_modules/fsevents/node_modules/aproba": { - "version": "1.2.0", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/are-we-there-yet": { - "version": "1.1.5", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "inBundle": true, - "optional": true, + "node_modules/fstream": { + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", + "integrity": "sha512-N1pLGEHoDyCoI8uMmPXJXhn238L4nk41iipXCrqs4Ss0ooYSr5sNj2ucMo5AqJVC4OaOa7IztpBhOaaYTGZVuA==", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "graceful-fs": "~3.0.2", + "inherits": "~2.0.0", + "mkdirp": "0.5", + "rimraf": "2" + }, + "engines": { + "node": ">=0.6" } }, - "node_modules/fsevents/node_modules/balanced-match": { - "version": "1.0.0", - "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/brace-expansion": { - "version": "1.1.11", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "inBundle": true, - "optional": true, + "node_modules/fstream/node_modules/graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/fsevents/node_modules/chownr": { - "version": "1.1.1", - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/code-point-at": { - "version": "1.1.0", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", - "inBundle": true, - "optional": true, + "natives": "^1.1.0" + }, "engines": { - "node": ">=0.10.0" + "node": ">=0.4.0" } }, - "node_modules/fsevents/node_modules/concat-map": { - "version": "0.0.1", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/console-control-strings": { - "version": "1.1.0", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/core-util-is": { - "version": "1.0.2", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "inBundle": true, - "optional": true + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, - "node_modules/fsevents/node_modules/debug": { - "version": "4.1.1", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", - "inBundle": true, - "optional": true, + "node_modules/gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha512-3IWbXGkDDHFX8zIlNdfnmhvlSMhpBO6tDr4InB8fGku6dh/gjFPGNqcdsXJajZg05x9jRzXbL6gCnCnuMap4tw==", "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/fsevents/node_modules/deep-extend": { - "version": "0.6.0", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "inBundle": true, - "optional": true, + "globule": "~0.1.0" + }, "engines": { - "node": ">=4.0.0" + "node": ">= 0.8.0" } }, - "node_modules/fsevents/node_modules/delegates": { - "version": "1.0.0", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/detect-libc": { + "node_modules/get-caller-file": { "version": "1.0.3", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "inBundle": true, - "optional": true, - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" }, - "node_modules/fsevents/node_modules/fs-minipass": { - "version": "1.2.5", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", - "inBundle": true, - "optional": true, - "dependencies": { - "minipass": "^2.2.1" + "node_modules/get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "engines": { + "node": ">=4" } }, - "node_modules/fsevents/node_modules/fs.realpath": { - "version": "1.0.0", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/gauge": { - "version": "2.7.4", - "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", - "inBundle": true, - "optional": true, - "dependencies": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "node_modules/get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "engines": { + "node": ">=0.10.0" } }, - "node_modules/fsevents/node_modules/glob": { - "version": "7.1.3", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "inBundle": true, - "optional": true, + "node_modules/glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1744,576 +1793,44 @@ "node": "*" } }, - "node_modules/fsevents/node_modules/has-unicode": { - "version": "2.0.1", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "inBundle": true, - "optional": true + "node_modules/glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", + "dependencies": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + } }, - "node_modules/fsevents/node_modules/iconv-lite": { - "version": "0.4.24", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "inBundle": true, - "optional": true, + "node_modules/glob-parent/node_modules/is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "is-extglob": "^2.1.0" }, "engines": { "node": ">=0.10.0" } }, - "node_modules/fsevents/node_modules/ignore-walk": { - "version": "3.0.1", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "inBundle": true, - "optional": true, + "node_modules/glob-stream": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", + "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==", "dependencies": { - "minimatch": "^3.0.4" - } - }, - "node_modules/fsevents/node_modules/inflight": { - "version": "1.0.6", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "inBundle": true, - "optional": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/fsevents/node_modules/inherits": { - "version": "2.0.3", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/ini": { - "version": "1.3.5", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue", - "inBundle": true, - "optional": true, - "engines": { - "node": "*" - } - }, - "node_modules/fsevents/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "inBundle": true, - "optional": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/isarray": { - "version": "1.0.0", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/minimatch": { - "version": "3.0.4", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "inBundle": true, - "optional": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/fsevents/node_modules/minimist": { - "version": "0.0.8", - "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/minipass": { - "version": "2.3.5", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "inBundle": true, - "optional": true, - "dependencies": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "node_modules/fsevents/node_modules/minizlib": { - "version": "1.2.1", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", - "inBundle": true, - "optional": true, - "dependencies": { - "minipass": "^2.2.1" - } - }, - "node_modules/fsevents/node_modules/mkdirp": { - "version": "0.5.1", - "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", - "inBundle": true, - "optional": true, - "dependencies": { - "minimist": "0.0.8" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/fsevents/node_modules/ms": { - "version": "2.1.1", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/needle": { - "version": "2.3.0", - "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", - "inBundle": true, - "optional": true, - "dependencies": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - }, - "bin": { - "needle": "bin/needle" - }, - "engines": { - "node": ">= 4.4.x" - } - }, - "node_modules/fsevents/node_modules/node-pre-gyp": { - "version": "0.12.0", - "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", - "deprecated": "Please upgrade to @mapbox/node-pre-gyp: the non-scoped node-pre-gyp package is deprecated and only the @mapbox scoped package will recieve updates in the future", - "inBundle": true, - "optional": true, - "dependencies": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - }, - "bin": { - "node-pre-gyp": "bin/node-pre-gyp" - } - }, - "node_modules/fsevents/node_modules/nopt": { - "version": "4.0.1", - "integrity": "sha512-+5XZFpQZEY0cg5JaxLwGxDlKNKYxuXwGt8/Oi3UXm5/4ymrJve9d2CURituxv3rSrVCGZj4m1U1JlHTdcKt2Ng==", - "inBundle": true, - "optional": true, - "dependencies": { - "abbrev": "1", - "osenv": "^0.1.4" - }, - "bin": { - "nopt": "bin/nopt.js" - } - }, - "node_modules/fsevents/node_modules/npm-bundled": { - "version": "1.0.6", - "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/npm-packlist": { - "version": "1.4.1", - "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", - "inBundle": true, - "optional": true, - "dependencies": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "node_modules/fsevents/node_modules/npmlog": { - "version": "4.1.2", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "inBundle": true, - "optional": true, - "dependencies": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "node_modules/fsevents/node_modules/number-is-nan": { - "version": "1.0.1", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", - "inBundle": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/object-assign": { - "version": "4.1.1", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "inBundle": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/once": { - "version": "1.4.0", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "inBundle": true, - "optional": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/fsevents/node_modules/os-homedir": { - "version": "1.0.2", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "inBundle": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/os-tmpdir": { - "version": "1.0.2", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "inBundle": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/osenv": { - "version": "0.1.5", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "inBundle": true, - "optional": true, - "dependencies": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "node_modules/fsevents/node_modules/path-is-absolute": { - "version": "1.0.1", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "inBundle": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/process-nextick-args": { - "version": "2.0.0", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/rc": { - "version": "1.2.8", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "inBundle": true, - "optional": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/fsevents/node_modules/rc/node_modules/minimist": { - "version": "1.2.0", - "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/readable-stream": { - "version": "2.3.6", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "inBundle": true, - "optional": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/fsevents/node_modules/rimraf": { - "version": "2.6.3", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "inBundle": true, - "optional": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/fsevents/node_modules/safe-buffer": { - "version": "5.1.2", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/safer-buffer": { - "version": "2.1.2", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/sax": { - "version": "1.2.4", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/semver": { - "version": "5.7.0", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", - "inBundle": true, - "optional": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/fsevents/node_modules/set-blocking": { - "version": "2.0.0", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/signal-exit": { - "version": "3.0.2", - "integrity": "sha512-meQNNykwecVxdu1RlYMKpQx4+wefIYpmxi6gexo/KAbwquJrBUrBmKYJrE8KFkVQAAVWEnwNdu21PgrD77J3xA==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/string_decoder": { - "version": "1.1.1", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "inBundle": true, - "optional": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/fsevents/node_modules/string-width": { - "version": "1.0.2", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", - "inBundle": true, - "optional": true, - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/strip-ansi": { - "version": "3.0.1", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "inBundle": true, - "optional": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/strip-json-comments": { - "version": "2.0.1", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "inBundle": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/tar": { - "version": "4.4.8", - "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", - "inBundle": true, - "optional": true, - "dependencies": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - }, - "engines": { - "node": ">=4.5" - } - }, - "node_modules/fsevents/node_modules/util-deprecate": { - "version": "1.0.2", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/wide-align": { - "version": "1.1.3", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "inBundle": true, - "optional": true, - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/fsevents/node_modules/wrappy": { - "version": "1.0.2", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "inBundle": true, - "optional": true - }, - "node_modules/fsevents/node_modules/yallist": { - "version": "3.0.3", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "inBundle": true, - "optional": true - }, - "node_modules/fstream": { - "version": "0.1.31", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", - "integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=", - "dependencies": { - "graceful-fs": "~3.0.2", - "inherits": "~2.0.0", - "mkdirp": "0.5", - "rimraf": "2" - }, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/fstream/node_modules/graceful-fs": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", - "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", - "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js", - "dependencies": { - "natives": "^1.1.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "node_modules/gaze": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", - "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", - "dependencies": { - "globule": "~0.1.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "node_modules/get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "engines": { - "node": ">=4" - } - }, - "node_modules/get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dependencies": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - } - }, - "node_modules/glob-parent/node_modules/is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dependencies": { - "is-extglob": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/glob-stream": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", - "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", - "dependencies": { - "extend": "^3.0.0", - "glob": "^7.1.1", - "glob-parent": "^3.1.0", - "is-negated-glob": "^1.0.0", - "ordered-read-streams": "^1.0.0", - "pumpify": "^1.3.5", - "readable-stream": "^2.1.5", - "remove-trailing-separator": "^1.0.1", - "to-absolute-glob": "^2.0.0", - "unique-stream": "^2.0.2" - }, - "engines": { - "node": ">= 0.10" + "extend": "^3.0.0", + "glob": "^7.1.1", + "glob-parent": "^3.1.0", + "is-negated-glob": "^1.0.0", + "ordered-read-streams": "^1.0.0", + "pumpify": "^1.3.5", + "readable-stream": "^2.1.5", + "remove-trailing-separator": "^1.0.1", + "to-absolute-glob": "^2.0.0", + "unique-stream": "^2.0.2" + }, + "engines": { + "node": ">= 0.10" } }, "node_modules/glob-stream/node_modules/isarray": { @@ -2344,15 +1861,16 @@ } }, "node_modules/glob-watcher": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz", - "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz", + "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==", "dependencies": { "anymatch": "^2.0.0", "async-done": "^1.2.0", "chokidar": "^2.0.0", "is-negated-glob": "^1.0.0", "just-debounce": "^1.0.0", + "normalize-path": "^3.0.0", "object.defaults": "^1.1.0" }, "engines": { @@ -2424,7 +1942,7 @@ "node_modules/globule": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", - "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "integrity": "sha512-3eIcA2OjPCm4VvwIwZPzIxCVssA8HSpM2C6c6kK5ufJH4FGwWoyqL3In19uuX4oe+TwH3w2P1nQDmW56iehO4A==", "dependencies": { "glob": "~3.1.21", "lodash": "~1.0.1", @@ -2437,7 +1955,7 @@ "node_modules/globule/node_modules/glob": { "version": "3.1.21", "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "integrity": "sha512-ANhy2V2+tFpRajE3wN4DhkNQ08KDr0Ir1qL12/cUe5+a7STEK8jkW4onUYuY8/06qAFuT5je7mjAqzx0eKI2tQ==", "dependencies": { "graceful-fs": "~1.2.0", "inherits": "1", @@ -2461,19 +1979,10 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" }, - "node_modules/globule/node_modules/lodash": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", - "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=", - "engines": [ - "node", - "rhino" - ] - }, "node_modules/globule/node_modules/minimatch": { "version": "0.2.14", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==", "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue", "dependencies": { "lru-cache": "2", @@ -2614,7 +2123,7 @@ "node_modules/gulp-modify-file/node_modules/glob": { "version": "4.5.3", "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==", "dependencies": { "inflight": "^1.0.4", "inherits": "2", @@ -2628,7 +2137,7 @@ "node_modules/gulp-modify-file/node_modules/glob-stream": { "version": "3.1.18", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", - "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "integrity": "sha512-owHtlMMXIAbxLjhUAO0HhW1/TB7kV0AwDduI3BLbYsWCaRzNIcLBu8N0wHZft2Za2SCmUXCEOdpZzC7k/H19eg==", "dependencies": { "glob": "^4.3.1", "glob2base": "^0.0.12", @@ -2653,7 +2162,7 @@ "node_modules/gulp-modify-file/node_modules/glob-watcher": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", - "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "integrity": "sha512-lzYWq1BJLBmtb9rzT6+lgbFlEW6Sc7B+Qs3RmsNA9lbdFSqLHhebfypPR3nbEOMeEQyawVXqSDH0aqjtImldow==", "dependencies": { "gaze": "^0.5.1" }, @@ -2676,7 +2185,7 @@ "node_modules/gulp-modify-file/node_modules/gulp": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", - "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", + "integrity": "sha512-6FHNdR+VG1LcPz6gZGGqgvimWWGtl4x3FvshAdK/UnAjU7aFOyzft3Fjp35r0Y3ZF4u8vND0S4nGsIB/sxTqzQ==", "dependencies": { "archy": "^1.0.0", "chalk": "^1.0.0", @@ -2702,7 +2211,7 @@ "node_modules/gulp-modify-file/node_modules/minimatch": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==", "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue", "dependencies": { "brace-expansion": "^1.0.0" @@ -2711,11 +2220,6 @@ "node": "*" } }, - "node_modules/gulp-modify-file/node_modules/minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, "node_modules/gulp-modify-file/node_modules/ordered-read-streams": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", @@ -2724,7 +2228,7 @@ "node_modules/gulp-modify-file/node_modules/semver": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", + "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==", "bin": { "semver": "bin/semver" } @@ -2783,7 +2287,7 @@ "node_modules/gulp-modify-file/node_modules/vinyl-fs": { "version": "0.3.14", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", - "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "integrity": "sha512-9CTKjt8378nhdydwFDTwywKio0n8aqq6xA70g0uypcnTNSCow/gQOwv0L9E2GaKd7EQ3kZl/diBxPSCgcBXESw==", "dependencies": { "defaults": "^1.0.0", "glob-stream": "^3.1.5", @@ -2850,7 +2354,7 @@ "node_modules/gulp-util": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==", "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5", "dependencies": { "array-differ": "^1.0.0", @@ -2899,11 +2403,6 @@ "node": ">=0.10.0" } }, - "node_modules/gulp-util/node_modules/minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, "node_modules/gulp-util/node_modules/supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -3124,9 +2623,9 @@ } }, "node_modules/hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==" + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" }, "node_modules/inflight": { "version": "1.0.6", @@ -3143,13 +2642,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "node_modules/ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue", - "engines": { - "node": "*" - } + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/interpret": { "version": "1.1.0", @@ -3431,9 +2926,9 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=" }, "node_modules/jszip": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz", - "integrity": "sha1-uI86ey5noqBIFSmCx6N1bZxIKPA=", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.7.0.tgz", + "integrity": "sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==", "dependencies": { "pako": "~1.0.2" } @@ -3444,9 +2939,9 @@ "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=" }, "node_modules/kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "engines": { "node": ">=0.10.0" } @@ -3578,6 +3073,15 @@ "node": ">=0.10.0" } }, + "node_modules/lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha512-0VSEDVec/Me2eATuoiQd8IjyBMMX0fahob8YJ96V1go2RjvCk1m1GxmtfXn8RNSaLaTtop7fsuhhu9oLk3hUgA==", + "engines": [ + "node", + "rhino" + ] + }, "node_modules/lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", @@ -3659,7 +3163,7 @@ "node_modules/lodash.template": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==", "dependencies": { "lodash._basecopy": "^3.0.0", "lodash._basetostring": "^3.0.0", @@ -3779,9 +3283,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -3790,15 +3294,17 @@ } }, "node_modules/minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "deprecated": "Critical bug fixed in v2.0.1, please upgrade to the latest version.", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dependencies": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -3819,12 +3325,11 @@ } }, "node_modules/mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dependencies": { - "minimist": "0.0.8" + "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" @@ -3908,11 +3413,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "node_modules/normalize-package-data/node_modules/path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" - }, "node_modules/normalize-package-data/node_modules/resolve": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", @@ -4295,9 +3795,9 @@ "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" }, "node_modules/path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-root": { "version": "0.1.1", @@ -4331,6 +3831,17 @@ "node": ">=0.10.0" } }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -4520,37 +4031,6 @@ "node": ">=0.10" } }, - "node_modules/readdirp/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/readdirp/node_modules/define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", @@ -4908,9 +4388,9 @@ } }, "node_modules/semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -4940,9 +4420,9 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "node_modules/set-getter": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz", - "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz", + "integrity": "sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==", "dependencies": { "to-object-path": "^0.3.0" }, @@ -4951,10 +4431,9 @@ } }, "node_modules/set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", - "deprecated": "Critical bug fixed in v3.0.1, please upgrade to the latest version.", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -4994,7 +4473,7 @@ "node_modules/smart-zip": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/smart-zip/-/smart-zip-0.0.9.tgz", - "integrity": "sha1-BQbnL4AL+NfqOgYZIpztM2sdaP0=", + "integrity": "sha512-qSC5oWgrpuIPTtx1Q4wDK2cgDG5x90pGHQ/lvVC5v/VSiNdRi4DjYbWwDdBcd2OpiSLtpUWh/2UPghgTX7h+bg==", "dependencies": { "jszip": "^2.5.0", "unzip": "^0.1.11" @@ -5665,11 +5144,6 @@ "node": ">=4.2.0" } }, - "node_modules/ts-node/node_modules/minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, "node_modules/tsconfig": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz", @@ -5739,29 +5213,14 @@ } }, "node_modules/union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/union-value/node_modules/set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "deprecated": "Critical bug fixed in v3.0.1, please upgrade to the latest version.", - "dependencies": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" + "set-value": "^2.0.1" }, "engines": { "node": ">=0.10.0" @@ -5828,7 +5287,7 @@ "node_modules/unzip": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz", - "integrity": "sha1-iXScY7BY19kNYZ+GuYqhU107l/A=", + "integrity": "sha512-Dvxd7bj2RcfbM+AbNfx0Ufqvk7Kl4YGeAQlEGn9+glDQz1HFxeeRjBStxi/DfIvgutn6hbC4yMc1rEo3x+dmVQ==", "dependencies": { "binary": ">= 0.3.0 < 1", "fstream": ">= 0.1.30 < 1", @@ -6208,9 +5667,9 @@ } }, "node_modules/y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" }, "node_modules/yargs": { "version": "7.1.0", @@ -6233,11 +5692,12 @@ } }, "node_modules/yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz", + "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", "dependencies": { - "camelcase": "^3.0.0" + "camelcase": "^3.0.0", + "object.assign": "^4.1.0" } }, "node_modules/yazl": { @@ -6291,13 +5751,104 @@ } }, "@types/gulp": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.6.tgz", - "integrity": "sha512-0E8/iV/7FKWyQWSmi7jnUvgXXgaw+pfAzEB06Xu+l0iXVJppLbpOye5z7E2klw5akXd+8kPtYuk65YBcZPM4ow==", + "version": "4.0.16", + "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.16.tgz", + "integrity": "sha512-yY3XJjYejEzIQqLt6ZXaOZ/jynVxUe7Km33XA1/sU2zfZ2AeFDragIcT+i53a+j7eoWPgVeikhFvtC0gCteBdA==", "requires": { - "@types/undertaker": "*", + "@types/node": "*", + "@types/undertaker": ">=1.2.6", "@types/vinyl-fs": "*", - "chokidar": "^2.1.2" + "chokidar": "^3.3.1" + }, + "dependencies": { + "anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "optional": true + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "requires": { + "picomatch": "^2.2.1" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + } } }, "@types/gulp-replace": { @@ -6337,17 +5888,19 @@ "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==" }, "@types/undertaker": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.2.tgz", - "integrity": "sha512-j4iepCSuY2JGW/hShVtUBagic0klYNFIXP7VweavnYnNC2EjiKxJFeaS9uaJmAT0ty9sQSqTS1aagWMZMV0HyA==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.10.tgz", + "integrity": "sha512-UzbgxdP5Zn0UlaLGF8CxXGpP7MCu/Y/b/24Kj3dK0J3+xOSmAGJw4JJKi21avFNuUviG59BMBUdrcL+KX+z7BA==", "requires": { - "@types/undertaker-registry": "*" + "@types/node": "*", + "@types/undertaker-registry": "*", + "async-done": "~1.3.2" } }, "@types/undertaker-registry": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz", - "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.3.tgz", + "integrity": "sha512-9wabQxkMB6Nb6FuPxvLQiMLBT2KkJXxgC9RoehnSSCvVzrag5GKxI5pekcgnMcZaGupuJOd0CLT+8ZwHHlG5vQ==" }, "@types/vinyl": { "version": "2.0.3", @@ -6604,9 +6157,9 @@ } }, "atob": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", - "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "bach": { "version": "1.2.0", @@ -6667,6 +6220,15 @@ "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz", "integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U=" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", @@ -6677,13 +6239,12 @@ } }, "braces": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz", - "integrity": "sha512-P4O8UQRdGiMLWSizsApmXVQDBS6KCt7dSexgLKBmH5Hr1CZq7vsnscFh8oR1sP1ab1Zj0uCHCEzZeV6SfUf3rA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", - "define-property": "^1.0.0", "extend-shallow": "^2.0.1", "fill-range": "^4.0.0", "isobject": "^3.0.1", @@ -6754,9 +6315,9 @@ } }, "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "requires": { "anymatch": "^2.0.0", "async-each": "^1.0.1", @@ -6770,25 +6331,6 @@ "path-is-absolute": "^1.0.0", "readdirp": "^2.2.1", "upath": "^1.1.1" - }, - "dependencies": { - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } - } } }, "class-utils": { @@ -7011,12 +6553,19 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copy-props": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", - "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz", + "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==", "requires": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" + "each-props": "^1.3.2", + "is-plain-object": "^5.0.0" + }, + "dependencies": { + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" + } } }, "core-util-is": { @@ -7052,9 +6601,9 @@ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==" }, "default-compare": { "version": "1.0.0", @@ -7131,9 +6680,9 @@ "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" }, "diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" }, "duplexer2": { "version": "0.0.2", @@ -7350,9 +6899,9 @@ } }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extend-shallow": { "version": "2.0.1", @@ -7387,6 +6936,12 @@ "time-stamp": "^1.0.0" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -7416,531 +6971,63 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "fined": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", - "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - } - }, - "first-chunk-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", - "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" - }, - "flagged-respawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz", - "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=" - }, - "flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "requires": { - "for-in": "^1.0.1" - } - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "requires": { - "map-cache": "^0.2.2" - } - }, - "fs-mkdirp-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", - "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", - "requires": { - "graceful-fs": "^4.1.11", - "through2": "^2.0.3" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", - "optional": true, - "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "bundled": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "bundled": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "bundled": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "bundled": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==", - "bundled": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "bundled": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.1", - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", - "bundled": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", - "bundled": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "bundled": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "bundled": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "bundled": true, - "optional": true - }, - "debug": { - "version": "4.1.1", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "bundled": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "bundled": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "bundled": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "bundled": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "bundled": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==", - "bundled": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.3", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "bundled": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "bundled": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "bundled": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "bundled": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "bundled": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", - "bundled": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "bundled": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "bundled": true, - "optional": true, + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^3.1.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "number-is-nan": "^1.0.0" + "is-extglob": "^2.1.0" } - }, + } + } + }, + "fined": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", + "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", + "requires": { + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" + }, + "flagged-respawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz", + "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=" + }, + "flush-write-stream": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", + "requires": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + }, + "dependencies": { "isarray": { "version": "1.0.0", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "bundled": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "bundled": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==", - "bundled": true, - "optional": true - }, - "minipass": { - "version": "2.3.5", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.2.1", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", - "bundled": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.1.1", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "bundled": true, - "optional": true - }, - "needle": { - "version": "2.3.0", - "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", - "bundled": true, - "optional": true, - "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.12.0", - "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", - "bundled": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "integrity": "sha512-+5XZFpQZEY0cg5JaxLwGxDlKNKYxuXwGt8/Oi3UXm5/4ymrJve9d2CURituxv3rSrVCGZj4m1U1JlHTdcKt2Ng==", - "bundled": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.6", - "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", - "bundled": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.1", - "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", - "bundled": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "bundled": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", - "bundled": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "bundled": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "bundled": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "bundled": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", - "bundled": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "bundled": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "bundled": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "bundled": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "bundled": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", - "bundled": true, - "optional": true - } - } + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "readable-stream": { "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "bundled": true, - "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -7951,134 +7038,65 @@ "util-deprecate": "~1.0.1" } }, - "rimraf": { - "version": "2.6.3", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "bundled": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "bundled": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "bundled": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "bundled": true, - "optional": true - }, - "semver": { - "version": "5.7.0", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", - "bundled": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "bundled": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "integrity": "sha512-meQNNykwecVxdu1RlYMKpQx4+wefIYpmxi6gexo/KAbwquJrBUrBmKYJrE8KFkVQAAVWEnwNdu21PgrD77J3xA==", - "bundled": true, - "optional": true - }, "string_decoder": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "bundled": true, - "optional": true, "requires": { "safe-buffer": "~5.1.0" } - }, - "string-width": { - "version": "1.0.2", - "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", - "bundled": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "bundled": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "bundled": true, - "optional": true - }, - "tar": { - "version": "4.4.8", - "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", - "bundled": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "bundled": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "bundled": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "bundled": true, - "optional": true - }, - "yallist": { - "version": "3.0.3", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "bundled": true, - "optional": true } } }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "requires": { + "for-in": "^1.0.1" + } + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "requires": { + "map-cache": "^0.2.2" + } + }, + "fs-mkdirp-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", + "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", + "requires": { + "graceful-fs": "^4.1.11", + "through2": "^2.0.3" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, "fstream": { "version": "0.1.31", "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", - "integrity": "sha1-czfwWPu7vvqMn1YaKMqwhJICyYg=", + "integrity": "sha512-N1pLGEHoDyCoI8uMmPXJXhn238L4nk41iipXCrqs4Ss0ooYSr5sNj2ucMo5AqJVC4OaOa7IztpBhOaaYTGZVuA==", "requires": { "graceful-fs": "~3.0.2", "inherits": "~2.0.0", @@ -8104,7 +7122,7 @@ "gaze": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", - "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "integrity": "sha512-3IWbXGkDDHFX8zIlNdfnmhvlSMhpBO6tDr4InB8fGku6dh/gjFPGNqcdsXJajZg05x9jRzXbL6gCnCnuMap4tw==", "requires": { "globule": "~0.1.0" } @@ -8140,7 +7158,7 @@ "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==", "requires": { "is-glob": "^3.1.0", "path-dirname": "^1.0.0" @@ -8159,7 +7177,7 @@ "glob-stream": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", - "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", + "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==", "requires": { "extend": "^3.0.0", "glob": "^7.1.1", @@ -8203,15 +7221,16 @@ } }, "glob-watcher": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz", - "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz", + "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==", "requires": { "anymatch": "^2.0.0", "async-done": "^1.2.0", "chokidar": "^2.0.0", "is-negated-glob": "^1.0.0", "just-debounce": "^1.0.0", + "normalize-path": "^3.0.0", "object.defaults": "^1.1.0" } }, @@ -8267,7 +7286,7 @@ "globule": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", - "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "integrity": "sha512-3eIcA2OjPCm4VvwIwZPzIxCVssA8HSpM2C6c6kK5ufJH4FGwWoyqL3In19uuX4oe+TwH3w2P1nQDmW56iehO4A==", "requires": { "glob": "~3.1.21", "lodash": "~1.0.1", @@ -8277,7 +7296,7 @@ "glob": { "version": "3.1.21", "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "integrity": "sha512-ANhy2V2+tFpRajE3wN4DhkNQ08KDr0Ir1qL12/cUe5+a7STEK8jkW4onUYuY8/06qAFuT5je7mjAqzx0eKI2tQ==", "requires": { "graceful-fs": "~1.2.0", "inherits": "1", @@ -8294,15 +7313,10 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=" }, - "lodash": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", - "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=" - }, "minimatch": { "version": "0.2.14", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==", "requires": { "lru-cache": "2", "sigmund": "~1.0.0" @@ -8463,7 +7477,7 @@ "glob": { "version": "4.5.3", "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==", "requires": { "inflight": "^1.0.4", "inherits": "2", @@ -8474,7 +7488,7 @@ "glob-stream": { "version": "3.1.18", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", - "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "integrity": "sha512-owHtlMMXIAbxLjhUAO0HhW1/TB7kV0AwDduI3BLbYsWCaRzNIcLBu8N0wHZft2Za2SCmUXCEOdpZzC7k/H19eg==", "requires": { "glob": "^4.3.1", "glob2base": "^0.0.12", @@ -8498,7 +7512,7 @@ "glob-watcher": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", - "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "integrity": "sha512-lzYWq1BJLBmtb9rzT6+lgbFlEW6Sc7B+Qs3RmsNA9lbdFSqLHhebfypPR3nbEOMeEQyawVXqSDH0aqjtImldow==", "requires": { "gaze": "^0.5.1" } @@ -8514,7 +7528,7 @@ "gulp": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", - "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=", + "integrity": "sha512-6FHNdR+VG1LcPz6gZGGqgvimWWGtl4x3FvshAdK/UnAjU7aFOyzft3Fjp35r0Y3ZF4u8vND0S4nGsIB/sxTqzQ==", "requires": { "archy": "^1.0.0", "chalk": "^1.0.0", @@ -8534,16 +7548,11 @@ "minimatch": { "version": "2.0.10", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==", "requires": { "brace-expansion": "^1.0.0" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, "ordered-read-streams": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", @@ -8552,7 +7561,7 @@ "semver": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", - "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=" + "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==" }, "strip-bom": { "version": "1.0.0", @@ -8593,7 +7602,7 @@ "vinyl-fs": { "version": "0.3.14", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", - "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", + "integrity": "sha512-9CTKjt8378nhdydwFDTwywKio0n8aqq6xA70g0uypcnTNSCow/gQOwv0L9E2GaKd7EQ3kZl/diBxPSCgcBXESw==", "requires": { "defaults": "^1.0.0", "glob-stream": "^3.1.5", @@ -8660,7 +7669,7 @@ "gulp-util": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==", "requires": { "array-differ": "^1.0.0", "array-uniq": "^1.0.2", @@ -8699,11 +7708,6 @@ "supports-color": "^2.0.0" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -8825,9 +7829,9 @@ } }, "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==" + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" }, "inflight": { "version": "1.0.6", @@ -8844,9 +7848,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "interpret": { "version": "1.1.0", @@ -9058,9 +8062,9 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=" }, "jszip": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz", - "integrity": "sha1-uI86ey5noqBIFSmCx6N1bZxIKPA=", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.7.0.tgz", + "integrity": "sha512-JIsRKRVC3gTRo2vM4Wy9WBC3TRcfnIZU8k65Phi3izkvPH975FowRYtKGT6PxevA0XnJ/yO8b0QwV0ydVyQwfw==", "requires": { "pako": "~1.0.2" } @@ -9071,9 +8075,9 @@ "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=" }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "last-run": { "version": "1.1.1", @@ -9182,6 +8186,11 @@ } } }, + "lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha512-0VSEDVec/Me2eATuoiQd8IjyBMMX0fahob8YJ96V1go2RjvCk1m1GxmtfXn8RNSaLaTtop7fsuhhu9oLk3hUgA==" + }, "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", @@ -9263,7 +8272,7 @@ "lodash.template": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==", "requires": { "lodash._basecopy": "^3.0.0", "lodash._basetostring": "^3.0.0", @@ -9367,22 +8376,22 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -9399,11 +8408,11 @@ } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.6" } }, "ms": { @@ -9476,11 +8485,6 @@ "validate-npm-package-license": "^3.0.1" }, "dependencies": { - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" - }, "resolve": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", @@ -9789,9 +8793,9 @@ "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" }, "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-root": { "version": "0.1.1", @@ -9816,6 +8820,11 @@ "pinkie-promise": "^2.0.0" } }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -9965,33 +8974,6 @@ "readable-stream": "^2.0.2" }, "dependencies": { - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", @@ -10290,9 +9272,9 @@ } }, "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "semver-greatest-satisfied-range": { "version": "1.1.0", @@ -10313,17 +9295,17 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-getter": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz", - "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz", + "integrity": "sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==", "requires": { "to-object-path": "^0.3.0" } }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -10360,7 +9342,7 @@ "smart-zip": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/smart-zip/-/smart-zip-0.0.9.tgz", - "integrity": "sha1-BQbnL4AL+NfqOgYZIpztM2sdaP0=", + "integrity": "sha512-qSC5oWgrpuIPTtx1Q4wDK2cgDG5x90pGHQ/lvVC5v/VSiNdRi4DjYbWwDdBcd2OpiSLtpUWh/2UPghgTX7h+bg==", "requires": { "jszip": "^2.5.0", "unzip": "^0.1.11" @@ -10905,13 +9887,6 @@ "tsconfig": "^7.0.0", "v8flags": "^3.0.0", "yn": "^2.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } } }, "tsconfig": { @@ -10967,27 +9942,14 @@ "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=" }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unique-stream": { @@ -11043,7 +10005,7 @@ "unzip": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/unzip/-/unzip-0.1.11.tgz", - "integrity": "sha1-iXScY7BY19kNYZ+GuYqhU107l/A=", + "integrity": "sha512-Dvxd7bj2RcfbM+AbNfx0Ufqvk7Kl4YGeAQlEGn9+glDQz1HFxeeRjBStxi/DfIvgutn6hbC4yMc1rEo3x+dmVQ==", "requires": { "binary": ">= 0.3.0 < 1", "fstream": ">= 0.1.30 < 1", @@ -11350,9 +10312,9 @@ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" }, "yargs": { "version": "7.1.0", @@ -11375,11 +10337,12 @@ } }, "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz", + "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", "requires": { - "camelcase": "^3.0.0" + "camelcase": "^3.0.0", + "object.assign": "^4.1.0" } }, "yazl": { diff --git a/build.bat b/build.bat index 8a32a549a..fd8fa7187 100644 --- a/build.bat +++ b/build.bat @@ -13,7 +13,7 @@ rem CD into build tool directory cd %~dp0_tools/build-tool rem Install dependencies and build missions -call npm install --loglevel=error +call npm install --silent call npx gulp echo. From 3bf33f6bbe374cc51817380a66ede721dadd559b Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 16:09:06 +0200 Subject: [PATCH 091/115] Cleanup .gitignore --- .gitignore | 52 ++++------------------------------------------------ 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 07ba90008..5da0fdcae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,55 +1,11 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db +# dev mission.sqm +/Missionframework/mission.sqm -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk +# Tools local configs +/_tools/config.ps1 # Build directory /build/ -/_tools/build/ -/_tools/node_modules/ # KP-Steam steam_appid.txt From fa3b660a3f5edf1360ece04e88668a7b37e53e8d Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 16:11:27 +0200 Subject: [PATCH 092/115] VSCode - Add tasks/script for dev setup and game launch --- .vscode/tasks.json | 22 +++++++++++++++++++++ _tools/config.ps1.dist | 10 ++++++++++ _tools/vscode/Invoke-Setup.ps1 | 29 ++++++++++++++++++++++++++++ _tools/vscode/Run-Game.ps1 | 35 ++++++++++++++++++++++++++++++++++ _tools/vscode/functions.ps1 | 15 +++++++++++++++ 5 files changed, 111 insertions(+) create mode 100644 .vscode/tasks.json create mode 100644 _tools/config.ps1.dist create mode 100644 _tools/vscode/Invoke-Setup.ps1 create mode 100644 _tools/vscode/Run-Game.ps1 create mode 100644 _tools/vscode/functions.ps1 diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..5ea85aece --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,22 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Launch game", + "type": "shell", + "command": "powershell -c '. ${workspaceFolder}/_tools/vscode/Run-Game.ps1'", + "problemMatcher": [], + "group": { + "kind": "build" + } + }, + { + "label": "Setup", + "type": "shell", + "command": "powershell -c '. ${workspaceFolder}/_tools/vscode/Invoke-Setup.ps1'", + "problemMatcher": [] + } + ] +} diff --git a/_tools/config.ps1.dist b/_tools/config.ps1.dist new file mode 100644 index 000000000..7cd9b6151 --- /dev/null +++ b/_tools/config.ps1.dist @@ -0,0 +1,10 @@ +$global:armaDir = "C:\Program Files (x86)\Steam\steamapps\common\Arma 3" +$global:armaExe = "arma3_x64.exe" + +$global:armaProfile = "dev_kplib" +$global:devMap = "altis" + +$global:modsArray = @( + "!Workshop\@Advanced Developer Tools", + "!Workshop\@CBA_A3" +) diff --git a/_tools/vscode/Invoke-Setup.ps1 b/_tools/vscode/Invoke-Setup.ps1 new file mode 100644 index 000000000..647cace36 --- /dev/null +++ b/_tools/vscode/Invoke-Setup.ps1 @@ -0,0 +1,29 @@ +Set-StrictMode -Version latest +$ErrorActionPreference = "Stop" + +. "$PSScriptRoot\functions.ps1" +. "$PSScriptRoot\..\config.ps1" + +$repoRoot = Resolve-Path "$PSScriptRoot/../.." +$devMission = "kp_liberation.$devMap" + +<# + .DESCRIPTION + Create development mission files with framework inside specified profile directory. +#> +function Add-MissionFiles($profileDir) { + $targetDir = "$($profileDir.FullName)/mpmissions" + # ensure that $targetDir directory exists + New-Item -ItemType Directory -Path $targetDir -ErrorAction SilentlyContinue | Out-Null + + # Link Missionframework into editor mission directory + (gi "$targetDir/$devMission").Delete() + New-Item -ItemType Junction -Path "$targetDir/$devMission" -Value "$repoRoot/Missionframework" -Force + + $baseMission = Get-Item "$repoRoot/Missionbasefiles/$devMission" + New-Item -ItemType HardLink -Path "$repoRoot/Missionframework/mission.sqm" -Value "$baseMission/mission.sqm" -Force +} + +$targetProfileDir = Get-TargetProfileDir +Add-MissionFiles $targetProfileDir + diff --git a/_tools/vscode/Run-Game.ps1 b/_tools/vscode/Run-Game.ps1 new file mode 100644 index 000000000..238d8065f --- /dev/null +++ b/_tools/vscode/Run-Game.ps1 @@ -0,0 +1,35 @@ +Set-StrictMode -Version latest +$ErrorActionPreference = "Stop" + +. "$PSScriptRoot\functions.ps1" +. "$PSScriptRoot\..\config.ps1" + +$devMission = "kp_liberation.$devMap" + +function Get-Arma3LaunchCommand { + param ( + [Parameter(Mandatory)] + [string] $exePath, + [array] $modsArray = @("vn") + ) + + $baseParams = '-world=empty -window -noPause -noSplash -skipIntro' + $params = @( + "-name=""$armaProfile""" + ) -join ' ' + + $command = @( + """$exePath""" + $params, + "-mod=""$($modsArray -join ';')""", + $baseParams, + """$(Get-TargetProfileDir)\mpmissions\$devMission""" + ) + + return $command +} + +$launchCommand = Get-Arma3LaunchCommand -ExePath "$armaDir/$armaExe" -ModsArray $modsArray +Write-Host $launchCommand + +Start-Process $launchCommand[0] ($launchCommand | Select-Object -Skip 1) diff --git a/_tools/vscode/functions.ps1 b/_tools/vscode/functions.ps1 new file mode 100644 index 000000000..1a78f46f3 --- /dev/null +++ b/_tools/vscode/functions.ps1 @@ -0,0 +1,15 @@ +Set-StrictMode -Version latest +$ErrorActionPreference = "Stop" + +$documents = "$env:UserProfile\Documents" + +function Get-TargetProfileDir() { + # $armaDefaultProfile = "$documents\Arma 3" + $armaProfilesDir = "$documents\Arma 3 - Other Profiles" + $profilePath = "$armaProfilesDir\$armaProfile" + + # ensure that $armaProfilesDir directory exists + New-Item -ItemType Directory -Path $profilePath -ErrorAction SilentlyContinue | Out-Null + + return Get-Item $profilePath +} From f1291328a28a8539ef97e7a4edb100135a7def73 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 16:16:45 +0200 Subject: [PATCH 093/115] Fix CI --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55b0ea3ad..25be59055 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,11 +16,11 @@ jobs: name: Setup Node - name: Install dependencies - working-directory: _tools + working-directory: _tools/build-tool run: npm install - name: Assemble and pack - working-directory: _tools + working-directory: _tools/build-tool run: npx gulp - uses: actions/upload-artifact@master From 2ff7d65fae20505cb072b935530897aaa807cab3 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 16:23:57 +0200 Subject: [PATCH 094/115] Unify build output naming --- _tools/_presets.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_tools/_presets.json b/_tools/_presets.json index d56441f12..e6cb1bb1e 100644 --- a/_tools/_presets.json +++ b/_tools/_presets.json @@ -221,7 +221,7 @@ }, { "sourceFolder": "kp_liberation.gm_weferlingen_summer", - "missionName": "KPLIB_east", + "missionName": "kp_liberation_ger_east", "map": "gm_weferlingen_summer", "mapDisplay": "Weferlingen", "configFile": "KPLIB_config.sqf", @@ -236,7 +236,7 @@ }, { "sourceFolder": "kp_liberation.gm_weferlingen_winter", - "missionName": "KPLIB_east", + "missionName": "kp_liberation_ger_east", "map": "gm_weferlingen_winter", "mapDisplay": "Weferlingen Winter", "configFile": "KPLIB_config.sqf", @@ -251,7 +251,7 @@ }, { "sourceFolder": "kp_liberation.Takistan", - "missionName": "KPLIB_afrf", + "missionName": "kp_liberation_afrf", "map": "Takistan", "configFile": "KPLIB_config.sqf", "variables": { From 750ea911390d3afe86e4956e4b2c198c33192b07 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 17:06:39 +0200 Subject: [PATCH 095/115] Add changelog entries --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60ac977c8..d5e1e7c00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Changelog ## 0.96.8 (TBD) +* Added: Scripts/configs to setup and run development environment from VSCode tasks * Updated: Italian localization. Thanks to [k4s0](https://github.com/k4s0) -* Tweaked: Splitted the config file in seperate files, as it was getting quite big. +* Tweaked: Splitted the config file in separate files, as it was getting quite big. * Tweaked: Unified the prefix of all variables to `KPLIB_`. * Tweaked: Arsenal presets are now in the presets folder. * Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal. @@ -10,6 +11,7 @@ * Tweaked: Parameter value variables are having a `param` prefix now. * Tweaked: Comments/structure of the config file. Also added some category prefix sorting to some config variables. * Tweaked: GM East enemy preset, lower the chance for unarmed BRDM. +* Tweaked: Moved mission build tool into subdirectory * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total. * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server. * Fixed: FOB truck got mass set, but should've just apply to FOB boxes. From d5babab087394302f521054021acdc916d1a98b8 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 17:58:44 +0200 Subject: [PATCH 096/115] Code formatting, remove unused variables --- .../functions/fn_createManagedUnit.sqf | 5 ++-- .../functions/fn_handlePlacedZeusObject.sqf | 14 +++++------ .../functions/fn_spawnVehicle.sqf | 20 ++++++++-------- Missionframework/init.sqf | 1 - .../scripts/client/build/do_build.sqf | 23 ++++++++++--------- .../scripts/client/init_client.sqf | 6 ++--- .../scripts/server/battlegroup/spawn_air.sqf | 18 ++++++++------- .../scripts/server/game/save_manager.sqf | 7 +++--- .../scripts/server/init_server.sqf | 10 ++++---- .../patrols/manage_one_civilian_patrol.sqf | 5 +++- .../server/patrols/send_paratroopers.sqf | 11 +++++---- .../server/secondary/search_and_rescue.sqf | 8 ++++++- .../scripts/shared/kill_manager.sqf | 3 +-- 13 files changed, 68 insertions(+), 63 deletions(-) diff --git a/Missionframework/functions/fn_createManagedUnit.sqf b/Missionframework/functions/fn_createManagedUnit.sqf index 2ac602127..17f028780 100644 --- a/Missionframework/functions/fn_createManagedUnit.sqf +++ b/Missionframework/functions/fn_createManagedUnit.sqf @@ -2,7 +2,7 @@ File: fn_createManagedUnit.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-10-04 - Last Update: 2019-12-04 + Last Update: 2023-10-28 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -35,8 +35,7 @@ isNil { _unit = _groupTemp createUnit [_type, _spawnPos, [], _placement, "FORM"]; _unit addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; }]; _unit setRank _rank; diff --git a/Missionframework/functions/fn_handlePlacedZeusObject.sqf b/Missionframework/functions/fn_handlePlacedZeusObject.sqf index cf7156780..05d8fe437 100644 --- a/Missionframework/functions/fn_handlePlacedZeusObject.sqf +++ b/Missionframework/functions/fn_handlePlacedZeusObject.sqf @@ -2,7 +2,7 @@ File: fn_handlePlacedZeusObject.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-11 - Last Update: 2020-05-10 + Last Update: 2023-10-28 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -33,10 +33,9 @@ if (_vehicle) then { // Add kill manager and object init to possible crew units { _x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }]; + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; [_x] call KPLIB_fnc_addObjectInit; } forEach (crew _obj); }; @@ -44,9 +43,8 @@ if (_vehicle) then { // Apply kill manager, if it's not a crate if !(_crate) then { _obj addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; }]; } else { // Otherwise apply all needed values/functionalities diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index b192da43a..7266d55e4 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -2,7 +2,7 @@ File: fn_spawnVehicle.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2019-12-03 - Last Update: 2020-05-15 + Last Update: 2023-10-28 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -84,19 +84,19 @@ if (_classname in KPLIB_o_militiaVehicles) then { private _crew = units (createVehicleCrew _newvehicle); _crew joinSilent _grp; sleep 0.1; - {_x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }];} forEach _crew; + { + _x addEventHandler ["Killed", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; + } forEach _crew; }; // Add Killed and GetIn EHs and enable damage again _newvehicle addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }]; + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; +}]; sleep 0.1; _newvehicle allowDamage true; _newvehicle setDamage 0; diff --git a/Missionframework/init.sqf b/Missionframework/init.sqf index 21a2da89b..11c65b5ba 100644 --- a/Missionframework/init.sqf +++ b/Missionframework/init.sqf @@ -60,7 +60,6 @@ if ((isNil {player getVariable "bis_revive_ehHandleHeal"} || isDedicated) && !(b [] call bis_fnc_reviveInit; }; - KPLIB_init = true; // Notify clients that server is ready diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 003f611f0..ec8d989f3 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -51,7 +51,7 @@ while { true } do { if ( manned ) then { _grp = createGroup KPLIB_side_player; }; - _classname createUnit [_pos, _grp,"this addEventHandler [""Killed"", {[""KPLIB_manageKills"", _this] call CBA_fnc_serverEvent;}]", 0.5, "private"]; + _classname createUnit [_pos, _grp,"this addEventHandler ['Killed', {['KPLIB_manageKills', _this] call CBA_fnc_serverEvent}]", 0.5, "private"]; build_confirmed = 0; } else { if ( buildtype == 8 ) then { @@ -64,9 +64,9 @@ while { true } do { if(_idx == 0) then { _unitrank = "sergeant"; }; if(_idx == 1) then { _unitrank = "corporal"; }; if (_classname isEqualTo KPLIB_b_squadPara) then { - _x createUnit [_pos, _grp,"this addEventHandler [""Killed"", {[""KPLIB_manageKills"", _this] call CBA_fnc_serverEvent;}]; removeBackpackGlobal this; this addBackpackGlobal ""B_parachute""", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addEventHandler ['Killed', {['KPLIB_manageKills', _this] call CBA_fnc_serverEvent}]; removeBackpackGlobal this; this addBackpackGlobal 'B_parachute'", 0.5, _unitrank]; } else { - _x createUnit [_pos, _grp,"this addEventHandler [""Killed"", {[""KPLIB_manageKills"", _this] call CBA_fnc_serverEvent;}];", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addEventHandler ['Killed', {['KPLIB_manageKills', _this] call CBA_fnc_serverEvent}];", 0.5, _unitrank]; }; _idx = _idx + 1; @@ -333,15 +333,16 @@ while { true } do { if(buildtype != 6) then { _vehicle addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }]; - { _x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }]; } foreach (crew _vehicle); + { + _x addEventHandler ["Killed", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; + } foreach (crew _vehicle); }; }; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index 1fc50a7aa..41d8cff04 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -35,9 +35,9 @@ execVM "scripts\client\ui\tutorial_manager.sqf"; execVM "scripts\client\markers\update_production_sites.sqf"; player addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }]; + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; +}]; player addEventHandler ["GetInMan", {[_this select 2] spawn kp_fuel_consumption;}]; player addEventHandler ["GetInMan", {[_this select 2] call KPLIB_fnc_setVehiclesSeized;}]; player addEventHandler ["GetInMan", {[_this select 2] call KPLIB_fnc_setVehicleCaptured;}]; diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index 96f550783..e03f3b99a 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -18,17 +18,19 @@ for "_i" from 1 to _planes_number do { _plane = createVehicle [_class, _spawnPos, [], 0, "FLY"]; createVehicleCrew _plane; _plane flyInHeight (120 + (random 180)); - _plane addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; + [_plane] call KPLIB_fnc_addObjectInit; - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + _plane addEventHandler ["Killed", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; }]; - [_plane] call KPLIB_fnc_addObjectInit; - {_x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; + { + _x addEventHandler ["Killed", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + }]; + } forEach (crew _plane); - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }];} forEach (crew _plane); (crew _plane) joinSilent _grp; sleep 1; }; diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 9cdaaa6d3..0c3497b61 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -357,10 +357,9 @@ if (!isNil "_saveData") then { // Apply kill manager handling, if not excluded if !((toLower _class) in _noKillHandler) then { _object addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }]; + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; }; // Set enemy vehicle as captured diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index da5ff35cf..1ddbae141 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -117,12 +117,10 @@ execVM "scripts\server\asymmetric\init_module.sqf"; execVM "scripts\server\offloading\group_diag.sqf"; // Server event(s) -["KPLib_manageKills", -{ - params ["_unit","_killer"]; - [_unit,_killer] call kill_manager; -} -] call CBA_fnc_addEventHandler; +["KPLib_manageKills", { + params ["_unit", "_killer"]; + [_unit, _killer] call kill_manager; +}] call CBA_fnc_addEventHandler; { diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index 63448e7c7..5465e35ff 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -42,7 +42,10 @@ while { KPLIB_endgame == 0 } do { [selectRandom KPLIB_c_units, _spawnpos, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; _civveh = (selectRandom KPLIB_c_vehicles) createVehicle _spawnpos; _civveh setpos _spawnpos; - _civveh addEventHandler ["Killed", {["KPLIB_manageKills", _this] call CBA_fnc_serverEvent;}]; + _civveh addEventHandler ["Killed", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_player ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; ((units _grp) select 0) moveInDriver _civveh; ((units _grp) select 0) disableAI "FSM"; diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index 87654bd35..320a8f5b6 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -31,11 +31,12 @@ if (isNull _chopper_type) then { ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; }]; - {_x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }];} forEach (crew _newvehicle); + { + _x addEventHandler ["Killed", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; + } forEach (crew _newvehicle); } else { _newvehicle = _chopper_type; _pilot_group = group _newvehicle; diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index 9e072be1a..e04f6999a 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -76,7 +76,13 @@ if ( KPLIB_enemyReadiness < 50 ) then { private _vehtospawn = []; private _spawnchances = [75,50,15]; {if (random 100 < _x) then {_vehtospawn pushBack (selectRandom _vehicle_pool);};} foreach _spawnchances; -{([(getpos _helowreck) getPos [30 + (random 30), random 360], _x, true] call KPLIB_fnc_spawnVehicle) addEventHandler ["Killed", {["KPLIB_manageKills", _this] call CBA_fnc_serverEvent;}]; } foreach _vehtospawn; +{ + private _vehicle = [(getpos _helowreck) getPos [30 + (random 30), random 360], _x, true] call KPLIB_fnc_spawnVehicle; + _vehicle addEventHandler ["Killed", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + }]; +} foreach _vehtospawn; secondary_objective_position = getpos _helowreck; secondary_objective_position_marker = secondary_objective_position getPos [800, random 360]; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index e580212cb..429250feb 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -145,11 +145,10 @@ params ["_unit", "_killer"]; }; // Body/wreck cleanup - if (!isPlayer _unit) then { [{ params ["_unit"]; - if (_unit isKindOf "CAManBase") exitwith { + if (_unit isKindOf "CAManBase") exitWith { hideBody _unit; }; deleteVehicle _unit; From f83a8077db4a0d4972a6eff63bc9de83aca5f6a6 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 18:11:10 +0200 Subject: [PATCH 097/115] Revert to MPKilled, use localEvent --- .../functions/fn_createManagedUnit.sqf | 4 ++-- .../functions/fn_handlePlacedZeusObject.sqf | 8 ++++---- Missionframework/functions/fn_spawnVehicle.sqf | 8 ++++---- Missionframework/scripts/client/build/do_build.sqf | 14 +++++++------- Missionframework/scripts/client/init_client.sqf | 4 ++-- .../scripts/server/battlegroup/spawn_air.sqf | 8 ++++---- .../scripts/server/game/save_manager.sqf | 4 ++-- .../server/patrols/manage_one_civilian_patrol.sqf | 4 ++-- .../scripts/server/patrols/send_paratroopers.sqf | 8 ++++---- .../scripts/server/secondary/search_and_rescue.sqf | 4 ++-- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Missionframework/functions/fn_createManagedUnit.sqf b/Missionframework/functions/fn_createManagedUnit.sqf index 17f028780..484b3ab6c 100644 --- a/Missionframework/functions/fn_createManagedUnit.sqf +++ b/Missionframework/functions/fn_createManagedUnit.sqf @@ -34,8 +34,8 @@ isNil { private _groupTemp = createGroup [CIVILIAN, true]; _unit = _groupTemp createUnit [_type, _spawnPos, [], _placement, "FORM"]; - _unit addEventHandler ["Killed", { - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + _unit addMPEventHandler ["MPKilled", { + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; _unit setRank _rank; diff --git a/Missionframework/functions/fn_handlePlacedZeusObject.sqf b/Missionframework/functions/fn_handlePlacedZeusObject.sqf index 05d8fe437..2bda2e60a 100644 --- a/Missionframework/functions/fn_handlePlacedZeusObject.sqf +++ b/Missionframework/functions/fn_handlePlacedZeusObject.sqf @@ -32,9 +32,9 @@ if (_vehicle) then { // Add kill manager and object init to possible crew units { - _x addEventHandler ["Killed", { + _x addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; [_x] call KPLIB_fnc_addObjectInit; } forEach (crew _obj); @@ -42,9 +42,9 @@ if (_vehicle) then { // Apply kill manager, if it's not a crate if !(_crate) then { - _obj addEventHandler ["Killed", { + _obj addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; } else { // Otherwise apply all needed values/functionalities diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index 7266d55e4..4749a7a02 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -85,17 +85,17 @@ if (_classname in KPLIB_o_militiaVehicles) then { _crew joinSilent _grp; sleep 0.1; { - _x addEventHandler ["Killed", { + _x addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; } forEach _crew; }; // Add Killed and GetIn EHs and enable damage again -_newvehicle addEventHandler ["Killed", { +_newvehicle addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; sleep 0.1; _newvehicle allowDamage true; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index ec8d989f3..82b362e34 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -51,7 +51,7 @@ while { true } do { if ( manned ) then { _grp = createGroup KPLIB_side_player; }; - _classname createUnit [_pos, _grp,"this addEventHandler ['Killed', {['KPLIB_manageKills', _this] call CBA_fnc_serverEvent}]", 0.5, "private"]; + _classname createUnit [_pos, _grp,"this addMpEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}]", 0.5, "private"]; build_confirmed = 0; } else { if ( buildtype == 8 ) then { @@ -64,9 +64,9 @@ while { true } do { if(_idx == 0) then { _unitrank = "sergeant"; }; if(_idx == 1) then { _unitrank = "corporal"; }; if (_classname isEqualTo KPLIB_b_squadPara) then { - _x createUnit [_pos, _grp,"this addEventHandler ['Killed', {['KPLIB_manageKills', _this] call CBA_fnc_serverEvent}]; removeBackpackGlobal this; this addBackpackGlobal 'B_parachute'", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addMpEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}]; removeBackpackGlobal this; this addBackpackGlobal 'B_parachute'", 0.5, _unitrank]; } else { - _x createUnit [_pos, _grp,"this addEventHandler ['Killed', {['KPLIB_manageKills', _this] call CBA_fnc_serverEvent}];", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addMpEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}];", 0.5, _unitrank]; }; _idx = _idx + 1; @@ -332,15 +332,15 @@ while { true } do { _vehicle setDamage 0; if(buildtype != 6) then { - _vehicle addEventHandler ["Killed", { + _vehicle addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; { - _x addEventHandler ["Killed", { + _x addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; } foreach (crew _vehicle); }; diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index 41d8cff04..f2f1acca2 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -34,9 +34,9 @@ execVM "scripts\client\ui\ui_manager.sqf"; execVM "scripts\client\ui\tutorial_manager.sqf"; execVM "scripts\client\markers\update_production_sites.sqf"; -player addEventHandler ["Killed", { +player addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; player addEventHandler ["GetInMan", {[_this select 2] spawn kp_fuel_consumption;}]; player addEventHandler ["GetInMan", {[_this select 2] call KPLIB_fnc_setVehiclesSeized;}]; diff --git a/Missionframework/scripts/server/battlegroup/spawn_air.sqf b/Missionframework/scripts/server/battlegroup/spawn_air.sqf index e03f3b99a..f32a55247 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_air.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_air.sqf @@ -20,14 +20,14 @@ for "_i" from 1 to _planes_number do { _plane flyInHeight (120 + (random 180)); [_plane] call KPLIB_fnc_addObjectInit; - _plane addEventHandler ["Killed", { + _plane addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; { - _x addEventHandler ["Killed", { + _x addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_localEvent; }]; } forEach (crew _plane); diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index 0c3497b61..c6cb31cbf 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -356,9 +356,9 @@ if (!isNil "_saveData") then { // Apply kill manager handling, if not excluded if !((toLower _class) in _noKillHandler) then { - _object addEventHandler ["Killed", { + _object addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; }; diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index 5465e35ff..4d315cebe 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -42,9 +42,9 @@ while { KPLIB_endgame == 0 } do { [selectRandom KPLIB_c_units, _spawnpos, _grp, "PRIVATE", 0.5] call KPLIB_fnc_createManagedUnit; _civveh = (selectRandom KPLIB_c_vehicles) createVehicle _spawnpos; _civveh setpos _spawnpos; - _civveh addEventHandler ["Killed", { + _civveh addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; _civveh addEventHandler ["HandleDamage", { private [ "_damage" ]; if (( side (_this select 3) != KPLIB_side_player ) && ( side (_this select 3) != KPLIB_side_enemy )) then { _damage = 0 } else { _damage = _this select 2 }; _damage } ]; ((units _grp) select 0) moveInDriver _civveh; diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index 320a8f5b6..b93e6d519 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -26,15 +26,15 @@ if (isNull _chopper_type) then { _pilot_group = createGroup [KPLIB_side_enemy, true]; (crew _newvehicle) joinSilent _pilot_group; - _newvehicle addEventHandler ["Killed", { + _newvehicle addMPEventHandler ["MPKilled", { params ["_unit", "_killer", "_instigator", "_useEffects"]; - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_localEvent; }]; { - _x addEventHandler ["Killed", { + _x addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; } forEach (crew _newvehicle); } else { diff --git a/Missionframework/scripts/server/secondary/search_and_rescue.sqf b/Missionframework/scripts/server/secondary/search_and_rescue.sqf index e04f6999a..4f31ca022 100644 --- a/Missionframework/scripts/server/secondary/search_and_rescue.sqf +++ b/Missionframework/scripts/server/secondary/search_and_rescue.sqf @@ -78,9 +78,9 @@ private _spawnchances = [75,50,15]; {if (random 100 < _x) then {_vehtospawn pushBack (selectRandom _vehicle_pool);};} foreach _spawnchances; { private _vehicle = [(getpos _helowreck) getPos [30 + (random 30), random 360], _x, true] call KPLIB_fnc_spawnVehicle; - _vehicle addEventHandler ["Killed", { + _vehicle addMPEventHandler ["MPKilled", { params ["_unit", "_killer"]; - ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_serverEvent; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; } foreach _vehtospawn; From 0124e3cb7e09b50bb531669588240e3a62bb9d13 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 18:22:01 +0200 Subject: [PATCH 098/115] Add missing params, minor formatting --- Missionframework/functions/fn_createManagedUnit.sqf | 1 + Missionframework/scripts/client/build/do_build.sqf | 6 +++--- .../scripts/server/patrols/send_paratroopers.sqf | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Missionframework/functions/fn_createManagedUnit.sqf b/Missionframework/functions/fn_createManagedUnit.sqf index 484b3ab6c..1d744568f 100644 --- a/Missionframework/functions/fn_createManagedUnit.sqf +++ b/Missionframework/functions/fn_createManagedUnit.sqf @@ -35,6 +35,7 @@ isNil { _unit = _groupTemp createUnit [_type, _spawnPos, [], _placement, "FORM"]; _unit addMPEventHandler ["MPKilled", { + params ["_unit", "_killer"]; ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; }]; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 82b362e34..9b7132bc1 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -51,7 +51,7 @@ while { true } do { if ( manned ) then { _grp = createGroup KPLIB_side_player; }; - _classname createUnit [_pos, _grp,"this addMpEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}]", 0.5, "private"]; + _classname createUnit [_pos, _grp,"this addMPEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}]", 0.5, "private"]; build_confirmed = 0; } else { if ( buildtype == 8 ) then { @@ -64,9 +64,9 @@ while { true } do { if(_idx == 0) then { _unitrank = "sergeant"; }; if(_idx == 1) then { _unitrank = "corporal"; }; if (_classname isEqualTo KPLIB_b_squadPara) then { - _x createUnit [_pos, _grp,"this addMpEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}]; removeBackpackGlobal this; this addBackpackGlobal 'B_parachute'", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addMPEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}]; removeBackpackGlobal this; this addBackpackGlobal 'B_parachute'", 0.5, _unitrank]; } else { - _x createUnit [_pos, _grp,"this addMpEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}];", 0.5, _unitrank]; + _x createUnit [_pos, _grp,"this addMPEventHandler ['MPKilled', {['KPLIB_manageKills', _this] call CBA_fnc_localEvent}]", 0.5, _unitrank]; }; _idx = _idx + 1; diff --git a/Missionframework/scripts/server/patrols/send_paratroopers.sqf b/Missionframework/scripts/server/patrols/send_paratroopers.sqf index b93e6d519..a10c86a68 100644 --- a/Missionframework/scripts/server/patrols/send_paratroopers.sqf +++ b/Missionframework/scripts/server/patrols/send_paratroopers.sqf @@ -27,9 +27,8 @@ if (isNull _chopper_type) then { (crew _newvehicle) joinSilent _pilot_group; _newvehicle addMPEventHandler ["MPKilled", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_localEvent; + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_localEvent; }]; { _x addMPEventHandler ["MPKilled", { From 661ffea56a3558060be374c7dd2cccde05df88b0 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 19:57:44 +0200 Subject: [PATCH 099/115] Fix crates floating after detach --- Missionframework/functions/fn_addActionsPlayer.sqf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index e904033d3..9464eddec 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -2,7 +2,7 @@ File: fn_addActionsPlayer.sqf Author: KP Liberation Dev Team - https://github.com/KillahPotatoes Date: 2020-04-13 - Last Update: 2020-09-23 + Last Update: 2023-10-28 License: MIT License - http://www.opensource.org/licenses/MIT Description: @@ -373,7 +373,11 @@ _player addAction [ // Drop crate _player addAction [ ["", localize "STR_ACTION_CRATE_DROP", ""] joinString "", - {detach (((attachedObjects player) select {(typeOf _x) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]}) select 0)}, + { + private _crate = ((attachedObjects player) select {(typeOf _x) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]}) param [0, objNull]; + detach _crate; + _crate awake true; + }, nil, -504, true, From c5d26ba3b7439a9fd5c42b332dd90c7fe78de677 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 20:21:05 +0200 Subject: [PATCH 100/115] Optimize crate carry/drop actions --- .../functions/fn_addActionsPlayer.sqf | 13 +++++++------ .../client/ammoboxes/ammobox_action_manager.sqf | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index 9464eddec..58a30ef43 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -374,7 +374,9 @@ _player addAction [ _player addAction [ ["", localize "STR_ACTION_CRATE_DROP", ""] joinString "", { - private _crate = ((attachedObjects player) select {(typeOf _x) in [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]}) param [0, objNull]; + params ["_player"]; + private _crate = _player getVariable ["KPLIB_carriedObject", objNull]; + _player setVariable ["KPLIB_carriedObject", nil]; detach _crate; _crate awake true; }, @@ -383,11 +385,10 @@ _player addAction [ true, false, "", - " - alive _originalTarget - && {build_confirmed isEqualTo 0} - && {!((((attachedObjects _originalTarget) apply {typeOf _x}) arrayIntersect [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]) isEqualTo [])} - " + toString { + alive _originalTarget && + build_confirmed == 0 && _this in _this && {!isNull (_this getVariable ["KPLIB_carriedObject", objNull])} + } ]; true diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index 4d0695ab8..c6667e08e 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -57,12 +57,24 @@ while {true} do { _b_action_id2 = _next_box addAction ["" + localize "STR_ACTION_STORE_CRATE" + "",{[(_this select 0), (nearestObjects [player,KPLIB_storageBuildings,20]) select 0,true] call KPLIB_fnc_crateToStorage;},"",-502,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id3 = _next_box addAction ["" + localize "STR_ACTION_CRATE_VALUE" + "",{[_this select 0] call KPLIB_fnc_checkCrateValue;uiSleep 3; hint "";},"",-503,true,true,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; _b_action_id4 = _next_box addAction ["" + localize "STR_ACTION_CRATE_PUSH" + "",{(_this select 0) setPos ((_this select 0) getPos [1, (player getDir (_this select 0))]);},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player)"]; - _b_action_id5 = _next_box addAction ["" + localize "STR_ACTION_CRATE_CARRY" + "",{(_this select 0) attachTo [(_this select 1), [0, 2, 1]];},"",-504,true,false,"","build_confirmed == 0 && (_this distance _target < 5) && (vehicle player == player) && {(((attachedObjects player) apply {typeOf _x}) arrayIntersect [KPLIB_b_crateSupply, KPLIB_b_crateAmmo, KPLIB_b_crateFuel]) isEqualTo []}"]; + _b_action_id_carry = _next_box addAction [ + "" + localize "STR_ACTION_CRATE_CARRY" + "", + { + params ["_crate", "_player"]; + _crate attachTo [_player, [0, 2, 1]]; + _player setVariable ["KPLIB_carriedObject", _crate]; + }, + "", -504, true, false, "", + toString { + build_confirmed == 0 && _this in _this && {isNull (_this getVariable ["KPLIB_carriedObject", objNull])} + }, + 5 // radius + ]; _next_box setVariable ["KPLIB_ammo_box_action", _b_action_id1, false]; _next_box setVariable ["KP_crate_store_action", _b_action_id2, false]; _next_box setVariable ["KP_crate_value_action", _b_action_id3, false]; _next_box setVariable ["KP_crate_push_action", _b_action_id4, false]; - _next_box setVariable ["KP_crate_carry_action", _b_action_id5, false]; + _next_box setVariable ["KP_crate_carry_action", _b_action_id_carry, false]; _managed_boxes pushback _next_box; }; From 7cd55b06e6774665461a1f2cead50e326c4ffbac Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 20:24:43 +0200 Subject: [PATCH 101/115] Prevent players from getting into vehicles while carrying --- Missionframework/scripts/client/init_client.sqf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Missionframework/scripts/client/init_client.sqf b/Missionframework/scripts/client/init_client.sqf index adb30622f..69644cfa8 100644 --- a/Missionframework/scripts/client/init_client.sqf +++ b/Missionframework/scripts/client/init_client.sqf @@ -39,6 +39,12 @@ player addEventHandler ["GetInMan", {[_this select 2] spawn kp_fuel_consumption; player addEventHandler ["GetInMan", {[_this select 2] call KPLIB_fnc_setVehiclesSeized;}]; player addEventHandler ["GetInMan", {[_this select 2] call KPLIB_fnc_setVehicleCaptured;}]; player addEventHandler ["GetInMan", {[_this select 2] call kp_vehicle_permissions;}]; +player addEventHandler ["GetInMan", { + params ["_player"]; + // prevent players from getting into vehicles while carrying + if (isNull (_player getVariable ["KPLIB_carriedObject", objNull])) exitWith {}; + moveOut _player; +}]; player addEventHandler ["SeatSwitchedMan", {[_this select 2] call kp_vehicle_permissions;}]; player addEventHandler ["HandleRating", {if ((_this select 1) < 0) then {0};}]; From 0de9560219c244c4dd616c9e36c18bf48a30bb7e Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 20:40:23 +0200 Subject: [PATCH 102/115] Prevent weaponization of crates --- Missionframework/functions/fn_addActionsPlayer.sqf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Missionframework/functions/fn_addActionsPlayer.sqf b/Missionframework/functions/fn_addActionsPlayer.sqf index 58a30ef43..06b3eea99 100644 --- a/Missionframework/functions/fn_addActionsPlayer.sqf +++ b/Missionframework/functions/fn_addActionsPlayer.sqf @@ -376,6 +376,14 @@ _player addAction [ { params ["_player"]; private _crate = _player getVariable ["KPLIB_carriedObject", objNull]; + + // prevent players from putting crates inside vehicles + private _crateSize = sizeOf typeOf _crate * 1.5; + private _nearObjects = (_crate nearEntities [["Man", "Air", "Car", "Tank"], _crateSize]) - [_crate, _player]; + if (_nearObjects isNotEqualTo []) exitWith { + hint format [localize "STR_PLACEMENT_IMPOSSIBLE", count _nearObjects, _crateSize toFixed 0]; + }; + _player setVariable ["KPLIB_carriedObject", nil]; detach _crate; _crate awake true; From 28c19bb3e07991ca0039dd431fc9a780d2f4e796 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 20:46:51 +0200 Subject: [PATCH 103/115] Fix vehicle unlock check error --- Missionframework/scripts/client/build/open_build_menu.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionframework/scripts/client/build/open_build_menu.sqf b/Missionframework/scripts/client/build/open_build_menu.sqf index 975404372..3a54918c3 100644 --- a/Missionframework/scripts/client/build/open_build_menu.sqf +++ b/Missionframework/scripts/client/build/open_build_menu.sqf @@ -149,7 +149,7 @@ while {dialog && alive player && (dobuild == 0 || buildtype == 1)} do { { if ( ( _build_item select 0 ) == ( _x select 0 ) ) exitWith { _base_link = _x select 1; _linked = true; } } foreach KPLIB_vehicle_to_military_base_links; if ( _linked ) then { - if ( !(_base_link in blufor_sectors) ) then { _linked_unlocked = false }; + if ( !(_base_link in KPLIB_sectors_player) ) then { _linked_unlocked = false }; }; }; }; From 5a52036cd3527e5e34788d0e720f2bbddc8de80f Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 21:09:55 +0200 Subject: [PATCH 104/115] Add scriptName to KPLIB script for easier debugging --- Missionframework/scripts/client/actions/intel_manager.sqf | 1 + Missionframework/scripts/client/actions/open_arsenal.sqf | 2 ++ Missionframework/scripts/client/actions/recycle_manager.sqf | 2 ++ Missionframework/scripts/client/actions/unflip_manager.sqf | 2 ++ .../scripts/client/ammoboxes/ammobox_action_manager.sqf | 2 ++ .../scripts/client/asymmetric/asymm_notifications.sqf | 1 + Missionframework/scripts/client/build/build_overlay.sqf | 2 ++ Missionframework/scripts/client/build/do_build.sqf | 1 + Missionframework/scripts/client/build/do_build_fob.sqf | 2 ++ Missionframework/scripts/client/build/do_sector_build.sqf | 2 ++ Missionframework/scripts/client/build/open_build_menu.sqf | 2 ++ Missionframework/scripts/client/civinformant/civinfo_escort.sqf | 2 ++ Missionframework/scripts/client/commander/open_logistic.sqf | 2 ++ Missionframework/scripts/client/commander/open_permissions.sqf | 2 ++ Missionframework/scripts/client/commander/open_production.sqf | 2 ++ .../scripts/client/markers/empty_vehicles_marker.sqf | 2 ++ Missionframework/scripts/client/markers/fob_markers.sqf | 2 ++ Missionframework/scripts/client/markers/group_icons.sqf | 2 ++ Missionframework/scripts/client/markers/hostile_groups.sqf | 2 ++ Missionframework/scripts/client/markers/huron_marker.sqf | 2 ++ Missionframework/scripts/client/markers/sector_manager.sqf | 2 ++ Missionframework/scripts/client/markers/spot_timer.sqf | 2 ++ .../scripts/client/markers/update_production_sites.sqf | 2 ++ Missionframework/scripts/client/misc/broadcast_squad_colors.sqf | 2 ++ Missionframework/scripts/client/misc/kp_fuel_consumption.sqf | 1 + Missionframework/scripts/client/misc/resupply_manager.sqf | 2 ++ Missionframework/scripts/client/misc/synchronise_eco.sqf | 2 ++ Missionframework/scripts/client/misc/synchronise_vars.sqf | 2 ++ .../scripts/client/remotecall/remote_call_battlegroup.sqf | 2 ++ .../scripts/client/remotecall/remote_call_endgame.sqf | 2 ++ Missionframework/scripts/client/remotecall/remote_call_fob.sqf | 2 ++ .../scripts/client/remotecall/remote_call_incoming.sqf | 2 ++ .../scripts/client/remotecall/remote_call_intel.sqf | 2 ++ .../scripts/client/remotecall/remote_call_prisonner.sqf | 2 ++ .../scripts/client/remotecall/remote_call_sector.sqf | 2 ++ Missionframework/scripts/client/spawn/do_halo.sqf | 2 ++ Missionframework/scripts/client/spawn/redeploy_manager.sqf | 2 ++ Missionframework/scripts/client/spawn/spawn_camera.sqf | 2 ++ Missionframework/scripts/client/ui/cinematic_camera.sqf | 2 ++ Missionframework/scripts/client/ui/end_screen.sqf | 2 ++ Missionframework/scripts/client/ui/intro.sqf | 2 ++ Missionframework/scripts/client/ui/secondary_ui.sqf | 2 ++ Missionframework/scripts/client/ui/squad_management.sqf | 2 ++ Missionframework/scripts/client/ui/tutorial_manager.sqf | 2 ++ 44 files changed, 84 insertions(+) diff --git a/Missionframework/scripts/client/actions/intel_manager.sqf b/Missionframework/scripts/client/actions/intel_manager.sqf index 630fe14e8..c46636add 100644 --- a/Missionframework/scripts/client/actions/intel_manager.sqf +++ b/Missionframework/scripts/client/actions/intel_manager.sqf @@ -1,3 +1,4 @@ +scriptName "intel_manager"; // TODO Remove this loop by adding the actions to the units/intel objects on spawn waitUntil {!isNil "KPLIB_permissions"}; waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_param_permissions}; diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index a60927ae4..e5a85e9d8 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/Missionframework/scripts/client/actions/open_arsenal.sqf @@ -1,3 +1,5 @@ +scriptName "open_arsenal"; + if (KPLIB_param_directArsenal) exitWith { if (KP_liberation_ace && KP_liberation_arsenal_type) then { [player, player, false] call ace_arsenal_fnc_openBox; diff --git a/Missionframework/scripts/client/actions/recycle_manager.sqf b/Missionframework/scripts/client/actions/recycle_manager.sqf index 51486aa71..32d7d28ce 100644 --- a/Missionframework/scripts/client/actions/recycle_manager.sqf +++ b/Missionframework/scripts/client/actions/recycle_manager.sqf @@ -1,3 +1,5 @@ +scriptName "recycle_manager"; + private _recycleable_vehicles = []; private _recycleable_classnames = []; veh_action_detect_distance = 20; diff --git a/Missionframework/scripts/client/actions/unflip_manager.sqf b/Missionframework/scripts/client/actions/unflip_manager.sqf index a7bf33707..1774e7ede 100644 --- a/Missionframework/scripts/client/actions/unflip_manager.sqf +++ b/Missionframework/scripts/client/actions/unflip_manager.sqf @@ -1,3 +1,5 @@ +scriptName "unflip_manager"; + waitUntil {!isNil "KPLIB_permissions"}; waitUntil {!(KPLIB_permissions isEqualTo []) || !KPLIB_param_permissions}; diff --git a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf index c6667e08e..4cf28e515 100644 --- a/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf +++ b/Missionframework/scripts/client/ammoboxes/ammobox_action_manager.sqf @@ -1,3 +1,5 @@ +scriptName "ammobox_action_manager"; + waitUntil {!isNil "build_confirmed"}; waitUntil {!isNil "one_synchro_done"}; waitUntil {!isNil "one_eco_done"}; diff --git a/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf b/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf index 40911c3df..4a4932c4f 100644 --- a/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf +++ b/Missionframework/scripts/client/asymmetric/asymm_notifications.sqf @@ -1,3 +1,4 @@ +scriptName "asymm_notificatins"; if (isDedicated) exitWith {}; params ["_notif_id", ["_pos", getpos player]]; diff --git a/Missionframework/scripts/client/build/build_overlay.sqf b/Missionframework/scripts/client/build/build_overlay.sqf index a09075007..b967ab5aa 100644 --- a/Missionframework/scripts/client/build/build_overlay.sqf +++ b/Missionframework/scripts/client/build/build_overlay.sqf @@ -1,3 +1,5 @@ +scriptName "build_overlay"; + KPLIB_conflicting_objects = []; KPLIB_buildoverlay_icon = "\A3\ui_f\data\map\markers\handdrawn\objective_CA.paa"; KPLIB_buildoverlay_color = [ 1, 0, 0, 1 ]; diff --git a/Missionframework/scripts/client/build/do_build.sqf b/Missionframework/scripts/client/build/do_build.sqf index 300744057..b4561dfb3 100644 --- a/Missionframework/scripts/client/build/do_build.sqf +++ b/Missionframework/scripts/client/build/do_build.sqf @@ -1,3 +1,4 @@ +scriptName "do_build"; // TODO This needs absolutely a code refactoring, flamethrower or nuke private [ "_maxdist", "_truepos", "_built_object_remote", "_pos", "_grp", "_classname", "_idx", "_unitrank", "_posfob", "_ghost_spot", "_vehicle", "_dist", "_actualdir", "_near_objects", "_near_objects_25", "_debug_colisions" ]; diff --git a/Missionframework/scripts/client/build/do_build_fob.sqf b/Missionframework/scripts/client/build/do_build_fob.sqf index 853b32d38..ea13526cd 100644 --- a/Missionframework/scripts/client/build/do_build_fob.sqf +++ b/Missionframework/scripts/client/build/do_build_fob.sqf @@ -1,3 +1,5 @@ +scriptName "do_build_fob"; + private [ "_minfobdist", "_minsectordist", "_distfob", "_clearedtobuildfob", "_distsector", "_clearedtobuildsector", "_idx" ]; if ( count KPLIB_sectors_fob >= KPLIB_param_maxFobs ) exitWith { diff --git a/Missionframework/scripts/client/build/do_sector_build.sqf b/Missionframework/scripts/client/build/do_sector_build.sqf index 970dbdc72..c656f451f 100644 --- a/Missionframework/scripts/client/build/do_sector_build.sqf +++ b/Missionframework/scripts/client/build/do_sector_build.sqf @@ -1,3 +1,5 @@ +scriptName "do_sector_build"; + private ["_vector", "_idactcancel", "_idactplace", "_idactvector", "_ghost_spot", "_truedir", "_dist", "_truepos", "_sectorpos", "_building"]; if (((_this select 3) select 0) == KPLIB_b_smallStorage) then { diff --git a/Missionframework/scripts/client/build/open_build_menu.sqf b/Missionframework/scripts/client/build/open_build_menu.sqf index 3a54918c3..b5b8a0d2e 100644 --- a/Missionframework/scripts/client/build/open_build_menu.sqf +++ b/Missionframework/scripts/client/build/open_build_menu.sqf @@ -1,3 +1,5 @@ +scriptName "open_build_menu"; + private [ "_oldbuildtype", "_cfg", "_initindex", "_dialog", "_iscommandant", "_squadname", "_buildpages", "_build_list", "_classnamevar", "_entrytext", "_icon", "_affordable", "_affordable_crew", "_selected_item", "_linked", "_linked_unlocked", "_base_link", "_link_color", "_link_str", "_nearfob", "_actual_fob"]; if (([ getpos player , 500 , KPLIB_side_enemy ] call KPLIB_fnc_getUnitsCount ) > 4 ) exitWith { hint localize "STR_BUILD_ENEMIES_NEARBY";}; diff --git a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf index 35c425c5c..89f4b53cd 100644 --- a/Missionframework/scripts/client/civinformant/civinfo_escort.sqf +++ b/Missionframework/scripts/client/civinformant/civinfo_escort.sqf @@ -1,3 +1,5 @@ +scriptName "civinfo_escort"; + params ["_informant"]; if (isDedicated) exitWith {}; diff --git a/Missionframework/scripts/client/commander/open_logistic.sqf b/Missionframework/scripts/client/commander/open_logistic.sqf index e27469c80..e9745b386 100644 --- a/Missionframework/scripts/client/commander/open_logistic.sqf +++ b/Missionframework/scripts/client/commander/open_logistic.sqf @@ -1,3 +1,5 @@ +scriptName "open_logistic"; + private ["_dialog", "_logi_count", "_listselect", "_selectedGroup", "_detailControls", "_nearfob", "_logi_destinations", "_mapdisplay", "_tempvariable"]; _dialog = createDialog "liberation_logistic"; diff --git a/Missionframework/scripts/client/commander/open_permissions.sqf b/Missionframework/scripts/client/commander/open_permissions.sqf index fb97eb9bc..38145efe4 100644 --- a/Missionframework/scripts/client/commander/open_permissions.sqf +++ b/Missionframework/scripts/client/commander/open_permissions.sqf @@ -1,3 +1,5 @@ +scriptName "open_permissions"; + waitUntil {!isNil "KPLIB_permissions"}; private _players_array = []; diff --git a/Missionframework/scripts/client/commander/open_production.sqf b/Missionframework/scripts/client/commander/open_production.sqf index b80a95a1c..22ba91d02 100644 --- a/Missionframework/scripts/client/commander/open_production.sqf +++ b/Missionframework/scripts/client/commander/open_production.sqf @@ -1,3 +1,5 @@ +scriptName "open_production"; + private ["_dialog", "_color_positive", "_color_neutral", "_color_negative", "_color_actual", "_sectorType", "_storage", "_crateCount", "_crateMax", "_producing", "_storagespace", "_productiontime", "_saveChanges", "_listselect", "_listcolor", "_selectedSector", "_mapdisplay", "_supplyValue", "_ammoValue", "_fuelValue"]; _dialog = createDialog "liberation_production"; diff --git a/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf b/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf index a1e5fa183..def0e60e3 100644 --- a/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf +++ b/Missionframework/scripts/client/markers/empty_vehicles_marker.sqf @@ -1,3 +1,5 @@ +scriptName "empty_vehicles_marker"; + private [ "_vehmarkers", "_markedveh", "_cfg", "_vehtomark", "_supporttomark", "_marker" ]; _vehmarkers = []; diff --git a/Missionframework/scripts/client/markers/fob_markers.sqf b/Missionframework/scripts/client/markers/fob_markers.sqf index a0b73ac0c..6daf68488 100644 --- a/Missionframework/scripts/client/markers/fob_markers.sqf +++ b/Missionframework/scripts/client/markers/fob_markers.sqf @@ -1,3 +1,5 @@ +scriptName "fob_markers"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_sectors_fob"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/client/markers/group_icons.sqf b/Missionframework/scripts/client/markers/group_icons.sqf index 6eed99ec4..97b4aac33 100644 --- a/Missionframework/scripts/client/markers/group_icons.sqf +++ b/Missionframework/scripts/client/markers/group_icons.sqf @@ -1,3 +1,5 @@ +scriptName "group_icons"; + private [ "_iconed_groups", "_ticks", "_localgroup", "_grouptype", "_groupicon" ]; _iconed_groups = []; diff --git a/Missionframework/scripts/client/markers/hostile_groups.sqf b/Missionframework/scripts/client/markers/hostile_groups.sqf index 300485d8e..a9d7a7802 100644 --- a/Missionframework/scripts/client/markers/hostile_groups.sqf +++ b/Missionframework/scripts/client/markers/hostile_groups.sqf @@ -1,3 +1,5 @@ +scriptName "hostile_groups"; + private ["_kp_markers_array","_kp_markers_start","_kp_markers_change","_kp_markers_pos","_kp_markers_posx","_kp_markers_posy","_kp_markers_name","_kp_markers_color"]; waitUntil {sleep 0.1; !isNil "KPLIB_saveLoaded" && {KPLIB_saveLoaded}}; diff --git a/Missionframework/scripts/client/markers/huron_marker.sqf b/Missionframework/scripts/client/markers/huron_marker.sqf index 0b62c5b2a..6e08dcddd 100644 --- a/Missionframework/scripts/client/markers/huron_marker.sqf +++ b/Missionframework/scripts/client/markers/huron_marker.sqf @@ -1,3 +1,5 @@ +scriptName "huron_marker"; + private [ "_huronlocal" ]; "huronmarker" setMarkerTextLocal "Potato 01"; diff --git a/Missionframework/scripts/client/markers/sector_manager.sqf b/Missionframework/scripts/client/markers/sector_manager.sqf index 489ea493e..08eab3b37 100644 --- a/Missionframework/scripts/client/markers/sector_manager.sqf +++ b/Missionframework/scripts/client/markers/sector_manager.sqf @@ -1,3 +1,5 @@ +scriptName "sector_manager"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_vehicle_to_military_base_links"}; waitUntil {!isNil "KPLIB_sectors_player"}; diff --git a/Missionframework/scripts/client/markers/spot_timer.sqf b/Missionframework/scripts/client/markers/spot_timer.sqf index c9416b6f8..f38dccb27 100644 --- a/Missionframework/scripts/client/markers/spot_timer.sqf +++ b/Missionframework/scripts/client/markers/spot_timer.sqf @@ -1,3 +1,5 @@ +scriptName "spot_timer"; + createMarkerLocal ["opfor_bg_marker", markers_reset]; "opfor_bg_marker" setMarkerTypeLocal "mil_unknown"; "opfor_bg_marker" setMarkerColorLocal KPLIB_color_enemyActive; diff --git a/Missionframework/scripts/client/markers/update_production_sites.sqf b/Missionframework/scripts/client/markers/update_production_sites.sqf index f938b6bdc..22b54df16 100644 --- a/Missionframework/scripts/client/markers/update_production_sites.sqf +++ b/Missionframework/scripts/client/markers/update_production_sites.sqf @@ -1,3 +1,5 @@ +scriptName "update_production_sites"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_production_markers"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf b/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf index 520764c98..3cc4611ad 100644 --- a/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf +++ b/Missionframework/scripts/client/misc/broadcast_squad_colors.sqf @@ -1,3 +1,5 @@ +scriptName "broadcast_squad_colors"; + while { true } do { if ( local group player ) then { diff --git a/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf b/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf index 37416cc1d..cf589ccfe 100644 --- a/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf +++ b/Missionframework/scripts/client/misc/kp_fuel_consumption.sqf @@ -1,3 +1,4 @@ +scriptName "kp_fuel_consumption"; /* kp_fuel_consumption.sqf Author: Wyqer diff --git a/Missionframework/scripts/client/misc/resupply_manager.sqf b/Missionframework/scripts/client/misc/resupply_manager.sqf index 32039909a..88c957c79 100644 --- a/Missionframework/scripts/client/misc/resupply_manager.sqf +++ b/Missionframework/scripts/client/misc/resupply_manager.sqf @@ -1,3 +1,5 @@ +scriptName "resupply_manager"; + private [ "_resupply_dist", "_repair_increment", "_repair_speed", "_repair_altitude", "_veh", "_repaired", "_rearmed", "_refueled", "_average_damage", "_average_fuel", "_screenmsg", "_rearm_time", "_refuel_amount", "_rearm_ticker" ]; _repair_amount = 0.01; diff --git a/Missionframework/scripts/client/misc/synchronise_eco.sqf b/Missionframework/scripts/client/misc/synchronise_eco.sqf index 868a52f72..7b334d318 100644 --- a/Missionframework/scripts/client/misc/synchronise_eco.sqf +++ b/Missionframework/scripts/client/misc/synchronise_eco.sqf @@ -1,3 +1,5 @@ +scriptName "synchronise_eco"; + one_eco_done = false; waitUntil {!isNil "sync_eco"}; diff --git a/Missionframework/scripts/client/misc/synchronise_vars.sqf b/Missionframework/scripts/client/misc/synchronise_vars.sqf index 305ea5e9d..4fee6e27b 100644 --- a/Missionframework/scripts/client/misc/synchronise_vars.sqf +++ b/Missionframework/scripts/client/misc/synchronise_vars.sqf @@ -1,3 +1,5 @@ +scriptName "synchronise_vars"; + one_synchro_done = false; synchro_done = false; diff --git a/Missionframework/scripts/client/remotecall/remote_call_battlegroup.sqf b/Missionframework/scripts/client/remotecall/remote_call_battlegroup.sqf index 63816c272..227ea0b94 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_battlegroup.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_battlegroup.sqf @@ -1,3 +1,5 @@ +scriptName "remote_call_battlegroup"; + if ( isDedicated ) exitWith {}; params [ "_battlegroup_position" ]; diff --git a/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf b/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf index 1998381c6..5c9d639e7 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_endgame.sqf @@ -1,3 +1,5 @@ +scriptName "remote_call_endgame"; + player allowDamage false; (vehicle player) allowDamage false; KPLIB_endgame = 1; diff --git a/Missionframework/scripts/client/remotecall/remote_call_fob.sqf b/Missionframework/scripts/client/remotecall/remote_call_fob.sqf index 0b222b28d..efd004898 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_fob.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_fob.sqf @@ -1,3 +1,5 @@ +scriptName "remote_call_fob"; + if ( isDedicated ) exitWith {}; if ( isNil "sector_timer" ) then { sector_timer = 0 }; diff --git a/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf b/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf index 1d17ba808..38b254558 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_incoming.sqf @@ -1,3 +1,5 @@ +scriptName "remote_call_incoming"; + if ( isDedicated ) exitWith {}; params [ "_attack_destination" ]; diff --git a/Missionframework/scripts/client/remotecall/remote_call_intel.sqf b/Missionframework/scripts/client/remotecall/remote_call_intel.sqf index 1c0352d96..5159a58b7 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_intel.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_intel.sqf @@ -1,3 +1,5 @@ +scriptName "remote_call_intel"; + if (isDedicated) exitWith {}; params ["_notiftype", ["_obj_position", getpos player]]; diff --git a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf index 340876c4b..39796f4d0 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_prisonner.sqf @@ -1,3 +1,5 @@ +scriptName "remote_call_prisoner"; + params [ "_unit" ]; private [ "_nearestfob", "_is_near_fob", "_is_near_blufor", "_grp", "_waypoint", "_nearblufor" ]; diff --git a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf index 0d6511a1c..a9528aa27 100644 --- a/Missionframework/scripts/client/remotecall/remote_call_sector.sqf +++ b/Missionframework/scripts/client/remotecall/remote_call_sector.sqf @@ -1,3 +1,5 @@ +scriptName "remote_call_sector"; + if ( isDedicated ) exitWith {}; if ( isNil "sector_timer" ) then { sector_timer = 0 }; diff --git a/Missionframework/scripts/client/spawn/do_halo.sqf b/Missionframework/scripts/client/spawn/do_halo.sqf index 376d79cee..e2168be20 100644 --- a/Missionframework/scripts/client/spawn/do_halo.sqf +++ b/Missionframework/scripts/client/spawn/do_halo.sqf @@ -1,3 +1,5 @@ +scriptName "do_halo"; + private [ "_dialog", "_backpack", "_backpackcontents" ]; if ( isNil "KPLIB_last_halo_jump" ) then { KPLIB_last_halo_jump = -6000; }; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index cb7877496..4ffc2d1c6 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -1,3 +1,5 @@ +scriptName "redeploy_manager"; + #define DEPLOY_DISPLAY (findDisplay 5201) #define DEPLOY_LIST_IDC 201 #define DEPLOY_BUTTON_IDC 202 diff --git a/Missionframework/scripts/client/spawn/spawn_camera.sqf b/Missionframework/scripts/client/spawn/spawn_camera.sqf index 5e1410148..92b04b6cb 100644 --- a/Missionframework/scripts/client/spawn/spawn_camera.sqf +++ b/Missionframework/scripts/client/spawn/spawn_camera.sqf @@ -1,3 +1,5 @@ +scriptName "spawn_camera"; + private [ "_nearest_sector", "_leadingzero_hour", "_leadingzero_minute", "_startpos0", "_startpos1", "_endpos1", "_startpos2", "_endpos2", "_startpos3", "_endpos3", "_spawn_camera", "_datestring" ]; params [ "_spawn_str" ]; diff --git a/Missionframework/scripts/client/ui/cinematic_camera.sqf b/Missionframework/scripts/client/ui/cinematic_camera.sqf index c8e908e98..dbc68bd55 100644 --- a/Missionframework/scripts/client/ui/cinematic_camera.sqf +++ b/Missionframework/scripts/client/ui/cinematic_camera.sqf @@ -1,3 +1,5 @@ +scriptName "cinematic_camera"; + if ( isNil "KPLIB_sectors_active" ) then { KPLIB_sectors_active = [] }; if ( isNil "KPLIB_sectors_fob" ) then { KPLIB_sectors_fob = [] }; diff --git a/Missionframework/scripts/client/ui/end_screen.sqf b/Missionframework/scripts/client/ui/end_screen.sqf index ddb1152cb..0dec7f731 100644 --- a/Missionframework/scripts/client/ui/end_screen.sqf +++ b/Missionframework/scripts/client/ui/end_screen.sqf @@ -1,3 +1,5 @@ +scriptName "end_screen"; + params [ "_stats_ammo_produced", "_stats_ammo_spent", diff --git a/Missionframework/scripts/client/ui/intro.sqf b/Missionframework/scripts/client/ui/intro.sqf index 546e7e0b4..bddaef6e1 100644 --- a/Missionframework/scripts/client/ui/intro.sqf +++ b/Missionframework/scripts/client/ui/intro.sqf @@ -1,3 +1,5 @@ +scriptName "KPLIB_intro"; + if ( isNil "cinematic_camera_started" ) then { cinematic_camera_started = false }; sleep 0.5; waitUntil { time > 0 }; diff --git a/Missionframework/scripts/client/ui/secondary_ui.sqf b/Missionframework/scripts/client/ui/secondary_ui.sqf index 84e9cab19..aefab7f7a 100644 --- a/Missionframework/scripts/client/ui/secondary_ui.sqf +++ b/Missionframework/scripts/client/ui/secondary_ui.sqf @@ -1,3 +1,5 @@ +scriptName "KPLIB_secondary_ui"; + if ( isNil "KPLIB_secondary_starting" ) then { KPLIB_secondary_starting = false; }; if ( isNil "KPLIB_secondary_in_progress" ) then { KPLIB_secondary_in_progress = -1; }; diff --git a/Missionframework/scripts/client/ui/squad_management.sqf b/Missionframework/scripts/client/ui/squad_management.sqf index d5cc049c4..391a8567a 100644 --- a/Missionframework/scripts/client/ui/squad_management.sqf +++ b/Missionframework/scripts/client/ui/squad_management.sqf @@ -1,3 +1,5 @@ +scriptName "squad_management"; + private [ "_dialog", "_membercount", "_memberselection", "_unitname", "_selectedmember", "_cfgVehicles", "_cfgWeapons", "_primary_mags", "_secondary_mags", "_vehstring", "_nearfob", "_fobdistance", "_nearsquad", "_tempgmp", "_destpos", "_destdir", "_resupplied","_firstloop", "_squad_camera", "_targetobject", "_isvehicle" ]; KPLIB_squadaction = -1; diff --git a/Missionframework/scripts/client/ui/tutorial_manager.sqf b/Missionframework/scripts/client/ui/tutorial_manager.sqf index 4a43f0e37..395f66cee 100644 --- a/Missionframework/scripts/client/ui/tutorial_manager.sqf +++ b/Missionframework/scripts/client/ui/tutorial_manager.sqf @@ -1,3 +1,5 @@ +scriptName "tutorial_manager"; + private [ "_tutorial_titles", "_tutorial_pages", "_current_page", "_old_page", "_dialog" ]; if ( isNil "howtoplay" ) then { howtoplay = 0; }; From ed3b8993c5363bd4aaea66569c460d2f610f6ede Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Sat, 28 Oct 2023 21:40:45 +0200 Subject: [PATCH 105/115] Add more scriptName to KPLIB scripts for easier debugging --- Missionframework/scripts/client/misc/secondary_jip.sqf | 2 ++ Missionframework/scripts/server/ai/add_defense_waypoints.sqf | 2 ++ Missionframework/scripts/server/ai/building_defence_ai.sqf | 2 ++ .../scripts/server/asymmetric/asymmetric_loop.sqf | 2 ++ Missionframework/scripts/server/base/huron_manager.sqf | 2 ++ .../scripts/server/battlegroup/counter_battlegroup.sqf | 2 ++ .../scripts/server/battlegroup/random_battlegroups.sqf | 2 ++ .../scripts/server/battlegroup/readiness_increase.sqf | 2 ++ Missionframework/scripts/server/civinformant/civinfo_loop.sqf | 2 ++ .../scripts/server/game/apply_default_permissions.sqf | 2 ++ Missionframework/scripts/server/game/cleanup_vehicles.sqf | 2 ++ Missionframework/scripts/server/game/manage_time.sqf | 2 ++ Missionframework/scripts/server/game/manage_weather.sqf | 2 ++ Missionframework/scripts/server/game/playtime.sqf | 2 ++ Missionframework/scripts/server/game/server_restart.sqf | 2 ++ Missionframework/scripts/server/game/synchronise_eco.sqf | 4 ++++ Missionframework/scripts/server/game/synchronise_vars.sqf | 2 ++ Missionframework/scripts/server/game/zeus_synchro.sqf | 2 ++ Missionframework/scripts/server/offloading/group_diag.sqf | 2 ++ Missionframework/scripts/server/offloading/show_fps.sqf | 2 ++ .../scripts/server/patrols/manage_one_civilian_patrol.sqf | 2 ++ Missionframework/scripts/server/patrols/manage_one_patrol.sqf | 2 ++ Missionframework/scripts/server/patrols/manage_patrols.sqf | 2 ++ .../scripts/server/patrols/reinforcements_resetter.sqf | 2 ++ .../scripts/server/resources/manage_logistics.sqf | 2 ++ .../scripts/server/resources/manage_resources.sqf | 2 ++ .../scripts/server/resources/recalculate_resources.sqf | 2 ++ .../scripts/server/resources/recalculate_timer.sqf | 2 ++ .../scripts/server/resources/recalculate_timer_sector.sqf | 2 ++ Missionframework/scripts/server/resources/unit_cap.sqf | 2 ++ Missionframework/scripts/server/sector/lose_sectors.sqf | 2 ++ Missionframework/scripts/server/sector/manage_one_sector.sqf | 1 + .../scripts/server/sector/wait_to_spawn_sector.sqf | 2 ++ Missionframework/scripts/shared/diagnostics.sqf | 2 ++ 34 files changed, 69 insertions(+) diff --git a/Missionframework/scripts/client/misc/secondary_jip.sqf b/Missionframework/scripts/client/misc/secondary_jip.sqf index 56107faee..44f910584 100644 --- a/Missionframework/scripts/client/misc/secondary_jip.sqf +++ b/Missionframework/scripts/client/misc/secondary_jip.sqf @@ -1,3 +1,5 @@ +scriptName "secondary_jip"; + waitUntil { time > 20; }; diff --git a/Missionframework/scripts/server/ai/add_defense_waypoints.sqf b/Missionframework/scripts/server/ai/add_defense_waypoints.sqf index bd4e95a89..c52cc9f0d 100644 --- a/Missionframework/scripts/server/ai/add_defense_waypoints.sqf +++ b/Missionframework/scripts/server/ai/add_defense_waypoints.sqf @@ -1,3 +1,5 @@ +scriptName "add_defense_waypoints"; + private _grp = _this select 0; private _flagpos = _this select 1; private _basepos = getpos (leader _grp); diff --git a/Missionframework/scripts/server/ai/building_defence_ai.sqf b/Missionframework/scripts/server/ai/building_defence_ai.sqf index 8fc2f64a7..307f5e497 100644 --- a/Missionframework/scripts/server/ai/building_defence_ai.sqf +++ b/Missionframework/scripts/server/ai/building_defence_ai.sqf @@ -1,3 +1,5 @@ +scriptName "building_defence_ai"; + params ["_unit", ["_sector", ""]]; _unit setUnitPos "UP"; diff --git a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf index ad6046161..b1a401f89 100644 --- a/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf +++ b/Missionframework/scripts/server/asymmetric/asymmetric_loop.sqf @@ -1,3 +1,5 @@ +scriptName "asymmetric_loop"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_civ_rep"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/server/base/huron_manager.sqf b/Missionframework/scripts/server/base/huron_manager.sqf index 995924949..e0c123294 100644 --- a/Missionframework/scripts/server/base/huron_manager.sqf +++ b/Missionframework/scripts/server/base/huron_manager.sqf @@ -1,3 +1,5 @@ +scriptName "huron_manager"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf index 262e715b5..5a003a926 100644 --- a/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/counter_battlegroup.sqf @@ -1,3 +1,5 @@ +scriptName "counter_battle_group"; + if (isNil "infantry_weight") then {infantry_weight = 33;}; if (isNil "armor_weight") then {armor_weight = 33;}; if (isNil "air_weight") then {air_weight = 33;}; diff --git a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf index daec8f09f..7ca7c139c 100644 --- a/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf +++ b/Missionframework/scripts/server/battlegroup/random_battlegroups.sqf @@ -1,3 +1,5 @@ +scriptName "random_battlegroups"; + sleep (900 / KPLIB_param_aggressivity); private _sleeptime = 0; while {KPLIB_param_aggressivity > 0.9 && KPLIB_endgame == 0} do { diff --git a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf index 02f3859d6..87e62aeb5 100644 --- a/Missionframework/scripts/server/battlegroup/readiness_increase.sqf +++ b/Missionframework/scripts/server/battlegroup/readiness_increase.sqf @@ -1,3 +1,5 @@ +scriptName "readiness_increase"; + waitUntil {!isNil "KPLIB_saveLoaded" && {KPLIB_saveLoaded}}; while {true} do { diff --git a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf index 34b45f352..b9b5c07ef 100644 --- a/Missionframework/scripts/server/civinformant/civinfo_loop.sqf +++ b/Missionframework/scripts/server/civinformant/civinfo_loop.sqf @@ -1,3 +1,5 @@ +scriptName "civinfo_loop"; + waitUntil {sleep 10; ({_x in KPLIB_sectors_city || _x in KPLIB_sectors_capital} count KPLIB_sectors_player) > 0}; if (KPLIB_civinfo_debug > 0) then {[format ["Loop spawned on: %1", debug_source], "CIVINFO"] remoteExecCall ["KPLIB_fnc_log", 2];}; diff --git a/Missionframework/scripts/server/game/apply_default_permissions.sqf b/Missionframework/scripts/server/game/apply_default_permissions.sqf index 3f00fc506..9711cdf70 100644 --- a/Missionframework/scripts/server/game/apply_default_permissions.sqf +++ b/Missionframework/scripts/server/game/apply_default_permissions.sqf @@ -1,3 +1,5 @@ +scriptName "apply_default_permissions"; + if (!KPLIB_param_permissions) exitWith {}; waitUntil {!isNil "KPLIB_permissions"}; diff --git a/Missionframework/scripts/server/game/cleanup_vehicles.sqf b/Missionframework/scripts/server/game/cleanup_vehicles.sqf index cd26ee094..51f878fe9 100644 --- a/Missionframework/scripts/server/game/cleanup_vehicles.sqf +++ b/Missionframework/scripts/server/game/cleanup_vehicles.sqf @@ -1,3 +1,5 @@ +scriptName "cleanup_vehicles"; + private [ "_nextvehicle", "_nearestfob", "_reset_ticker" ]; _cleanup_classnames = []; diff --git a/Missionframework/scripts/server/game/manage_time.sqf b/Missionframework/scripts/server/game/manage_time.sqf index 8ea971b63..a98743fb0 100644 --- a/Missionframework/scripts/server/game/manage_time.sqf +++ b/Missionframework/scripts/server/game/manage_time.sqf @@ -1,3 +1,5 @@ +scriptName "manage_time"; + while {true} do { if (KPLIB_param_shorterNights && (daytime > 20 || daytime < 4)) then { setTimeMultiplier (KPLIB_param_timeMulti * 4); diff --git a/Missionframework/scripts/server/game/manage_weather.sqf b/Missionframework/scripts/server/game/manage_weather.sqf index 1c4e0a82a..eb6d8570b 100644 --- a/Missionframework/scripts/server/game/manage_weather.sqf +++ b/Missionframework/scripts/server/game/manage_weather.sqf @@ -1,3 +1,5 @@ +scriptName "manage_weather"; + private _weathers = [ [0.25], [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55], diff --git a/Missionframework/scripts/server/game/playtime.sqf b/Missionframework/scripts/server/game/playtime.sqf index 44a97ec00..330322da4 100644 --- a/Missionframework/scripts/server/game/playtime.sqf +++ b/Missionframework/scripts/server/game/playtime.sqf @@ -1,3 +1,5 @@ +scriptName "KPLIB_playtime"; + waitUntil { !isNil "KPLIB_saveLoaded" }; waitUntil { KPLIB_saveLoaded }; diff --git a/Missionframework/scripts/server/game/server_restart.sqf b/Missionframework/scripts/server/game/server_restart.sqf index 875a19bde..d7c8da1d0 100644 --- a/Missionframework/scripts/server/game/server_restart.sqf +++ b/Missionframework/scripts/server/game/server_restart.sqf @@ -1,3 +1,5 @@ +scriptName "server_restart"; + if (!isDedicated) exitWith {}; _serverDuration = (KPLIB_param_restart * 60 * 60); diff --git a/Missionframework/scripts/server/game/synchronise_eco.sqf b/Missionframework/scripts/server/game/synchronise_eco.sqf index b4b3fe674..8a1fcda5b 100644 --- a/Missionframework/scripts/server/game/synchronise_eco.sqf +++ b/Missionframework/scripts/server/game/synchronise_eco.sqf @@ -1,3 +1,7 @@ +scriptName "synchronize_eco"; + +publicVariable "synchronise_eco"; + sync_eco = []; publicVariable "sync_eco"; waitUntil{!isNil "KPLIB_saveLoaded"}; diff --git a/Missionframework/scripts/server/game/synchronise_vars.sqf b/Missionframework/scripts/server/game/synchronise_vars.sqf index 6da7b2ae0..d9429ee74 100644 --- a/Missionframework/scripts/server/game/synchronise_vars.sqf +++ b/Missionframework/scripts/server/game/synchronise_vars.sqf @@ -1,3 +1,5 @@ +scriptName "synchronise_vars"; + sync_vars = []; publicVariable "sync_vars"; waitUntil{!isNil "KPLIB_saveLoaded"}; diff --git a/Missionframework/scripts/server/game/zeus_synchro.sqf b/Missionframework/scripts/server/game/zeus_synchro.sqf index ec1b24191..8f2f0a2c2 100644 --- a/Missionframework/scripts/server/game/zeus_synchro.sqf +++ b/Missionframework/scripts/server/game/zeus_synchro.sqf @@ -1,3 +1,5 @@ +scriptName "zeus_synchro"; + waitUntil {!isNil "KPLIB_b_potato01"}; // Classnames of objects which should be added as editable for Zeus diff --git a/Missionframework/scripts/server/offloading/group_diag.sqf b/Missionframework/scripts/server/offloading/group_diag.sqf index f33ffc378..221f9ce18 100644 --- a/Missionframework/scripts/server/offloading/group_diag.sqf +++ b/Missionframework/scripts/server/offloading/group_diag.sqf @@ -1,3 +1,5 @@ +scriptName "group_diag"; + waitUntil {sleep 1; !isNil "KPLIB_sectors_active"}; while {true} do { diff --git a/Missionframework/scripts/server/offloading/show_fps.sqf b/Missionframework/scripts/server/offloading/show_fps.sqf index 49c289f62..a3d062b61 100644 --- a/Missionframework/scripts/server/offloading/show_fps.sqf +++ b/Missionframework/scripts/server/offloading/show_fps.sqf @@ -1,3 +1,5 @@ +scriptName "show_fps"; + private _sourcestr = "Server"; private _position = 0; diff --git a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf index 414354d97..f6e6a9923 100644 --- a/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_civilian_patrol.sqf @@ -1,3 +1,5 @@ +scriptName "manage_one_civilian_patrol"; + private [ "_spawnsector", "_grp", "_usable_sectors", "_spawntype", "_civnumber", "_vehdriver", "_spawnpos", "_civveh", "_sectors_patrol", "_patrol_startpos", "_waypoint", "_grpspeed", "_sectors_patrol_random", "_sectorcount", "_nextsector", "_nearestroad" ]; diff --git a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf index a30ca2344..f26c77cde 100644 --- a/Missionframework/scripts/server/patrols/manage_one_patrol.sqf +++ b/Missionframework/scripts/server/patrols/manage_one_patrol.sqf @@ -1,3 +1,5 @@ +scriptName "manage_one_patrol"; + params [ "_minimum_readiness", "_is_infantry" ]; private [ "_headless_client" ]; diff --git a/Missionframework/scripts/server/patrols/manage_patrols.sqf b/Missionframework/scripts/server/patrols/manage_patrols.sqf index 60bcde8bd..a9e4c3fec 100644 --- a/Missionframework/scripts/server/patrols/manage_patrols.sqf +++ b/Missionframework/scripts/server/patrols/manage_patrols.sqf @@ -1,3 +1,5 @@ +scriptName "manage_patrols"; + _combat_triggers = [20,40,50,65,80,95]; if ( KPLIB_param_unitcap < 0.9 ) then { _combat_triggers = [20,45,90]; }; if ( KPLIB_param_unitcap > 1.3 ) then { _combat_triggers = [15,25,40,65,75,85,95]; }; diff --git a/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf b/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf index 2362e3483..3012c0919 100644 --- a/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf +++ b/Missionframework/scripts/server/patrols/reinforcements_resetter.sqf @@ -1,3 +1,5 @@ +scriptName "reinforcements_resetter"; + _reset_time = 1800; reinforcements_set = false; diff --git a/Missionframework/scripts/server/resources/manage_logistics.sqf b/Missionframework/scripts/server/resources/manage_logistics.sqf index d12bc3c27..6d2cb7fe8 100644 --- a/Missionframework/scripts/server/resources/manage_logistics.sqf +++ b/Missionframework/scripts/server/resources/manage_logistics.sqf @@ -1,3 +1,5 @@ +scriptName "manage_logistics"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_logistics"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/server/resources/manage_resources.sqf b/Missionframework/scripts/server/resources/manage_resources.sqf index e3cec3c70..a4a3aa9f8 100644 --- a/Missionframework/scripts/server/resources/manage_resources.sqf +++ b/Missionframework/scripts/server/resources/manage_resources.sqf @@ -1,3 +1,5 @@ +scriptName "manage_resources"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {!isNil "KPLIB_production"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/server/resources/recalculate_resources.sqf b/Missionframework/scripts/server/resources/recalculate_resources.sqf index 4cab5ab3d..1b13f6dcf 100644 --- a/Missionframework/scripts/server/resources/recalculate_resources.sqf +++ b/Missionframework/scripts/server/resources/recalculate_resources.sqf @@ -1,3 +1,5 @@ +scriptName "recalculate_resources"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/server/resources/recalculate_timer.sqf b/Missionframework/scripts/server/resources/recalculate_timer.sqf index a2781a78d..26321ae38 100644 --- a/Missionframework/scripts/server/resources/recalculate_timer.sqf +++ b/Missionframework/scripts/server/resources/recalculate_timer.sqf @@ -1,3 +1,5 @@ +scriptName "recalculate_timer"; + waitUntil { !isNil "KPLIB_saveLoaded" }; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf b/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf index 80c9ee11d..7f3cddea7 100644 --- a/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf +++ b/Missionframework/scripts/server/resources/recalculate_timer_sector.sqf @@ -1,3 +1,5 @@ +scriptName "recalculate_timer_sector"; + waitUntil {!isNil "KPLIB_saveLoaded"}; waitUntil {KPLIB_saveLoaded}; diff --git a/Missionframework/scripts/server/resources/unit_cap.sqf b/Missionframework/scripts/server/resources/unit_cap.sqf index e5109a083..47ce2b66c 100644 --- a/Missionframework/scripts/server/resources/unit_cap.sqf +++ b/Missionframework/scripts/server/resources/unit_cap.sqf @@ -1,3 +1,5 @@ +scriptName "unit_cap"; + unitcap = 0; KPLIB_heli_count = 0; KPLIB_plane_count = 0; diff --git a/Missionframework/scripts/server/sector/lose_sectors.sqf b/Missionframework/scripts/server/sector/lose_sectors.sqf index ed96f0f47..eea53637c 100644 --- a/Missionframework/scripts/server/sector/lose_sectors.sqf +++ b/Missionframework/scripts/server/sector/lose_sectors.sqf @@ -1,3 +1,5 @@ +scriptName "lose_sectors"; + waitUntil { !isNil "KPLIB_sectors_fob" }; waitUntil { !isNil "KPLIB_sectors_player" }; diff --git a/Missionframework/scripts/server/sector/manage_one_sector.sqf b/Missionframework/scripts/server/sector/manage_one_sector.sqf index bbff77bd7..0d7e84829 100644 --- a/Missionframework/scripts/server/sector/manage_one_sector.sqf +++ b/Missionframework/scripts/server/sector/manage_one_sector.sqf @@ -1,3 +1,4 @@ +scriptName "manage_one_sector"; // base amount of sector lifetime tickets // if there are no enemies one ticket is removed every SECTOR_TICK_TIME seconds // 12 * 5 = 60s by default diff --git a/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf b/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf index 6697b803b..e67bdc17e 100644 --- a/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf +++ b/Missionframework/scripts/server/sector/wait_to_spawn_sector.sqf @@ -1,3 +1,5 @@ +scriptName "wait_to_spawn_sector"; + params ["_sector", "_opforcount"]; private _start = diag_tickTime; diff --git a/Missionframework/scripts/shared/diagnostics.sqf b/Missionframework/scripts/shared/diagnostics.sqf index e976f534d..017c7a3db 100644 --- a/Missionframework/scripts/shared/diagnostics.sqf +++ b/Missionframework/scripts/shared/diagnostics.sqf @@ -1,3 +1,5 @@ +scriptName "KPLIB_diagnostics"; + private _source = ""; ["------------------------------------", "MISSIONSTART"] call KPLIB_fnc_log; From 560384adcbfbba2382f563e461194f1a9a78570c Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Sun, 19 Nov 2023 14:42:51 -0500 Subject: [PATCH 106/115] Docblocked second time --- Missionframework/KPLIB_config.sqf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Missionframework/KPLIB_config.sqf b/Missionframework/KPLIB_config.sqf index 009636e26..bae114c53 100644 --- a/Missionframework/KPLIB_config.sqf +++ b/Missionframework/KPLIB_config.sqf @@ -363,3 +363,6 @@ KPLIB_battlegroup_clearance = [ // Delay after death for wrecks and corpses to be deleted KPLIB_cleanup_delay = 1200; + +// Fill magazines on loading loadout? +KP_liberation_fill_mags = true; From 26ddd1ed6a14feb5d1135999214de4d27b4627f3 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Sun, 19 Nov 2023 15:09:47 -0500 Subject: [PATCH 107/115] Conflict resolving resolving conflictsu --- .../scripts/client/actions/open_arsenal.sqf | 20 +++---- .../scripts/client/spawn/redeploy_manager.sqf | 52 ++++++++++--------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index 79a7d5f5c..afd3af105 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/Missionframework/scripts/client/actions/open_arsenal.sqf @@ -1,4 +1,6 @@ -if (KPLIB_directArsenal) exitWith { +scriptName "open_arsenal"; + +if (KPLIB_param_directArsenal) exitWith { if (KP_liberation_ace && KP_liberation_arsenal_type) then { [player, player, false] call ace_arsenal_fnc_openBox; } else { @@ -17,7 +19,7 @@ private _backpack = backpack player; private ["_loadouts_data"]; // Get loadouts either from ACE or BI arsenals -if (KP_liberation_ace && KP_liberation_arsenal_type) then { +if (KPLIB_ace && KPLIB_param_arsenalType) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -82,13 +84,13 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( load_loadout > 0 ) then { private _loaded_loadout = _loadouts_data select (lbCurSel 201); - if (KP_liberation_ace && KP_liberation_arsenal_type) then { - [player, _loaded_loadout select 1, KP_liberation_fill_mags] call CBA_fnc_setLoadout; + if (KPLIB_ace && KPLIB_param_arsenalType) then { + [player, _loaded_loadout select 1, KP_liberation_fill_mags] call CBA_fnc_setLoadout; } else { [player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory; }; - if (KP_liberation_arsenalUsePreset) then { + if (KPLIB_param_useArsenalPreset) then { if ([_backpack] call KPLIB_fnc_checkGear) then { hint format [ localize "STR_HINT_LOADOUT_LOADED", _loaded_loadout param [0]]; }; @@ -103,7 +105,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do { }; if ( respawn_loadout > 0 ) then { - GRLIB_respawn_loadout = [ player, ["repetitive"] ] call KPLIB_fnc_getLoadout; + KPLIB_respawn_loadout = [ player, ["repetitive"] ] call KPLIB_fnc_getLoadout; hint localize "STR_MAKE_RESPAWN_LOADOUT_HINT"; respawn_loadout = 0; }; @@ -123,15 +125,15 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( edit_loadout > 0 ) then { closeDialog 0; waitUntil { !dialog }; - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { [player, player, false] call ace_arsenal_fnc_openBox; } else { [ "Open", false ] spawn BIS_fnc_arsenal; }; - if (KP_liberation_arsenalUsePreset) then { + if (KPLIB_param_useArsenalPreset) then { uiSleep 5; - private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KP_liberation_ace && KP_liberation_arsenal_type); + private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KPLIB_ace && KPLIB_param_arsenalType); waitUntil {sleep 1; isNull (uinamespace getvariable [_arsenalDisplay, displayNull])}; [_backpack] call KPLIB_fnc_checkGear; }; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 26a6d24c7..346db2d3b 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -1,3 +1,5 @@ +scriptName "redeploy_manager"; + #define DEPLOY_DISPLAY (findDisplay 5201) #define DEPLOY_LIST_IDC 201 #define DEPLOY_BUTTON_IDC 202 @@ -9,12 +11,12 @@ private _oldsel = -999; private _standard_map_pos = []; private _frame_pos = []; -GRLIB_force_redeploy = false; +KPLIB_force_redeploy = false; -waitUntil {!isNil "GRLIB_all_fobs"}; -waitUntil {!isNil "blufor_sectors"}; -waitUntil {!isNil "save_is_loaded"}; -waitUntil {save_is_loaded}; +waitUntil {!isNil "KPLIB_sectors_fob"}; +waitUntil {!isNil "KPLIB_sectors_player"}; +waitUntil {!isNil "KPLIB_saveLoaded"}; +waitUntil {KPLIB_saveLoaded}; private _spawn_str = ""; @@ -25,13 +27,13 @@ waitUntil {cinematic_camera_stop}; private _basenamestr = "Operation Base"; -KP_liberation_respawn_time = time; -KP_liberation_respawn_mobile_done = false; +KPLIB_respawn_time = time; +KPLIB_respawn_mobile_done = false; while {true} do { waitUntil { sleep 0.2; - (GRLIB_force_redeploy || (player distance (markerPos GRLIB_respawn_marker) < 50)) && vehicle player == player && alive player && !dialog && howtoplay == 0 + (KPLIB_force_redeploy || (player distance (markerPos KPLIB_respawn_marker) < 50)) && vehicle player == player && alive player && !dialog && howtoplay == 0 }; private _backpack = backpack player; @@ -39,7 +41,7 @@ while {true} do { fullmap = 0; _old_fullmap = 0; - GRLIB_force_redeploy = false; + KPLIB_force_redeploy = false; createDialog "liberation_deploy"; deploy = 0; @@ -67,7 +69,7 @@ while {true} do { // Get loadouts either from ACE or BI arsenals private ["_loadouts_data"]; - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -93,14 +95,14 @@ while {true} do { { KPLIB_respawnPositionsList pushBack [ - format ["FOB %1 - %2", (military_alphabet select _forEachIndex), mapGridPosition _x], + format ["FOB %1 - %2", (KPLIB_militaryAlphabet select _forEachIndex), mapGridPosition _x], _x ]; - } forEach GRLIB_all_fobs; + } forEach KPLIB_sectors_fob; - if (KP_liberation_mobilerespawn) then { - if (KP_liberation_respawn_time <= time) then { - private _mobileRespawns = [] call KPLIB_fnc_getMobileRespawns; + if (KPLIB_param_mobileRespawn) then { + if (KPLIB_respawn_time <= time) then { + private _respawn_trucks = [] call KPLIB_fnc_getMobileRespawns; { KPLIB_respawnPositionsList pushBack [ @@ -108,7 +110,7 @@ while {true} do { getPosATL _x, _x ]; - } forEach _mobileRespawns + } forEach _respawn_trucks }; }; @@ -138,7 +140,7 @@ while {true} do { _alti = 30; }; // Disable if sector is under attack - if (!KPLIB_respawnOnAttackedSectors && {_objectpos in KPLIB_sectorsUnderAttack}) then { + if (!KPLIB_param_attackedFobRespawn && {_objectpos in KPLIB_sectorsUnderAttack}) then { (DEPLOY_DISPLAY displayCtrl DEPLOY_BUTTON_IDC) ctrlSetText localize "STR_DEPLOY_UNDERATTACK"; (DEPLOY_DISPLAY displayCtrl DEPLOY_BUTTON_IDC) ctrlEnable false; } else { @@ -183,7 +185,7 @@ while {true} do { if (count (KPLIB_respawnPositionsList select _idxchoice) == 3) then { private _truck = (KPLIB_respawnPositionsList select _idxchoice) select 2; player setposATL (_truck getPos [5 + (random 3), random 360]); - KP_liberation_respawn_mobile_done = true; + KPLIB_respawn_mobile_done = true; } else { private _destpos = ((KPLIB_respawnPositionsList select _idxchoice) select 1); player setposATL [((_destpos select 0) + 5) - (random 10),((_destpos select 1) + 5) - (random 10),(_destpos select 2)]; @@ -191,7 +193,7 @@ while {true} do { if ((lbCurSel 203) > 0) then { private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1); - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { [player, _selectedLoadout select 1, KP_liberation_fill_mags] call CBA_fnc_setLoadout; } else { [player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory; @@ -211,18 +213,18 @@ while {true} do { if (alive player && deploy == 1) then { [_spawn_str] spawn spawn_camera; - if (KP_liberation_respawn_mobile_done) then { - KP_liberation_respawn_time = time + KP_liberation_respawn_cooldown; - KP_liberation_respawn_mobile_done = false; + if (KPLIB_respawn_mobile_done) then { + KPLIB_respawn_time = time + KPLIB_param_mobileRespawnCooldown; + KPLIB_respawn_mobile_done = false; }; }; - if (KP_liberation_arsenalUsePreset) then { + if (KPLIB_param_useArsenalPreset) then { [_backpack] call KPLIB_fnc_checkGear; }; - if (KP_liberation_mobilerespawn && (KP_liberation_respawn_time > time)) then { - hint format [localize "STR_RESPAWN_COOLDOWN_HINT", ceil ((KP_liberation_respawn_time - time) / 60)]; + if (KPLIB_param_mobileRespawn && (KPLIB_respawn_time > time)) then { + hint format [localize "STR_RESPAWN_COOLDOWN_HINT", ceil ((KPLIB_respawn_time - time) / 60)]; uiSleep 12; hint ""; }; From 0ad5bcb876a9509488be612b279e979debd1ca3c Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Thu, 14 Mar 2024 22:57:09 +0100 Subject: [PATCH 108/115] Apply suggestions from code review --- .../functions/fn_LAMBS_enableReinforcements.sqf | 2 +- Missionframework/functions/fn_spawnVehicle.sqf | 11 ++++------- Missionframework/scripts/server/ai/battlegroup_ai.sqf | 2 -- .../scripts/server/battlegroup/spawn_battlegroup.sqf | 10 +++++----- Missionframework/scripts/server/init_server.sqf | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf b/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf index 330861ff6..598ea740b 100644 --- a/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf +++ b/Missionframework/functions/fn_LAMBS_enableReinforcements.sqf @@ -23,5 +23,5 @@ if (isNull _grp) exitwith { ["Attempted to set LAMBS Reinforcements on null group.", "ERROR"] remoteExecCall ["KPLIB_fnc_log", 2]; }; -(leader _grp) setVariable ["lambs_danger_dangerRadio", true,true]; +(leader _grp) setVariable ["lambs_danger_dangerRadio", true, true]; _grp setVariable ["lambs_danger_enableGroupReinforce", true, true]; diff --git a/Missionframework/functions/fn_spawnVehicle.sqf b/Missionframework/functions/fn_spawnVehicle.sqf index 20d3c5fa8..6c9454703 100644 --- a/Missionframework/functions/fn_spawnVehicle.sqf +++ b/Missionframework/functions/fn_spawnVehicle.sqf @@ -84,15 +84,12 @@ if (_classname in KPLIB_o_militiaVehicles) then { private _crew = units (createVehicleCrew _newvehicle); _crew joinSilent _grp; { - _x addEventHandler ["Killed", { - params ["_unit", "_killer", "_instigator", "_useEffects"]; - - ["KPLIB_manageKills", [_unit,_killer]] call CBA_fnc_serverEvent; - }]; - + _x addMPEventHandler ["MPKilled", { + params ["_unit", "_killer"]; + ["KPLIB_manageKills", [_unit, _killer]] call CBA_fnc_localEvent; + }]; } forEach _crew; }; -}; // Add Killed and GetIn EHs and enable damage again _newvehicle addMPEventHandler ["MPKilled", { diff --git a/Missionframework/scripts/server/ai/battlegroup_ai.sqf b/Missionframework/scripts/server/ai/battlegroup_ai.sqf index 9f56c10ca..6fe39d6a2 100644 --- a/Missionframework/scripts/server/ai/battlegroup_ai.sqf +++ b/Missionframework/scripts/server/ai/battlegroup_ai.sqf @@ -15,8 +15,6 @@ private _waypoint = []; { deleteWaypoint _x } forEachReversed waypoints _grp; {_x doFollow leader _grp} forEach units _grp; -_startpos = getPos (leader _grp); - _waypoint = _grp addWaypoint [_objPos, 100]; _waypoint setWaypointType "MOVE"; _waypoint setWaypointSpeed "NORMAL"; diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index 4ae2912be..4759e2623 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -32,13 +32,13 @@ if !(_spawn_marker isEqualTo "") then { for "_i" from 1 to _squadNumber do { // Create infantry groups with up to 8 units per squad - private _grp = createGroup [kplib_side_enemy, true]; + private _grp = createGroup [KPLIB_side_enemy, true]; for "_i" from 0 to 7 do { [selectRandom _infClasses, markerPos _spawn_marker, _grp] call KPLIB_fnc_createManagedUnit; }; - [_grp] call KPLIB_fnc_LAMBS_enableReinforcements; - [_grp] call battlegroup_ai; - _grp setVariable ["KPLIB_isBattleGroup",true]; + [_grp] call KPLIB_fnc_LAMBS_enableReinforcements; + [_grp] call battlegroup_ai; + _grp setVariable ["KPLIB_isBattleGroup",true]; }; } else { private _vehicle_pool = [KPLIB_o_battleGrpVehicles, KPLIB_o_battleGrpVehiclesLight] select (KPLIB_enemyReadiness < 50); @@ -56,7 +56,7 @@ if !(_spawn_marker isEqualTo "") then { (crew _vehicle) joinSilent _nextgrp; [_nextgrp] call battlegroup_ai; - _nextgrp setVariable ["KPLIB_isBattleGroup",true]; + _nextgrp setVariable ["KPLIB_isBattleGroup", true]; if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup)) then { if (_vehicle isKindOf "Air") then { diff --git a/Missionframework/scripts/server/init_server.sqf b/Missionframework/scripts/server/init_server.sqf index 9090c5131..693e9b134 100644 --- a/Missionframework/scripts/server/init_server.sqf +++ b/Missionframework/scripts/server/init_server.sqf @@ -136,7 +136,7 @@ if (KPLIB_param_restart > 0) then { ["KPLIB_ResetBattleGroups", { { - if (_x getVariable ["KPLIB_isBattleGroup",false]) then { + if (_x getVariable ["KPLIB_isBattleGroup", false]) then { [_x] call battlegroup_ai; } } foreach allGroups; From 9f939f387c8e9ea694e974bf13ecf3d20b0e04ef Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Thu, 14 Mar 2024 22:59:58 +0100 Subject: [PATCH 109/115] Update Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf --- .../scripts/server/battlegroup/spawn_battlegroup.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index 4759e2623..6ae17ff8f 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -33,9 +33,9 @@ if !(_spawn_marker isEqualTo "") then { for "_i" from 1 to _squadNumber do { // Create infantry groups with up to 8 units per squad private _grp = createGroup [KPLIB_side_enemy, true]; - for "_i" from 0 to 7 do { - [selectRandom _infClasses, markerPos _spawn_marker, _grp] call KPLIB_fnc_createManagedUnit; - }; + for "_i" from 0 to 7 do { + [selectRandom _infClasses, markerPos _spawn_marker, _grp] call KPLIB_fnc_createManagedUnit; + }; [_grp] call KPLIB_fnc_LAMBS_enableReinforcements; [_grp] call battlegroup_ai; _grp setVariable ["KPLIB_isBattleGroup",true]; From b121f66a038315fe85e0a3d7a375791229366849 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Thu, 14 Mar 2024 23:03:15 +0100 Subject: [PATCH 110/115] Update Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf --- .../scripts/server/battlegroup/spawn_battlegroup.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index 6ae17ff8f..70a947a4e 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -31,8 +31,8 @@ if !(_spawn_marker isEqualTo "") then { private _squadNumber = round (_target_size/8); for "_i" from 1 to _squadNumber do { - // Create infantry groups with up to 8 units per squad - private _grp = createGroup [KPLIB_side_enemy, true]; + // Create infantry groups with up to 8 units per squad + private _grp = createGroup [KPLIB_side_enemy, true]; for "_i" from 0 to 7 do { [selectRandom _infClasses, markerPos _spawn_marker, _grp] call KPLIB_fnc_createManagedUnit; }; From b44cd41643767b64cc4772c78eaccb59adb244f8 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Thu, 14 Mar 2024 18:10:32 -0400 Subject: [PATCH 111/115] Update Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf Co-authored-by: Filip Maciejewski --- .../scripts/server/battlegroup/spawn_battlegroup.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index 70a947a4e..cf13eba21 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -57,6 +57,7 @@ if !(_spawn_marker isEqualTo "") then { (crew _vehicle) joinSilent _nextgrp; [_nextgrp] call battlegroup_ai; _nextgrp setVariable ["KPLIB_isBattleGroup", true]; +_bg_groups pushback _nextgrp; if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup)) then { if (_vehicle isKindOf "Air") then { From 79ab7fd3f58a2192a27856d883274e823b374a83 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Thu, 14 Mar 2024 23:12:35 +0100 Subject: [PATCH 112/115] Fix indent My bad --- .../scripts/server/battlegroup/spawn_battlegroup.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf index cf13eba21..fe5a573de 100644 --- a/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf +++ b/Missionframework/scripts/server/battlegroup/spawn_battlegroup.sqf @@ -57,7 +57,7 @@ if !(_spawn_marker isEqualTo "") then { (crew _vehicle) joinSilent _nextgrp; [_nextgrp] call battlegroup_ai; _nextgrp setVariable ["KPLIB_isBattleGroup", true]; -_bg_groups pushback _nextgrp; + _bg_groups pushback _nextgrp; if ((_x in KPLIB_o_troopTransports) && ([] call KPLIB_fnc_getOpforCap < KPLIB_cap_battlegroup)) then { if (_vehicle isKindOf "Air") then { From 50a987caa7d3fe028753f9d72b747d44b3d9efca Mon Sep 17 00:00:00 2001 From: prisonerMO Date: Wed, 21 Aug 2024 14:57:37 +0300 Subject: [PATCH 113/115] Update README.md (#958) * Yulakia (#953) * Add files via upload yulakia basefile * Add files via upload * Update README.md added Yulakia required downloads to readme * Update README.md ACE update This includes the following compats: any CDLC, CUP, RHS, RH, RKSL, SMA (more might follow in the future). --------- Co-authored-by: FatRefrigerator Co-authored-by: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> --- .../kp_liberation.yulakia/mission.sqm | 5582 +++++++++++++++++ README.md | 5 +- 2 files changed, 5585 insertions(+), 2 deletions(-) create mode 100644 Missionbasefiles/kp_liberation.yulakia/mission.sqm diff --git a/Missionbasefiles/kp_liberation.yulakia/mission.sqm b/Missionbasefiles/kp_liberation.yulakia/mission.sqm new file mode 100644 index 000000000..7a628f015 --- /dev/null +++ b/Missionbasefiles/kp_liberation.yulakia/mission.sqm @@ -0,0 +1,5582 @@ +version=54; +class EditorData +{ + moveGridStep=1; + angleGridStep=0.2617994; + scaleGridStep=1; + autoGroupingDist=10; + toggles=513; + class ItemIDProvider + { + nextID=536; + }; + class MarkerIDProvider + { + nextID=1; + }; + class LayerIndexProvider + { + nextID=48; + }; + class Camera + { + pos[]={1136.3691,57.610386,551.93207}; + dir[]={0.31148231,-0.69641817,0.64663756}; + up[]={0.30223709,0.71760648,0.62744266}; + aside[]={0.90099382,1.687662e-006,-0.43400642}; + }; +}; +binarizationWanted=0; +sourceName="KP_Liberation"; +addons[]= +{ + "A3_Ui_F", + "A3_Modules_F_Curator_Curator", + "A3_Modules_F", + "A3_Characters_F", + "A3_Structures_F_System", + "A3_Structures_F_Mil_Cargo", + "A3_Structures_F_Mil_Helipads", + "A3_Structures_F_Civ_Lamps", + "A3_Structures_F_Enoch_Infrastructure_Lamps", + "A3_Structures_F_Mil_Fortification", + "A3_Structures_F_Mil_BagBunker", + "A3_Structures_F_EPA_Civ_Constructions", + "A3_Structures_F_Civ_Camping", + "A3_Structures_F_Items_Vessels", + "A3_Structures_F_Ind_Cargo", + "A3_Structures_F_Civ_Constructions", + "A3_Structures_F_EPA_Mil_Scrapyard", + "A3_Structures_F_EPB_Items_Vessels" +}; +class AddonsMetaData +{ + class List + { + items=10; + class Item0 + { + className="A3_Ui_F"; + name="Arma 3 - User Interface"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item1 + { + className="A3_Modules_F_Curator"; + name="Arma 3 Zeus Update - Scripted Modules"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item2 + { + className="A3_Modules_F"; + name="Arma 3 Alpha - Scripted Modules"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item3 + { + className="A3_Characters_F"; + name="Arma 3 Alpha - Characters and Clothing"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item4 + { + className="A3_Structures_F"; + name="Arma 3 - Buildings and Structures"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item5 + { + className="A3_Structures_F_Mil"; + name="Arma 3 - Military Buildings and Structures"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item6 + { + className="A3_Structures_F_Enoch_Infrastructure"; + name="Arma 3 Contact Platform - Infrastructure Objects"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item7 + { + className="A3_Structures_F_EPA"; + name="Arma 3 Survive Episode - Buildings and Structures"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item8 + { + className="A3_Structures_F_Ind"; + name="Arma 3 - Industrial Structures"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + class Item9 + { + className="A3_Structures_F_EPB"; + name="Arma 3 Adapt Episode - Buildings and Structures"; + author="Bohemia Interactive"; + url="https://www.arma3.com"; + }; + }; +}; +randomSeed=1898175; +class ScenarioData +{ + author="Wyqer"; +}; +class Mission +{ + class Intel + { + timeOfChanges=1800.0002; + startWeather=0; + startWind=0.1; + startWaves=0.1; + forecastWeather=0; + forecastWind=0.1; + forecastWaves=0.1; + forecastLightnings=0.1; + year=2035; + day=28; + hour=13; + minute=37; + startFogDecay=0.014; + forecastFogDecay=0.014; + }; + class Entities + { + items=49; + class Item0 + { + dataType="Marker"; + position[]={727.42505,13.64373,439.94232}; + name="ghost_spot"; + type="Empty"; + id=0; + atlOffset=9.5367432e-007; + }; + class Item1 + { + dataType="Trigger"; + position[]={716.91187,14.773228,460.45825}; + angle=6.1939669; + class Attributes + { + condition="true"; + timeout[]={1.5,1.5,1.5}; + interuptable=1; + effectMusic="LeadTrack01_F"; + }; + id=1; + type="EmptyDetector"; + }; + class Item2 + { + dataType="Trigger"; + position[]={728.75171,13.630027,456.83325}; + angle=6.1939669; + class Attributes + { + condition="!(player in thislist)"; + sizeA=250; + sizeB=250; + timeout[]={0.2,0.2,0.2}; + interuptable=1; + activationBy="WEST"; + effectMusic="EventTrack01_F_Curator"; + }; + id=2; + type="EmptyDetector"; + }; + class Item3 + { + dataType="Trigger"; + position[]={740.97046,13.011345,463.95239}; + angle=6.1939669; + class Attributes + { + condition="GRLIB_endgame == 1"; + timeout[]={17,17,17}; + interuptable=1; + effectMusic="LeadTrack03_F"; + }; + id=3; + type="EmptyDetector"; + }; + class Item4 + { + dataType="Logic"; + class PositionInfo + { + position[]={718.41968,13.589347,442.86548}; + angles[]={6.1969995,0,0.012798273}; + }; + name="zm1"; + id=4; + type="ModuleCurator_F"; + atlOffset=-9.5367432e-007; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCurator_F_Owner"; + expression="_this setVariable ['Owner',_value,true];"; + class Value + { + class data + { + singleType="STRING"; + value="commandant"; + }; + }; + }; + class Attribute1 + { + property="ModuleCurator_F_Forced"; + expression="_this setVariable ['Forced',_value,true];"; + class Value + { + class data + { + singleType="SCALAR"; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCurator_F_Name"; + expression="_this setVariable ['Name',_value,true];"; + class Value + { + class data + { + singleType="STRING"; + value="OVERLORD"; + }; + }; + }; + class Attribute3 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCurator_F_Addons"; + expression="_this setVariable ['Addons',_value,true];"; + class Value + { + class data + { + singleType="SCALAR"; + value=0; + }; + }; + }; + nAttributes=5; + }; + }; + class Item5 + { + dataType="Logic"; + class PositionInfo + { + position[]={714.53296,13.655223,443.97437}; + angles[]={6.1558776,0,0.0032018756}; + }; + id=5; + type="ModuleCuratorSetAttributesObject_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCuratorSetAttributesObject_F_Lock"; + expression="_this setVariable ['Lock',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute1 + { + property="ModuleCuratorSetAttributesObject_F_Exec"; + expression="_this setVariable ['Exec',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + class Attribute2 + { + property="ModuleCuratorSetAttributesObject_F_Fuel"; + expression="_this setVariable ['Fuel',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + class Attribute3 + { + property="ModuleCuratorSetAttributesObject_F_UnitPos"; + expression="_this setVariable ['UnitPos',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCuratorSetAttributesObject_F_Curator"; + expression="_this setVariable ['Curator',_value,true];"; + class Value + { + class data + { + singleType="STRING"; + value=""; + }; + }; + }; + class Attribute5 + { + property="ModuleCuratorSetAttributesObject_F_Damage"; + expression="_this setVariable ['Damage',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + class Attribute6 + { + property="ModuleCuratorSetAttributesObject_F_Rank"; + expression="_this setVariable ['Rank',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + class Attribute7 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute8 + { + property="ModuleCuratorSetAttributesObject_F_RespawnVehicle"; + expression="_this setVariable ['RespawnVehicle',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + class Attribute9 + { + property="ModuleCuratorSetAttributesObject_F_Skill"; + expression="_this setVariable ['Skill',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + class Attribute10 + { + property="ModuleCuratorSetAttributesObject_F_RespawnPosition"; + expression="_this setVariable ['RespawnPosition',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=11; + }; + }; + class Item6 + { + dataType="Logic"; + class PositionInfo + { + position[]={714.69312,14.140789,447.95532}; + angles[]={6.1590276,0,6.2767816}; + }; + id=6; + type="ModuleCuratorSetAttributesGroup_F"; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCuratorSetAttributesObject_F_UnitPos"; + expression="_this setVariable ['UnitPos',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute1 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute2 + { + property="ModuleCuratorSetAttributesGroup_F_Curator"; + expression="_this setVariable ['Curator',_value,true];"; + class Value + { + class data + { + singleType="STRING"; + value=""; + }; + }; + }; + class Attribute3 + { + property="ModuleCuratorSetAttributesObject_F_SpeedMode"; + expression="_this setVariable ['SpeedMode',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCuratorSetAttributesObject_F_Skill"; + expression="_this setVariable ['Skill',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute5 + { + property="ModuleCuratorSetAttributesObject_F_GroupID"; + expression="_this setVariable ['GroupID',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute6 + { + property="ModuleCuratorSetAttributesObject_F_Formation"; + expression="_this setVariable ['Formation',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute7 + { + property="ModuleCuratorSetAttributesObject_F_RespawnPosition"; + expression="_this setVariable ['RespawnPosition',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute8 + { + property="ModuleCuratorSetAttributesObject_F_Behaviour"; + expression="_this setVariable ['Behaviour',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + nAttributes=9; + }; + }; + class Item7 + { + dataType="Logic"; + class PositionInfo + { + position[]={714.63647,14.505245,451.45728}; + angles[]={6.2129025,0,6.2703872}; + }; + id=7; + type="ModuleCuratorSetAttributesPlayer_F"; + atlOffset=9.5367432e-007; + class CustomAttributes + { + class Attribute0 + { + property="ModuleCuratorSetAttributesObject_F_Lock"; + expression="_this setVariable ['Lock',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute1 + { + property="ModuleCuratorSetAttributesObject_F_Exec"; + expression="_this setVariable ['Exec',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute2 + { + property="ModuleCuratorSetAttributesObject_F_Fuel"; + expression="_this setVariable ['Fuel',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute3 + { + property="ModuleCuratorSetAttributesObject_F_UnitPos"; + expression="_this setVariable ['UnitPos',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute4 + { + property="ModuleCuratorSetAttributesObject_F_Curator"; + expression="_this setVariable ['Curator',_value,true];"; + class Value + { + class data + { + singleType="STRING"; + value=""; + }; + }; + }; + class Attribute5 + { + property="ModuleCuratorSetAttributesObject_F_Damage"; + expression="_this setVariable ['Damage',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute6 + { + property="ModuleCuratorSetAttributesObject_F_Rank"; + expression="_this setVariable ['Rank',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute7 + { + property="ModuleInfo"; + expression="false"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute8 + { + property="ModuleCuratorSetAttributesObject_F_RespawnVehicle"; + expression="_this setVariable ['RespawnVehicle',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute9 + { + property="ModuleCuratorSetAttributesObject_F_Skill"; + expression="_this setVariable ['Skill',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + class Attribute10 + { + property="ModuleCuratorSetAttributesObject_F_RespawnPosition"; + expression="_this setVariable ['RespawnPosition',_value,true];"; + class Value + { + class data + { + singleType="BOOL"; + value=1; + }; + }; + }; + nAttributes=11; + }; + }; + class Item8 + { + dataType="Logic"; + class PositionInfo + { + position[]={741.33569,13.437191,452.07642}; + angles[]={0.057536088,0,6.2224603}; + }; + name="gamelogic"; + id=8; + type="Logic"; + }; + class Item9 + { + dataType="Group"; + side="West"; + class Entities + { + items=2; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={727.45673,13.947972,467.49121}; + angles[]={6.2767816,6.0991402,6.2160864}; + }; + side="West"; + flags=6; + class Attributes + { + rank="COLONEL"; + init="removeallWeapons this; removebackpack this; this setVariable ['ace_medical_medicClass', 1]; this setVariable ['ACE_isEngineer', 1];"; + name="commandant"; + description="Platoon Leader (Commander)"; + isPlayer=1; + isPlayable=1; + }; + id=10; + type="B_officer_F"; + atlOffset=9.5367432e-007; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.04; + }; + }; + }; + nAttributes=1; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={728.80243,13.839616,466.72217}; + angles[]={6.2767911,6.1139932,6.1969995}; + }; + side="West"; + flags=4; + class Attributes + { + rank="CAPTAIN"; + init="removeallWeapons this; removebackpack this;"; + description="Platoon Sergeant"; + isPlayable=1; + }; + id=11; + type="B_Soldier_SL_F"; + atlOffset=1.9073486e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.97000003; + }; + }; + }; + nAttributes=1; + }; + }; + }; + class Attributes + { + }; + id=9; + atlOffset=9.5367432e-007; + }; + class Item10 + { + dataType="Group"; + side="West"; + class Entities + { + items=11; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={721.13055,14.380643,464.3667}; + }; + side="West"; + flags=7; + class Attributes + { + rank="SERGEANT"; + description="Squad 1 Leader"; + isPlayable=1; + }; + id=13; + type="B_Soldier_SL_F"; + atlOffset=3.8146973e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + nAttributes=1; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={719.50946,14.540656,464.17969}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Squad 1 Medic"; + isPlayable=1; + }; + id=14; + type="B_medic_F"; + atlOffset=-2.8610229e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.97000003; + }; + }; + }; + nAttributes=1; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={722.95087,14.192469,464.55029}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 1 Engineer"; + isPlayable=1; + }; + id=15; + type="B_engineer_F"; + atlOffset=3.8146973e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.04; + }; + }; + }; + nAttributes=1; + }; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={720.32782,14.463464,462.64063}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Squad 1 Team 1 Leader"; + isPlayable=1; + }; + id=16; + type="B_Soldier_TL_F"; + atlOffset=-1.9073486e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + nAttributes=1; + }; + }; + class Item4 + { + dataType="Object"; + class PositionInfo + { + position[]={719.52509,14.526539,461.65771}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 1 Team 1 Rifleman"; + isPlayable=1; + }; + id=17; + type="B_Soldier_F"; + atlOffset=4.7683716e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.02; + }; + }; + }; + nAttributes=1; + }; + }; + class Item5 + { + dataType="Object"; + class PositionInfo + { + position[]={720.38446,14.382547,460.47754}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 1 Team 1 Rifleman"; + isPlayable=1; + }; + id=18; + type="B_Soldier_F"; + atlOffset=5.7220459e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.01; + }; + }; + }; + nAttributes=1; + }; + }; + class Item6 + { + dataType="Object"; + class PositionInfo + { + position[]={719.56024,14.460076,459.50635}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 1 Team 1 Rifleman"; + isPlayable=1; + }; + id=19; + type="B_Soldier_F"; + atlOffset=4.7683716e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.95999998; + }; + }; + }; + nAttributes=1; + }; + }; + class Item7 + { + dataType="Object"; + class PositionInfo + { + position[]={722.29462,14.239716,462.96436}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Squad 1 Team 2 Leader"; + isPlayable=1; + }; + id=20; + type="B_Soldier_TL_F"; + atlOffset=3.8146973e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.04; + }; + }; + }; + nAttributes=1; + }; + }; + class Item8 + { + dataType="Object"; + class PositionInfo + { + position[]={721.96844,14.245275,461.91162}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 1 Team 2 Rifleman"; + isPlayable=1; + }; + id=21; + type="B_Soldier_F"; + atlOffset=7.6293945e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.98000002; + }; + }; + }; + nAttributes=1; + }; + }; + class Item9 + { + dataType="Object"; + class PositionInfo + { + position[]={722.7204,14.117359,461.02441}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 1 Team 2 Rifleman"; + isPlayable=1; + }; + id=22; + type="B_Soldier_F"; + atlOffset=6.6757202e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + nAttributes=1; + }; + }; + class Item10 + { + dataType="Object"; + class PositionInfo + { + position[]={722.02899,14.16418,459.99658}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 1 Team 2 Rifleman"; + isPlayable=1; + }; + id=23; + type="B_Soldier_F"; + atlOffset=7.6293945e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.99000001; + }; + }; + }; + nAttributes=1; + }; + }; + }; + class Attributes + { + }; + id=12; + atlOffset=3.8146973e-006; + }; + class Item11 + { + dataType="Group"; + side="West"; + class Entities + { + items=11; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={726.18329,13.920542,464.0376}; + }; + side="West"; + flags=7; + class Attributes + { + rank="SERGEANT"; + description="Squad 2 Leader"; + isPlayable=1; + }; + id=25; + type="B_Soldier_SL_F"; + atlOffset=1.2397766e-005; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + nAttributes=1; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={724.56415,14.029535,463.85059}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Squad 2 Medic"; + isPlayable=1; + }; + id=26; + type="B_medic_F"; + atlOffset=1.2397766e-005; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.97000003; + }; + }; + }; + nAttributes=1; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={728.0036,13.821078,464.22168}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 2 Engineer"; + isPlayable=1; + }; + id=27; + type="B_engineer_F"; + atlOffset=0.02301693; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.04; + }; + }; + }; + nAttributes=1; + }; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={725.38055,13.878402,462.31152}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Squad 2 Team 1 Leader"; + isPlayable=1; + }; + id=28; + type="B_Soldier_TL_F"; + atlOffset=1.9073486e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + nAttributes=1; + }; + }; + class Item4 + { + dataType="Object"; + class PositionInfo + { + position[]={724.57977,13.906486,461.32861}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 2 Team 1 Rifleman"; + isPlayable=1; + }; + id=29; + type="B_Soldier_F"; + atlOffset=7.6293945e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.02; + }; + }; + }; + nAttributes=1; + }; + }; + class Item5 + { + dataType="Object"; + class PositionInfo + { + position[]={725.43915,13.782779,460.14844}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 2 Team 1 Rifleman"; + isPlayable=1; + }; + id=30; + type="B_Soldier_F"; + atlOffset=6.6757202e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.01; + }; + }; + }; + nAttributes=1; + }; + }; + class Item6 + { + dataType="Object"; + class PositionInfo + { + position[]={724.61102,13.85206,459.17725}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 2 Team 1 Rifleman"; + isPlayable=1; + }; + id=31; + type="B_Soldier_F"; + atlOffset=0.040001869; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.95999998; + }; + }; + }; + nAttributes=1; + }; + }; + class Item7 + { + dataType="Object"; + class PositionInfo + { + position[]={727.3454,13.737057,462.63525}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Squad 2 Team 2 Leader"; + isPlayable=1; + }; + id=32; + type="B_Soldier_TL_F"; + atlOffset=1.2397766e-005; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.04; + }; + }; + }; + nAttributes=1; + }; + }; + class Item8 + { + dataType="Object"; + class PositionInfo + { + position[]={727.02118,13.740735,461.58252}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 2 Team 2 Rifleman"; + isPlayable=1; + }; + id=33; + type="B_Soldier_F"; + atlOffset=9.5367432e-007; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.98000002; + }; + }; + }; + nAttributes=1; + }; + }; + class Item9 + { + dataType="Object"; + class PositionInfo + { + position[]={727.77509,13.668642,460.69531}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 2 Team 2 Rifleman"; + isPlayable=1; + }; + id=34; + type="B_Soldier_F"; + atlOffset=1.9073486e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1; + }; + }; + }; + nAttributes=1; + }; + }; + class Item10 + { + dataType="Object"; + class PositionInfo + { + position[]={727.08173,13.682388,459.66748}; + }; + side="West"; + flags=5; + class Attributes + { + description="Squad 2 Team 2 Rifleman"; + isPlayable=1; + }; + id=35; + type="B_Soldier_F"; + atlOffset=9.5367432e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.99000001; + }; + }; + }; + nAttributes=1; + }; + }; + }; + class Attributes + { + }; + id=24; + atlOffset=1.2397766e-005; + }; + class Item12 + { + dataType="Logic"; + class PositionInfo + { + position[]={749.60522,12.041864,457.61597}; + angles[]={0.044771437,0,6.1495862}; + }; + name="HC1"; + isPlayable=1; + id=36; + type="HeadlessClient_F"; + atlOffset=9.5367432e-007; + }; + class Item13 + { + dataType="Logic"; + class PositionInfo + { + position[]={749.84546,12.60172,450.44702}; + angles[]={0.067099303,0,6.1433043}; + }; + name="HC2"; + isPlayable=1; + id=37; + type="HeadlessClient_F"; + atlOffset=9.5367432e-007; + }; + class Item14 + { + dataType="Logic"; + class PositionInfo + { + position[]={749.89233,12.707481,442.7605}; + angles[]={0.012798273,0,6.1464443}; + }; + name="HC3"; + isPlayable=1; + id=38; + type="HeadlessClient_F"; + }; + class Item15 + { + dataType="Group"; + side="West"; + class Entities + { + items=4; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={730.52899,13.653187,464.94043}; + }; + side="West"; + flags=7; + class Attributes + { + rank="LIEUTENANT"; + description="MedEvac Pilot"; + isPlayable=1; + }; + id=40; + type="B_Helipilot_F"; + atlOffset=8.5830688e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.94999999; + }; + }; + }; + nAttributes=1; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={730.77509,13.559449,463.19824}; + }; + side="West"; + flags=5; + class Attributes + { + rank="SERGEANT"; + description="MedEvac Co-Pilot"; + isPlayable=1; + }; + id=41; + type="B_Helipilot_F"; + atlOffset=8.5830688e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.97000003; + }; + }; + }; + nAttributes=1; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={730.95477,13.531009,461.54248}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="MedEvac Medic"; + isPlayable=1; + }; + id=42; + type="B_medic_F"; + atlOffset=-5.7220459e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.98000002; + }; + }; + }; + nAttributes=1; + }; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={731.13446,13.556926,459.92334}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="MedEvac Medic"; + isPlayable=1; + }; + id=43; + type="B_medic_F"; + atlOffset=-5.7220459e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.95999998; + }; + }; + }; + nAttributes=1; + }; + }; + }; + class Attributes + { + }; + id=39; + atlOffset=8.5830688e-006; + }; + class Item16 + { + dataType="Group"; + side="West"; + class Entities + { + items=3; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={732.77118,13.548852,465.25928}; + }; + side="West"; + flags=7; + class Attributes + { + rank="LIEUTENANT"; + description="Logistics Pilot"; + isPlayable=1; + }; + id=45; + type="B_Helipilot_F"; + atlOffset=4.7683716e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.01; + }; + }; + }; + nAttributes=1; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={733.10126,13.475261,463.15771}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Logistics Engineer"; + isPlayable=1; + }; + id=46; + type="B_engineer_F"; + atlOffset=7.6293945e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.03; + }; + }; + }; + nAttributes=1; + }; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={733.19696,13.484642,461.39941}; + }; + side="West"; + flags=5; + class Attributes + { + rank="CORPORAL"; + description="Logistics Demolition Expert"; + isPlayable=1; + }; + id=47; + type="B_soldier_exp_F"; + atlOffset=-4.7683716e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.03; + }; + }; + }; + nAttributes=1; + }; + }; + }; + class Attributes + { + }; + id=44; + atlOffset=4.7683716e-006; + }; + class Item17 + { + dataType="Group"; + side="West"; + class Entities + { + items=2; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={734.94305,13.464605,465.59668}; + }; + side="West"; + flags=7; + class Attributes + { + rank="LIEUTENANT"; + description="CAS Pilot"; + isPlayable=1; + }; + id=49; + type="B_Helipilot_F"; + atlOffset=-3.8146973e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=0.98000002; + }; + }; + }; + nAttributes=1; + }; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={735.30243,13.437823,463.28125}; + }; + side="West"; + flags=5; + class Attributes + { + rank="LIEUTENANT"; + description="CAS Pilot"; + isPlayable=1; + }; + id=50; + type="B_Helipilot_F"; + atlOffset=4.7683716e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.03; + }; + }; + }; + nAttributes=1; + }; + }; + }; + class Attributes + { + }; + id=48; + atlOffset=-3.8146973e-006; + }; + class Item18 + { + dataType="Group"; + side="West"; + class Entities + { + items=1; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={737.07977,13.341537,465.92969}; + }; + side="West"; + flags=7; + class Attributes + { + rank="SERGEANT"; + description="UAV and Intelligence"; + isPlayable=1; + }; + id=52; + type="B_soldier_UAV_F"; + atlOffset=-7.6293945e-006; + class CustomAttributes + { + class Attribute0 + { + property="pitch"; + expression="_this setpitch _value;"; + class Value + { + class data + { + singleType="SCALAR"; + value=1.02; + }; + }; + }; + nAttributes=1; + }; + }; + }; + class Attributes + { + }; + id=51; + atlOffset=-7.6293945e-006; + }; + class Item19 + { + dataType="Marker"; + position[]={728.98804,17.505718,454.5105}; + name="respawn"; + type="Empty"; + id=60; + atlOffset=3.8410578; + }; + class Item20 + { + dataType="Marker"; + position[]={1172.8141,4.3069363,566.28638}; + name="huronmarker"; + text="Spartan 01"; + type="b_air"; + id=61; + }; + class Item21 + { + dataType="Object"; + class PositionInfo + { + position[]={1155.4945,3.5680678,607.12122}; + angles[]={0.022394964,0.51354545,0.0032018756}; + }; + side="Empty"; + flags=4; + class Attributes + { + name="startbase"; + }; + id=62; + type="Land_ClutterCutter_small_F"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=1; + }; + }; + class Item22 + { + dataType="Object"; + class PositionInfo + { + position[]={1132.7123,3.4605937,603.59796}; + angles[]={6.2607903,0.49084777,0}; + }; + side="Empty"; + flags=4; + class Attributes + { + name="littlebird_0"; + }; + id=63; + type="Land_ClutterCutter_small_F"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=1; + }; + }; + class Item23 + { + dataType="Object"; + class PositionInfo + { + position[]={1168.7581,4.6579146,583.7215}; + angles[]={6.2639866,0.54611778,0.057536088}; + }; + side="Empty"; + flags=4; + class Attributes + { + name="huronspawn"; + }; + id=64; + type="Land_ClutterCutter_small_F"; + atlOffset=4.7683716e-007; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=1; + }; + }; + class Item24 + { + dataType="Object"; + class PositionInfo + { + position[]={1177.4672,3.898591,604.26929}; + angles[]={0.098876528,1.9651433,6.2192721}; + }; + side="Empty"; + flags=4; + class Attributes + { + name="base_boxspawn"; + }; + id=65; + type="Land_ClutterCutter_small_F"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=1; + }; + }; + class Item25 + { + dataType="Marker"; + position[]={1164.5,4.4051976,583.0105}; + name="startbase_marker"; + text="Chimera Base"; + type="mil_start"; + colorName="ColorWEST"; + id=66; + atlOffset=4.7683716e-007; + }; + class Item26 + { + dataType="Object"; + class PositionInfo + { + position[]={1139.1274,3.3252823,626.61969}; + angles[]={0,5.2623663,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + init="this setVariable [""ace_medical_isMedicalFacility"", true, true];"; + }; + id=67; + type="Land_Medevac_house_V1_F"; + }; + class Item27 + { + dataType="Object"; + class PositionInfo + { + position[]={1162.3109,1.1521924,634.42737}; + angles[]={0,0.4546389,0}; + }; + side="Empty"; + class Attributes + { + name="boat_0"; + }; + id=68; + type="Land_ClutterCutter_small_F"; + atlOffset=1.0021924; + }; + class Item28 + { + dataType="Logic"; + class PositionInfo + { + position[]={727.112,13.872067,448.13199}; + angles[]={6.2735863,0,0}; + }; + areaSize[]={25,0,25}; + flags=1; + id=78; + type="ModuleHideTerrainObjects_F"; + class CustomAttributes + { + class Attribute0 + { + property="#filter"; + expression="_this setVariable [""#filter"",_value]"; + class Value + { + class data + { + singleType="SCALAR"; + value=15; + }; + }; + }; + class Attribute1 + { + property="#hideLocally"; + expression="_this setVariable [""#hideLocally"",_value]"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=2; + }; + }; + class Item29 + { + dataType="Logic"; + class PositionInfo + { + position[]={1159.4113,3.9432144,596.75763}; + angles[]={0.0095994528,0,0.057536088}; + }; + areaSize[]={35,0,35}; + flags=1; + id=79; + type="ModuleHideTerrainObjects_F"; + class CustomAttributes + { + class Attribute0 + { + property="#filter"; + expression="_this setVariable [""#filter"",_value]"; + class Value + { + class data + { + singleType="SCALAR"; + value=7; + }; + }; + }; + class Attribute1 + { + property="#hideLocally"; + expression="_this setVariable [""#hideLocally"",_value]"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=2; + }; + }; + class Item30 + { + dataType="Object"; + class PositionInfo + { + position[]={1168.214,1.007149,632.48517}; + angles[]={0,0.53017032,0}; + }; + side="Empty"; + class Attributes + { + name="boat_1"; + }; + id=80; + type="Land_ClutterCutter_small_F"; + atlOffset=1.1702186; + }; + class Item31 + { + dataType="Object"; + class PositionInfo + { + position[]={1173.949,1.1201414,628.88898}; + angles[]={0,0.56513458,0}; + }; + side="Empty"; + class Attributes + { + name="boat_2"; + }; + id=81; + type="Land_ClutterCutter_small_F"; + atlOffset=0.98570275; + }; + class Item32 + { + dataType="Object"; + class PositionInfo + { + position[]={1132.7358,3.4596801,603.55713}; + angles[]={6.2607903,0.49702296,0}; + }; + side="Empty"; + flags=4; + class Attributes + { + }; + id=82; + type="Land_HelipadSquare_F"; + atlOffset=7.1525574e-007; + }; + class Item33 + { + dataType="Object"; + class PositionInfo + { + position[]={1143.1693,3.4425671,597.96619}; + angles[]={0,0.51918244,0.012798273}; + }; + side="Empty"; + flags=4; + class Attributes + { + name="littlebird_1"; + }; + id=83; + type="Land_ClutterCutter_small_F"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=1; + }; + }; + class Item34 + { + dataType="Object"; + class PositionInfo + { + position[]={1143.1917,3.4428527,597.92468}; + angles[]={0,0.49350834,0.012798273}; + }; + side="Empty"; + flags=4; + class Attributes + { + }; + id=84; + type="Land_HelipadSquare_F"; + }; + class Item35 + { + dataType="Object"; + class PositionInfo + { + position[]={1168.7351,4.6559296,583.69177}; + angles[]={6.2639894,0.51603246,0.063912325}; + }; + side="Empty"; + flags=4; + class Attributes + { + }; + id=85; + type="Land_HelipadSquare_F"; + atlOffset=4.7683716e-007; + }; + class Item36 + { + dataType="Object"; + class PositionInfo + { + position[]={1153.6167,3.7520287,592.34601}; + angles[]={0,0.51556504,0.044770103}; + }; + side="Empty"; + flags=4; + class Attributes + { + name="littlebird_2"; + }; + id=86; + type="Land_ClutterCutter_small_F"; + class CustomAttributes + { + class Attribute0 + { + property="allowDamage"; + expression="_this allowdamage _value;"; + class Value + { + class data + { + singleType="BOOL"; + value=0; + }; + }; + }; + nAttributes=1; + }; + }; + class Item37 + { + dataType="Object"; + class PositionInfo + { + position[]={1153.6392,3.7530329,592.30457}; + angles[]={0,0.49105084,0.044770103}; + }; + side="Empty"; + flags=4; + class Attributes + { + }; + id=87; + type="Land_HelipadSquare_F"; + }; + class Item38 + { + dataType="Object"; + class PositionInfo + { + position[]={1139.2566,15.174818,574.60504}; + angles[]={0,0.50125682,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + }; + id=94; + type="Land_LampAirport_F"; + atlOffset=-0.0047142506; + }; + class Item39 + { + dataType="Object"; + class PositionInfo + { + position[]={1148,6.6147366,628.80988}; + angles[]={0,2.7201049,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + }; + id=95; + type="land_lampstreet_02_f"; + }; + class Item40 + { + dataType="Layer"; + name="Capture Points"; + class Entities + { + items=33; + class Item0 + { + dataType="Marker"; + position[]={2497.0391,18.507,4565.1602}; + name="capture_1"; + text="Adamovic Farm"; + type="n_art"; + colorName="ColorEAST"; + id=109; + atlOffset=-0.00037574768; + }; + class Item1 + { + dataType="Marker"; + position[]={6444.6982,2.79,10967.227}; + name="capture_20"; + text="Badaxev"; + type="n_art"; + colorName="ColorEAST"; + id=140; + atlOffset=-0.0013940334; + }; + class Item2 + { + dataType="Marker"; + position[]={4899.563,8,7184.4331}; + name="capture_24"; + text="Barmanovo"; + type="n_art"; + colorName="ColorEAST"; + id=144; + }; + class Item3 + { + dataType="Marker"; + position[]={9872.4854,19.989,9550.1865}; + name="capture_14"; + text="Buty"; + type="n_art"; + colorName="ColorEAST"; + id=134; + atlOffset=-0.00099945068; + }; + class Item4 + { + dataType="Marker"; + position[]={7436.0752,6.4289999,4595.7529}; + name="capture_10"; + text="Camp Nuka"; + type="n_art"; + colorName="ColorEAST"; + id=129; + atlOffset=-0.00073194504; + }; + class Item5 + { + dataType="Marker"; + position[]={11159.82,22.169001,8235.6885}; + name="capture_13"; + text="Chervenka"; + type="n_art"; + colorName="ColorEAST"; + id=133; + atlOffset=-0.00099945068; + }; + class Item6 + { + dataType="Marker"; + position[]={6523.7241,10.418,6796.9092}; + name="capture_23"; + text="Devina"; + type="n_art"; + colorName="ColorEAST"; + id=143; + atlOffset=-0.001288414; + }; + class Item7 + { + dataType="Marker"; + position[]={10810.784,9.6059999,4549.4258}; + name="capture_6"; + text="Falot Prison"; + type="n_art"; + colorName="ColorEAST"; + id=124; + atlOffset=-0.00047206879; + }; + class Item8 + { + dataType="Marker"; + position[]={1833.3569,13.66,2570.1506}; + name="capture"; + text="FOB Flerberk"; + type="n_art"; + colorName="ColorEAST"; + id=54; + }; + class Item9 + { + dataType="Marker"; + position[]={2536.5339,34.508999,9406.2832}; + name="capture_17"; + text="Gornigrad"; + type="n_art"; + colorName="ColorEAST"; + id=137; + atlOffset=-0.00099945068; + }; + class Item10 + { + dataType="Marker"; + position[]={1332.542,4.9590001,8917.0195}; + name="capture_16"; + text="Hauta"; + type="n_art"; + colorName="ColorEAST"; + id=136; + atlOffset=-0.00099992752; + }; + class Item11 + { + dataType="Marker"; + position[]={10387.657,49.969002,5998.5762}; + name="capture_26"; + text="Komatin"; + type="n_art"; + colorName="ColorEAST"; + id=146; + atlOffset=-0.00099945068; + }; + class Item12 + { + dataType="Marker"; + position[]={6769.0449,8,10044.396}; + name="capture_21"; + text="Komunograd"; + type="n_art"; + colorName="ColorEAST"; + id=141; + }; + class Item13 + { + dataType="Marker"; + position[]={8655.9023,71.390999,4825.834}; + name="capture_25"; + text="Laikanov"; + type="n_art"; + colorName="ColorEAST"; + id=145; + atlOffset=0.00024414063; + }; + class Item14 + { + dataType="Marker"; + position[]={10991.435,23.594999,3186.6111}; + name="capture_28"; + text="Markov Farms"; + type="n_art"; + colorName="ColorEAST"; + id=148; + atlOffset=-0.0009803772; + }; + class Item15 + { + dataType="Marker"; + position[]={1248.911,5,11657.518}; + name="capture_3"; + text="Martopol Docks"; + type="n_art"; + colorName="ColorEAST"; + id=121; + }; + class Item16 + { + dataType="Marker"; + position[]={6941.5132,16.148857,8747.1865}; + name="capture_22"; + text="Mazemovo Farmland"; + type="n_art"; + colorName="ColorEAST"; + id=142; + }; + class Item17 + { + dataType="Marker"; + position[]={7963.4082,55.089001,7425.9302}; + name="capture_12"; + text="Mirtelov"; + type="n_art"; + colorName="ColorEAST"; + id=131; + atlOffset=-0.00099945068; + }; + class Item18 + { + dataType="Marker"; + position[]={8959.8086,32.988998,11753.882}; + name="capture_27"; + text="Orlanov"; + type="n_art"; + colorName="ColorEAST"; + id=151; + atlOffset=-0.0010032654; + }; + class Item19 + { + dataType="Marker"; + position[]={3292.345,23.41,4265.5698}; + name="capture_2"; + text="Orpin"; + type="n_art"; + colorName="ColorEAST"; + id=110; + }; + class Item20 + { + dataType="Marker"; + position[]={4420.2192,33.02,10502.585}; + name="capture_4"; + text="Presidential Palace"; + type="n_art"; + colorName="ColorEAST"; + id=122; + atlOffset=-0.00037002563; + }; + class Item21 + { + dataType="Marker"; + position[]={10625.268,10.419,2321.906}; + name="capture_7"; + text="Rabina"; + type="n_art"; + colorName="ColorEAST"; + id=125; + atlOffset=-0.00074768066; + }; + class Item22 + { + dataType="Marker"; + position[]={5986.8379,30.700001,12296.996}; + name="capture_19"; + text="Sencilia"; + type="n_art"; + colorName="ColorEAST"; + id=139; + }; + class Item23 + { + dataType="Marker"; + position[]={4470.8472,12.804,9594.8975}; + name="capture_15"; + text="Stanta"; + type="n_art"; + colorName="ColorEAST"; + id=135; + atlOffset=-0.00092983246; + }; + class Item24 + { + dataType="Marker"; + position[]={4988.2632,10.229,12286.847}; + name="capture_18"; + text="Stipla"; + type="n_art"; + colorName="ColorEAST"; + id=138; + atlOffset=-0.0013484955; + }; + class Item25 + { + dataType="Marker"; + position[]={7502.0981,8.6709995,1546.922}; + name="capture_8"; + text="Tambova"; + type="n_art"; + colorName="ColorEAST"; + id=126; + atlOffset=-0.00019264221; + }; + class Item26 + { + dataType="Marker"; + position[]={12222.973,17.316521,10567.065}; + name="capture_30"; + text="Volkov"; + type="n_art"; + colorName="ColorEAST"; + id=155; + }; + class Item27 + { + dataType="Marker"; + position[]={10383.342,4.9990001,11162.264}; + name="capture_29"; + text="Yurievgrad"; + type="n_art"; + colorName="ColorEAST"; + id=154; + atlOffset=-0.00099992752; + }; + class Item28 + { + dataType="Marker"; + position[]={8535.5576,4.7249999,5987.4209}; + name="capture_5"; + text="Zacharov"; + type="n_art"; + colorName="ColorEAST"; + id=123; + atlOffset=-0.00068855286; + }; + class Item29 + { + dataType="Marker"; + position[]={3119.343,64.055,8978.8213}; + name="capture_31"; + text="Baralin Castle"; + type="n_art"; + colorName="ColorEAST"; + id=158; + atlOffset=-0.00051879883; + }; + class Item30 + { + dataType="Marker"; + position[]={6956.2891,4.96,1212.02}; + name="capture_32"; + text="Port Tambova"; + type="n_art"; + colorName="ColorEAST"; + id=180; + }; + class Item31 + { + dataType="Marker"; + position[]={4840.166,4.7189999,5604.374}; + name="capture_33"; + text="Volgograd Training Camp"; + type="n_art"; + colorName="ColorEAST"; + id=189; + atlOffset=-0.00099992752; + }; + class Item32 + { + dataType="Marker"; + position[]={9335.6514,40.098999,8488.9111}; + name="capture_34"; + text="Blavtarov"; + type="n_art"; + colorName="ColorEAST"; + id=217; + atlOffset=-0.00099945068; + }; + }; + id=156; + atlOffset=21.693848; + }; + class Item41 + { + dataType="Layer"; + name="Military Points"; + class Entities + { + items=13; + class Item0 + { + dataType="Marker"; + position[]={734.52502,9.9700003,10683.703}; + name="military_4"; + text="Airbase Arianna"; + type="o_support"; + colorName="ColorEAST"; + id=118; + }; + class Item1 + { + dataType="Marker"; + position[]={9957.5947,179.56,4113.8179}; + name="military_2"; + text="Airbase Blagoy"; + type="o_support"; + colorName="ColorEAST"; + id=113; + }; + class Item2 + { + dataType="Marker"; + position[]={11046.072,4.7199998,11452.896}; + name="military_3"; + text="Airbase Shakal"; + type="o_support"; + colorName="ColorEAST"; + id=114; + }; + class Item3 + { + dataType="Marker"; + position[]={4859.8179,14.98,7837.5078}; + name="military_6"; + text="Airport Skilava"; + type="o_support"; + colorName="ColorEAST"; + id=157; + }; + class Item4 + { + dataType="Marker"; + position[]={7006.2729,224.97,3352.9641}; + name="military"; + text="Camp Duboak"; + type="o_support"; + colorName="ColorEAST"; + id=55; + }; + class Item5 + { + dataType="Marker"; + position[]={3930.3379,29.528,9425.3867}; + name="military_7"; + text="Jantina Military Depot"; + type="o_support"; + colorName="ColorEAST"; + id=160; + atlOffset=-0.00046920776; + }; + class Item6 + { + dataType="Marker"; + position[]={9544.4033,39.959999,7321.3271}; + name="military_5"; + text="Mahala Military Depot"; + type="o_support"; + colorName="ColorEAST"; + id=150; + }; + class Item7 + { + dataType="Marker"; + position[]={2909.512,91.578003,2387.103}; + name="military_8"; + text="Military Depot Remont"; + type="o_support"; + colorName="ColorEAST"; + id=162; + atlOffset=0.00019073486; + }; + class Item8 + { + dataType="Marker"; + position[]={4897.3848,91.258003,820.49799}; + name="military_1"; + text="Snake Island"; + type="o_support"; + colorName="ColorEAST"; + id=112; + atlOffset=51.189106; + }; + class Item9 + { + dataType="Marker"; + position[]={5997.8169,33.653999,11829.699}; + name="military_9"; + text="Valor Vista"; + type="o_support"; + colorName="ColorEAST"; + id=242; + atlOffset=-0.00015258789; + }; + class Item10 + { + dataType="Marker"; + position[]={8581.9072,69.989998,4303.603}; + name="military_10"; + text="Bobrowka Helibase"; + type="o_support"; + colorName="ColorEAST"; + id=275; + }; + class Item11 + { + dataType="Marker"; + position[]={2653.0979,24.865999,7033.9102}; + name="military_11"; + text="Outpost Viktor"; + type="o_support"; + colorName="ColorEAST"; + id=486; + atlOffset=-0.00047874451; + }; + class Item12 + { + dataType="Marker"; + position[]={5712.1655,20.719999,6991.6421}; + name="military_12"; + text="Military Storage Depot"; + type="o_support"; + colorName="ColorEAST"; + id=487; + }; + }; + id=183; + atlOffset=29.690968; + }; + class Item42 + { + dataType="Layer"; + name="Capitals"; + class Entities + { + items=6; + class Item0 + { + dataType="Marker"; + position[]={12184.911,7.9899998,9315.9346}; + name="bigtown_3"; + text="Havenbrook"; + type="n_service"; + colorName="ColorEAST"; + a=1.55; + b=1.55; + angle=90; + id=115; + }; + class Item1 + { + dataType="Marker"; + position[]={1620.243,14.98,4285.373}; + name="bigtown_2"; + text="Marlov"; + type="n_service"; + colorName="ColorEAST"; + a=1.55; + b=1.55; + angle=90; + id=111; + }; + class Item2 + { + dataType="Marker"; + position[]={2230.6079,9.5600004,11266.306}; + name="bigtown_5"; + text="Martopol"; + type="n_service"; + colorName="ColorEAST"; + a=1.55; + b=1.55; + angle=90; + id=119; + }; + class Item3 + { + dataType="Marker"; + position[]={6025.1812,19.99,8060.356}; + name="bigtown_4"; + text="Mazemovo"; + type="n_service"; + colorName="ColorEAST"; + a=1.55; + b=1.55; + angle=90; + id=117; + }; + class Item4 + { + dataType="Marker"; + position[]={6973.9331,9.3534155,5079.0396}; + name="bigtown"; + text="Nuclear Power Plant Kastrulya"; + type="n_service"; + colorName="ColorEAST"; + a=1.55; + b=1.55; + angle=90; + id=57; + }; + class Item5 + { + dataType="Marker"; + position[]={5823.8501,10.205,4685.7061}; + name="bigtown_1"; + text="Sveti Peral"; + type="n_service"; + colorName="ColorEAST"; + a=1.55; + b=1.55; + angle=90; + id=102; + atlOffset=-0.00029945374; + }; + }; + id=184; + atlOffset=5.8094401; + }; + class Item43 + { + dataType="Layer"; + name="Factories"; + class Entities + { + items=15; + class Item0 + { + dataType="Marker"; + position[]={6926.3462,33.016998,2587.415}; + name="factory_8"; + text="Ekaterina Ironworks"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=161; + atlOffset=0.00034332275; + }; + class Item1 + { + dataType="Marker"; + position[]={1137.1031,9.9700003,2818.6868}; + name="factory"; + text="Fuel Depot Lapochka"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=56; + }; + class Item2 + { + dataType="Marker"; + position[]={3885.748,4.7199998,10961.147}; + name="factory_7"; + text="Gatov Refinery"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=159; + }; + class Item3 + { + dataType="Marker"; + position[]={561.27197,14.98,5317.4048}; + name="factory_1"; + text="Lauka Storage Facility"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=105; + }; + class Item4 + { + dataType="Marker"; + position[]={10405.725,30.24,7666.4971}; + name="factory_4"; + text="Mahala Concrete Works"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=132; + }; + class Item5 + { + dataType="Marker"; + position[]={2588.1621,9.9700003,11698.498}; + name="factory_3"; + text="Martopol Industrial"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=120; + }; + class Item6 + { + dataType="Marker"; + position[]={5625.3462,19.99,8469.3652}; + name="factory_2"; + text="Mazemovo Industrial"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=116; + }; + class Item7 + { + dataType="Marker"; + position[]={11574.092,5.2118211,4968.9673}; + name="factory_5"; + text="Port Zaytsev"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=149; + }; + class Item8 + { + dataType="Marker"; + position[]={9832.1367,19.969999,11845.658}; + name="factory_6"; + text="Rybov Warehouse"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=153; + }; + class Item9 + { + dataType="Marker"; + position[]={1391.632,6.2270002,9414.7842}; + name="factory_9"; + text="Vypr Point Warehouse"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=188; + atlOffset=-0.00030946732; + }; + class Item10 + { + dataType="Marker"; + position[]={11348.881,72.029999,6218.1831}; + name="factory_10"; + text="Komatin Heavy Industrial Plant"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=194; + }; + class Item11 + { + dataType="Marker"; + position[]={11435.332,4.7199998,12405.107}; + name="factory_11"; + text="Shakal Fuel Depot"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=195; + }; + class Item12 + { + dataType="Marker"; + position[]={6041.502,3.1500001,9542.1963}; + name="factory_12"; + text="Komunograd Grain Storage"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=197; + }; + class Item13 + { + dataType="Marker"; + position[]={8932.7412,15.59,12301.146}; + name="factory_13"; + text="Orlanov Factory"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=213; + }; + class Item14 + { + dataType="Marker"; + position[]={6752.0732,43.125999,6166.4521}; + name="factory_14"; + text="Devina Fuel Station"; + type="loc_Fuelstation"; + colorName="ColorEAST"; + id=255; + atlOffset=0.00017166138; + }; + }; + id=185; + atlOffset=10.207367; + }; + class Item44 + { + dataType="Layer"; + name="Radio Towers"; + class Entities + { + items=29; + class Item0 + { + dataType="Marker"; + position[]={2465.0469,134.36301,3004.0139}; + name="tower"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=58; + atlOffset=10.110443; + }; + class Item1 + { + dataType="Marker"; + position[]={1597.1416,25.454472,4809.0576}; + name="tower_1"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=127; + atlOffset=10.110442; + }; + class Item2 + { + dataType="Marker"; + position[]={2364.1326,28.044422,2101.2437}; + name="tower_2"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=163; + atlOffset=10.110443; + }; + class Item3 + { + dataType="Marker"; + position[]={6967.5391,89.073608,1649.1135}; + name="tower_3"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=177; + atlOffset=10.110443; + }; + class Item4 + { + dataType="Marker"; + position[]={9652.998,198.58044,2443.3662}; + name="tower_4"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=178; + atlOffset=10.110443; + }; + class Item5 + { + dataType="Marker"; + position[]={11508.234,12.751325,3681.2644}; + name="tower_5"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=181; + atlOffset=10.110443; + }; + class Item6 + { + dataType="Marker"; + position[]={8830.5303,21.080444,6619.1851}; + name="tower_6"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=187; + atlOffset=10.110444; + }; + class Item7 + { + dataType="Marker"; + position[]={5424.8081,57.335014,5859.771}; + name="tower_7"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=190; + atlOffset=10.110443; + }; + class Item8 + { + dataType="Marker"; + position[]={7676.6763,62.221722,5172.8906}; + name="tower_8"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=191; + atlOffset=10.110443; + }; + class Item9 + { + dataType="Marker"; + position[]={8175.7729,181.93045,3198.5244}; + name="tower_9"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=192; + atlOffset=10.110443; + }; + class Item10 + { + dataType="Marker"; + position[]={10320.554,114.86122,5232.2617}; + name="tower_10"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=193; + atlOffset=10.110443; + }; + class Item11 + { + dataType="Marker"; + position[]={8283.6201,127.3221,9218.5479}; + name="tower_11"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=198; + atlOffset=10.110443; + }; + class Item12 + { + dataType="Marker"; + position[]={11987.291,22.090443,11291.123}; + name="tower_12"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=199; + atlOffset=10.110443; + }; + class Item13 + { + dataType="Marker"; + position[]={11363.881,65.299599,9866.2432}; + name="tower_13"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=200; + atlOffset=10.110443; + }; + class Item14 + { + dataType="Marker"; + position[]={1865.0973,16.443954,9790.04}; + name="tower_14"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=202; + atlOffset=10.110443; + }; + class Item15 + { + dataType="Marker"; + position[]={11824.954,29.110443,8307.3975}; + name="tower_15"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=214; + atlOffset=10.110443; + }; + class Item16 + { + dataType="Marker"; + position[]={4834.1196,20.610443,8628.7227}; + name="tower_16"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=219; + atlOffset=10.110443; + }; + class Item17 + { + dataType="Marker"; + position[]={2357.9551,15.070443,8430.3271}; + name="tower_17"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=220; + atlOffset=11.961581; + }; + class Item18 + { + dataType="Marker"; + position[]={9324.6563,151.6181,3775.1235}; + name="tower_18"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=244; + atlOffset=10.110443; + }; + class Item19 + { + dataType="Marker"; + position[]={4877.3755,59.35524,11247.421}; + name="tower_19"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=245; + atlOffset=10.110443; + }; + class Item20 + { + dataType="Marker"; + position[]={789.58929,26.110443,11916.271}; + name="tower_20"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=246; + atlOffset=10.110443; + }; + class Item21 + { + dataType="Marker"; + position[]={9314.0293,32.160229,11176.803}; + name="tower_21"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=247; + atlOffset=10.110443; + }; + class Item22 + { + dataType="Marker"; + position[]={8581.5518,165.57852,7809.1821}; + name="tower_22"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=249; + atlOffset=10.110443; + }; + class Item23 + { + dataType="Marker"; + position[]={7037.3809,34.614513,7795.022}; + name="tower_23"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=250; + atlOffset=10.110443; + }; + class Item24 + { + dataType="Marker"; + position[]={5431.209,24.386997,12209.891}; + name="tower_24"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=251; + atlOffset=10.110444; + }; + class Item25 + { + dataType="Marker"; + position[]={7727.6724,16.488003,10507.896}; + name="tower_25"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=252; + atlOffset=10.0977; + }; + class Item26 + { + dataType="Marker"; + position[]={6887.9541,256.21814,4008.1443}; + name="tower_26"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=253; + atlOffset=10.110428; + }; + class Item27 + { + dataType="Marker"; + position[]={3804.8054,25.347328,10164.689}; + name="tower_27"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=254; + atlOffset=10.110442; + }; + class Item28 + { + dataType="Marker"; + position[]={4446.2256,14.830442,4757.0791}; + name="tower_28"; + text="Radio Tower"; + type="loc_Transmitter"; + colorName="ColorEAST"; + id=526; + atlOffset=10.110443; + }; + }; + id=186; + atlOffset=99.72554; + }; + class Item45 + { + dataType="Layer"; + name="Opfor Points"; + class Entities + { + items=78; + class Item0 + { + dataType="Marker"; + position[]={2151.8313,8.2889252,5334.5308}; + name="opfor_point"; + type="Empty"; + id=59; + }; + class Item1 + { + dataType="Marker"; + position[]={963.53271,15.05,5442.4258}; + name="opfor_point_1"; + type="Empty"; + id=106; + }; + class Item2 + { + dataType="Marker"; + position[]={6995.5552,3.1900001,10539.455}; + name="opfor_point_10"; + type="Empty"; + id=170; + }; + class Item3 + { + dataType="Marker"; + position[]={7116.7778,2.4005275,10909.32}; + name="opfor_point_11"; + type="Empty"; + id=171; + }; + class Item4 + { + dataType="Marker"; + position[]={4474.144,23.299999,11664.712}; + name="opfor_point_12"; + type="Empty"; + id=172; + }; + class Item5 + { + dataType="Marker"; + position[]={2718.1843,5.6300001,7325.6914}; + name="opfor_point_13"; + type="Empty"; + id=173; + }; + class Item6 + { + dataType="Marker"; + position[]={3341.5764,4.7199998,11140.278}; + name="opfor_point_14"; + type="Empty"; + id=174; + }; + class Item7 + { + dataType="Marker"; + position[]={2528.042,15.383167,4800.7754}; + name="opfor_point_15"; + type="Empty"; + id=175; + }; + class Item8 + { + dataType="Marker"; + position[]={1835.3923,2.6667652,5638.1211}; + name="opfor_point_16"; + type="Empty"; + id=176; + }; + class Item9 + { + dataType="Marker"; + position[]={10334.864,22.144958,10586.983}; + name="opfor_point_17"; + type="Empty"; + id=179; + }; + class Item10 + { + dataType="Marker"; + position[]={2072.9778,5.98,9875.2461}; + name="opfor_point_18"; + type="Empty"; + id=203; + }; + class Item11 + { + dataType="Marker"; + position[]={3347.5127,4.6399999,10382.521}; + name="opfor_point_19"; + type="Empty"; + id=204; + }; + class Item12 + { + dataType="Marker"; + position[]={1208.8374,11.563719,3865.5327}; + name="opfor_point_2"; + type="Empty"; + id=107; + }; + class Item13 + { + dataType="Marker"; + position[]={3665.3674,29.969999,7604.9448}; + name="opfor_point_20"; + type="Empty"; + id=205; + }; + class Item14 + { + dataType="Marker"; + position[]={5742.0698,4.7199998,6716.9219}; + name="opfor_point_21"; + type="Empty"; + id=206; + }; + class Item15 + { + dataType="Marker"; + position[]={5641.001,4.7199998,6542.3506}; + name="opfor_point_22"; + type="Empty"; + id=207; + }; + class Item16 + { + dataType="Marker"; + position[]={8027.9316,16.778173,8462.2451}; + name="opfor_point_23"; + type="Empty"; + id=208; + }; + class Item17 + { + dataType="Marker"; + position[]={6371.5635,63.085037,5694.9297}; + name="opfor_point_24"; + type="Empty"; + id=209; + }; + class Item18 + { + dataType="Marker"; + position[]={5712.8247,3.2968836,10359.173}; + name="opfor_point_25"; + type="Empty"; + id=210; + }; + class Item19 + { + dataType="Marker"; + position[]={8368.8965,4.7199998,11428.214}; + name="opfor_point_26"; + type="Empty"; + id=211; + }; + class Item20 + { + dataType="Marker"; + position[]={8647.8652,7.5556345,12107.414}; + name="opfor_point_27"; + type="Empty"; + id=212; + }; + class Item21 + { + dataType="Marker"; + position[]={9728.3477,51.774395,10490.926}; + name="opfor_point_28"; + type="Empty"; + id=216; + }; + class Item22 + { + dataType="Marker"; + position[]={4302.5557,10.152805,8727.5605}; + name="opfor_point_29"; + type="Empty"; + id=218; + }; + class Item23 + { + dataType="Marker"; + position[]={409.19006,14.98,5831.8877}; + name="opfor_point_3"; + type="Empty"; + id=108; + }; + class Item24 + { + dataType="Marker"; + position[]={1122.1202,7.9699998,5828.2295}; + name="opfor_point_4"; + type="Empty"; + id=164; + }; + class Item25 + { + dataType="Marker"; + position[]={9802.7119,111.77,5077.249}; + name="opfor_point_5"; + type="Empty"; + id=165; + }; + class Item26 + { + dataType="Marker"; + position[]={11524.961,27.049999,4183.0537}; + name="opfor_point_6"; + type="Empty"; + id=166; + }; + class Item27 + { + dataType="Marker"; + position[]={11167.516,21.870001,7611.8667}; + name="opfor_point_7"; + type="Empty"; + id=167; + }; + class Item28 + { + dataType="Marker"; + position[]={8524.7637,12.8193,9934.417}; + name="opfor_point_8"; + type="Empty"; + id=168; + }; + class Item29 + { + dataType="Marker"; + position[]={8527.0215,12.777442,9971.6992}; + name="opfor_point_9"; + type="Empty"; + id=169; + }; + class Item30 + { + dataType="Marker"; + position[]={9143.2813,120.36,4186.3101}; + name="opfor_point_30"; + type="Empty"; + id=228; + atlOffset=50.029999; + }; + class Item31 + { + dataType="Marker"; + position[]={9027.9629,120,4971.665}; + name="opfor_point_31"; + type="Empty"; + id=229; + atlOffset=50.029999; + }; + class Item32 + { + dataType="Marker"; + position[]={9543.7236,171.16,5450.23}; + name="opfor_point_32"; + type="Empty"; + id=230; + atlOffset=50.030006; + }; + class Item33 + { + dataType="Marker"; + position[]={7690.0132,88.940002,6065.563}; + name="opfor_point_34"; + type="Empty"; + id=227; + atlOffset=50.030003; + }; + class Item34 + { + dataType="Marker"; + position[]={10430.743,71.989998,6831.8589}; + name="opfor_point_33"; + type="Empty"; + id=231; + atlOffset=50.029999; + }; + class Item35 + { + dataType="Marker"; + position[]={8022.6729,8.1817255,9668.3633}; + name="opfor_point_35"; + type="Empty"; + id=236; + }; + class Item36 + { + dataType="Marker"; + position[]={8050.3066,9.2399998,9793.834}; + name="opfor_point_36"; + type="Empty"; + id=237; + }; + class Item37 + { + dataType="Marker"; + position[]={8062.8882,12.827474,9975.2773}; + name="opfor_point_37"; + type="Empty"; + id=238; + }; + class Item38 + { + dataType="Marker"; + position[]={8013.3555,3.52,11114.305}; + name="opfor_point_38"; + type="Empty"; + id=239; + }; + class Item39 + { + dataType="Marker"; + position[]={7044.0483,14.239405,11583.662}; + name="opfor_point_39"; + type="Empty"; + id=240; + }; + class Item40 + { + dataType="Marker"; + position[]={11850.657,24.075455,4273.9043}; + name="opfor_point_40"; + type="Empty"; + id=243; + }; + class Item41 + { + dataType="Marker"; + position[]={11535.343,21.134815,7002.3667}; + name="opfor_point_41"; + type="Empty"; + id=256; + }; + class Item42 + { + dataType="Marker"; + position[]={5248.3408,3.2581959,9627.3975}; + name="opfor_point_42"; + type="Empty"; + id=257; + }; + class Item43 + { + dataType="Marker"; + position[]={5619.6309,3.1500001,9237.7646}; + name="opfor_point_43"; + type="Empty"; + id=258; + }; + class Item44 + { + dataType="Marker"; + position[]={9331.2627,19.791222,9664.4561}; + name="opfor_point_44"; + type="Empty"; + id=259; + }; + class Item45 + { + dataType="Marker"; + position[]={11214.964,40.402344,10373.063}; + name="opfor_point_45"; + type="Empty"; + id=260; + atlOffset=0.00015640259; + }; + class Item46 + { + dataType="Marker"; + position[]={11013.015,4.7199998,12201.639}; + name="opfor_point_46"; + type="Empty"; + id=261; + }; + class Item47 + { + dataType="Marker"; + position[]={11238.073,4.7199998,12067.442}; + name="opfor_point_47"; + type="Empty"; + id=262; + }; + class Item48 + { + dataType="Marker"; + position[]={11193.515,19.950001,7057.7012}; + name="opfor_point_48"; + type="Empty"; + id=263; + }; + class Item49 + { + dataType="Marker"; + position[]={1734.6853,9.96,11663.97}; + name="opfor_point_49"; + type="Empty"; + id=264; + }; + class Item50 + { + dataType="Marker"; + position[]={3733.3318,4.7199998,11262.341}; + name="opfor_point_50"; + type="Empty"; + id=265; + }; + class Item51 + { + dataType="Marker"; + position[]={3377.4741,59.593147,7317.0278}; + name="opfor_point_51"; + type="Empty"; + id=266; + }; + class Item52 + { + dataType="Marker"; + position[]={6902.0171,3.7664552,7027.812}; + name="opfor_point_52"; + type="Empty"; + id=267; + }; + class Item53 + { + dataType="Marker"; + position[]={7970.3369,117.5667,4350.9116}; + name="opfor_point_53"; + type="Empty"; + id=268; + atlOffset=50.029999; + }; + class Item54 + { + dataType="Marker"; + position[]={10771.185,72.019997,3476.4365}; + name="opfor_point_54"; + type="Empty"; + id=269; + atlOffset=50.029999; + }; + class Item55 + { + dataType="Marker"; + position[]={10854.25,70,5432.3311}; + name="opfor_point_55"; + type="Empty"; + id=270; + atlOffset=50.029999; + }; + class Item56 + { + dataType="Marker"; + position[]={10879.805,71.107346,5322.4702}; + name="opfor_point_56"; + type="Empty"; + id=271; + atlOffset=50.029999; + }; + class Item57 + { + dataType="Marker"; + position[]={10912.339,72.660362,8082.4683}; + name="opfor_point_57"; + type="Empty"; + id=272; + atlOffset=50.029999; + }; + class Item58 + { + dataType="Marker"; + position[]={6856.8062,5.52,9283.9199}; + name="opfor_point_58"; + type="Empty"; + id=273; + }; + class Item59 + { + dataType="Marker"; + position[]={6559.2803,11.493765,12552.865}; + name="opfor_point_59"; + type="Empty"; + id=274; + }; + class Item60 + { + dataType="Marker"; + position[]={8667.3184,120,4001.2063}; + name="opfor_point_60"; + type="Empty"; + id=276; + atlOffset=50.029999; + }; + class Item61 + { + dataType="Marker"; + position[]={9064.4482,90.334808,8988.4258}; + name="opfor_point_61"; + type="Empty"; + id=277; + atlOffset=50.029999; + }; + class Item62 + { + dataType="Marker"; + position[]={1751.24,9.96,3087.4397}; + name="opfor_point_62"; + type="Empty"; + id=488; + }; + class Item63 + { + dataType="Marker"; + position[]={2035.0328,11.282223,3688.189}; + name="opfor_point_63"; + type="Empty"; + id=489; + }; + class Item64 + { + dataType="Marker"; + position[]={6393.4609,40,3473.7742}; + name="opfor_point_64"; + type="Empty"; + id=490; + }; + class Item65 + { + dataType="Marker"; + position[]={7342.0137,4.9899998,1541.4978}; + name="opfor_point_65"; + type="Empty"; + id=491; + }; + class Item66 + { + dataType="Marker"; + position[]={11337.02,14.795058,5353.0664}; + name="opfor_point_66"; + type="Empty"; + id=492; + }; + class Item67 + { + dataType="Marker"; + position[]={8695.6777,21.185287,8343.5918}; + name="opfor_point_67"; + type="Empty"; + id=493; + }; + class Item68 + { + dataType="Marker"; + position[]={10411.352,32.632301,2959.2048}; + name="opfor_point_68"; + type="Empty"; + id=494; + }; + class Item69 + { + dataType="Marker"; + position[]={10566.781,21.864042,2729.1558}; + name="opfor_point_69"; + type="Empty"; + id=495; + }; + class Item70 + { + dataType="Marker"; + position[]={11160.438,8.8100004,2816.1294}; + name="opfor_point_70"; + type="Empty"; + id=496; + }; + class Item71 + { + dataType="Marker"; + position[]={10452.623,21.099844,8546.7275}; + name="opfor_point_71"; + type="Empty"; + id=497; + }; + class Item72 + { + dataType="Marker"; + position[]={9981.4971,9.9700003,2207.4746}; + name="opfor_point_72"; + type="Empty"; + id=498; + }; + class Item73 + { + dataType="Marker"; + position[]={1344.9426,14.962898,5466.7349}; + name="opfor_point_73"; + type="Empty"; + id=527; + }; + class Item74 + { + dataType="Marker"; + position[]={3060.179,5.954958,1835.5972}; + name="opfor_point_74"; + type="Empty"; + id=528; + }; + class Item75 + { + dataType="Marker"; + position[]={3128.677,23.496801,2108.895}; + name="opfor_point_75"; + type="Empty"; + id=529; + }; + class Item76 + { + dataType="Marker"; + position[]={7261.4072,91.685867,2123.439}; + name="opfor_point_76"; + type="Empty"; + id=530; + }; + class Item77 + { + dataType="Marker"; + position[]={174.54572,3.2749424,5833.1846}; + name="opfor_point_77"; + type="Empty"; + id=535; + atlOffset=2.3841858e-007; + }; + }; + id=221; + atlOffset=-16.414837; + }; + class Item46 + { + dataType="Layer"; + name="Boatspawns"; + class Entities + { + items=12; + class Item0 + { + dataType="Marker"; + position[]={11659.053,-4.4262695,2067.907}; + name="opfor_boatspawn_8"; + type="Empty"; + id=233; + atlOffset=50.029999; + }; + class Item1 + { + dataType="Marker"; + position[]={463.39536,0,9784.4961}; + name="opfor_boatspawn"; + type="Empty"; + id=96; + atlOffset=50.029999; + }; + class Item2 + { + dataType="Marker"; + position[]={5655.6411,-0.51000214,1682.7827}; + name="opfor_boatspawn_1"; + type="Empty"; + id=97; + atlOffset=50.029999; + }; + class Item3 + { + dataType="Marker"; + position[]={7787.1733,0,12439.291}; + name="opfor_boatspawn_2"; + type="Empty"; + id=98; + atlOffset=50.029999; + }; + class Item4 + { + dataType="Marker"; + position[]={12522.858,0,11425.526}; + name="opfor_boatspawn_3"; + type="Empty"; + id=99; + atlOffset=50; + }; + class Item5 + { + dataType="Marker"; + position[]={12479.292,-0.030002594,8658.5332}; + name="opfor_boatspawn_4"; + type="Empty"; + id=100; + atlOffset=50.029999; + }; + class Item6 + { + dataType="Marker"; + position[]={3782.4575,0,3280.9683}; + name="opfor_boatspawn_6"; + type="Empty"; + id=103; + atlOffset=50.540001; + }; + class Item7 + { + dataType="Marker"; + position[]={3889.5879,6.0021095,6226.5845}; + name="opfor_boatspawn_7"; + type="Empty"; + id=104; + atlOffset=50.029999; + }; + class Item8 + { + dataType="Marker"; + position[]={4853.5806,0.040000916,3477.8518}; + name="opfor_boatspawn_9"; + type="Empty"; + id=531; + atlOffset=50.049999; + }; + class Item9 + { + dataType="Marker"; + position[]={4149.8242,0.020000458,1533.9623}; + name="opfor_boatspawn_10"; + type="Empty"; + id=532; + atlOffset=50.049999; + }; + class Item10 + { + dataType="Marker"; + position[]={1183.8615,0.040000916,7242.0957}; + name="opfor_boatspawn_11"; + type="Empty"; + id=533; + atlOffset=50.049999; + }; + class Item11 + { + dataType="Marker"; + position[]={2269.2891,0.020000458,12619.126}; + name="opfor_boatspawn_5"; + type="Empty"; + id=534; + atlOffset=50.049999; + }; + }; + id=234; + atlOffset=-31.171843; + }; + class Item47 + { + dataType="Layer"; + name="Airspawns"; + class Entities + { + items=6; + class Item0 + { + dataType="Marker"; + position[]={3275.7666,0,12706.202}; + name="opfor_airspawn"; + type="Empty"; + id=53; + atlOffset=50.029999; + }; + class Item1 + { + dataType="Marker"; + position[]={12738.255,0,7454.1304}; + name="opfor_airspawn_1"; + type="Empty"; + id=222; + atlOffset=50.029999; + }; + class Item2 + { + dataType="Marker"; + position[]={12696.759,-0.020000458,2173.5793}; + name="opfor_airspawn_2"; + type="Empty"; + id=223; + atlOffset=50.029999; + }; + class Item3 + { + dataType="Marker"; + position[]={6112.4224,0,103.22266}; + name="opfor_airspawn_3"; + type="Empty"; + id=224; + atlOffset=50.029999; + }; + class Item4 + { + dataType="Marker"; + position[]={27.576447,0,7654.7388}; + name="opfor_airspawn_4"; + type="Empty"; + id=225; + atlOffset=50.029999; + }; + class Item5 + { + dataType="Marker"; + position[]={7930.606,0,12733.525}; + name="opfor_airspawn_5"; + type="Empty"; + id=226; + atlOffset=50.029999; + }; + }; + id=235; + atlOffset=0.2308985; + }; + class Item48 + { + dataType="Layer"; + name="Camp Audacity"; + class Entities + { + items=56; + class Item0 + { + dataType="Object"; + class PositionInfo + { + position[]={2668.8621,30.392982,7054.6919}; + angles[]={0,4.5858583,0.15553339}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=429; + type="Land_HBarrierBig_F"; + atlOffset=0.025428772; + }; + class Item1 + { + dataType="Object"; + class PositionInfo + { + position[]={2673.1628,30.75993,7046.3188}; + angles[]={6.2767911,4.6012921,0.092534281}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=430; + type="Land_BagBunker_Large_F"; + atlOffset=0.054286957; + }; + class Item2 + { + dataType="Object"; + class PositionInfo + { + position[]={2678.7661,31.04594,7028.8696}; + angles[]={0,4.5785198,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + skill=0.2; + }; + id=431; + type="Land_PortableLight_double_F"; + atlOffset=0.012126923; + }; + class Item3 + { + dataType="Object"; + class PositionInfo + { + position[]={2637.6619,24.609417,7051.3115}; + angles[]={6.1621799,6.1475444,0.1680008}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=432; + type="Land_ToiletBox_F"; + atlOffset=-0.0038375854; + }; + class Item4 + { + dataType="Object"; + class PositionInfo + { + position[]={2663.9104,28.426996,7018.5122}; + angles[]={6.2065363,4.5639052,0.30388656}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=433; + type="Land_WaterTank_F"; + atlOffset=-0.0067672729; + }; + class Item5 + { + dataType="Object"; + class PositionInfo + { + position[]={2662.5613,29.375828,7054.2534}; + angles[]={6.2639866,4.9217148,0.21120292}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=434; + type="Land_Cargo20_military_green_F"; + atlOffset=-0.0035858154; + }; + class Item6 + { + dataType="Object"; + class PositionInfo + { + position[]={2664.6362,29.831005,7062.0664}; + angles[]={6.2416081,3.8403921,0.15240942}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=435; + type="Land_HBarrierBig_F"; + atlOffset=0.00093841553; + }; + class Item7 + { + dataType="Object"; + class PositionInfo + { + position[]={2656.6943,28.805828,7064.2993}; + angles[]={6.1969995,3.0423863,0.15240864}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=436; + type="Land_HBarrierBig_F"; + atlOffset=0.0021629333; + }; + class Item8 + { + dataType="Object"; + class PositionInfo + { + position[]={2679.7341,30.737844,7031.936}; + angles[]={6.2703872,4.5937624,0.012798273}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=437; + type="Land_HBarrier_5_F"; + atlOffset=0.017953873; + }; + class Item9 + { + dataType="Object"; + class PositionInfo + { + position[]={2680.5042,30.707092,7026.4614}; + angles[]={0,4.5958915,0}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=438; + type="Land_HBarrier_5_F"; + atlOffset=0.016576767; + }; + class Item10 + { + dataType="Object"; + class PositionInfo + { + position[]={2675.8718,30.637438,7033.5894}; + angles[]={6.2703872,3.0434048,0.044768773}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=439; + type="Land_HBarrier_5_F"; + atlOffset=0.017921448; + }; + class Item11 + { + dataType="Object"; + class PositionInfo + { + position[]={2677.6738,31.11298,7022.1045}; + angles[]={6.2735858,3.0547514,0.01919602}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=440; + type="Land_HBarrierBig_F"; + atlOffset=0.029441833; + }; + class Item12 + { + dataType="Object"; + class PositionInfo + { + position[]={2671.3965,30.672798,7017.5576}; + angles[]={6.2480001,2.1002223,0.13045534}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=441; + type="Land_HBarrierBig_F"; + atlOffset=0.02755928; + }; + class Item13 + { + dataType="Object"; + class PositionInfo + { + position[]={2664.655,28.642612,7013.0723}; + angles[]={6.1874781,3.0559051,0.28925377}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=442; + type="Land_HBarrierBig_F"; + atlOffset=0.026376724; + }; + class Item14 + { + dataType="Object"; + class PositionInfo + { + position[]={2661.7546,26.798698,7006.7407}; + angles[]={6.2320304,3.0396872,0.24158764}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=443; + type="Land_HBarrier_5_F"; + atlOffset=0.016729355; + }; + class Item15 + { + dataType="Object"; + class PositionInfo + { + position[]={2660.7207,27.831776,7017.9023}; + angles[]={6.1938243,4.6013336,0.3356055}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=444; + type="Land_HBarrierBig_F"; + atlOffset=0.028366089; + }; + class Item16 + { + dataType="Object"; + class PositionInfo + { + position[]={2668.3938,28.764349,7009.7695}; + angles[]={6.1401682,1.5094827,0.27152464}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=445; + type="Land_HBarrier_5_F"; + atlOffset=0.0062274933; + }; + class Item17 + { + dataType="Object"; + class PositionInfo + { + position[]={2656.1252,25.24786,7006.1318}; + angles[]={6.2129016,3.0632162,0.26855165}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=446; + type="Land_HBarrier_5_F"; + }; + class Item18 + { + dataType="Object"; + class PositionInfo + { + position[]={2637.2202,21.115368,7014.2476}; + angles[]={6.2160864,1.4186521,0.23856853}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=447; + type="Land_HBarrierBig_F"; + atlOffset=0.026010513; + }; + class Item19 + { + dataType="Object"; + class PositionInfo + { + position[]={2632.5398,20.296562,7022.4604}; + angles[]={6.2001767,1.4129591,0.21731357}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=448; + type="Land_BagBunker_Large_F"; + atlOffset=0.013408661; + }; + class Item20 + { + dataType="Object"; + class PositionInfo + { + position[]={2626.2537,21.144464,7040.0513}; + angles[]={0,1.3995767,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + skill=0.2; + }; + id=449; + type="Land_PortableLight_double_F"; + atlOffset=-1.9073486e-006; + }; + class Item21 + { + dataType="Object"; + class PositionInfo + { + position[]={2641.6743,21.837402,7007.2417}; + angles[]={6.2192721,0.68064165,0.26557502}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=450; + type="Land_HBarrierBig_F"; + atlOffset=0.028535843; + }; + class Item22 + { + dataType="Object"; + class PositionInfo + { + position[]={2649.1809,23.776379,7005.3345}; + angles[]={6.2224603,6.1680775,0.2685523}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=451; + type="Land_HBarrierBig_F"; + atlOffset=0.027488708; + }; + class Item23 + { + dataType="Object"; + class PositionInfo + { + position[]={2625.3613,20.230736,7036.6875}; + angles[]={6.1495857,1.4063376,0.17731783}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=452; + type="Land_HBarrier_5_F"; + atlOffset=0.0046882629; + }; + class Item24 + { + dataType="Object"; + class PositionInfo + { + position[]={2624.4021,20.769123,7042.1396}; + angles[]={6.1590276,1.4057031,0.15865555}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=453; + type="Land_HBarrier_5_F"; + atlOffset=0.01527977; + }; + class Item25 + { + dataType="Object"; + class PositionInfo + { + position[]={2629.2908,20.732084,7035.2188}; + angles[]={6.1558781,6.144309,0.17731749}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=454; + type="Land_HBarrier_5_F"; + atlOffset=0.004655838; + }; + class Item26 + { + dataType="Object"; + class PositionInfo + { + position[]={2627.1501,22.259785,7046.5215}; + angles[]={6.1590276,6.1461449,0.16800152}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=455; + type="Land_HBarrierBig_F"; + atlOffset=0.0093002319; + }; + class Item27 + { + dataType="Object"; + class PositionInfo + { + position[]={2633.2739,23.87056,7051.2832}; + angles[]={6.1653337,5.1896486,0.15553378}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=456; + type="Land_HBarrierBig_F"; + atlOffset=0.011276245; + }; + class Item28 + { + dataType="Object"; + class PositionInfo + { + position[]={2639.8225,25.480785,7056.0332}; + angles[]={6.1716504,6.143652,0.15553339}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=457; + type="Land_HBarrierBig_F"; + atlOffset=0.010902405; + }; + class Item29 + { + dataType="Object"; + class PositionInfo + { + position[]={2643.929,26.38283,7062.5171}; + angles[]={6.1653342,6.1533909,0.1430165}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=458; + type="Land_HBarrier_5_F"; + atlOffset=0.0045642853; + }; + class Item30 + { + dataType="Object"; + class PositionInfo + { + position[]={2643.9519,25.61478,7051.3237}; + angles[]={6.1684914,1.4064147,0.1866035}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=459; + type="Land_HBarrierBig_F"; + atlOffset=0.014190674; + }; + class Item31 + { + dataType="Object"; + class PositionInfo + { + position[]={2636.1401,24.87359,7059.4604}; + angles[]={6.1401691,4.5987878,0.14615022}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=460; + type="Land_HBarrier_5_F"; + atlOffset=0.010953903; + }; + class Item32 + { + dataType="Object"; + class PositionInfo + { + position[]={2649.5139,27.236191,7063.2383}; + angles[]={6.1779752,6.1518254,0.12730782}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=461; + type="Land_HBarrier_5_F"; + }; + class Item33 + { + dataType="Object"; + class PositionInfo + { + position[]={2647.9575,26.073313,7047.3809}; + angles[]={6.1843085,1.4424829,0.17731816}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=462; + type="Land_Cargo20_military_green_F"; + atlOffset=-0.0026664734; + }; + class Item34 + { + dataType="Object"; + class PositionInfo + { + position[]={2656.2866,27.813803,7049.3257}; + angles[]={6.2575908,0.59869832,0.27449149}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=463; + type="Land_Cargo20_military_green_F"; + atlOffset=-0.0054607391; + }; + class Item35 + { + dataType="Object"; + class PositionInfo + { + position[]={2666.8203,29.848106,7041.5283}; + angles[]={0,3.054322,0.18351157}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=464; + type="Land_HBarrier_5_F"; + atlOffset=0.055736542; + }; + class Item36 + { + dataType="Object"; + class PositionInfo + { + position[]={2661.9946,28.622704,7039.3325}; + angles[]={6.2480021,2.2105763,0.295122}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=465; + type="Land_HBarrier_5_F"; + atlOffset=0.021337509; + }; + class Item37 + { + dataType="Object"; + class PositionInfo + { + position[]={2638.6792,21.879766,7027.3081}; + angles[]={6.2256494,3.0133171,0.20814106}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=466; + type="Land_HBarrier_5_F"; + atlOffset=0.037286758; + }; + class Item38 + { + dataType="Object"; + class PositionInfo + { + position[]={2643.5417,23.072876,7029.5098}; + angles[]={6.2065363,2.2872329,0.20814106}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=467; + type="Land_HBarrier_5_F"; + atlOffset=1.9073486e-006; + }; + class Item39 + { + dataType="Object"; + class PositionInfo + { + position[]={2659.7668,27.427834,7025.1206}; + angles[]={6.2480001,4.6008024,0.34697083}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=468; + type="Land_HBarrier_5_F"; + atlOffset=0.031410217; + }; + class Item40 + { + dataType="Object"; + class PositionInfo + { + position[]={2645.2417,24.673683,7044.2534}; + angles[]={6.1811414,4.586709,0.1866035}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=469; + type="Land_HBarrier_5_F"; + }; + class Item41 + { + dataType="Object"; + class PositionInfo + { + position[]={2639.8223,25.010462,7051.6929}; + angles[]={6.1716504,6.1460872,0.15865518}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=470; + type="Land_ToiletBox_F"; + atlOffset=-0.0038471222; + }; + class Item42 + { + dataType="Object"; + class PositionInfo + { + position[]={2667.1152,29.404913,7018.9219}; + angles[]={6.1938248,4.5643835,0.26855165}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=471; + type="Land_WaterTank_F"; + atlOffset=-0.0036869049; + }; + class Item43 + { + dataType="Object"; + class PositionInfo + { + position[]={2660.6335,27.634272,7027.5679}; + angles[]={6.2639866,1.611799,0.33274969}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=472; + type="Land_WaterBarrel_F"; + atlOffset=-0.0096664429; + }; + class Item44 + { + dataType="Object"; + class PositionInfo + { + position[]={2642.7859,22.089409,7008.999}; + angles[]={0,3.7764776,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + skill=0.2; + }; + id=473; + type="Land_PortableLight_double_F"; + atlOffset=0.0033435822; + }; + class Item45 + { + dataType="Object"; + class PositionInfo + { + position[]={2672.3381,30.750486,7022.7739}; + angles[]={0,2.4949629,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + skill=0.2; + }; + id=474; + type="Land_PortableLight_double_F"; + }; + class Item46 + { + dataType="Object"; + class PositionInfo + { + position[]={2653.1338,28.095119,7060.4473}; + angles[]={6.1938243,6.1288791,0.15240864}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=475; + type="Land_Cargo20_military_green_F"; + atlOffset=-0.0073204041; + }; + class Item47 + { + dataType="Object"; + class PositionInfo + { + position[]={2628.9661,25.641409,7040.9683}; + angles[]={0,1.4009905,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + skill=0.2; + }; + id=476; + type="Land_Cargo_Patrol_V1_F"; + atlOffset=0.099567413; + }; + class Item48 + { + dataType="Object"; + class PositionInfo + { + position[]={2675.8584,34.782467,7028.126}; + angles[]={0,4.5659857,0}; + }; + side="Empty"; + flags=5; + class Attributes + { + skill=0.2; + }; + id=477; + type="Land_Cargo_Patrol_V1_F"; + }; + class Item49 + { + dataType="Object"; + class PositionInfo + { + position[]={2641.9365,23.989929,7047.5459}; + angles[]={6.1716509,4.4823556,0.17731783}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=478; + type="Land_Pallets_F"; + atlOffset=0.0014743805; + }; + class Item50 + { + dataType="Object"; + class PositionInfo + { + position[]={2659.2087,26.410391,7012.9023}; + angles[]={6.2192731,3.0913038,0.29219031}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=479; + type="Land_PaperBox_closed_F"; + atlOffset=0.011489868; + }; + class Item51 + { + dataType="Object"; + class PositionInfo + { + position[]={2661.7041,27.860769,7027.8877}; + angles[]={6.2639866,3.4914954,0.33274969}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=480; + type="Land_MetalBarrel_F"; + atlOffset=-0.0068302155; + }; + class Item52 + { + dataType="Object"; + class PositionInfo + { + position[]={2662.3066,28.029572,7026.8008}; + angles[]={6.2639866,4.5987368,0.33274969}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=481; + type="Land_BarrelEmpty_grey_F"; + atlOffset=-0.0064086914; + }; + class Item53 + { + dataType="Object"; + class PositionInfo + { + position[]={2662.3682,28.065104,7027.5498}; + angles[]={6.2639866,4.7044363,0.33274969}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=482; + type="Land_BarrelTrash_grey_F"; + atlOffset=-0.0065288544; + }; + class Item54 + { + dataType="Object"; + class PositionInfo + { + position[]={2656.3428,25.623304,7013.5283}; + angles[]={6.2352223,0.50790417,0.27745461}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=483; + type="Land_PaperBox_closed_F"; + atlOffset=0.014341354; + }; + class Item55 + { + dataType="Object"; + class PositionInfo + { + position[]={2654.4648,24.810249,7012.251}; + angles[]={6.2288389,4.6006856,0.27745375}; + }; + side="Empty"; + flags=4; + class Attributes + { + skill=0.2; + }; + id=484; + type="Land_Pallets_stack_F"; + atlOffset=-0.0050125122; + }; + }; + id=485; + atlOffset=0.071369171; + }; + }; + class Connections + { + class LinkIDProvider + { + nextID=3; + }; + class Links + { + items=3; + class Item0 + { + linkID=0; + item0=6; + item1=4; + class CustomData + { + type="Sync"; + }; + }; + class Item1 + { + linkID=1; + item0=7; + item1=4; + class CustomData + { + type="Sync"; + }; + }; + class Item2 + { + linkID=2; + item0=5; + item1=4; + class CustomData + { + type="Sync"; + }; + }; + }; + }; +}; diff --git a/README.md b/README.md index 7de6a2045..0dcb0a485 100644 --- a/README.md +++ b/README.md @@ -107,12 +107,13 @@ You can play every map without any mods (only the maps themself) if you set the * Global Mobilization CDLC * Weferlingen Winter * Global Mobilization CDLC +* Yulakia + * [Yulakia Map](https://steamcommunity.com/sharedfiles/filedetails/?id=2950257727) + * [CUP Terrains - Core](http://steamcommunity.com/sharedfiles/filedetails/?id=583496184) ## Recommended Mods These mods are recommended by us, as they are likely to increase your gaming experience: * [ACE](https://steamcommunity.com/sharedfiles/filedetails/?id=463939057) -* [ACE Compat - RHS Armed Forces of the Russian Federation](https://steamcommunity.com/workshop/filedetails/?id=773131200) -* [ACE Compat - RHS United States Armed Forces](https://steamcommunity.com/workshop/filedetails/?id=773125288) * [ACE3 - BWMOD Compatibility](https://steamcommunity.com/sharedfiles/filedetails/?id=1200145989) * [ACRE 2](https://steamcommunity.com/sharedfiles/filedetails/?id=751965892) * [Advanced Urban Rappeling](https://steamcommunity.com/sharedfiles/filedetails/?id=730310357) From 8a6d78acd9df10beb7293f2e1e091d538d14706d Mon Sep 17 00:00:00 2001 From: PiG13BR Date: Mon, 26 Aug 2024 21:09:18 -0300 Subject: [PATCH 114/115] Update tags in 0.96.8 (#961) * Update fn_tutorial.fsm * Update fn_tutorial.fsm * Update open_arsenal.sqf --- .../scripts/client/actions/open_arsenal.sqf | 2 +- .../scripts/client/tutorial/fn_tutorial.fsm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index afd3af105..31108de99 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/Missionframework/scripts/client/actions/open_arsenal.sqf @@ -1,7 +1,7 @@ scriptName "open_arsenal"; if (KPLIB_param_directArsenal) exitWith { - if (KP_liberation_ace && KP_liberation_arsenal_type) then { + if (KPLIB_ace && KPLIB_param_arsenalType) then { [player, player, false] call ace_arsenal_fnc_openBox; } else { ["Open", false] spawn BIS_fnc_arsenal; diff --git a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm index ba8f8adaf..29292f36d 100644 --- a/Missionframework/scripts/client/tutorial/fn_tutorial.fsm +++ b/Missionframework/scripts/client/tutorial/fn_tutorial.fsm @@ -491,7 +491,7 @@ class FSM priority = 1.000000; to="Slingload_crate"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!KP_liberation_fob_vehicle"/*%FSM*/; + condition=/*%FSM*/"!KPLIB_param_fobVehicle"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -502,7 +502,7 @@ class FSM priority = 0.000000; to="Drive_the_truck"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"KP_liberation_fob_vehicle"/*%FSM*/; + condition=/*%FSM*/"KPLIB_param_fobVehicle"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -642,7 +642,7 @@ class FSM precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n " (((KPLIB_sectors_fob select 0) nearObjects KPLIB_range_fob) select {" \n - " (_x getVariable [""KP_liberation_storage_type"", -1]) == 0" \n + " (_x getVariable [""KPLIB_storage_type"", -1]) == 0" \n " }) isEqualTo []" \n ")"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; @@ -918,7 +918,7 @@ class FSM precondition = /*%FSM*/""/*%FSM*/; condition=/*%FSM*/"!(" \n " (((markerPos _factory) nearObjects KPLIB_range_fob) select {" \n - " (_x getVariable [""KP_liberation_storage_type"", -1]) == 1" \n + " (_x getVariable [""KPLIB_storage_type"", -1]) == 1" \n " }) isEqualTo []" \n ")"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; @@ -956,7 +956,7 @@ class FSM priority = 0.000000; to="Complete_tasks_1"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"(((KP_liberation_production select {(_x select 1) isEqualTo _factory}) select 0) select 7) < 3"/*%FSM*/; + condition=/*%FSM*/"(((KPLIB_production select {(_x select 1) isEqualTo _factory}) select 0) select 7) < 3"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ From 36fe3df8205013033a16db62f85500869fc82467 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:29:27 -0400 Subject: [PATCH 115/115] fix undefined var (#962) --- Missionframework/scripts/client/misc/fn_initArsenal.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/scripts/client/misc/fn_initArsenal.sqf b/Missionframework/scripts/client/misc/fn_initArsenal.sqf index 8d1fe70f2..dbc820de7 100644 --- a/Missionframework/scripts/client/misc/fn_initArsenal.sqf +++ b/Missionframework/scripts/client/misc/fn_initArsenal.sqf @@ -98,12 +98,12 @@ if (KPLIB_param_useArsenalPreset) then { // Handle CBA (MRT) Accessories, https://github.com/CBATeam/CBA_A3/wiki/Accessory-Functions private _itemCfg = configFile >> "CfgWeapons" >> _x; if (!isNull _itemCfg) then { - private _nextItem = getText (_cfg >> "MRT_SwitchItemPrevClass"); + private _nextItem = getText (_itemCfg >> "MRT_SwitchItemPrevClass"); if (_nextItem != "") then { KPLIB_arsenalAllowedExtension pushBackUnique _nextItem; }; - private _prevItem = getText (_cfg >> "MRT_SwitchItemNextClass"); + private _prevItem = getText (_itemCfg >> "MRT_SwitchItemNextClass"); if (_prevItem != "") then { KPLIB_arsenalAllowedExtension pushBackUnique _prevItem; };