Compare commits

...

6 Commits

Author SHA1 Message Date
3308cdc5ba Update defines/DisallowedEquipment.hpp
Added Restricted Item Check for MRH Satcom / Satellite
2024-11-16 17:42:14 -06:00
a35c39721e Update defines/BattalionInfo.hpp
Commented out unused Units
Updated Command Callsigns
2024-11-13 19:53:11 -06:00
c94f660682 Merge pull request '4.2.1 release' (#56) from develop into main
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 41s
Reviewed-on: #56
2024-06-23 23:35:59 -05:00
hizumi
7e93ebfbfd Update script_version.hpp
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 41s
prep 4.2.1 release
2024-06-23 23:33:23 -05:00
hizumi
e0c8f3c952 Update CHANGELOG.md
version 4.2.0 release notes
2024-06-23 23:33:07 -05:00
hizumi
d200f83375 Update DisallowedEquipment.hpp 2024-06-23 23:32:24 -05:00
4 changed files with 34 additions and 27 deletions

View File

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html). The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [4.2.1] - 2024-06-23
### Changed
- Allowed Equipment Definition typo
## [4.2.0] - 2024-06-20 ## [4.2.0] - 2024-06-20
### Added ### Added
@@ -12,7 +18,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- New Resupply Boxes - New Resupply Boxes
- Ability to spawn spare tires and tracks at the arsenal and via Zeus module - Ability to spawn spare tires and tracks at the arsenal and via Zeus module
### Changed ### Changed
- Split vehicle flags into colors and shapes for additional options - Split vehicle flags into colors and shapes for additional options

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;

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_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
}; };
}; };

View File

@@ -1,4 +1,4 @@
#define MAJOR 4 #define MAJOR 4
#define MINOR 2 #define MINOR 2
#define PATCHLVL 0 #define PATCHLVL 1
#define BUILD 0 #define BUILD 0