17th-Ranger-Battalion-ORG/MissionTemplate
6
0
Fork 0
Code Issues 1 Pull Requests Actions Projects 1 Releases 16 Wiki Activity

Merge pull request 'Campaign-Updates-Nov-13-2024' (#61) from Campaign-Updates-Nov-13-2024 into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 2m56s
Details

Browse Source 
Reviewed-on: #61
This commit was merged in pull request #61.
This commit is contained in:
hizumi
2024-12-23 00:09:37 -06:00
parent ca478ab08d 38d03353b3
commit 5cf3ea5c1f
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
defines/BattalionInfo.hpp
View File

@@ -4,11 +4,11 @@
// Define the callsigns for the Battalion // Define the callsigns for the Battalion
#define COMMAND_CALLSIGN STORMSURGE #define COMMAND_CALLSIGN POWERLINE
#define RRC_CALLSIGN TIGER //#define RRC_CALLSIGN TIGER
#define MEDIC_CALLSIGN LIFELINE //#define MEDIC_CALLSIGN LIFELINE
#define ALPHA_CALLSIGN SAVAGE #define ALPHA_CALLSIGN NOMAD
#define ECHO_CALLSIGN NIGHTFALL #define ECHO_CALLSIGN WARLORD
#define WPN_CALLSIGN BLACKFOOT #define WPN_CALLSIGN BLACKFOOT
// Define the frequencies for the Battalion // Define the frequencies for the Battalion
@@ -73,26 +73,26 @@ class BattalionInfo {
}; };
class RRC { // WIP // class RRC { // WIP
callsign = RRC_CALLSIGN; // callsign = RRC_CALLSIGN;
shortDescription = "RRC"; // shortDescription = "RRC";
textColor = LVL2_TEXT_COLOR; // textColor = LVL2_TEXT_COLOR;
frequencies[] = { // frequencies[] = {
{"Contact", {}, {FREQ_BATTALION}}, // {"Contact", {}, {FREQ_BATTALION}},
{"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}} // {"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}}
}; // };
}; // };
class BattalionMedical { // WIP // class BattalionMedical { // WIP
callsign = MEDIC_CALLSIGN; // callsign = MEDIC_CALLSIGN;
shortDescription = "Battalion Medical"; // shortDescription = "Battalion Medical";
textColor = LVL2_TEXT_COLOR; // textColor = LVL2_TEXT_COLOR;
frequencies[] = { // frequencies[] = {
{"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}}, // {"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}},
{"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}}, // {"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}},
{"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}} // {"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}}
}; // };
}; // };
class WeaponsSquad { // WIP class WeaponsSquad { // WIP
callsign = WPN_CALLSIGN; callsign = WPN_CALLSIGN;

4
defines/DisallowedEquipment.hpp
View File

@@ -141,7 +141,9 @@ class DisallowedEquipment {
"Tier1_ATACR18_Geissele_Docter_Black", //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_Vanilla", //Nightforce Series Optic
"Tier1_ATACR18_Geissele_Docter_Desert", //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
}; };
}; };