diff --git a/defines/ApprovedAssets.hpp b/defines/ApprovedAssets.hpp index 32a80f5..09b8218 100644 --- a/defines/ApprovedAssets.hpp +++ b/defines/ApprovedAssets.hpp @@ -1,22 +1,74 @@ // Lists approved fixed-wing and rotary vehicle types that mission makers can use in their missions. class ApprovedAssets { - // Fixed-wing aircraft - class USAF_A10 {callsign = "Ares";}; - class RHSGREF_A29B_HIDF {callsign = "Odyssey";}; - class USAF_C130J {callsign = "Hercules";}; - // Rotary aircraft - class RHS_MELB_MH6M {callsign = "Apollo";}; - class RHS_MELB_AH6M {callsign = "Artemis";}; - class RHS_MELB_H6M {callsign = "Icarus";}; - class RHS_CH_47F {callsign = "Achilles";}; - class ej_MH60MDAP4 {callsign = "Hades";}; - class RHS_UH60M {callsign = "Griffin";}; - class RHS_UH60M_MEV2 {callsign = "Dustoff";}; - class B_T_VTOL_01_INFANTRY_F {callsign = "Pegasus";}; - class B_T_VTOL_01_ARMED_F {callsign = "Spartan";}; - class RHS_AH64D {callsign = "Orion";}; - class RHS_AH1Z {callsign = "Athena";}; - class RHS_UH1Y {callsign = "Homer";}; - class rhsusf_CH53E_USMC {callsign = "Atlas";}; + // APC + class rhsusf_stryker_m1126_m2_d {callsign = "Katana"; category = "APC";}; + class rhsusf_stryker_m1126_mk19_d {callsign = "Katana"; category = "APC";}; + class rhsusf_stryker_m1127_m2_wd {callsign = "Katana"; category = "APC";}; + class rhsusf_stryker_m1132_m2_wd {callsign = "Katana"; category = "APC";}; + class rhsusf_stryker_m1134_wd {callsign = "Katana"; category = "APC";}; + class B_APC_Wheeled_01_cannon_F {callsign = "Rapier"; category = "APC";}; + class B_APC_Tracked_01_CRV_F {callsign = "DuctTape"; category = "APC";}; + // Rotary + class TF373_SOAR_MH47G_No_Rear_Guns {callsign = "Achilles"; category = "Rotary";}; + class TF373_SOAR_MH47G_No_Rear_Guns_EasyActions {callsign = "Achilles"; category = "Rotary";}; + class TF373_SOAR_MH47G {callsign = "Achilles"; category = "Rotary";}; + class TF373_SOAR_MH47G_EasyActions {callsign = "Achilles"; category = "Rotary";}; + class RHS_CH_47F_10 {callsign = "Achilles"; category = "Rotary";}; + class RHS_MELB_AH6M {callsign = "Artemis"; category = "Rotary";}; + class RHS_MELB_MH6M {callsign = "Apollo"; category = "Rotary";}; + class RHS_MELB_H6M {callsign = "Icarus"; category = "Rotary";}; + class RHS_UH60M {callsign = "Griffin"; category = "Rotary";}; + class RHS_UH60M2 {callsign = "Griffin"; category = "Rotary";}; + class RHS_UH60M_MEV {callsign = "Dustoff"; category = "Rotary";}; + class ej_MH60MDAP {callsign = "Hades"; category = "Rotary";}; + class ej_MH60MDAP16H {callsign = "Hades"; category = "Rotary";}; + class ej_MH60MDAP8H {callsign = "Hades"; category = "Rotary";}; + class ej_MH60MDAP4 {callsign = "Hades"; category = "Rotary";}; + class RHS_AH64DGrey {callsign = "Orion"; category = "Rotary";}; + // Air + // Truck + class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom {callsign = "DuctTape"; category = "Truck";}; + class rhsusf_M1084A1R_SOV_M2_D_fmtv_socom {callsign = "DuctTape"; category = "Truck";}; + class rhsusf_M1078A1P2_B_WD_CP_fmtv_usarmy {callsign = ""; category = "Truck";}; + // Boats + class rhsusf_mkvsoc {callsign = "Poseidon"; category = "Boats";}; + class B_Boat_Armed_01_minigun_F {callsign = "Neptune"; category = "Boats";}; + // MRAP + class rhsusf_M1238A1_M2_socom_d {callsign = "Tanto"; category = "MRAP";}; + class rhsusf_M1238A1_Mk19_socom_d {callsign = "Tanto"; category = "MRAP";}; + class rhsusf_M1239_M2_socom_d {callsign = "DuctTape"; category = "MRAP";}; + class rhsusf_M1239_MK19_socom_d {callsign = "DuctTape"; category = "MRAP";}; + class rhsusf_m1245_m2crows_socom_d {callsign = "Dagger"; category = "MRAP";}; + class rhsusf_m1245_mk19crows_socom_d {callsign = "Dagger"; category = "MRAP";}; + class rhsusf_M1239_M2_Deploy_socom_d {callsign = "DuctTape"; category = "MRAP";}; + // TiltRotor + class B_T_VTOL_01_infantry_F {callsign = "Pegasus"; category = "TiltRotor";}; + class B_T_VTOL_01_armed_F {callsign = "Chimera"; category = "TiltRotor";}; + // Water + // Ground Vehicle + // Cars + class rhsusf_m1165a1_gmv_m134d_m240_socom_d {callsign = "Dagger"; category = "Cars";}; + class rhsusf_m1165a1_gmv_m2_m240_socom_d {callsign = "Dagger"; category = "Cars";}; + class rhsusf_m1165a1_gmv_mk19_m240_socom_d {callsign = "Dagger"; category = "Cars";}; + class rhsusf_mrzr4_d {callsign = ""; category = "Cars";}; + class UK3CB_B_M1030_NATO {callsign = ""; category = "Cars";}; + class B_T_LSV_01_AT_F {callsign = ""; category = "Cars";}; + class B_T_LSV_01_armed_F {callsign = ""; category = "Cars";}; + class C_Quadbike_01_F {callsign = ""; category = "Cars";}; + // Fixed-Wing + class B_Plane_CAS_01_dynamicLoadout_F {callsign = "Ares"; category = "Fixed-Wing";}; + class RHS_A10 {callsign = "Ares"; category = "Fixed-Wing";}; + class USAF_AC130U {callsign = "Odin"; category = "Fixed-Wing";}; + class USAF_C130J {callsign = "Hercules"; category = "Fixed-Wing";}; + class B_Plane_Fighter_01_F {callsign = "Xerxes"; category = "Fixed-Wing";}; + // Artillery + class rhsusf_M142_usarmy_WD {callsign = "Halberd"; category = "Artillery";}; + class UK3CB_B_M270_MLRS_HE_DES {callsign = "Halberd"; category = "Artillery";}; + class rhsusf_m109d_usarmy {callsign = "Glaive"; category = "Artillery";}; + class RHS_M119_D {callsign = "Mailman"; category = "Artillery";}; + class B_Mortar_01_F {callsign = "Hammer"; category = "Artillery";}; + // Armor + class B_AFV_Wheeled_01_cannon_F {callsign = "Gladius"; category = "Armor";}; + class B_AFV_Wheeled_01_up_cannon_F {callsign = "Gladius"; category = "Armor";}; }; \ No newline at end of file diff --git a/defines/BattalionInfo.hpp b/defines/BattalionInfo.hpp index 8be13e0..897cf85 100644 --- a/defines/BattalionInfo.hpp +++ b/defines/BattalionInfo.hpp @@ -4,11 +4,11 @@ // Define the callsigns for the Battalion -#define COMMAND_CALLSIGN SPARTAN +#define COMMAND_CALLSIGN STORMSURGE #define RRC_CALLSIGN TIGER #define MEDIC_CALLSIGN LIFELINE -#define ALPHA_CALLSIGN ROGUE -#define ECHO_CALLSIGN FIREBRAND +#define ALPHA_CALLSIGN SAVAGE +#define ECHO_CALLSIGN NIGHTFALL #define WPN_CALLSIGN BLACKFOOT // Define the frequencies for the Battalion diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index 92a9325..4c309fe 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -140,7 +140,8 @@ class DisallowedEquipment { "Tier1_ATACR18_Geissele_Docter_Black_Vanilla", //Nightforce Series Optic "Tier1_ATACR18_Geissele_Docter_Black", //Nightforce Series Optic "Tier1_ATACR18_Geissele_Docter_Desert_Vanilla", //Nightforce Series Optic - "Tier1_ATACR18_Geissele_Docter_Desert" //Nightforce Series Optic + "Tier1_ATACR18_Geissele_Docter_Desert", //Nightforce Series Optic + "sps_black_hornet_01_F" // Black Hornet Drone Mod }; }; diff --git a/defines/SupplyCrates.hpp b/defines/SupplyCrates.hpp index 600e989..3336526 100644 --- a/defines/SupplyCrates.hpp +++ b/defines/SupplyCrates.hpp @@ -28,11 +28,6 @@ class SupplyCrates { {"1Rnd_SmokeYellow_Grenade_shell",12}, {"rhs_mag_30Rnd_556x45_M855A1_Stanag",25}, {"ACE_30Rnd_556x45_Stanag_M995_AP_mag",75}, - {"SMA_30Rnd_762x35_BLK_EPR",25}, - {"SMA_20Rnd_762x51mm_M80A1_EPR",25}, - {"SMA_20Rnd_762x51mm_M80A1_EPR_Tracer",25}, - {"SMA_20Rnd_762x51mm_Mk316_Mod_0_Special_Long_Range",25}, - {"SMA_20Rnd_762x51mm_Mk316_Mod_0_Special_Long_Range_Tracer",25}, {"Tier1_250Rnd_762x51_Belt_M993_AP",15}, {"ACE_20Rnd_762x51_Mag_Tracer",25}, {"ACE_20Rnd_762x51_M993_AP_Mag",25},