From a35c39721e3acd964f5b300a8e91371b43d5028c Mon Sep 17 00:00:00 2001 From: EagleTrooper Date: Wed, 13 Nov 2024 19:53:11 -0600 Subject: [PATCH 1/2] Update defines/BattalionInfo.hpp Commented out unused Units Updated Command Callsigns --- defines/BattalionInfo.hpp | 48 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/defines/BattalionInfo.hpp b/defines/BattalionInfo.hpp index 897cf85..cb5d347 100644 --- a/defines/BattalionInfo.hpp +++ b/defines/BattalionInfo.hpp @@ -4,11 +4,11 @@ // Define the callsigns for the Battalion -#define COMMAND_CALLSIGN STORMSURGE -#define RRC_CALLSIGN TIGER -#define MEDIC_CALLSIGN LIFELINE -#define ALPHA_CALLSIGN SAVAGE -#define ECHO_CALLSIGN NIGHTFALL +#define COMMAND_CALLSIGN POWERLINE +//#define RRC_CALLSIGN TIGER +//#define MEDIC_CALLSIGN LIFELINE +#define ALPHA_CALLSIGN NOMAD +#define ECHO_CALLSIGN WARLORD #define WPN_CALLSIGN BLACKFOOT // Define the frequencies for the Battalion @@ -73,26 +73,26 @@ class BattalionInfo { }; - class RRC { // WIP - callsign = RRC_CALLSIGN; - shortDescription = "RRC"; - textColor = LVL2_TEXT_COLOR; - frequencies[] = { - {"Contact", {}, {FREQ_BATTALION}}, - {"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}} - }; - }; +// class RRC { // WIP +// callsign = RRC_CALLSIGN; +// shortDescription = "RRC"; +// textColor = LVL2_TEXT_COLOR; +// frequencies[] = { +// {"Contact", {}, {FREQ_BATTALION}}, +// {"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}} +// }; +// }; - class BattalionMedical { // WIP - callsign = MEDIC_CALLSIGN; - shortDescription = "Battalion Medical"; - textColor = LVL2_TEXT_COLOR; - frequencies[] = { - {"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}}, - {"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}}, - {"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}} - }; - }; +// class BattalionMedical { // WIP +// callsign = MEDIC_CALLSIGN; +// shortDescription = "Battalion Medical"; +// textColor = LVL2_TEXT_COLOR; +// frequencies[] = { +// {"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}}, +// {"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}}, +// {"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}} +// }; +// }; class WeaponsSquad { // WIP callsign = WPN_CALLSIGN; -- 2.37.3.windows.1 From 3308cdc5bab231cec1624bd6fc612e42d6775f21 Mon Sep 17 00:00:00 2001 From: EagleTrooper Date: Sat, 16 Nov 2024 17:42:14 -0600 Subject: [PATCH 2/2] Update defines/DisallowedEquipment.hpp Added Restricted Item Check for MRH Satcom / Satellite --- defines/DisallowedEquipment.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index 87652c0..acaa924 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -141,7 +141,9 @@ class DisallowedEquipment { "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 - "sps_black_hornet_01_Static_F" // Black Hornet Drone Mod + "sps_black_hornet_01_Static_F", // Black Hornet Drone Mod + "MRH_TacticalDisplay", //MRH Satellite Display Tablet + "MRH_FoldedSatcomAntenna" //MRH Satellite Satcom }; }; -- 2.37.3.windows.1