Update defines/SupplyCrates.hpp

Change rhs_weap_m72a7 with JPSP_weap_m72ecmk1

.gitea/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,37 @@
+name: Bug Report
+about: File a bug report to help us improve
+title: ""
+labels: "Kind/Bug"
+ref: main
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Describe the bug!
+      description: What did you see, and what did you expect to happen.
+      render: markdown
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: How can we reproduce this?
+      description: "Steps to reproduce the behavior, and attach full log here if needed."
+      value: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output?
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code.
+      render: shell

.gitea/ISSUE_TEMPLATE/config.yaml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.gitea/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,34 @@
+name: Feature Request
+about: Suggest an idea for this project
+title: ""
+labels: "Kind/Feature"
+ref: main
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to suggest an idea to us!
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Is your feature request related to a problem?
+      description: A clear and concise description of what the problem is.
+      render: markdown
+      value: " I'm always frustrated when [...]"
+  - type: textarea
+    id: feature-solution
+    attributes:
+      label: Describe the solution you would like.
+      description: "A clear and concise description of what you want to happen. Context and screenshots welcome!"
+      value: |
+        1. Go to '...'
+        2. Look at '....'
+        3. Change to '....'
+    validations:
+      required: true
+  - type: textarea
+    id: feature-references
+    attributes:
+      label: Describe the alternatives you have considered.
+      description: "A clear and concise description of any alternative solutions or features you've considered."
+      render: markdown

.gitea/workflows/on-push-devel.yaml

@@ -0,0 +1,71 @@
+name: Generate testing snapshot
+on: 
+  push:
+    branches: [develop]
+
+jobs:
+  Clean:
+    name: Create testing release
+    runs-on: windows
+    steps:
+      - name: Diagnostics
+        run: |
+          echo "repository: ${{ gitea.repository }}"
+          echo "ref:  ${{ gitea.ref }}"
+          echo "ref_name: ${{ gitea.ref_name }}"
+          echo "sha: ${{ gitea.sha }}"
+          echo "api_url: ${{ gitea.api_url }}"
+          echo "workflow: ${{ gitea.workflow }}"
+
+      - name: Checkout framework
+        uses: actions/checkout@v3
+        with:
+          path: MissionFramework
+
+      - name: Clean framework
+        run: |
+          Remove-Item -Recurse MissionFramework\aaFrameworkUtils
+          Remove-Item -Recurse MissionFramework\framework\x
+          Remove-Item -Recurse MissionFramework\.git*
+
+      - name: Backup artifacts from runner
+        uses: actions/upload-artifact@v3
+        with:
+          name: framework-test-snapshot
+          path: MissionFramework
+
+      - name: Create archive
+        run: Compress-Archive MissionFramework framework-test-snapshot.zip
+
+      - name: Delete old testing-release release
+        run: |
+          $headers = @{
+            "accept" = "application/json"
+            "Authorization" = "token ${{ gitea.token }}"
+          }
+          Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/releases/tags/testing-release" -Method Delete -Headers $headers
+
+      - name: Delete old testing-release tag
+        run: |
+          $headers = @{
+            "accept" = "application/json"
+            "Authorization" = "token ${{ gitea.token }}"
+          }
+          Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/tags/testing-release" -Method Delete -Headers $headers
+
+      - name: Create new testing-release tag
+        run: |
+          $headers = @{
+            "accept" = "application/json"
+            "Authorization" = "token ${{ gitea.token }}"
+          }
+          Invoke-WebRequest -Uri "${{ gitea.api_url }}/repos/${{ gitea.repository }}/tags" -Method Post -Headers $headers -ContentType "application/json" -Body "{`"message`": `"testing-release`", `"tag_name`": `"testing-release`", `"target`": `"${{ gitea.sha }}`"}"
+
+      - name: Create new testing-release
+        uses: https://gitea.com/actions/gitea-release-action@v1.3.0
+        with:
+          tag_name: 'testing-release'
+          name: 'testing-release'
+          prerelease: true
+          files: |-
+            framework-test-snapshot.zip

.gitea/workflows/on-release.yaml

@@ -0,0 +1,70 @@
+name: Pack Release files
+on:
+  release:
+    types: [published]
+
+jobs:
+  DispatchZGMBuild:
+    name: Dispatch MissionZGM build job
+    runs-on: windows
+    steps:
+      - name: Diagnostics
+        run: |
+          echo "repository: ${{ gitea.repository }}"
+          echo "ref:  ${{ gitea.ref }}"
+          echo "ref_name: ${{ gitea.ref_name }}"
+          echo "sha: ${{ gitea.sha }}"
+          echo "api_url: ${{ gitea.api_url }}"
+          echo "workflow: ${{ gitea.workflow }}"
+
+      - name: Publish remote issue
+        run: |
+          $headers = @{
+            "accept" = "application/json"
+            "Authorization" = "token ${{ secrets.RUNNER_ISSUE_TOKEN }}"
+          }
+          $response = Invoke-RestMethod -Uri "${{ gitea.api_url }}/repos/17th-Ranger-Battalion-ORG/MissionsForZGM/issues" -Method Post -Headers $headers -ContentType "application/json" -Body "{`"title`": `"publish-release`"}"
+
+  CreateRelease:
+    name: Publish cleaned template
+    runs-on: windows
+    steps:
+      - name: Diagnostics
+        run: |
+          echo "repository: ${{ gitea.repository }}"
+          echo "ref:  ${{ gitea.ref }}"
+          echo "ref_name: ${{ gitea.ref_name }}"
+          echo "sha: ${{ gitea.sha }}"
+          echo "api_url: ${{ gitea.api_url }}"
+          echo "workflow: ${{ gitea.workflow }}"
+
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: 'main'
+          path: release
+
+      - name: Prepare template
+        run: |
+          mkdir MissionTemplate
+          cd MissionTemplate
+          Get-ChildItem ..\release\ | Copy-Item -Recurse
+          Remove-Item -Recurse aaFrameworkUtils
+          Remove-Item -Recurse framework\x
+          Remove-Item -Recurse .git*
+          Get-ChildItem
+      
+      - name: Create archive
+        run: |
+          cd release
+          $revision = git rev-parse --short=10 HEAD
+          $tag = git describe --abbrev=0 --tags
+          cd ..
+          Compress-Archive MissionTemplate mission-maker-template-v$tag-$revision.zip
+
+      - name: Add archive to release
+        uses: https://gitea.com/actions/gitea-release-action@v1.3.0
+        with:
+          files: |-
+            mission-maker-template*.zip

.gitignore

@@ -2,3 +2,5 @@
 # Notepad++ backups #
 *.bak
 
+
+.vscode/

CHANGELOG.md

@@ -4,7 +4,131 @@ 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).
 
-## [3.2] - 2024-02-01
+## [4.2.3] - 2025-05-24
+
+### Added
+
+- Warlord Vehicle Flag
+
+### Changed
+
+- Campaign Callsigns
+- Equipment Changes
+- Supply Crate contents
+
+### Fixed
+
+- Update chat logic handler for new cba settings
+
+## [4.2.2] - 2024-12-23
+
+### Added
+
+- CBA settings to allow disabling of remaining text chat channels
+
+### Changed
+
+- Log triage level on player respawn
+- Campaign Callsigns
+
+### Fixed
+
+- Equipment typos
+
+## [4.2.1] - 2024-06-23
+
+### Changed
+
+- Allowed Equipment Definition typo
+
+## [4.2.0] - 2024-06-20
+
+### Added
+
+- Custom remainsCollector script to replace and supplement the built in arma remainsCollector function
+- New Resupply Boxes
+- Ability to spawn spare tires and tracks at the arsenal and via Zeus module
+
+### Changed
+
+- Split vehicle flags into colors and shapes for additional options
+- Battalion Callsigns
+- Allowed Equipment Definitions
+- Resupply Box Contents
+- Fixed incorrect ace carry variable setting
+
+### Removed
+
+- SMA mod references
+- Extraneous server performance calculation broadcast to all clients
+- Ability for pilots to check re-insertion queue
+
+## [4.1.2] - 2024-04-25
+
+### Changed
+
+- Fix internal versioning
+- Swap resupply box 5.56 magazines due to mod conflict
+- Group deletion handler now properly processes empty groups and logs errors 
+
+## [4.1.1] - 2024-04-19
+
+### Added
+
+- Function to remove lightning bolt from zeus
+
+### Changed
+
+- Alpha Callsign
+- Allowed Equipment Definitions
+
+### Removed
+
+- Custom tire patch code
+- Extraneous server performance calculation broadcast to all clients
+
+## [4.1.0] - 2024-03-01
+
+### Added
+
+- Added ability for mission maker to use custom leaflets
+- Added ability for mission maker to define points of interested to be automatically added as MicroDAGR waypoints
+- Added `missionGroup` variable in `description.ext` for backend grouping of mission
+- Added custom script support via `CfgFunctions`
+- Added 5 second invulnerability on ejection of air vehicle when parachute equipped
+
+### Changed
+
+- Track unconsciousness time
+
+## [4.0.0] - 2024-02-07
+
+ Version 4 marks a massive rewrite due in whole to @IndigoFox by updating the internals of the framework into CBA macros and functions.
+
+### Added
+
+- Added ability for FBCB2 Assets to locate themselves on player local map
+- Added various framework utitily functions
+- Added ability for mission maker to allow spawning of resupply boxes from arsenal boxes
+- Added CBA settings for resupply box spawning
+- Added additional vehicle flags
+- Addded Zeus module to fill vehicle ace cargo inventory with tracks/tires
+
+### Changed
+
+- Documented purpose of `missionSeries` parameter in `mission_settings.hpp`
+- Moved internal functions into new framework directory structure
+- Moved FBCB2 internal data structure into multiple defintion files
+- Moved resupply boxes internal data structures into their own definiton file
+- Moved player inventory internal data structure into its own defintion file
+- Moved vehicle flags internal data structure into its own defitinion file
+- Use player's preferred ACE color settings for medical triage icons
+
+### Deleted
+
+- Leftover resupply box code from before version 3.2.0 update
+
+## [3.2.0] - 2024-02-01
 
 ### Added
 
@@ -62,7 +186,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Lowered garbage collection times and range for dead bodies
 
 
-## [3.0] - 2023-05-03
+## [3.0.0] - 2023-05-03
 
 ### Added
 
@@ -79,7 +203,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Remove `CfgRemoteExec` from `description.ext` as it has been deprecated as of Arma v1.54
 
-## [2.2] - 2023-04-23
+## [2.2.0] - 2023-04-23
 
 ### Added
 
@@ -93,7 +217,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Force `sideChat` CBA setting to 'disabled' on mission start by default
 
-## [2.1] - 2023-04-12
+## [2.1.0] - 2023-04-12
 
 ### Added
 
@@ -103,7 +227,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Allow `#admin` to enable or disable `sideChat` via CBA setting on a per mission file basis. 
 `Escape -> Configure -> Addon Options -> Server -> 17th Battalion -> Enable Side Chat`
 
-## [2.0] -2023-04-12
+## [2.0.0] -2023-04-12
 
 ### Added
 
@@ -113,7 +237,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - mission.jpg to correct dimensions and optimize
 
-## [1.9] - 2023-03-07
+## [1.9.0] - 2023-03-07
 
 ### Added
 

README.md

@@ -1,22 +1,30 @@
 # Installation Instructions
 
-Once your mission has been created and saved in the Arma 3 Eden Editor, download the latest mission template zip and copy its contents to the folder where your mission file lives.
+The only file which should be pre-existing in your mission folder is `mission.sqm`, once freshly saved from Arma 3's EDEN Editor.
 
-The only file which should be pre-existing in your mission folder is `mission.sqm`
+Download the latest mission template zip from the [latest release](https://gitea.iceberg-gaming.com/17th-Ranger-Battalion-ORG/MissionTemplate/releases/latest) and copy its contents to the folder where your mission file lives.
 
 Once copied, the final structure should appear similar to the following:
-```markdown
-├── functions/
+```
+├── defines/
+├── framework/
 ├── images/
 ├── scripts/
 ├── sounds/
 ├── textures/
+├── CHANGELOG.md
+├── custom_leaflets.hpp
+├── custom_scripts.hpp
+├── CHANGELOG.md
 ├── description.ext
 ├── mission.jpg
 ├── mission.sqm
 ├── mission_settings.hpp
+├── README.md
 ```
 
+> **Note:** If you're building a mission for use and not actively developing code, you should download the `mission-maker-template` zip file which is a cleaned version of this framework. The `aaFrameworkUtils` and `framework\x` directories in the source tree are for the purposes of development and would only add size bloat to the mission download when players connect to your mission.
+
 After the requisite configuration file edits have been made, your mission is ready to be packed into a pbo for deployment.
 
 # Files
@@ -33,13 +41,29 @@ Almost none of the template files should be edited in anyway as they have been f
 
 The contents of this file must be edited to reflect the naming of your mission for display purposes. All variables are self-documented inside the file to clearly identify the purpose of each piece of required text
 
-The contents of the lower half of the file are where the mission maker is able to add/replace/modify the built in `#ace-fortify` preset
+The contents of the lower half of the file contain templated declaration blocks where the mission maker can define custom waypoints to be automatically added to the ACE MicroDAGR, and define/edit the custom built in `#ace-fortify` preset.
 
 ## mission.jpg
 
 This file will be displayed the client mission loading screen.
 File should remain small *(under 300KiB)* and should optimally be `1024px by 512px` in resolution
 
+## custom_leaflets.hpp
+
+This file contains the temeplate block for declaring custom leaflets to be used within missions.
+
+## custom_scripts.hpp
+
+This file contains an accessbile `CfgFunctions` declaration block for custom functions which require setup in this manner.
+
+## defines/
+
+This directory contains the definition files use by the framework in various places. *Contents should not be edited*
+
+## framework/
+
+This directory contains the code for the mission framework. **Contents must not be edited.**
+
 ## images/
 
 This directory is for organizational purposes for any images you wish to use in your mission
@@ -47,7 +71,7 @@ This directory is for organizational purposes for any images you wish to use in
 ## scripts/
 
 This directory is for organizational purposes for any custom scripts you wish to use in your mission.
-> **Note**: Scripts may need to be edited to account for their new location
+> **Note:** Scripts may need to be edited to account for their new location
 
 ## sounds/
 
@@ -56,4 +80,59 @@ This directory is for organizational purposes for any custom scripts you wish to
 
 ## textures/
 
-This directory is for organizational purposes for textures files used by mission scripts
+This directory is for organizational purposes for textures files used by mission scripts.
+
+
+# Development Notes
+
+All modules are broken apart as such in /framework. Client and server inits are managed in /framework/init.
+
+Pay attention to framework/script_mod.hpp prior to deployment of releases, as the debug settings within will determine what is logged during prod missions.
+
+CfgFunctions is sensitive to the folder/script_component.hpp of each module.
+
+### `defines` Directory
+
+This directory contains a number of hpp files used to define constants throughout the framework. These should ONLY be edited by or with the supervision of a developer to reflect format battalion-wide changes.
+
+- `ApprovedAssets.hpp`: Contains subclasses for approved aerial assets with their assigned callsigns. Used primarily in `fbcb2_assets`.
+- `BattalionInfo.hpp`: Used for representing Battalion structure, element callsigns, and radio frequency assignments. Used primarily in `fbcb2_main`.
+- `DisallowedEquipment.hpp`: Contains flagged item classnames by category that players may not use, or may use only in specific roles. Used to monitor and enforce equipment restrictions.
+- `SignalColors.hpp`: Contains smoke/flare/chemlight colors and what they represent in the field. Used primarily in `fbcb2_main` for the Signal Colors diary record.
+- `SupplyCrates.hpp`: Contains the types, contents, and metadata for all supply crate types in the `resupply` module.
+- `VehicleFlags.hpp`: Defines system information, flag categories, and flag options used to populate ACE3 interaction menus for vehicles. Used by the `vehicleFlags` module.
+
+
+### Modules List
+
+*Within `framework`:*
+
+- `ambience`:
+  - Adds ambient flak capabilities.
+- `client`:
+  - Contains core client-side event handlers and actions that don't fit into other modules.
+- `common`:
+  - Contains common functions and variables used by multiple modules.
+- `fbcb2_main`:
+  - Contains the main FBCB2 functionality and initialization code. Populates the briefing/diary with mission information.
+- `fbcb2_assets`:
+  - A subcomponent of `fbcb2_main`. Used to gather, display, and manage diary records as intel for assets near known bases.
+- `init`:
+  - Contains core initialization functions. Both server and client inits across all modules are managed here.
+- `mapcopy`:
+  - Gives players the ability to copy each other's maps.
+- `performance`:
+  - Contains functionality for monitoring and logging performance data.
+- `reinsert`:
+  - Provides a reinsertion queue system for players and pilots to maximize efficiency of the reinsertion process.
+- `resupply`:
+  - Provides a Zeus module and standalone function to spawn pre-equipped supply crates onto the battlefield.
+  - Supply crate definitions are stored in `defines/SupplyCrates.hpp`.
+  - Optionally, allows players to spawn supply crates from arsenal boxes.
+- `triageIcons`:
+  - For those with medical permissions (`ace_medical`), provides a configurable 3D icon over unconscious units indicating their current ACE Triage Card status.
+- `vehicleFlags`:
+  - Provides an ACE3 interaction menu that allows players to attach and remove flags from vehicles.
+  - Flags are defined in `defines/VehicleFlags.hpp`.
+
+c

custom_leaflets.hpp

@@ -0,0 +1,39 @@
+// This contains custom definitions for leaflets. It is not required to set this up, but you're welcome to if you want to use them.
+
+// To use this, configure one or more of the below. Then use the pylon editor of a drone in EDEN to add the appropriate magazine type (like 1Rnd_Leaflets_Custom_01_F) to the drone. Then, when the drone is flying, do `drone1 fire "1Rnd_Leaflets_Custom_01_F";` to drop the leaflets. The leaflet will then be shown in the world, and can be picked up by players to read the text and see the image.
+
+class Custom_01 // configuration for 1Rnd_Leaflets_Custom_01_F
+{
+	text = "Leaflet text"; // text shown when previewing the leaflet full-screen. Ideally should be localized, so even player who cannot read the image can get the information
+	texture = "images\leaflets\leaflet_custom_01.paa"; // leaflet texture shown when previewing the leaflet full-screen
+};
+
+class Custom_02 // configuration for 1Rnd_Leaflets_Custom_02_F
+{
+	text = "Leaflet text"; // text shown when previewing the leaflet full-screen. Ideally should be localized, so even player who cannot read the image can get the information
+	texture = "images\leaflets\leaflet_custom_02.paa"; // leaflet texture shown when previewing the leaflet full-screen
+};
+
+class Custom_03 // configuration for 1Rnd_Leaflets_Custom_03_F
+{
+	text = "Leaflet text"; // text shown when previewing the leaflet full-screen. Ideally should be localized, so even player who cannot read the image can get the information
+	texture = "images\leaflets\leaflet_custom_03.paa"; // leaflet texture shown when previewing the leaflet full-screen
+};
+
+class Custom_04 // configuration for 1Rnd_Leaflets_Custom_04_F
+{
+	text = "Leaflet text"; // text shown when previewing the leaflet full-screen. Ideally should be localized, so even player who cannot read the image can get the information
+	texture = "images\leaflets\leaflet_custom_04.paa"; // leaflet texture shown when previewing the leaflet full-screen
+};
+
+class Custom_05 // configuration for 1Rnd_Leaflets_Custom_05_F
+{
+	text = "Leaflet text"; // text shown when previewing the leaflet full-screen. Ideally should be localized, so even player who cannot read the image can get the information
+	texture = "images\leaflets\leaflet_custom_05.paa"; // leaflet texture shown when previewing the leaflet full-screen
+};
+
+class Custom_06 // configuration for 1Rnd_Leaflets_Custom_06_F
+{
+	text = "Leaflet text"; // text shown when previewing the leaflet full-screen. Ideally should be localized, so even player who cannot read the image can get the information
+	texture = "images\leaflets\leaflet_custom_06.paa"; // leaflet texture shown when previewing the leaflet full-screen
+};

custom_scripts.hpp

@@ -0,0 +1,11 @@
+// This file's contents will be included in the mission's CfgFunctions section, and serves to give you a place to define custom functions from files you've placed in /scripts.
+
+class milsim_scripts {
+	class functions {
+		file = "scripts";
+		// Add your custom functions here, like so:
+		// class init {postInit = 1;}; // refers to scripts/fn_init.sqf. postInit=1 means it will be run on each machine when they're done loading the mission.
+		// class customFunction1 {}; // refers to the file scripts/fn_customFunction1.sqf, and is called as milsim_scripts_fnc_customFunction1
+		// class customFunction2 {}; // refers to the file scripts/fn_customFunction2.sqf, and is called as milsim_scripts_fnc_customFunction2
+	};
+};

custom_sounds.hpp

@@ -0,0 +1,8 @@
+
+// EXAMPLE
+// class uncon_alarm
+// {
+//     name = "uncon_alarm";
+//     sound[] = {"AJ_CBRN_V2\sounds\AJ_warning_1.ogg", 0.9, 1, 5}; //directory, volume, pitch, range
+//     titles[]={};
+// };

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

defines/BattalionInfo.hpp

@@ -4,11 +4,11 @@
 
 
 // Define the callsigns for the Battalion
-#define COMMAND_CALLSIGN SPARTAN
-#define RRC_CALLSIGN TIGER
-#define MEDIC_CALLSIGN LIFELINE
-#define ALPHA_CALLSIGN BLACKJACK
-#define ECHO_CALLSIGN ZOOMER
+#define COMMAND_CALLSIGN ONI
+//#define RRC_CALLSIGN TIGER
+//#define MEDIC_CALLSIGN LIFELINE
+#define ALPHA_CALLSIGN GLACIER
+#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;
@@ -229,8 +229,8 @@ class BattalionInfo {
 					};
 				};
 
-				class Attack {
-					callsign = CALLSIGN_ELEMENT(ECHO_CALLSIGN, ATTACK);
+				class Armor {
+					callsign = CALLSIGN_ELEMENT(ECHO_CALLSIGN, ARMOR);
 					textColor = LVL4_TEXT_COLOR;
 					frequencies[] = {
 						{"Contact", {}, {FREQ_ECHO_GROUND, FREQ_ECHO_FLIGHT_CAS}},

defines/DisallowedEquipment.hpp

@@ -11,9 +11,9 @@ class DisallowedEquipment {
 		label = "BLACKLISTED WEAPON OR ITEM";
 		description = "Items that NO member is allowed to use.";
 		items[] = {
-			"17BN_ANPVS14", // NVG AN/PVS-14
-			"ej_PVS15D", // NVG AN/PVS-15
-			"ej_VPS15", // NVG AN/PVS-15
+			//"17BN_ANPVS14", // NVG AN/PVS-14
+			//"ej_PVS15D", // NVG AN/PVS-15
+			//"ej_PVS15", // NVG AN/PVS-15
 			"LMG_Mk200_black_F", //Mk200 Series
 			"LMG_Mk200_F", //Mk200 Series
 			"rhs_weap_g36c", // G36 Series
@@ -34,11 +34,6 @@ class DisallowedEquipment {
 			"rhs_weap_m14_wd", // M14 Series
 			"rhs_weap_m14_weap_m14ebrri", // M14 Series
 			"rhs_weap_m14", // M14 Series
-			"rhs_weap_m16a4_carryhandle_M203", // M16 Series
-			"rhs_weap_m16a4_carryhandle", // M16 Series
-			"rhs_weap_m16a4_imod_M203", // M16 Series
-			"rhs_weap_m16a4_imod", // M16 Series
-			"rhs_weap_m16a4", // M16 Series
 			"rhs_weap_m27iar_grip", // M27 Series
 			"rhs_weap_m27iar", // M27 Series
 			"rhsusf_ANPVS_14", // NVG AN/PVS-14
@@ -100,14 +95,8 @@ class DisallowedEquipment {
 			"UK3CB_M14DMR_Railed_BLK", // M14 Series
 			"UK3CB_M14DMR_Railed", // M14 Series
 			"UK3CB_M14DMR", // M14 Series
-			"UK3CB_M16_Carbine", // M16 Series
-			"UK3CB_M16A1_LSW", // M16 Series
-			"UK3CB_M16A1", // M16 Series
-			"UK3CB_M16A2_UGL", // M16 Series
-			"UK3CB_M16A2", // M16 Series
-			"UK3CB_M16A3", // M16 Series
-			"USP_PVS_14", // NVG AN/PVS-14
-			"USP_PVS_15" // NVG AN/PVS-15
+			//"USP_PVS_14", // NVG AN/PVS-14
+			//"USP_PVS_15" // NVG AN/PVS-15
 		};
 	};
 
@@ -132,10 +121,9 @@ class DisallowedEquipment {
 			"optic_lrps_tna_F", //Nightforce Series Optic
 			"optic_lrps", //Nightforce Series Optic
 			"optic_Nightstalker", // Thermal Optic
-			"optic_tws_mg", // Thermal Optic
-			"optic_tws", // Thermal Optic
 			"rhsusf_acc_anpas13gv1", // Thermal Optic
 			"rhsusf_acc_anpvs27", // Thermal Optic
+			"optic_tws_mg", // Thermal Optic
 			"Tier1_ANPVS10_Tan", // Thermal Optic
 			"Tier1_ATACR18_ADM_Black_Vanilla", //Nightforce Series Optic
 			"Tier1_ATACR18_ADM_Black", //Nightforce Series Optic
@@ -152,14 +140,18 @@ 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_Static_F", // Black Hornet Drone Mod
+			"MRH_TacticalDisplay", //MRH Satellite Display Tablet
+			"MRH_FoldedSatcomAntenna" //MRH Satellite Satcom
 		};
 	};
 
 	class tabbedItems { // Items that are allowed for individuals with Ranger Tab
-		label = "TABBED WEAPON";
+		label = "TABBED ITEM";
 		description = "Items that are allowed for individuals with Ranger Tab.";
 		items[] = {
+			"optic_tws", // Thermal Optic
 			"arifle_MX_black_F", // MX Series
 			"arifle_MX_F", // MX Series
 			"arifle_MX_GL_black_F", // MX 3GL Series
@@ -208,7 +200,105 @@ class DisallowedEquipment {
 			"Tier1_SR25_ec_tan", // SR-25 Series
 			"Tier1_SR25_ec", // SR-25 Series
 			"Tier1_SR25_tan", // SR-25 Series
-			"Tier1_SR25" // SR-25 Series
+			"Tier1_SR25", // SR-25 Series
+			"rhsusf_weap_MP7A2", //MP7 Series 
+			"rhsusf_weap_MP7A2_aor1", //MP7 Series 
+			"rhsusf_weap_MP7A2_desert", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded_aor1", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded_winter", //MP7 Series 
+			"rhsusf_weap_MP7A2_folded_desert", //MP7 Series 
+			"rhsusf_weap_MP7A2_winter", //MP7 Series 
+			"UK3CB_MP510", //MP5 Series 
+			"UK3CB_MP5A2", //MP5 Series 
+			"UK3CB_MP5A3", //MP5 Series 
+			"UK3CB_MP5A4", //MP5 Series 
+			"UK3CB_MP5K", //MP5 Series 
+			"UK3CB_MP5K_PDW", //MP5 Series 
+			"UK3CB_MP5N", //MP5 Series 
+			"UK3CB_MP5N_UGL", //MP5 Series 
+			"UK3CB_MP5SD5", //MP5 Series 
+			"UK3CB_MP5SD6", //MP5 Series
+			"SMG_03C_black", //P90 Series
+			"SMG_03C_camo", //P90 Series
+			"SMG_03C_hex", //P90 Series
+			"SMG_03C_khaki", //P90 Series
+			"SMG_03C_TR_black", //P90 Series
+			"SMG_03C_TR_camo", //P90 Series
+			"SMG_03C_TR_hex", //P90 Series
+			"SMG_03C_TR_khaki", //P90 Series
+			"UK3CB_P90C_black", //P90 Series
+			"UK3CB_P90C_camo", //P90 Series
+			"UK3CB_P90C_hex", //P90 Series
+			"UK3CB_P90C_khaki", //P90 Series
+			"UK3CB_P90C_TR_black", //P90 Series
+			"UK3CB_P90C_TR_camo", //P90 Series
+			"UK3CB_P90C_TR_hex", //P90 Series
+			"UK3CB_P90C_TR_khaki", //P90 Series
+			"UK3CB_P90_black", //P90 Series
+			"UK3CB_P90_camo", //P90 Series
+			"UK3CB_P90_hex", //P90 Series
+			"UK3CB_P90_khaki", //P90 Series
+			"UK3CB_P90_TR_black", //P90 Series
+			"UK3CB_P90_TR_camo", //P90 Series
+			"UK3CB_P90_TR_hex", //P90 Series
+			"UK3CB_P90_TR_khaki", //P90 Series
+			"UK3CB_M16_Carbine", //M16 Series
+			"UK3CB_M16_Carbine_eotech_552", //M16 Series
+			"UK3CB_M16_Carbine_sup", //M16 Series
+			"UK3CB_M16A1", //M16 Series
+			"UK3CB_M16A1_LSW", //M16 Series
+			"UK3CB_M16A2", //M16 Series
+			"UK3CB_M16A2_sup", //M16 Series
+			"UK3CB_M16A2_UGL", //M16 Series
+			"UK3CB_M16A2_UGL_eotech_552", //M16 Series
+			"UK3CB_M16A2_UGL_sup", //M16 Series
+			"UK3CB_M16A3", //M16 Series
+			"UK3CB_M16A3_eotech_552", //M16 Series
+			"UK3CB_M16A3_eotech_552_sup", //M16 Series
+			"UK3CB_M16A3_sup", //M16 Series
+			"UK3CB_M16A3_UGL", //M16 Series
+			"rhs_weap_m16a4", //M16 Series
+			"rhs_weap_m16a4_grip", //M16 Series
+			"rhs_weap_m16a4_grip_acog", //M16 Series
+			"rhs_weap_m16a4_grip2", //M16 Series
+			"rhs_weap_m16a4_grip3", //M16 Series
+			"rhs_weap_m16a4_bipod", //M16 Series
+			"rhs_weap_m16a4_acog_usmc", //M16 Series
+			"rhs_weap_m16a4_carryhandle", //M16 Series
+			"rhs_weap_m16a4_carryhandle_bipod", //M16 Series
+			"rhs_weap_m16a4_carryhandle_grip", //M16 Series
+			"rhs_weap_m16a4_carryhandle_M203", //M16 Series
+			"rhs_weap_m16a4_carryhandle_M203_grip", //M16 Series
+			"rhs_weap_m16a4_m203_acog_usmc", //M16 Series
+			"uk3cb_weap_m16a4_m203s_eotech_552_anpeq15_sup", //M16 Series
+			"rhs_weap_m16a4_imod", //M16 Series
+			"rhs_weap_m16a4_imod_grip", //M16 Series
+			"rhs_weap_m16a4_imod_grip2", //M16 Series
+			"rhs_weap_m16a4_imod_grip3", //M16 Series
+			"rhs_weap_m16a4_imod_M203", //M16 Series
+			"rhs_weap_m16a4_imod_M203_grip", //M16 Series
+			"rhs_weap_m16a4_carryhandle_grip2", //M16 Series
+			"rhs_weap_m16a4_carryhandle_grip3", //M16 Series
+			"rhs_weap_m16a4_grip_acog_usmc", //M16 Series
+			"rhs_weap_m16a4_grip_acog2_usmc", //M16 Series
+			"rhs_weap_m32", //M32/MGL Series
+			"rhs_weap_m32_usmc", //M32/MGL Series
+			"G3_Multicam_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_M81_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_TGR_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_Multicam_Tee_BLK", //Tabbed T-Shirt
+			"G3_M81_Tee_BLK", //Tabbed T-Shirt
+			"G3_TGR_Tee_BLK", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Tan", //Tabbed T-Shirt
+			"G3_M81_Tee_Tan", //Tabbed T-Shirt
+			"G3_TGR_Tee_Tan", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Gray", //Tabbed T-Shirt
+			"G3_M81_Tee_Gray", //Tabbed T-Shirt
+			"G3_TGR_Tee_Gray", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Green", //Tabbed T-Shirt
+			"G3_M81_Tee_Green", //Tabbed T-Shirt
+			"G3_TGR_Tee_Green" //Tabbed T-Shirt
 		};
 	};
 

defines/SignalColors.hpp

@@ -0,0 +1,44 @@
+class SignalColors {
+	class White {
+		name = "White";
+		hexCode = "#FFFFFF";
+		usage = "Concealment, Light";
+		itemExamples[] = {"SmokeShell", "1Rnd_Smoke_Grenade_shell", "ACE_Chemlight_White"};
+	};
+	class Green {
+		name = "Green";
+		hexCode = "#00FF00";
+		usage = "Friendly Forces";
+		itemExamples[] = {"SmokeShellGreen", "1Rnd_SmokeGreen_Grenade_shell", "Chemlight_green"};
+	};
+	class Blue {
+		name = "Blue";
+		hexCode = "#0000FF";
+		usage = "LZ Marking";
+		itemExamples[] = {"SmokeShellBlue", "1Rnd_SmokeBlue_Grenade_shell", "Chemlight_blue"};
+	};
+	class Red {
+		name = "Red";
+		hexCode = "#FF0000";
+		usage = "Enemy Location";
+		itemExamples[] = {"SmokeShellRed", "1Rnd_SmokeRed_Grenade_shell", "Chemlight_red"};
+	};
+	class Orange {
+		name = "Orange";
+		hexCode = "#FFA500";
+		usage = "Resupply Marker";
+		itemExamples[] = {"SmokeShellOrange", "1Rnd_SmokeOrange_Grenade_shell", "ACE_Chemlight_Orange"};
+	};
+	class Yellow {
+		name = "Yellow";
+		hexCode = "#FFFF00";
+		usage = "Medical Emergency";
+		itemExamples[] = {"SmokeShellYellow", "1Rnd_SmokeYellow_Grenade_shell", "Chemlight_yellow"};
+	};
+	class Purple {
+		name = "Purple";
+		hexCode = "#800080";
+		usage = "Broken Arrow - 100m radius";
+		itemExamples[] = {"SmokeShellPurple", "1Rnd_SmokePurple_Grenade_shell"};
+	};
+};

defines/SupplyCrates.hpp

@@ -9,7 +9,8 @@ class SupplyCrates {
 		weapons[] = {
 			{"rhs_weap_M136",4},
 			{"rhs_weap_M136_hp",4},
-			{"rhs_weap_m72a7",2}
+			//{"rhs_weap_m72a7",2}
+			{"JPSP_weap_m72ecmk1",2}
 		};
 		magazines[] = {
 			{"1Rnd_SmokePurple_Grenade_shell",12},
@@ -20,31 +21,25 @@ class SupplyCrates {
 			{"ACE_40mm_Flare_ir",12},
 			{"rhsusf_200Rnd_556x45_mixed_soft_pouch_coyote",25},
 			{"rhsusf_20Rnd_762x51_m993_Mag",25},
-			{"SmokeShell",12},
-			{"rhs_mag_m67",12},
+			{"SmokeShell",24},
+			{"ACE_M84",24},
+			{"rhs_mag_m67",24},
 			{"1Rnd_Smoke_Grenade_shell",24},
 			{"1Rnd_SmokeRed_Grenade_shell",24},
 			{"1Rnd_SmokeGreen_Grenade_shell",24},
 			{"1Rnd_SmokeYellow_Grenade_shell",12},
-			{"Tier1_30Rnd_556x45_M856A1_EMag",25},
-			{"Tier1_30Rnd_556x45_Mk318Mod0_EMag",75},
-			{"ACE_30Rnd_65_Creedmor_mag",25},
-			{"SMA_30Rnd_762x35_BLK_EPR",25},
-			{"Tier1_30Rnd_762x35_300BLK_SMK_PMAG",25},
-			{"SMA_30Rnd_68x43_SPC_FMJ",25},
-			{"SMA_30Rnd_68x43_SPC_FMJ_Tracer",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},
+			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
+			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",75},
 			{"Tier1_250Rnd_762x51_Belt_M993_AP",15},
 			{"ACE_20Rnd_762x51_Mag_Tracer",25},
 			{"ACE_20Rnd_762x51_M993_AP_Mag",25},
 			{"rhsusf_20Rnd_762x51_SR25_m993_Mag",25},
 			{"Tier1_20Rnd_762x51_M993_SR25_Mag",25},
-			{"Tier1_20Rnd_65x48_Creedmoor_SR25_Mag",25},
-			{"rhssaf_30rnd_556x45_EPR_G36", 25},
-			{"DemoCharge_Remote_Mag",16}
+			{"KAR_20Rnd_Fury_blk",25},
+			{"rhsusf_m112_mag",25},
+			{"JCA_20Rnd_762x51_PMAG",25},
+			{"JCA_20Rnd_762x51_Tracer_Red_PMAG",25},
+			{"KAR_100Rnd_Fury_blk",25},
 		};
 		items[] = {};
 	};
@@ -56,16 +51,19 @@ class SupplyCrates {
 		icon = "\A3\ui_f\data\map\vehicleicons\iconCrateWpns_ca.paa";
 
 		backpacks[] = {};
-		weapons[] = {};
+		weapons[] = {
+			{"launch_MRAWS_green_F",2}
+		};
 		magazines[] = {
 			{"MRAWS_HEAT_F",35},
 			{"MRAWS_HE_F",15},
 			{"Tier1_250Rnd_762x51_Belt_M993_AP",50},
-			{"Tier1_30Rnd_556x45_M856A1_EMag",25},
-			{"Tier1_30Rnd_556x45_Mk318Mod0_EMag",50},
+			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
+			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
 			{"Titan_AA",10},
 			{"Titan_AT",10},
-			{"200Rnd_65x39_cased_Box_Tracer_Red",50}
+			{"200Rnd_65x39_cased_Box_Tracer_Red",50},
+			{"KAR_100Rnd_Fury_RT_blk",50}
 		};
 		items[] = {};
 	};
@@ -86,6 +84,7 @@ class SupplyCrates {
 			{"ACE_splint",48},
 			{"ACE_morphine",50},
 			{"ACE_epinephrine",50},
+			{"ACE_painkillers",20},
 			{"ACE_bloodIV",75},
 			{"ACE_bloodIV_500",50},
 			{"ACE_bloodIV_250",25},
@@ -136,6 +135,42 @@ class SupplyCrates {
 		items[] = {};
 	};
 
+	class SquadUtility {
+		boxClass = "Box_Syndicate_Ammo_F";
+		displayName = "Squad Utility Supply Crate";
+		tooltip = "A crate containing Flairs, Smokes, Breaching Charges";
+		icon = "\A3\ui_f\data\map\vehicleicons\iconCrateAmmo_ca.paa";
+
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {
+			{"ACE_Chemlight_HiYellow",20},
+			{"ACE_Chemlight_HiBlue",20},
+			{"ACE_Chemlight_HiGreen",20},
+			{"ACE_Chemlight_HiRed",20},
+			{"ACE_Chemlight_UltraHiOrange",20},
+			{"ACE_HandFlare_Yellow",20},
+			{"ACE_HandFlare_White",20},
+			{"ACE_HandFlare_Red",20},
+			{"ACE_HandFlare_Green",20},
+			{"ACE_Chemlight_IR",20},
+			{"ACE_IR_Strobe_Item",20},
+			{"SmokeShellYellow",20},
+			{"SmokeShellBlue",20},
+			{"SmokeShellPurple",20},
+			{"SmokeShellOrange",20},
+			{"SmokeShellGreen",20},
+			{"SmokeShellRed",20},
+			{"tsp_popperCharge_auto_mag",10},
+			{"tsp_frameCharge_mag",20},
+			{"tsp_stickCharge_auto_mag",10},
+			{"ACE_CableTie",25},
+			{"DemoCharge_Remote_Mag",15},
+			{"TFAR_anprc152",3},
+		};
+	};
+
 	class MortarMk6Resupply {
 		boxClass = "Box_NATO_WpsSpecial_F";
 		displayName = "Mortar MK6 Supply Crate";
@@ -168,13 +203,40 @@ class SupplyCrates {
 		icon = "\A3\ui_f\data\igui\cfg\simpleTasks\types\scout_ca.paa";
 		
 		backpacks[] = {};
-		weapons[] = {};
+		weapons[] = {
+			{"rhs_weap_M136",2},
+			{"twc_2inch_bag",3}
+		};
 		magazines[] = {
 			{"twc_2inch_he_1rnd",70},
 			{"twc_2inch_smoke_1rnd",15},
 			{"twc_2inch_illum_1rnd",15},
-			{"Tier1_30Rnd_556x45_Mk318Mod0_EMag",20}
+			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",20}
 		};
 		items[] = {};
 	};
+
+	class ResupplyTire {
+		boxClass = "ACE_Wheel";
+		displayName = "Vehicle Tire";
+		tooltip = "A single tire for replacement";
+		icon = "A3\ui_f\data\igui\cfg\simpletasks\types\repair_ca.paa";
+		
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {};
+	};
+
+	class ResupplyTrack {
+		boxClass = "ACE_Track";
+		displayName = "Vehicle Track";
+		tooltip = "A single track for replacement";
+		icon = "z\ace\addons\repair\ui\patch_ca.paa";
+		
+		backpacks[] = {};
+		weapons[] = {};
+		magazines[] = {};
+		items[] = {};
+	};
 };

defines/VehicleFlags.hpp

@@ -84,31 +84,160 @@ class VehicleFlags {
 			actionID = "flag_simpleshape";
 			actionTitle = "Simple Shapes";
 
+			class Blue {
+				actionID = "flags_simpleshape_blue";
+				actionTitle = "Blue";
+
+				class BlueCircle {
+					actionID = "flag_simpleshape_bluecircle";
+					actionTitle = "Blue Circle";
+					texture = "textures\simple_shape\flag_simpleshape_bluecircle_co.paa";
+				};
+				class BlueOctagon {
+					actionID = "flag_simpleshape_blueoctagon";
+					actionTitle = "Blue Octagon";
+					texture = "textures\simple_shape\flag_simpleshape_blueoctagon_co.paa";
+				};
+				class BluePentagon {
+					actionID = "flag_simpleshape_bluepentagon";
+					actionTitle = "Blue Pentagon";
+					texture = "textures\simple_shape\flag_simpleshape_bluepentagon_co.paa";
+				};
+				class BlueSquare {
+					actionID = "flag_simpleshape_bluesquare";
+					actionTitle = "Blue Square";
+					texture = "textures\simple_shape\flag_simpleshape_bluesquare_co.paa";
+				};
+				class BlueTriangle {
+					actionID = "flag_simpleshape_bluetriangle";
+					actionTitle = "Blue Triangle";
+					texture = "textures\simple_shape\flag_simpleshape_bluetriangle_co.paa";
+				};
+			};
+
+			class Green {
+				actionID = "flags_simpleshape_green";
+				actionTitle = "Green";
+
+				class GreenCircle {
+					actionID = "flag_simpleshape_greencircle";
+					actionTitle = "Green Circle";
+					texture = "textures\simple_shape\flag_simpleshape_greencircle_co.paa";
+				};
 				class GreenOctagon {
 					actionID = "flag_simpleshape_greenoctagon";
 					actionTitle = "Green Octagon";
 					texture = "textures\simple_shape\flag_simpleshape_greenoctagon_co.paa";
 				};
-			class BlueCircle {
-				actionID = "flag_simpleshape_bluecircle";
-				actionTitle = "Blue Circle";
-				texture = "textures\simple_shape\flag_simpleshape_bluecircle_co.paa";
+				class GreenPentagon {
+					actionID = "flag_simpleshape_greenpentagon";
+					actionTitle = "Green Pentagon";
+					texture = "textures\simple_shape\flag_simpleshape_greenpentagon_co.paa";
+				};
+				class GreenSquare {
+					actionID = "flag_simpleshape_greensquare";
+					actionTitle = "Green Square";
+					texture = "textures\simple_shape\flag_simpleshape_greensquare_co.paa";
+				};
+				class GreenTriangle {
+					actionID = "flag_simpleshape_greentriangle";
+					actionTitle = "Green Triangle";
+					texture = "textures\simple_shape\flag_simpleshape_greentriangle_co.paa";
+				};
+			};
+
+			class Orange {
+				actionID = "flags_simpleshape_orange";
+				actionTitle = "Orange";
+
+				class OrangeCircle {
+					actionID = "flag_simpleshape_orangecircle";
+					actionTitle = "Orange Circle";
+					texture = "textures\simple_shape\flag_simpleshape_orangecircle_co.paa";
+				};
+				class OrangeOctagon {
+					actionID = "flag_simpleshape_orangeoctagon";
+					actionTitle = "Orange Octagon";
+					texture = "textures\simple_shape\flag_simpleshape_orangeoctagon_co.paa";
+				};
+				class OrangePentagon {
+					actionID = "flag_simpleshape_orangepentagon";
+					actionTitle = "Orange Pentagon";
+					texture = "textures\simple_shape\flag_simpleshape_orangepentagon_co.paa";
 				};
 				class OrangeSquare {
 					actionID = "flag_simpleshape_orangesquare";
 					actionTitle = "Orange Square";
 					texture = "textures\simple_shape\flag_simpleshape_orangesquare_co.paa";
 				};
+				class OrangeTriangle {
+					actionID = "flag_simpleshape_orangetriangle";
+					actionTitle = "Orange Triangle";
+					texture = "textures\simple_shape\flag_simpleshape_orangetriangle_co.paa";
+				};
+			};
+
+			class Pink {
+				actionID = "flags_simpleshape_pink";
+				actionTitle = "Pink";
+
+				class PinkCircle {
+					actionID = "flag_simpleshape_pinkcircle";
+					actionTitle = "Pink Circle";
+					texture = "textures\simple_shape\flag_simpleshape_pinkcircle_co.paa";
+				};
+				class PinkOctagon {
+					actionID = "flag_simpleshape_pinkoctagon";
+					actionTitle = "Pink Octagon";
+					texture = "textures\simple_shape\flag_simpleshape_pinkoctagon_co.paa";
+				};
+				class PinkPentagon {
+					actionID = "flag_simpleshape_pinkpentagon";
+					actionTitle = "Pink Pentagon";
+					texture = "textures\simple_shape\flag_simpleshape_pinkpentagon_co.paa";
+				};
+				class PinkSquare {
+					actionID = "flag_simpleshape_pinksquare";
+					actionTitle = "Pink Square";
+					texture = "textures\simple_shape\flag_simpleshape_pinksquare_co.paa";
+				};
 				class PinkTriangle {
 					actionID = "flag_simpleshape_pinktriangle";
 					actionTitle = "Pink Triangle";
 					texture = "textures\simple_shape\flag_simpleshape_pinktriangle_co.paa";
 				};
+			};
+
+			class Red {
+				actionID = "flags_simpleshape_red";
+				actionTitle = "Red";
+				
+				class RedCircle {
+					actionID = "flag_simpleshape_redcircle";
+					actionTitle = "Red Circle";
+					texture = "textures\simple_shape\flag_simpleshape_redcircle_co.paa";
+				};
+				class RedOctagon {
+					actionID = "flag_simpleshape_redoctagon";
+					actionTitle = "Red Octagon";
+					texture = "textures\simple_shape\flag_simpleshape_redoctagon_co.paa";
+				};
 				class RedPentagon {
 					actionID = "flag_simpleshape_redpentagon";
 					actionTitle = "Red Pentagon";
 					texture = "textures\simple_shape\flag_simpleshape_redpentagon_co.paa";
 				};
+				class RedSquare {
+					actionID = "flag_simpleshape_redsquare";
+					actionTitle = "Red Square";
+					texture = "textures\simple_shape\flag_simpleshape_redsquare_co.paa";
+				};
+				class RedTriangle {
+					actionID = "flag_simpleshape_redtriangle";
+					actionTitle = "Red Triangle";
+					texture = "textures\simple_shape\flag_simpleshape_redtriangle_co.paa";
+				};
+			};
 		};
 
 		class Miscellaneous {
@@ -119,11 +248,51 @@ class VehicleFlags {
 				actionTitle = "17th Emblem";
 				texture = "textures\flags_misc\flag_17th_emblem_co.paa";
 			};
+			class WarlordEmblem {
+				actionID = "flag_17th_warlord";
+				actionTitle = "Warlord Emblem";
+				texture = "textures\flags_misc\flag_17th_warlord_co.paa";
+			};
 			class RedCross {
 				actionID = "flag_redcross";
 				actionTitle = "Red Cross";
 				texture = "textures\flags_misc\flag_redcross_co.paa";
 			};
 		};
+
+		class BuiltIn {
+			actionID = "flag_builtin";
+			actionTitle = "Built-In";
+			class BlueFlag {
+				actionID = "flag_builtin_blue";
+				actionTitle = "Blue Flag";
+				texture = "\A3\Data_F\Flags\flag_blue_CO.paa";
+			};
+			class GreenFlag {
+				actionID = "flag_builtin_green";
+				actionTitle = "Green Flag";
+				texture = "\A3\Data_F\Flags\flag_green_CO.paa";
+			};
+			class RedFlag {
+				actionID = "flag_builtin_red";
+				actionTitle = "Red Flag";
+				texture = "\A3\Data_F\Flags\flag_red_CO.paa";
+			};
+			class WhiteFlag {
+				actionID = "flag_builtin_white";
+				actionTitle = "White Flag";
+				texture = "\A3\Data_F\Flags\flag_white_CO.paa";
+			};
+			class NATOFlag {
+				actionID = "flag_builtin_nato";
+				actionTitle = "NATO Flag";
+				texture = "\A3\Data_F\Flags\flag_NATO_CO.paa";
+			};
+			class UNFlag {
+				actionID = "flag_builtin_un";
+				actionTitle = "UN Flag";
+				texture = "\A3\Data_F\Flags\Flag_uno_CO.paa";
+			};
+		};
 	};
 };

description.ext

@@ -17,11 +17,13 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "mission_settings.hpp"
+#include "framework\script_mod.hpp"
 #include "defines\ApprovedAssets.hpp"
 #include "defines\BattalionInfo.hpp"
 #include "defines\DisallowedEquipment.hpp"
 #include "defines\SupplyCrates.hpp"
 #include "defines\VehicleFlags.hpp"
+#include "defines\SignalColors.hpp"
 
 //-------------------------------------------MISSION INFO--------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -87,16 +89,20 @@ minPlayerDistance = 500;
 
 //-------------------------------------------BASE SETTINGS---------------------------------------------------------------//
 
-class Params
-{
+class Params {};
+
+class CfgFunctions {
+	#include "framework\CfgFunctions.hpp"
+	#include "custom_scripts.hpp"
 };
 
-
-class cfgFunctions 
-{
-	#include "functions\CfgFunctions.hpp"
+class CfgSounds {
+	#include "custom_sounds.hpp"
 };
 
+class CfgLeaflets {
+	#include "custom_leaflets.hpp"
+};
 
 class CfgDebriefingSections {
 	class acex_killTracker {

framework/CfgFunctions.hpp

@@ -0,0 +1,191 @@
+#include "script_mod.hpp"
+
+class DOUBLES(PREFIX,init) {
+	class functions {
+		file = "framework\init\functions";
+		class initServer { postInit = 1;};
+		class initClient { postInit = 1;};
+		class setDefaults {};
+		class addAARChatHandler {};
+		class addRespawnChatHandler {};
+		class checkMissionSettings {};
+	};
+};
+
+class PREFIX {	
+	class ambience {
+		file = "framework\ambience";
+		class flakInitVehicle {};
+		class flakEH {};
+	};
+};
+
+class DOUBLES(PREFIX,client) {
+	class functions {
+		file = "framework\client\functions";
+		class initClient {};
+		class addDraw3DPFH {};
+		class addGetNearMenPFH {};
+		class addMicroDAGRWaypoints {};
+		class addZenModules {};
+		class bindEventHandlers {};
+		class bindVehicleActions {};
+		class clearPFHCode {};
+		class logRespawnButtonUse {};
+		class registerPFHCode {};
+		class staticLineProtection {};
+	};
+};
+
+class DOUBLES(PREFIX,common) {
+	class functions {
+		file = "framework\common\functions";
+		class addCBASettings { preInit = 1; };
+		class addPlayerInfoToArray {};
+		class checkPlayerInventory {};
+		class createOrUpdateDiaryRecord {};
+		class draw3DIconStatus {};
+		class getApprovedAssetsCfg {};
+		class getBattalionCfg {};
+		class getNameOfBase {};
+		class getNearestBase {};
+		class log {};
+		class logMissionInfo {};
+		class logSettingChanged {};
+		class padString {};
+		class recurseSubclasses {};
+	};
+};
+
+class DOUBLES(PREFIX,fbcb2_assets) {
+	class functions {
+		file = "framework\fbcb2_assets\functions";
+		class addCBASettings {preInit=1;};
+		class initServer {};
+		class initClient {};
+		class getCallsignFromClassname {};
+		class getCurrentAssetsByBase {};
+		class getInventory {};
+		class getMagsForWeapon {};
+		class getStartingAndCurrentAssets {};
+		class getStartingAssetsByBase {};
+		class getVehicleData {};
+		class getWeaponry {};
+		class hintAllApprovedAssets {};
+		class isAssetInRangeOfBase {};
+		class removeAssetDiaryRecords {};
+		class removeMarkersOnMap {};
+		class showMarkersOnMap {};
+		class updateAssetDiary {};
+		class updateAssetsByBase {};
+	};
+};
+
+class DOUBLES(PREFIX,fbcb2_main) {
+	class functions {
+		file = "framework\fbcb2_main\functions";
+		class initClient {};
+		class addEnvironmentRecord {};
+		class addFrequenciesRecord {};
+		class addSignalColorsRecord {};
+	};
+	class util {
+		file = "framework\fbcb2_main\util";
+		class formatRadioElementForDiary {};
+		class generateElementFrequencyRecordText {};
+	};
+};
+
+class DOUBLES(PREFIX,mapcopy) {
+	class functions {
+		file = "framework\mapcopy\functions";
+		class addCBASettings {preInit=1;};
+		class initClient {};
+		class getMapMarkers {};
+		class loadMapMarkers {};
+		class mapMarkerToString {};
+		class stringToMapMarker {};
+	};
+};
+
+class DOUBLES(PREFIX,performance) {
+	class functions {
+		file = "framework\performance\functions";
+		class addCBASettings {preInit=1;};
+		class addDNI_PlayerFPS {postInit = 1;};
+
+		// PFHs managed in addCBASettings onChange code
+		class addClientStatsPFH {};
+		class calculateClientStats {};
+		class addServerStatsPFH {};
+		class calculateServerStats {};
+		class addEmptyGroupCleanupPFH {};
+		class addDeadUnitCleanupPFH {};
+	};
+};
+
+class DOUBLES(PREFIX,reinsert) {
+	class functions {
+		file = "framework\reinsert\functions";
+		class addCBASettings {preInit=1;};
+	};
+	class server {
+		file = "framework\reinsert\server";
+		class initServer {};
+		class addToQueue {};
+		class globalShowQueue {};
+		class removeFromQueue {};
+		class returnReinsertQueueNotification {};
+		class validateQueue {};
+	};
+	class client {
+		file = "framework\reinsert\client";
+		class initClient {};
+		class addAceSelfActions {};
+		class addCheckQueueSelfAction {};
+		class requestShowQueue {};
+	};
+};
+
+class DOUBLES(PREFIX,resupply) {
+	class functions {
+		file = "framework\resupply\functions";
+		class addCBASettings {preInit=1;};
+		class initClient {};
+		class createBox {};
+		class getSupplyCratesCfg {};
+		class addArsenalObjectSpawnBoxActions {};
+	};
+};
+
+class DOUBLES(PREFIX,triageIcons) {
+	class functions {
+		file = "framework\triageIcons\functions";
+		class addCBASettings {preInit=1;};
+		class initClient {};
+		class draw3D {};
+		class updateColors {};
+	};
+};
+
+class DOUBLES(PREFIX,vehicleFlags) {
+	class functions {
+		file = "framework\vehicleFlags\functions";
+		class initClient {};
+		class addFlagActions {};
+		class draw3D {};
+		class getActionsFlagCategories {};
+		class compileFlagAction {};
+		class compileFlagCategoryAction {};
+		class getVehicleFlagsCfg {};
+		class isClassExcluded {};
+	};
+};
+
+class DOUBLES(PREFIX,zeus) {
+	class functions {
+		file = "framework\zeus\functions";
+		class initClient {};
+		class addZenModules {};
+	};
+};

framework/client/functions/fn_addDraw3DPFH.sqf

@@ -0,0 +1,10 @@
+#include "..\script_component.hpp"
+
+
+if (!isNil QGVAR(draw3DPFH)) then {
+	[GVAR(draw3DPFH)] call CBA_fnc_removePerFrameHandler;
+};
+// add pfh that processes queued code
+GVAR(draw3DPFH) = [{
+	{call _x; true;} count (localNamespace getVariable [QGVAR(pfhCode), []]);
+}, 0] call CBA_fnc_addPerFrameHandler;

framework/client/functions/fn_addGetNearMenPFH.sqf

@@ -0,0 +1,17 @@
+#include "..\script_component.hpp"
+
+// subroutine to gather nearest 50 units every 5 seconds and store in GVAR(nearMen)
+// cleanup
+if (!isNil QGVAR(getNearMenPFH)) then {
+	[GVAR(getNearMenPFH)] call CBA_fnc_removePerFrameHandler;
+};
+// add pfh
+GVAR(getNearMenPFH) = [{
+	localNamespace setVariable [
+		QGVAR(nearMen), 
+		(nearestObjects [player,["Man"],50,false]) select {
+			!isNull _x &&
+			player isNotEqualTo _x
+		}
+	];
+}, 1] call CBA_fnc_addPerFrameHandler;

framework/client/functions/fn_addMicroDAGRWaypoints.sqf

@@ -0,0 +1,76 @@
+#include "..\script_component.hpp"
+
+// adds default base locations to players' microDAGR as waypoints
+
+if (!hasInterface) exitWith {};
+
+[{!isNull player}, {
+
+	// add base locations (respawn modules)
+	{
+		private _wpName = [_x] call EFUNC(common,getNameOfBase);
+		private _posASL = getPosASL _x;
+		[_wpName, _posASL] call ace_microdagr_fnc_deviceAddWaypoint;
+	} forEach GVARMAIN(baseObjects);
+
+	// add custom waypoints from mission_settings.hpp
+	private _customWaypoints = [missionConfigFile >> "custom_microdagr_waypoints", "ARRAY", []] call CBA_fnc_getConfigEntry;
+	{
+		_x params [
+			["_wpName", ""],
+			["_pos", [0, 0, 0], [[], ""]],
+			["_object", "", [""]]
+		];
+		private _realPos = nil;
+		// if pos was provided, process
+		if (count _pos >= 2) then {
+			switch (typeName _pos) do {
+				case "ARRAY": {
+					// pos is provided as an array
+					_realPos = _pos select [0, 2];
+					_realPos set [2, getTerrainHeightASL _realPos];
+				};
+				case "STRING": {
+					// pos is provided as a string
+					_realPos = [_pos, true] call ACE_common_fnc_getMapPosFromGrid;
+					_realPos set [2, getTerrainHeightASL _realPos];
+				};
+				default {
+					[
+						LEVEL_WARNING,
+						QUOTE(COMPONENT),
+						format["Invalid position for custom microDAGR waypoint: %1", _wpName],
+					[["name", _wpName], ["pos", _pos], ["object", _object]]] call EFUNC(common,log);
+					continue;
+				};
+			};
+		};
+		// if object was provided, process and override any pos
+		if (count _object > 0) then {
+			// object is provided as a string variable name
+			private _realObject = missionNamespace getVariable _object;
+			if (isNull _realObject) then {
+				[
+					LEVEL_WARNING,
+					QUOTE(COMPONENT),
+					format["Invalid object for custom microDAGR waypoint: %1", _wpName],
+				[["name", _wpName], ["pos", _pos], ["object", _object]]] call EFUNC(common,log);
+				continue;
+			};
+			_realPos = getPosASL (missionNamespace getVariable _object);
+		};
+		if (isNil "_realPos") then {
+			[
+				LEVEL_WARNING,
+				QUOTE(COMPONENT),
+				format["Invalid waypoint position for custom microDAGR waypoint: %1", _wpName],
+			[["name", _wpName], ["pos", _pos], ["object", _object]]] call EFUNC(common,log);
+			continue;
+		};
+
+		[_wpName, _realPos] call ace_microdagr_fnc_deviceAddWaypoint;
+		true;
+	} count _customWaypoints;
+}] call CBA_fnc_waitUntilAndExecute;
+
+nil;

framework/client/functions/fn_addZenModules.sqf

@@ -0,0 +1,41 @@
+#include "..\script_component.hpp"
+
+if ( !hasInterface ) exitWith {};
+
+[
+	QUOTE(MODULE_CATEGORY_NAME),
+	"Grounds Cleanup", 
+	{
+		params [["_pos", [0,0,0], [[]], 3], ["_target", objNull, [objNull]]];
+		
+		_pos = [_pos#0, _pos#1, 0];
+		
+		[
+			"Cleanup Area",
+			[
+				[ "SLIDER:RADIUS", "Radius (meters)", [50, 500, 100, 0, _pos, [0.8, 0.2, 0.2, 1.0]], true ]
+			],
+			{
+				
+				params ["_dialog", "_args"];
+				
+				_dialog params ["_radius"];
+				_args params ["_pos", "_target"];
+						
+				_objects = _pos nearObjects ["GroundWeaponHolder", _radius];
+				{
+					deleteVehicle _x;
+				} forEach _objects
+
+			},
+			{},
+			[_pos, _target]
+		] call zen_dialog_fnc_create;
+
+	}
+] call zen_custom_modules_fnc_register;
+
+
+diag_log text "[MILSIM] (client) zeus modules added";
+
+nil;

framework/client/functions/fn_bindEventHandlers.sqf

@@ -1,21 +1,7 @@
+#include "..\script_component.hpp"
+
 if ( !hasInterface ) exitWith {};
 
-player addEventHandler["Respawn", 
-	{
-		params ["_unit", "_corpse"];
-		private _killer = _corpse getVariable ["ace_medical_causeOfDeath", "#scripted"];
-		if (_killer == "respawn_button") then {
-			[
-				"client",
-				"RESPAWNED WHILE UNCONSCIOUS",
-				[_unit] call milsim_fnc_addPlayerInfoToArray
-			] remoteExec ["milsim_fnc_log", 2];
-		//	format["%1 was unconscious then clicked the respawn button", name _unit] remoteExec["systemChat", 0];
-		};
-	}
-];
-
-
 [
 	{
 		params ["_unit", "_object", "_cost"];
@@ -29,25 +15,28 @@ addMissionEventHandler ["HandleChatMessage",
 	{
 		params ["_channel", "_owner", "_from", "_text", "_person", "_name", "_strID", "_forcedDisplay", "_isPlayerMessage", "_sentenceType", "_chatMessageType"];
 				
-		if ( missionNamespace getVariable ["milsim_sideChat", false] ) exitWith{ false };
-		
-		if (_channel != 1) exitWith { false };
-		
 		if ( ( admin _owner ) != 0 ) exitWith { false };
 
 		if ( !isNull ( getAssignedCuratorLogic _person ) ) exitWith { false };
 		
+		if ( (missionNamespace getVariable ["milsim_globalChat", false] ) && ( _channel == 0 ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_sideChat", false] ) && ( _channel == 1 ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_commandChat", false] && ( _channel == 2 ) ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_groupChat", false] ) && ( _channel == 3 ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_vehicleChat", false] && ( _channel == 4 ) ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_directChat", false] ) && ( _channel == 5 ) ) exitWith{ false };
+
 		true;
 	}
 ];
 
 
 ["ace_arsenal_displayClosed", {
-	[player] remoteExec ["milsim_fnc_logPlayerInventory", 2];
+	[player] remoteExec [QEFUNC(common,checkPlayerInventory), 2];
 }] call CBA_fnc_addEventHandler;
 
 [missionNamespace, "arsenalClosed", {
-	[player] remoteExec ["milsim_fnc_logPlayerInventory", 2];
+	[player] remoteExec [QEFUNC(common,checkPlayerInventory), 2];
 }] call BIS_fnc_addScriptedEventHandler;
 
 diag_log text "[MILSIM] (client) event handlers bound";

framework/client/functions/fn_bindVehicleActions.sqf

@@ -0,0 +1,34 @@
+if ( !hasInterface ) exitWith {};
+
+_checkFuel =
+[
+	"CheckFuel",
+	"Check Fuel",
+	"",
+	{
+		hint format ["Fuel: %1%2", floor (fuel _target *100), "%"];
+	},
+	{true}
+] call ace_interact_menu_fnc_createAction;
+
+["LandVehicle", 0, ["ACE_MainActions"], _checkFuel, true] call ace_interact_menu_fnc_addActionToClass;
+
+
+_unflip =
+[
+	"Unfuck",
+	"Flip Vehicle",
+	"",
+	{
+		_target setpos [(getpos _target) select 0,(getpos _target) select 1, 0.5];
+		_target setVectorUp surfaceNormal position _target;
+	},
+	{true}
+] call ace_interact_menu_fnc_createAction;
+
+["LandVehicle", 0, ["ACE_MainActions"], _unflip, true] call ace_interact_menu_fnc_addActionToClass;
+
+
+diag_log text "[MILSIM] (client) vehicle actions bound";
+
+nil;

framework/client/functions/fn_clearPFHCode.sqf

@@ -0,0 +1,5 @@
+#include "..\script_component.hpp"
+
+localNamespace setVariable [QGVAR(pfhCode), []];
+
+count [];

framework/client/functions/fn_initClient.sqf

@@ -0,0 +1,32 @@
+#include "..\script_component.hpp"
+
+
+if (!hasInterface) exitWith {};
+
+call FUNC(addMicroDAGRWaypoints);
+call FUNC(addZenModules);
+call FUNC(bindEventHandlers);
+call FUNC(bindVehicleActions);
+
+// add core getNearMenPFH handler
+localNamespace setVariable [QGVAR(nearMen), []];
+call FUNC(addGetNearMenPFH);
+// add core draw3dPFH handler
+localNamespace setVariable [QGVAR(pfhCode), []];
+call FUNC(addDraw3DPFH);
+
+// add listener that tracks using the respawn button while unconscious
+call FUNC(logRespawnButtonUse);
+// add conditional eject-from-vehicle handler to apply temp invincibility when static line jumping
+call FUNC(staticLineProtection);
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"initClient complete",
+	[]
+] call EFUNC(common,log);
+
+localNamespace setVariable [QGVAR(complete), true];
+
+nil;

framework/client/functions/fn_logRespawnButtonUse.sqf

@@ -0,0 +1,57 @@
+#include "..\script_component.hpp"
+
+if ( !hasInterface ) exitWith {};
+
+["ace_killed", {
+	params ["_unit", "_causeOfDeath", "_killer", "_instigator"];
+
+	if (not (local _unit)) exitWith {};
+
+	private _causeOfDeath = _unit getVariable ["ace_medical_causeOfDeath", "#scripted"];
+	private _triageLevel = _unit call ace_medical_treatment_fnc_getTriageStatus;
+
+	if (_causeOfDeath != "respawn_button") exitWith {};
+	private _timeWentUnconscious = _unit getVariable [QGVARMAIN(lastTimeKnockedOut), -1];
+	private _durationSpentUnconscious = -1;
+	if (_timeWentUnconscious isEqualTo -1) exitWith {};
+	
+	_durationSpentUnconscious = diag_tickTime - _timeWentUnconscious;
+	[
+		LEVEL_INFO,
+		QUOTE(COMPONENT),
+		"RESPAWNED WHILE UNCONSCIOUS",
+		[_unit, [
+			["durationSpentUnconscious", _durationSpentUnconscious],
+			["triageLevel", _triageLevel#1]
+		]] call EFUNC(common,addPlayerInfoToArray)
+	] remoteExec [QEFUNC(common,log), 2];
+	//	format["%1 was unconscious then clicked the respawn button", name _unit] remoteExec["systemChat", 0];
+}] call CBA_fnc_addEventHandler;
+
+
+["ace_medical_knockOut", { // local event for module & epi event
+	// systemChat format["ace_medical_knockOut: %1", _this];
+	private _unit = _this;
+	if (not (local _unit)) exitWith {};
+	_this setVariable [QGVARMAIN(lastTimeKnockedOut), diag_tickTime];
+}] call CBA_fnc_addEventHandler;
+
+["ace_medical_WakeUp", { // local event for module & epi event
+	// systemChat format["ace_medical_WakeUp: %1", _this];
+	private _unit = _this;
+	if (not (local _unit)) exitWith {};
+	_this setVariable [QGVARMAIN(lastTimeKnockedOut), nil];
+}] call CBA_fnc_addEventHandler;
+
+["ace_unconscious", { // used when applying damage
+	params ["_unit", "_isUnconscious"];
+	if (not (local _unit)) exitWith {};
+
+	if (_isUnconscious && isNil {_unit getVariable QGVARMAIN(lastTimeKnockedOut)}) then {
+		// systemChat format["%1 is unconscious", _unit];
+		_unit setVariable [QGVARMAIN(lastTimeKnockedOut), diag_tickTime];
+	} else {
+		// systemChat format["%1 is conscious", _unit];
+		_unit setVariable [QGVARMAIN(lastTimeKnockedOut), nil];
+	};
+}] call CBA_fnc_addEventHandler;

framework/client/functions/fn_registerPFHCode.sqf

@@ -0,0 +1,9 @@
+#include "..\script_component.hpp"
+
+params [["_code", {}, [{}]]];
+
+private _pfhCode = localNamespace getVariable [QGVAR(pfhCode), []];
+_pfhCode pushBack _code;
+localNamespace setVariable [QGVAR(pfhCode), _pfhCode];
+
+count _pfhCode;

framework/client/functions/fn_staticLineProtection.sqf

@@ -0,0 +1,40 @@
+#include "..\script_component.hpp"
+
+if ( !hasInterface ) exitWith {};
+
+// Add GetOutMan event handler to grant temporary invincibility to players ejecting from vehicles
+// Only for players who have "hooked up" using VS static line
+// and are ejecting from a plane or helicopter above 100m
+player addEventHandler ["GetOutMan", {
+	params ["_unit", "_role", "_vehicle", "_turret", "_isEject"];
+	if (!isEject) exitWith {};
+	if (isNil {_unit getVariable "VS_Jump"}) exitWith {};
+	if (
+		not (_vehicle isKindOf "Plane" || _vehicle isKindOf "Helicopter") ||
+		((getPosATL _vehicle)#2) < 100
+	) exitWith {};
+
+	// disable damage for the unit to avoid collision damage
+	_unit allowDamage false;
+	// tested - vehicle _unit is the _unit, as this EH runs when they have left the vehicle
+
+
+	[
+		{!isNull (objectParent _this)}, // condition - wait until player re-enters vehicle (chute)
+		{
+			// if they enter a chute within 5 seconds, disable chute damage
+			(vehicle _this) allowDamage false;
+			// then wait X seconds and re-enable damage for both
+			[{
+				_this allowDamage true;
+				(vehicle _this) allowDamage true;
+			}, _this, 5] call CBA_fnc_waitAndExecute;
+		},
+		_unit, // args
+		2, // timeout
+		{ // run on timeout, if for some reason they don't enter a chute
+			// re-enable damage for unit
+			_this allowDamage true;
+		}
+	] call CBA_fnc_waitUntilAndExecute;
+}];

framework/client/script_component.hpp

@@ -0,0 +1,3 @@
+#define COMPONENT client
+#define COMPONENT_BEAUTIFIED Client
+#include "../script_mod.hpp"

framework/common/functions/fn_addCBASettings.sqf

@@ -0,0 +1,130 @@
+#include "..\script_component.hpp"
+
+//---------------------
+//	Global Chat
+//---------------------
+[
+	QGVARMAIN(globalChat),
+	"CHECKBOX",
+	"Global Chat Text Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true, // default value
+	true, // requires restart
+	{
+		params ["_value"];
+		[
+			QGVARMAIN(globalChat),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+//---------------------
+//	Side Chat
+//---------------------
+[
+	QGVARMAIN(sideChat),
+	"CHECKBOX",
+	"Side Chat Text Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true, // default value
+	true, // requires restart
+	{
+		params ["_value"];
+		[
+			QGVARMAIN(sideChat),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+
+//---------------------
+//	Command Chat
+//---------------------
+[
+	QGVARMAIN(commandChat),
+	"CHECKBOX",
+	"Command Chat Text Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true, // default value
+	true, // requires restart
+	{
+		params ["_value"];
+		[
+			QGVARMAIN(commandChat),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+//---------------------
+//	Group Chat
+//---------------------
+[
+	QGVARMAIN(groupChat),
+	"CHECKBOX",
+	"Group Chat Text Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true, // default value
+	true, // requires restart
+	{
+		params ["_value"];
+		[
+			QGVARMAIN(groupChat),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+
+//---------------------
+//	Vehicle Chat
+//---------------------
+[
+	QGVARMAIN(vehicleChat),
+	"CHECKBOX",
+	"Vehicle Chat Text Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true, // default value
+	true, // requires restart
+	{
+		params ["_value"];
+		[
+			QGVARMAIN(vehicleChat),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+
+//---------------------
+//	Vehicle Chat
+//---------------------
+[
+	QGVARMAIN(directChat),
+	"CHECKBOX",
+	"Direct Chat Text Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true, // default value
+	true, // requires restart
+	{
+		params ["_value"];
+		[
+			QGVARMAIN(directChat),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+
+[QGVARMAIN(globalChat), false] call CBA_settings_fnc_set;
+[QGVARMAIN(sideChat), false] call CBA_settings_fnc_set;
+[QGVARMAIN(commandChat), false] call CBA_settings_fnc_set;
+[QGVARMAIN(groupChat), false] call CBA_settings_fnc_set;
+[QGVARMAIN(vehicleChat), false] call CBA_settings_fnc_set;
+[QGVARMAIN(directChat), false] call CBA_settings_fnc_set;
+
+diag_log text "[MILSIM] (settings) Custom CBA settings initialized";
+
+nil;

framework/common/functions/fn_addPlayerInfoToArray.sqf

@@ -1,4 +1,6 @@
-params [["_playerObj", objNull], ["_arrayToModify", [], [[]]]];
+#include "..\script_component.hpp"
+
+params [["_playerObj", objNull, [nil, objNull]], ["_arrayToModify", [], [[]]]];
 
 if (isNull _playerObj) exitWith {_arrayToModify};
 
@@ -8,7 +10,7 @@ if (isNull _playerObj) exitWith {_arrayToModify};
 	["playerName", name _playerObj],
 	["playerUID", getPlayerUID _playerObj],
 	["playerGroup", groupId (group _playerObj)],
-	["playerNetID", [_playerObj] call BIS_fnc_netId]
+	["playerNetID", _playerObj call BIS_fnc_netId]
 ];
 
 _arrayToModify;

framework/common/functions/fn_checkPlayerInventory.sqf

@@ -1,5 +1,5 @@
 /*
-	Function: milsim_fnc_logPlayerInventory
+	Function: milsim_common_fnc_checkPlayerInventory
 
 	Description:
 		Checks a player's inventory for non-compliant items and logs results to all machines.
@@ -13,16 +13,19 @@
 		<ARRAY> - Array of strings to be logged.
 
 */
+#include "..\script_component.hpp"
+
 params [
 	["_player", objNull, [objNull]]
 ];
 
 if (!isPlayer _player) exitWith {
 	[
-		"logPlayerInventory",
+		LEVEL_ERROR,
+		QUOTE(COMPONENT),
 		"PARAM PLAYER IS NOT A PLAYER",
 		[["player", _player]]
-	] call milsim_fnc_log;
+	] call EFUNC(common,log);
 };
 
 // testing
@@ -53,10 +56,11 @@ _playerItems pushBack (uniform _player);
 
 
 [
-	"logPlayerInventory",
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
 	"CHECKING PLAYER INVENTORY",
-	[_player] call milsim_fnc_addPlayerInfoToArray
-] call milsim_fnc_log;
+	[_player] call EFUNC(common,addPlayerInfoToArray)
+] call EFUNC(common,log);
 
 ////////////////////////////////////////
 // HARDCODED DISALLOWED ITEMS - see functions/definitions/DisallowedEquipment.hpp
@@ -115,10 +119,11 @@ private _thermalItems = _playerItems select {
 // Only log compliance message if no non-compliant items were found
 if (count _allFoundItemsSoFar isEqualTo 0) exitWith {
 	[
-		"logPlayerInventory",
+		LEVEL_INFO,
+		QUOTE(COMPONENT),
 		"PLAYER INVENTORY IS COMPLIANT",
-		[_player] call milsim_fnc_addPlayerInfoToArray
-	] call milsim_fnc_log;
+		[_player] call EFUNC(common,addPlayerInfoToArray)
+	] call EFUNC(common,log);
 };
 
 // Log all non-compliant items
@@ -132,13 +137,14 @@ if (count _allFoundItemsSoFar isEqualTo 0) exitWith {
 		private _itemConfig = _itemClassName call CBA_fnc_getItemConfig;
 		// Log to RPT
 		[
-			"logPlayerInventory",
+			LEVEL_WARNING,
+			QUOTE(COMPONENT),
 			"NON-COMPLIANT ITEM",
 			[_player, [
 				["category", _categoryLabel],
 				["className", _itemClassName],
 				["displayName", [_itemConfig] call BIS_fnc_displayName]
-			]] call milsim_fnc_addPlayerInfoToArray
-		] call milsim_fnc_log;
+			]] call EFUNC(common,addPlayerInfoToArray)
+		] call EFUNC(common,log);
 	} forEach _items;
 } forEach _foundItemsKeyValue;

framework/common/functions/fn_createOrUpdateDiaryRecord.sqf

@@ -0,0 +1,58 @@
+#include "../script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+params [
+	["_subjectID", "", [""]],
+	["_recordTitle", "", [""]],
+	["_recordText", "", [""]],
+	["_recordIcon", "", [""]]
+];
+
+// Check if all parameters are provided
+if (
+	count _subjectID isEqualTo 0 ||
+	count _recordTitle isEqualTo 0 ||
+	count _recordText isEqualTo 0
+) exitWith {
+	[LEVEL_ERROR, QUOTE(COMPONENT), "Not all parameters provided"] call EFUNC(common,log);
+};
+
+// Check if already created
+private _subjectRecords = GVAR(diaryRecords) getOrDefault [_subjectID, createHashMap, true];
+private _existingRecord = _subjectRecords getOrDefault [_recordTitle, diaryRecordNull, true];
+
+if (!isNull _existingRecord) then {
+	player setDiaryRecordText [[_subjectID, _existingRecord], [_recordTitle, _recordText, _recordIcon]];
+	
+	[
+		LEVEL_DEBUG,
+		QUOTE(COMPONENT),
+		format ["Updated diary record: %1", _recordTitle],
+		[
+			["subjectID", _subjectID],
+			["recordTitle", _recordTitle]
+		]
+	] call EFUNC(common,log);
+} else {
+	private _new = player createDiaryRecord [
+		_subjectID, 
+		[
+			_recordTitle, 
+			_recordText,
+			_recordIcon
+		]
+	];
+	_subjectRecords set [_recordTitle, _new];
+	GVAR(diaryRecords) set [_subjectID, _subjectRecords];
+
+	[
+		LEVEL_DEBUG,
+		QUOTE(COMPONENT),
+		format ["Created diary record: %1", _recordTitle],
+		[
+			["subjectID", _subjectID],
+			["recordTitle", _recordTitle]
+		]
+	] call EFUNC(common,log);
+};

framework/common/functions/fn_draw3DIconStatus.sqf

@@ -0,0 +1,54 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+params [
+	["_drawTargets", [], [[]]],
+	["_icon", "", [""]],
+	["_text", "", [""]],
+	["_color", [], [[]]]
+];
+
+if (count _drawTargets isEqualTo 0) exitWith {};
+
+_cameraPos = positionCameraToWorld [0,0,0];
+_cameraPosASL = AGLToASL _cameraPos;
+
+{
+	_target = _x;
+	_visible = [objNull, "VIEW"] checkVisibility [_cameraPosASL, eyePos _target];
+	
+	if ( _visible isEqualTo 0 ) exitWith {};
+	
+	_objectPos = (_target modelToWorldVisual (_target selectionPosition "pilot"));
+	_distance =  (visiblePosition _target) vectorDiff _cameraPos;
+	
+	_scale = 0;
+	_heightOffset = 0;
+	_heightScaling = 0.012;
+
+	if ( _icon isNotEqualTo "") then {
+		_heightOffset = 0.065;
+		_scale = 1;
+		_heightScaling = 0.075;
+	};
+
+	_drawPos = _objectPos vectorAdd [0, 0, (0.18 + _heightOffset) + (vectorMagnitude _distance * _heightScaling)];
+	
+	drawIcon3D [
+		_icon,
+		_color,
+		_drawPos,
+		_scale,
+		_scale,
+		0,
+		_text,
+		2,
+		0.025
+	];
+	
+	true;
+} count _drawTargets;
+
+nil
+

framework/common/functions/fn_getApprovedAssetsCfg.sqf

@@ -0,0 +1,15 @@
+#include "../script_component.hpp"
+
+private _approvedAssetsCfg = (missionConfigFile >> "ApprovedAssets");
+
+if (!IS_CONFIG(_approvedAssetsCfg) || {!isClass _approvedAssetsCfg}) exitWith {
+	[
+		LEVEL_ERROR,
+		QUOTE(COMPONENT),
+		"ERROR: Approved assets config not found. Check that the config is present and correctly named in the mission config file. See defines/ApprovedAssets.hpp and framework/util/functions/getApprovedAssetsCfg.sqf.",
+		[]
+	] call EFUNC(common,log);
+	configNull;
+};
+
+_approvedAssetsCfg;

framework/common/functions/fn_getBattalionCfg.sqf

@@ -0,0 +1,15 @@
+#include "../script_component.hpp"
+
+private _battalionInfoCfg = (missionConfigFile >> "BattalionInfo");
+
+if (!IS_CONFIG(_battalionInfoCfg) || {!isClass _battalionInfoCfg}) exitWith {
+	[
+		LEVEL_ERROR,
+		QUOTE(COMPONENT),
+		"ERROR: Battalion config not found. Check that the battalion config is present and correctly named in the mission config file. See defines/BattalionInfo.hpp and framework/util/functions/getBattalionCfg.sqf.",
+		[]
+	] call EFUNC(common,log);
+	configNull;
+};
+
+_battalionInfoCfg;

framework/common/functions/fn_getNameOfBase.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 params [["_base", objNull, [objNull]]];
 if (_base == objNull) exitWith {""};
 

framework/common/functions/fn_getNearestBase.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 params [["_object", objNull, [objNull]]];
 if (isNull _object) exitWith {objNull};
 

framework/common/functions/fn_log.sqf

@@ -0,0 +1,33 @@
+/* 
+	Function: milsim_common_fnc_log
+
+	Description:
+		Used to log messages to the server RPT file.
+
+	Parameters:
+		0: NUMBER - log level.
+		1: STRING - component name.
+		2: STRING - message to log.
+		3: ARRAY - key value pairs of data to log.
+*/
+#include "..\script_component.hpp"
+
+params [
+	["_logLevel", 1, [-1,0,1,2,3]], // script_mod.hpp
+	["_component", "", [""]],
+	["_message", "", [""]],
+	["_data", [], [[]]]
+];
+
+if (_logLevel < DEBUG_MODE) exitWith {};
+
+private _hash = createHashMapFromArray _data;
+
+// Replace square brackets with round brackets to avoid parsing issues.
+[_message, "]", ")"] call CBA_fnc_replace;
+[_message, "[", "("] call CBA_fnc_replace;
+
+private _json = [_hash] call CBA_fnc_encodeJSON;
+private _log = format ["[%1] [%2] [%3] [%4] :: %5", QUOTE(PREFIX), _component, _fnc_scriptNameParent, _message, _json];
+
+diag_log text _log;

framework/common/functions/fn_logMissionInfo.sqf

@@ -1,5 +1,8 @@
+#include "..\script_component.hpp"
+
 [
-	"init",
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
 	"MISSION INFO",
 	[
 		["serverName", serverName],
@@ -20,4 +23,4 @@
 			["LOGIC", playableSlotsNumber sideLogic] // 5 is LOGIC side
 		]]
 	]
-] call milsim_fnc_log;
+] call FUNC(log);

framework/common/functions/fn_logSettingChanged.sqf

@@ -0,0 +1,16 @@
+#include "..\script_component.hpp"
+
+params [
+	["_settingName", "", [""]],
+	"_newValue"
+];
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"SETTING CHANGED",
+	[
+		["setting", _settingName],
+		["newValue", _value]
+	]
+] call EFUNC(common,log);

framework/common/functions/fn_padString.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 params [
 	["_text", "", [""]],
 	["_padSide", "left", ["left", "right"]],

framework/common/functions/fn_recurseSubclasses.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 params [
 	["_cfg", configNull, [configNull]],
 	["_code", {}, [{}]]

framework/common/script_component.hpp

@@ -0,0 +1,3 @@
+#define COMPONENT common
+#define COMPONENT_BEAUTIFIED Common
+#include "../script_mod.hpp"

framework/fbcb2_assets/functions/fn_addCBASettings.sqf

@@ -0,0 +1,27 @@
+#include "..\script_component.hpp"
+
+//---------------------
+// Asset Diary and Markers Settings
+
+[
+	QGVAR(setting_detectionRangeFromBase), // variable
+	"SLIDER", // type
+	["Detection Range From Base", "The range from a base that assets will be detected"], // title
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)], // category
+	[0, 1000, 750, 0, false], // [_min, _max, _default, _trailingDecimals, _isPercentage]
+	true, // global setting
+	{
+		params ["_value"];
+		[
+			QGVAR(setting_detectionRangeFromBase),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"CREATED SETTINGS",
+	[]
+] call EFUNC(common,log);

framework/fbcb2_assets/functions/fn_getCallsignFromClassname.sqf

@@ -0,0 +1,15 @@
+#include "..\script_component.hpp"
+
+params [
+	["_className", "", [""]]
+];
+
+// Get the approved assets config
+private _approvedAssetsCfg = call EFUNC(common,getApprovedAssetsCfg);
+if (isNull _approvedAssetsCfg) exitWith {""};
+
+// Get the asset definition
+private _assetDef = (_approvedAssetsCfg >> _className);
+if (isClass _assetDef) exitWith {getText(_assetDef >> "callsign")};
+
+"";

framework/fbcb2_assets/functions/fn_getCurrentAssetsByBase.sqf

@@ -0,0 +1,6 @@
+#include "../script_component.hpp"
+
+// return each base with its assets
+GVARMAIN(baseObjects) apply {
+	[_x, _x getVariable [QGVAR(assetsAtThisBase), []]]
+};

framework/fbcb2_assets/functions/fn_getStartingAndCurrentAssets.sqf

@@ -0,0 +1,17 @@
+#include "..\script_component.hpp"
+
+// get all starting assets at each base and combine to array
+private _startingAssetsByBase = call FUNC(getStartingAssetsByBase);
+private _startingAssets = [];
+{
+	_startingAssets append (_x#1);
+} forEach _startingAssetsByBase;
+
+// get all current assets at each base and combine to array
+private _assetsByBase = call FUNC(getCurrentAssetsByBase);
+private _assets = [];
+{
+	_assets append (_x#1);
+} forEach _assetsByBase;
+
+[_startingAssets, _assets];

framework/fbcb2_assets/functions/fn_getStartingAssetsByBase.sqf

@@ -0,0 +1,6 @@
+#include "../script_component.hpp"
+
+// return each base with its assets
+GVARMAIN(baseObjects) apply {
+	[_x, _x getVariable [QGVAR(assetsStartedAtThisBase), []]]
+};

framework/fbcb2_assets/functions/fn_getVehicleData.sqf

@@ -39,7 +39,7 @@ private _pylons = getAllPylonsInfo _vic;
 ///////////////////////////////////////////////
 // WRITE TITLE
 ///////////////////////////////////////////////
-_title pushBack format["<font size='24' shadow='1' color='#e1701a' face='PuristaBold'>%1</font>", _dispName];
+_title pushBack format["%1", _dispName];
 
 ///////////////////////////////////////////////
 // WRITE IMAGE

framework/fbcb2_assets/functions/fn_hintAllApprovedAssets.sqf

@@ -0,0 +1,94 @@
+#include "..\script_component.hpp"
+
+// get vehicles the mission started with at base locations
+(call FUNC(getStartingAndCurrentAssets)) params [
+	"_startingAssets",
+	"_currentAssets"
+];
+
+// get distinct classnames to group by
+private _distinctStartingAssetsClassNames = [];
+{
+	_x params ["_netId", "_cfg"];
+	private _className = configName _cfg;
+	_distinctStartingAssetsClassNames pushBackUnique _className;
+} forEach _startingAssets;
+
+// get the approved assets config to identify callsigns
+private _approvedAssetsCfg = call EFUNC(common,getApprovedAssetsCfg);
+if (isNull _approvedAssetsCfg) exitWith {
+	[
+		LEVEL_ERROR,
+		QUOTE(COMPONENT),
+		"No approved assets defined.",
+		[]
+	] call EFUNC(common,log);
+	[
+		"ERROR: No approved assets defined. See defines/ApprovedAssets.hpp"
+	] call BIS_fnc_error;
+};
+
+_text = parseText "<t size='4'>MESSAGE</t>";
+_text = composeText [_text, lineBreak ];
+
+_text = composeText [_text, parseText "<t align='left' size='2'>Asset</t><t align='right' size='2'>Available</t>", lineBreak ];
+ 
+{
+	private _className = _x;
+	// only approved assets
+	if (!isClass (_approvedAssetsCfg >> _className)) then {continue};
+
+	private _callsign = [_className] call FUNC(getCallsignFromClassname);
+
+	private _startingAssetsOfThisType = _startingAssets select {
+		// select all starting assets of this type
+		_x params ["_netId", "_cfg"];
+		_className isEqualTo (configName _cfg);
+	};
+	private _currentAssetsOfThisType = _currentAssets select {
+		_x params ["_netId", "_cfg"];
+		private _object = _netId call BIS_fnc_objectFromNetId;
+		// objNull if deleted, then check classname and if alive
+		!isNull _object && {
+			_className isEqualTo (typeOf _object) &&
+			alive _object
+		};
+	};
+
+	(_startingAssetsOfThisType#0) params [
+		"_assetNetId",
+		"_assetCfg"
+	];
+
+	_assigned = count _startingAssetsOfThisType;
+	_available =  count _currentAssetsOfThisType;
+	// count (getMarkerPos "respawn_west"  nearEntities [ _asset, 2000] );  
+	
+	
+	_image = getText(_assetCfg >> "picture");
+
+	_name = getText(_assetCfg >> "displayName") select [0, 22];
+	private _data = format[
+		"<img size='1' align='left' image='%1'/><t size='1' align='left'>  %2</t><t size='1' align='right'>%3   [ %4 ]</t>",
+		_image,
+		_name,
+		_available,
+		_assigned
+	];
+
+	// private _data = format[
+	// 	"<img size='1' align='left' image='%1'/>
+	// 	<t size='1' align='left'>  %2</t>
+	// 	<t size='1' align='middle'>%3</t>
+	// 	<t size='1' align='right'>%4</t>",
+	// 	_image,
+	// 	_name,
+	// 	_assigned,
+	// 	_available
+	// ];
+	_text = composeText[ _text,  parseText _data, lineBreak ];  
+   
+  
+} foreach _distinctStartingAssetsClassNames;
+ 
+hint _text;

framework/fbcb2_assets/functions/fn_initClient.sqf

@@ -0,0 +1,28 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+call FUNC(updateAssetDiary);
+
+// once the server has published that assets have been gathered and distributed to bases (respawn modules),
+// we can update the asset diary on our end using that data
+[QGVAR(assetsGathered), {
+	[
+		LEVEL_DEBUG,
+		QUOTE(COMPONENT),
+		"Received gathered base asset data from server",
+		[]
+	] call EFUNC(common,log);
+
+	// update the asset diary with the data we've received
+	FUNC(updateAssetDiary);
+}] call CBA_fnc_addEventHandlerArgs;
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"initClient complete",
+	[]
+] call EFUNC(common,log);
+
+localNamespace setVariable [QGVAR(complete), true];

framework/fbcb2_assets/functions/fn_initServer.sqf

@@ -0,0 +1,29 @@
+#include "..\script_component.hpp"
+
+if (!isServer) exitWith {};
+
+// init asset stores at bases
+[true] call FUNC(updateAssetsByBase);
+
+// starting 5 minutes after postInit, update asset stores every 5 minutes
+[{
+	[
+		{[false] call FUNC(updateAssetsByBase);},
+		60*5
+	] call CBA_fnc_addPerFrameHandler;
+}, 60*5] call CBA_fnc_waitAndExecute;
+
+
+// add end mission EH
+addMissionEventHandler ["MPEnded", {
+	// log the "current" asset counts to RPT
+	[false, true] call FUNC(updateAssetsByBase);
+}];
+
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"postInit complete",
+	[]
+] call EFUNC(common,log);

framework/fbcb2_assets/functions/fn_isAssetInRangeOfBase.sqf

@@ -0,0 +1,8 @@
+#include "..\script_component.hpp"
+
+params [["_asset", objNull, [objNull]]];
+
+private _closestBase = [_asset] call EFUNC(common,getNearestBase);
+if (isNull _closestBase) exitWith {false};
+
+(_asset distance2D _closestBase) <= GVAR(setting_detectionRangeFromBase)

framework/fbcb2_assets/functions/fn_removeAssetDiaryRecords.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 if (!hasInterface) exitWith {};
 
 {
@@ -10,7 +12,7 @@ if (!hasInterface) exitWith {};
 		player removeDiaryRecord [_diarySubject, _diaryRecord];
 	} forEach _records;
 } forEach [
-	milsim_fbcb2_subjectAssetsFixedWingID,
-	milsim_fbcb2_subjectAssetsRotaryID,
-	milsim_fbcb2_subjectAssetsGroundID
+	EGVAR(fbcb2_main,subjectAssetsFixedWingID),
+	EGVAR(fbcb2_main,subjectAssetsRotaryID),
+	EGVAR(fbcb2_main,subjectAssetsGroundID)
 ];

framework/fbcb2_assets/functions/fn_removeMarkersOnMap.sqf

@@ -1,12 +1,11 @@
-private _baseMarkerStoreVar = "milsim_fbcb2_assets_baseMarkerStore";
-private _assetMarkerStoreVar = "milsim_fbcb2_assets_assetMarkerStore";
+#include "..\script_component.hpp"
 
 private _baseMarkerStore = localNamespace getVariable [
-	_baseMarkerStoreVar,
+	QGVAR(baseMarkerStore),
 	[]
 ];
 private _assetMarkerStore = localNamespace getVariable [
-	_assetMarkerStoreVar,
+	QGVAR(assetMarkerStore),
 	[]
 ];
 
@@ -16,10 +15,10 @@ private _assetMarkerStore = localNamespace getVariable [
 } forEach (_baseMarkerStore + _assetMarkerStore);
 
 localNamespace setVariable [
-	_baseMarkerStoreVar,
+	QGVAR(baseMarkerStore),
 	[]
 ];
 localNamespace setVariable [
-	_assetMarkerStoreVar,
+	QGVAR(assetMarkerStore),
 	[]
 ];

framework/fbcb2_assets/functions/fn_showMarkersOnMap.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 params [
 	["_className", "", [""]],
 	["_markerType", "hd_dot", [""]],
@@ -12,11 +14,11 @@ if (count _markerColor isEqualTo 0) exitWith {
 	["No marker color provided!"] call BIS_fnc_error;
 };
 if (count _assetObjects isEqualTo 0) exitWith {
-	["No vehicles provided!"] call BIS_fnc_error;
+	["No vehicles to draw markers for!"] call BIS_fnc_error;
 };
 
-private _baseMarkerStoreVar = "milsim_fbcb2_assets_baseMarkerStore";
-private _assetMarkerStoreVar = "milsim_fbcb2_assets_assetMarkerStore";
+private _baseMarkerStoreVar = QGVAR(baseMarkerStore);
+private _assetMarkerStoreVar = QGVAR(assetMarkerStore);
 
 private _baseMarkerStore = localNamespace getVariable [
 	_baseMarkerStoreVar,
@@ -35,15 +37,15 @@ if (not (count _baseMarkerStore > 0)) then {
 
 		// create a circle marker with range as the detection range of assets
 		_newMarker = createMarkerLocal [
-			format["milsim_fbcb2_assets_base_marker_%1", _forEachIndex + 1],
+			format["%1_%2", QGVAR(baseCircleMarker), _forEachIndex + 1],
 			getPosASL _base
 		];
 		_newMarker setMarkerTypeLocal "mil_dot";
 		_newMarker setMarkerColorLocal "ColorGreen";
 		_newMarker setMarkerShapeLocal "ELLIPSE";
 		_newMarker setMarkerSizeLocal [
-			milsim_fbcb2_assets_setting_detectionRangeFromBase,
-			milsim_fbcb2_assets_setting_detectionRangeFromBase
+			GVAR(setting_detectionRangeFromBase),
+			GVAR(setting_detectionRangeFromBase)
 		];
 		_newMarker setMarkerAlphaLocal 0.5;
 		_newMarker setMarkerTextLocal str(_forEachIndex + 1);
@@ -55,19 +57,19 @@ if (not (count _baseMarkerStore > 0)) then {
 
 		// create a flag marker at base position
 		_newMarker = createMarkerLocal [
-			format["milsim_fbcb2_assets_base_flag_marker_%1", _forEachIndex + 1],
+			format["%1_%2", QGVAR(baseFlagMarker), _forEachIndex + 1],
 			getPosASL _base
 		];
 		_newMarker setMarkerTypeLocal "mil_flag";
 		_newMarker setMarkerColorLocal "ColorGreen";
 		_newMarker setMarkerSizeLocal [0.7, 0.7];
-		_newMarker setMarkerTextLocal ([_base] call milsim_fnc_getNameOfBase);
+		_newMarker setMarkerTextLocal ([_base] call EFUNC(common,getNameOfBase));
 
 		_baseMarkerStore pushBack [
 			_base,
 			_newMarker
 		];
-	} forEach milsim_baseObjects;
+	} forEach GVARMAIN(baseObjects);
 
 	localNamespace setVariable [_baseMarkerStoreVar, _baseMarkerStore];
 };
@@ -85,9 +87,12 @@ private _start = (count _assetMarkerStore) + 1;
 		> -1
 	) then {continue};
 
+	// check if the asset is within base detection range
+	if (not ([_asset] call FUNC(isAssetInRangeOfBase))) then {continue};
+
 	// create a marker for the asset
 	private _newMarker = createMarkerLocal [
-		format["milsim_fbcb2_assets_marker_%1", _start],
+		format["%1_%2", QGVAR(assetMarker), _start],
 		getPosASL _asset
 	];
 	_newMarker setMarkerAlphaLocal 1;

framework/fbcb2_assets/functions/fn_updateAssetDiary.sqf

@@ -0,0 +1,261 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+// create diary records
+
+// remove any existing asset map markers
+call FUNC(removeMarkersOnMap);
+
+// remove existing asset records
+call FUNC(removeAssetDiaryRecords);
+
+(call FUNC(getStartingAndCurrentAssets)) params [
+	"_startingAssets",
+	"_currentAssets"
+];
+
+// get distinct vehicle class names
+private _distinctVehiclesClassNames = [];
+{
+	_x params ["_netId", "_cfg"];
+	private _className = configName _cfg;
+	_distinctVehiclesClassNames pushBackUnique _className;
+} forEach _startingAssets;
+
+
+// for random color cycling
+private _colorSelectionIndex = 0;
+private _randomColors = [
+	["ColorRed", "#FF0000", "Red"],
+	["ColorGreen", "#00FF00", "Green"],
+	["ColorBlue", "#0000FF", "Blue"],
+	["ColorYellow", "#FFFF00", "Yellow"],
+	["ColorWhite", "#FFFFFF", "White"]
+];
+
+// ForEach unique vehicle class name, we'll find the first and gather its info
+{
+	private _className = _x;
+	private _vehicleCallsign = toUpper (
+		[_className] call FUNC(getCallsignFromClassname)
+	);
+
+	// Get all starting assets of this type
+	private _startingAssetsOfThisType = _startingAssets select {
+		_x params ["_netId", "_cfg"];
+		_className isEqualTo (configName _cfg);
+	};
+	// Get all current assets of this type
+	private _currentAssetsOfThisType = _currentAssets select {
+		_x params ["_netId", "_cfg"];
+		private _object = _netId call BIS_fnc_objectFromNetId;
+		// objNull if deleted, then check classname and if alive
+		!isNull _object && {_className isEqualTo (typeOf _object) && alive _object};
+	};
+	// This should never happen, but...
+	if (count _startingAssetsOfThisType isEqualTo 0) then {continue};
+
+	// Try to find a not null vehicle that can be processed
+	private _exampleVehicleToProcess = objNull;
+	private _assetCfg = configNull;
+
+	private _exampleVehicleToProcessIndex = _startingAssetsOfThisType findIf {
+		_x params ["_netId", "_cfg"];
+		!isNull (_netId call BIS_fnc_objectFromNetId);
+	};
+	// If found, get the data
+	if (_exampleVehicleToProcessIndex > -1) then {
+		private _exampleData = _startingAssetsOfThisType select _exampleVehicleToProcessIndex;
+		_assetNetId = _exampleData#0;
+		_assetCfg = _exampleData#1;
+		_exampleVehicleToProcess = _assetNetId call BIS_fnc_objectFromNetId;
+	} else {
+		// otherwise, we only have the config to work with
+		private _exampleData = _startingAssetsOfThisType#0;
+		_assetCfg = _exampleData#1;
+	};
+
+	private _parentClassNames = [_assetCfg, true] call BIS_fnc_returnParents;
+	
+	
+
+	// Process the vehicle for extended info
+	// Exclusion list for display names
+	if (
+		[_assetCfg] call BIS_fnc_displayName
+		in ["Helicopter"]
+	) then {continue};
+	
+	// Get the vehicle data
+	private _processed = [configNull, "", []];
+	if (!isNull _exampleVehicleToProcess) then {
+		_processed = [_exampleVehicleToProcess] call FUNC(getVehicleData);
+	};
+	_processed params ["_processedVehicleCfg", "_displayName", "_diaryTextSections"];
+	_diaryTextSections params [
+		["_title", "", [""]],
+		["_image", "", [""]],
+		["_info", "", [""]],
+		["_capacity", "", [""]]
+		// ["_weapons", "", [""]],
+		// ["_pylonWeapons", "", [""]],
+		// ["_inventory", "", [""]]
+	];
+
+	// Get what we can from the vehicle cfg
+
+	// Create the diary record
+	private _recordText = [];
+	// Add the title and image
+	if (count _title isEqualTo 0) then {
+		_title = format["%1", [_assetCfg] call BIS_fnc_displayName];
+	};
+	_recordText pushBack format[
+		"<font size='24' shadow='1' color='#e1701a' face='PuristaBold'>%1</font>",
+		_title
+	];
+	if (count _image isEqualTo 0) then {
+		_image = format["<img width='200' image='%1'/>", getText(_assetCfg >> 'editorPreview')];
+	};
+	_recordText pushBack _image;
+	_recordText pushBack "<br/>";
+	_recordText pushBack format[
+		"CALLSIGN: %1",
+		_vehicleCallsign
+	];
+	_recordText pushBack format[
+		"COUNT STARTED: %1",
+		count _startingAssetsOfThisType
+	];
+	_recordText pushBack format[
+		"COUNT ACTIVE: %1",
+		count _currentAssetsOfThisType
+	];
+
+	// Here, we'll create a link to show markers on the map for all vehicles of this kind
+	// get 'picture' for record
+	private _icon = getText(_assetCfg >> "picture");
+	// determine marker type
+	private _markerType = "mil_dot";
+	switch (true) do {
+		case ("Helicopter" in _parentClassNames): {
+			_markerType = "loc_heli";
+		};
+		case ("Air" in _parentClassNames): {
+			_markerType = "loc_plane";
+		};
+		case ("Ship" in _parentClassNames): {
+			_markerType = "loc_boat";
+		};
+		case ("Car" in _parentClassNames): {
+			_markerType = "loc_car";
+		};
+		default {
+			_markerType = "loc_truck";
+		};
+	};
+
+	private "_randomColor";
+	if (_colorSelectionIndex < count _randomColors) then {
+			_randomColor = _randomColors select _colorSelectionIndex;
+			INC(_colorSelectionIndex);
+	} else {
+		_colorSelectionIndex = 0;
+		_randomColor = _randomColors select _colorSelectionIndex;
+	};
+
+	// Link to show markers
+	private _showMarkersText = format[
+		"<execute expression='[""%1"",""%2"",""%3"",%4] call %5'>SHOW MARKERS for vehicles at base</execute> (in %6)",
+		_className,
+		_markerType,
+		_randomColor#0,
+		(_currentAssetsOfThisType apply {
+			_x params ["_netId", "_cfg"];
+			_netId;
+		}),
+		QFUNC(showMarkersOnMap),
+		format["<font color='%1'>%2</font>", _randomColor#1, _randomColor#2]
+	];
+	_recordText pushBack _showMarkersText;
+
+	// Link to hide markers
+	_recordText pushBack format[
+		"<execute expression=""call %1"">REMOVE ALL MARKERS showing asset positions</execute>",
+		QFUNC(removeMarkersOnMap)
+	];
+
+	// Link to update asset diary entries
+	_recordText pushBack format[
+		"<execute expression=""call %1"">UPDATE ENTRIES for all assets</execute>",
+		QFUNC(updateAssetDiary)
+	];
+
+	// link to display hint with all assets
+	_recordText pushBack format[
+		"<execute expression=""call %1"">SHOW APPROVED ASSET COUNTS via hint</execute>",
+		QFUNC(hintAllApprovedAssets)
+	];
+
+	_recordText pushBack format[
+		"<font size='10' color='#777777'>%1</font>",
+		"Notes:<br/>
+			- Markers are only displayed on your local machine.<br/>
+			- The REMOVE ALL option will remove all assets' markers from the map.<br/>
+			- UPDATE ENTRIES will update the asset diary with the latest information.<br/>
+			- Markers will only be displayed for assets that are within a certain distance of a base."
+	];
+
+
+
+	// Add info and capacity sections - exclude if no living examples were found
+	if (count _info > 0) then {
+		_recordText pushBack _info;
+	};
+	if (count _capacity > 0) then {
+		_recordText pushBack _capacity;
+	};
+
+
+	private _subjectID = "";
+	switch (true) do {
+		case ("Helicopter" in _parentClassNames): {
+			_subjectID = EGVAR(fbcb2_main,subjectAssetsRotaryID);
+		};
+		case ("Air" in _parentClassNames): {
+			_subjectID = EGVAR(fbcb2_main,subjectAssetsFixedWingID);
+		};
+		default {
+			_subjectID = EGVAR(fbcb2_main,subjectAssetsGroundID);
+		};
+	};
+
+	[
+		_subjectID,
+		format[
+			"[%1/%2] %3",
+			count _currentAssetsOfThisType,
+			count _startingAssetsOfThisType,
+			(_assetCfg) call BIS_fnc_displayName
+		],
+		_recordText joinString "<br/>",
+		_icon
+	] call EFUNC(common,createOrUpdateDiaryRecord);
+
+// "\A3\ui_f\data\igui\cfg\simpleTasks\types\car_ca.paa"
+} forEach _distinctVehiclesClassNames;
+
+// log to RPT
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"UPDATED ASSET DIARY",
+	[
+		["startingAssetCount", count _startingAssets],
+		["startingAssetCountDistinct", count _distinctVehiclesClassNames],
+		["currentassetCount", count _currentAssets]
+	]
+] call EFUNC(common,log);
+
+true;

framework/fbcb2_assets/functions/fn_updateAssetsByBase.sqf

@@ -0,0 +1,141 @@
+#include "..\script_component.hpp"
+
+params [
+	["_isInit", false, [false]],
+	["_logCurrentAssets", false, [false]]
+];
+
+if (!isServer) exitWith {};
+
+GVARMAIN(baseObjects) = allMissionObjects "ModuleRespawnPosition_F";
+
+// Get all approved assets on map, find the closest base
+// Then determine if it's within range
+// If it is, add it to the base's assets list
+// This is to ensure bases with overlapping detection range don't have duplicate assets
+private _allVehicles = vehicles;
+private _allSaved = [];
+
+private _assetsStartedAtThisBaseVar = QGVAR(assetsStartedAtThisBase);
+private _assetsAtThisBaseVar = QGVAR(assetsAtThisBase);
+
+private _approvedAssetsCfg = call EFUNC(common,getApprovedAssetsCfg);
+if (isNull _approvedAssetsCfg) exitWith {};
+
+private _currentBaseAssetsGathered = GVARMAIN(baseObjects) apply {[_x, []]};;
+
+{
+	private _className = configName _x;
+	private _callsign = getText(_x >> "callsign");
+	private _found = _allVehicles select { typeOf _x == _className };
+	{
+		private _asset = _x;
+
+		// ignore assets beyond the range of bases
+		if (not ([_asset] call FUNC(isAssetInRangeOfBase))) then {continue};
+
+
+		// add to base's assets list
+		private _closestBase = [_asset] call EFUNC(common,getNearestBase);
+		private _closestBaseCurrentAssets = (_currentBaseAssetsGathered select { _x select 0 isEqualTo _closestBase })#0#1;
+		_closestBaseCurrentAssets pushBackUnique  [
+			_asset call BIS_fnc_netId,
+			configOf _asset
+		];
+	} forEach _found;
+} forEach (_approvedAssetsCfg call BIS_fnc_returnChildren);
+
+// Add all ground vehicles (LandVehicle)
+{
+	private _asset = _x;
+
+	// ignore assets beyond the range of bases
+	if (not ([_asset] call FUNC(isAssetInRangeOfBase))) then {continue};
+
+	// add to base's assets list
+	private _closestBase = [_asset] call EFUNC(common,getNearestBase);
+	private _closestBaseCurrentAssets = (_currentBaseAssetsGathered select { _x select 0 isEqualTo _closestBase })#0#1;
+	_closestBaseCurrentAssets pushBackUnique  [
+		_asset call BIS_fnc_netId,
+		configOf _asset
+	];
+} forEach (_allVehicles select { _x isKindOf "LandVehicle" });
+
+////////////////////////////////////////////////////////////////////////
+// publish updated base variables
+////////////////////////////////////////////////////////////////////////
+{
+	private _base = _x;
+
+	private _thisBaseCurrentAssets = (_currentBaseAssetsGathered select { _x select 0 isEqualTo _base })#0#1;
+	_base setVariable [_assetsAtThisBaseVar, _thisBaseCurrentAssets, true];
+
+	if (_isInit) then {
+		_base setVariable [_assetsStartedAtThisBaseVar, _thisBaseCurrentAssets, true];
+	};
+} forEach GVARMAIN(baseObjects);
+
+// send a CBA event to let other scripts know that assets have been gathered
+[{[QGVAR(assetsGathered)] call CBA_fnc_globalEvent;}, 2] call CBA_fnc_waitAndExecute;
+
+////////////////////////////////////////////////////////////////////////
+// log starting assets if init
+// log current assets if requested (for end of mission counts)
+////////////////////////////////////////////////////////////////////////
+if !(_isInit || _logCurrentAssets) exitWith {};
+
+{
+	private _base = _x;
+
+	// get current assets
+	private _baseAssets = (_currentBaseAssetsGathered select { _x select 0 isEqualTo _base })#0#1;
+
+	// prepare key value for logging
+	private _baseAssetsHashesPrep = _baseAssets apply {
+		_x params ["_netId", "_cfg"];
+		[
+			["callsign", [configName _cfg] call FUNC(getCallsignFromClassname)],
+			["className", configName _cfg],
+			["displayName", [_cfg] call BIS_fnc_displayName]
+		];
+	};
+
+	_baseAssetsHashesPrep = _baseAssetsHashesPrep call BIS_fnc_consolidateArray;
+
+	private _baseAssetsHashes = [];
+	{
+		private _out = createHashMapFromArray (_x#0);
+		_out set ["count", _x#1];
+		_baseAssetsHashes pushBack _out;
+	} forEach _baseAssetsHashesPrep;
+
+	// if logging current assets
+	if (_logCurrentAssets) then {
+		{
+			[
+				LEVEL_INFO,
+				QUOTE(COMPONENT),
+				"CURRENT ASSETS",
+				[
+					["baseName", [[_base] call EFUNC(common,getNameOfBase)]],
+					["asset", _x]
+				]
+			] call EFUNC(common,log);
+		} forEach _baseAssetsHashes;
+	};
+
+	// if init, log starting assets
+	if (_isInit) then {		
+		{
+			[
+				LEVEL_INFO,
+				QUOTE(COMPONENT),
+				"STARTING ASSETS",
+				[
+					["baseName", [[_base] call EFUNC(common,getNameOfBase)]],
+					["asset", _x]
+				]
+			] call EFUNC(common,log);
+		} forEach _baseAssetsHashes;
+	};
+} forEach GVARMAIN(baseObjects);

framework/fbcb2_assets/script_component.hpp

@@ -0,0 +1,3 @@
+#define COMPONENT fbcb2_assets
+#define COMPONENT_BEAUTIFIED FBCB2 - Assets
+#include "../script_mod.hpp"

framework/fbcb2_main/functions/fn_addEnvironmentRecord.sqf

@@ -0,0 +1,112 @@
+#include "..\script_component.hpp"
+
+private _recordTitle = "ENVIRONMENTAL CONDITIONS";
+
+private _text = [
+	format[
+		"<font size='%1' color='%2' face='%3'>%4</font>",
+		GVAR(recordTitleSize),
+		GVAR(recordTitleColor),
+		GVAR(recordTitleFont),
+		_recordTitle
+	]
+];
+
+private _sunriseColor = "#4A86E8";
+private _sunsetColor = "#6AA84F";
+private _whiteColor = "#FFFFFF";
+
+private _sunTimes = date call BIS_fnc_sunriseSunsetTime;
+private _nearestBase = [player] call EFUNC(common,getNearestBase);
+
+if (isNull _nearestBase) exitWith {
+	[
+		LEVEL_WARNING,
+		QUOTE(COMPONENT),
+		"WARNING: No bases found nearby to report weather!",
+		[player, [
+			["position", getPos player]
+		]] call EFUNC(common,addPlayerInfoToArray)
+	] call EFUNC(common,log);
+	["WARNING: No bases found nearby to report weather!"] call BIS_fnc_error;
+};
+
+_text pushBack format[
+	"<font size='%1'>Current conditions at nearest weather station: %2</font><br/>",
+	GVAR(recordTextBodySize),
+	[_nearestBase] call EFUNC(common,getNameOfBase)
+];
+
+private _weatherData = [];
+
+if (isClass (configFile >> "CfgPatches" >> "ace_weather")) then {
+	// get ace_weather data
+	private _barometricPressure = ((getPosASL _nearestBase)#2) call ace_weather_fnc_calculateBarometricPressure;
+	private _relHumidity = missionNamespace getVariable ["ace_weather_currentHumidity", 0.5];
+	private _temperature = ((getPosASL _nearestBase)#2) call ace_weather_fnc_calculateTemperatureAtHeight;
+	private _dewPoint = [_temperature, _relHumidity] call ace_weather_fnc_calculateDewPoint;
+	private _windSpeed = [getPosASL _nearestBase, false, false, false] call ace_weather_fnc_calculateWindSpeed;
+	private _windChill = [_temperature, _windSpeed] call ace_weather_fnc_calculateWindChill;
+	private _heatIndex = [_temperature, _relHumidity] call ace_weather_fnc_calculateHeatIndex;
+
+	toFixed 2;
+	private _aceData = [
+		["Temperature", format["%1°C / %2°F", _temperature, _temperature * (9/5) + 32]],
+		["Wind Chill", format["%1°C / %2°F", _windChill, _windChill * (9/5) + 32]],
+		["Heat Index", format["%1°C / %2°F", _heatIndex, _heatIndex * (9/5) + 32]],
+		["Dew Point", format["%1°C / %2°F", _dewPoint, _dewPoint * (9/5) + 32]],
+		["Wind Speed", format["%1mph / %2kph / %3kts", _windSpeed * 2.237, _windSpeed * 3.6, _windSpeed * 1.944]],
+		["Wind Direction", ""],
+		["Barometric Pressure", format["%1 hPA", _barometricPressure]],
+		["Relative Humidity", format["%1%2", _relHumidity * 100, "%"]],
+		["Fog Cover", ""],
+		["Rain", ""],
+		["Overcast", ""]
+	];
+	toFixed -1;
+
+	{
+		_x params ["_name", "_value"];
+		[_weatherData, _name, _value] call BIS_fnc_setToPairs;
+	} forEach _aceData;
+};
+
+// always add built-in weather
+toFixed 2;
+private _vanillaData = [
+	["Temperature", format["%1°C", (ambientTemperature)#0]],
+	["Fog Cover", format["%1%2", fog * 100, "%"]],
+	["Overcast", format["%1%2", overcast * 100, "%"]],
+	["Rain", format["%1%2", rain * 100, "%"]],
+	["Wind Speed", format["%1m/s", windStr]],
+	["Wind Direction", format["%1°", windDir]]
+];
+toFixed -1;
+
+_vanillaData pushBack ["Sunrise", ([_sunTimes select 0, "HH:MM"] call BIS_fnc_timeToString)];
+_vanillaData pushBack ["Sunset", ([_sunTimes select 1, "HH:MM"] call BIS_fnc_timeToString)];
+
+// override or set keys for vanilla data into weather data
+{
+	_x params ["_name", "_value"];
+	[_weatherData, _name, _value] call BIS_fnc_setToPairs;
+} forEach _vanillaData;
+
+// write lines
+{
+	_x params ["_name", "_value"];
+	_text pushBack format[
+		"<font size='%1' face='EtelkaMonospacePro'>%2%3</font>",
+		GVAR(recordTextBodySize)-4,
+		[_name, "right", " ", 23] call EFUNC(common,padString),
+		_value
+	];
+} forEach _weatherData;
+
+_text = _text joinString "<br/>";
+
+[
+	GVAR(subjectIntelID),
+	_recordTitle,
+	_text
+] call EFUNC(common,createOrUpdateDiaryRecord);

framework/fbcb2_main/functions/fn_addFrequenciesRecord.sqf

@@ -1,11 +1,32 @@
 // updated 2024-02-01 by IndigoFox
 // now reads from the battalion config structure to generate the diary entries
 
+#include "../script_component.hpp"
+
 ////////////////////////////////////////
 // Get info from missionConfigFile
 ////////////////////////////////////////
-private _battalionInfoCfg = call milsim_fnc_getBattalionCfg;
+private _battalionInfoCfg = call EFUNC(common,getBattalionCfg);
+if (isNull _battalionInfoCfg) exitWith {
+	[
+		LEVEL_ERROR,
+		QUOTE(COMPONENT),
+		"Null Battalion Config",
+		[]
+	] call EFUNC(common,log);
+	["Null Battalion Config"] call BIS_fnc_error;
+};
+
 private _battalionElementCfgs = [_battalionInfoCfg >> "Command"] call BIS_fnc_returnChildren;
+if (count _battalionElementCfgs == 0) exitWith {
+	[
+		LEVEL_ERROR,
+		QUOTE(COMPONENT),
+		"ERROR: No battalion elements found. Check that the battalion config is correctly structured. See defines/BattalionInfo.hpp and framework/util/functions/getBattalionCfg.sqf.",
+		[]
+	] call EFUNC(common,log);
+	["ERROR: No battalion elements found. Check that the battalion config is correctly structured. See defines/BattalionInfo.hpp and framework/util/functions/getBattalionCfg.sqf."] call BIS_fnc_error;
+};
 
 ////////////////////////////////////////
 // Define formatting constants
@@ -29,22 +50,28 @@ private _FREQ_TEXT_COLOR = "#CCCCCC";
 reverse _battalionElementCfgs;
 
 {
-	// recursively generate diary text for all child elements of battalion-level elements
-	private _diaryTitleText = [_x, true] call milsim_fnc_generateElementFrequencyRecordText;
 	[
-		milsim_fbcb2_subjectFrequenciesID,
+		LEVEL_TRACE,
+		QUOTE(COMPONENT),
+		format["Processing battalion element %1", configName _x],
+		[]
+	] call EFUNC(common,log);
+	// recursively generate diary text for all child elements of battalion-level elements
+	private _diaryTitleText = [_x, true] call FUNC(generateElementFrequencyRecordText);
+	[
+		GVAR(subjectFrequenciesID),
 		_diaryTitleText#0,
 		_diaryTitleText#1
-	] call milsim_fnc_createOrUpdateDiaryRecord;
+	] call EFUNC(common,createOrUpdateDiaryRecord);
 } forEach _battalionElementCfgs;
 
 // add the battalion command to the top of the list
 // don't process child elements
-private _diaryTitleText = [_battalionInfoCfg >> "Command", false] call milsim_fnc_generateElementFrequencyRecordText;
+private _diaryTitleText = [_battalionInfoCfg >> "Command", false] call FUNC(generateElementFrequencyRecordText);
 [
-	milsim_fbcb2_subjectFrequenciesID,
+	GVAR(subjectFrequenciesID),
 	_diaryTitleText#0,
 	_diaryTitleText#1
-] call milsim_fnc_createOrUpdateDiaryRecord;
+] call EFUNC(common,createOrUpdateDiaryRecord);
 
 true;

framework/fbcb2_main/functions/fn_addSignalColorsRecord.sqf

@@ -0,0 +1,59 @@
+#include "../script_component.hpp"
+
+private _recordTitle = "SIGNAL COLORS";
+
+private _text = [
+	// Title
+	format[
+		"<font size='%1' color='%2' face='%3'>%4</font>",
+		GVAR(recordTitleSize),
+		GVAR(recordTitleColor),
+		GVAR(recordTitleFont),
+		_recordTitle
+	]
+];
+
+private _signalColorDefs = (missionConfigFile >> "SignalColors") call BIS_fnc_returnChildren;
+
+{
+	private _cfg = _x;
+	private _color = getText(_cfg >> "hexCode");
+	private _name = getText(_cfg >> "name");
+	private _usage = getText(_cfg >> "usage");
+	private _itemExamples = getArray(_cfg >> "itemExamples");
+
+	private _thisText = [];
+
+	_thisText pushBack format[
+		"<font size='%1'><font color='%2'>%3</font> - %4</font>",
+		GVAR(recordTextHeaderSize),
+		_color,
+		_name,
+		_usage
+	];
+
+	private _imagesLine = [];
+
+	{
+		private _itemClassname = _x;
+		private _itemCfg = [_itemClassname] call CBA_fnc_getItemConfig;
+		private _itemName = getText(_itemCfg >> "displayName");
+		private _itemImage = getText(_itemCfg >> "picture");
+		_imagesLine pushBack format[
+			"<img height='32' src='%1' title='%2'/>",
+			_itemImage,
+			_itemName
+		];
+	} forEach _itemExamples;
+
+	_thisText pushBack (_imagesLine joinString " ");
+	_text pushBack (_thisText joinString "<br/>");
+} forEach _signalColorDefs;
+
+_text = _text joinString "<br/><br/>";
+
+[
+	GVAR(subjectIntelID),
+	_recordTitle,
+	_text
+] call EFUNC(common,createOrUpdateDiaryRecord);

framework/fbcb2_main/functions/fn_initClient.sqf

@@ -0,0 +1,48 @@
+#include "../script_component.hpp"
+
+if ( !hasInterface ) exitWith {};
+
+GVAR(recordTitleColor) = "#ff6666";
+GVAR(recordTitleFont) = "PuristaMedium";
+GVAR(recordTitleSize) = 20;
+
+GVAR(recordTextHeaderSize) = 16;
+GVAR(recordTextBodySize) = 14;
+
+GVAR(subjectStatusID) = "FBCB2_Status";
+GVAR(subjectIntelID) = "FBCB2_Intel";
+GVAR(subjectMessagesID) = "FBCB2_Messages";
+GVAR(subjectFrequenciesID) = "FBCB2_Frequencies";
+GVAR(subjectAssetsFixedWingID) = "FBCB2_Assets_FixedWing";
+GVAR(subjectAssetsRotaryID) = "FBCB2_Assets_Rotary";
+GVAR(subjectAssetsGroundID) = "FBCB2_Assets_Ground";
+
+player createDiarySubject[GVAR(subjectStatusID), "FBCB2 Status"];
+player createDiarySubject[GVAR(subjectMessagesID), "FBCB2 Messages"];
+player createDiarySubject[GVAR(subjectIntelID), "FBCB2 Intel"];
+player createDiarySubject[GVAR(subjectFrequenciesID), "FBCB2 Frequencies"];
+player createDiarySubject[GVAR(subjectAssetsFixedWingID), "FBCB2 Planes"];
+player createDiarySubject[GVAR(subjectAssetsRotaryID), "FBCB2 Helicopters"];
+player createDiarySubject[GVAR(subjectAssetsGroundID), "FBCB2 Ground"];
+
+// run main inits
+[] call FUNC(addFrequenciesRecord);
+[] call FUNC(addSignalColorsRecord);
+[] call FUNC(addEnvironmentRecord);
+
+// starting 5 minutes after postInit, update weather diary record every 5 minutes
+[{
+	[
+		{call FUNC(addEnvironmentRecord);},
+		60*5
+	] call CBA_fnc_addPerFrameHandler;
+}, 60*5] call CBA_fnc_waitAndExecute;
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"initClient complete",
+	[]
+] call EFUNC(common,log);
+
+localNamespace setVariable [QGVAR(complete), true];

framework/fbcb2_main/script_component.hpp

@@ -0,0 +1,3 @@
+#define COMPONENT fbcb2_main
+#define COMPONENT_BEAUTIFIED FBCB2 - Main
+#include "../script_mod.hpp"

framework/fbcb2_main/util/fn_formatRadioElementForDiary.sqf

@@ -1,4 +1,6 @@
 // called from milsim_fnc_processFBCB2RadioFrequencies
+#include "../script_component.hpp"
+
 params ["_cfg", ["_indentCount", 1, [5]]];
 
 //////////////////////////////////////////////////////
@@ -62,8 +64,8 @@ _freqLeadingSpace = _freqLeadingSpace joinString "";
 		_ELEMENT_FREQ_SIZE,
 		_ELEMENT_FREQ_FONT,
 		_FREQ_TEXT_COLOR,
-		[_role, "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
-		[_srStr, "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
+		[_role, "right", " ", _FREQ_PAD_LENGTH] call EFUNC(common,padString),
+		[_srStr, "right", " ", _FREQ_PAD_LENGTH] call EFUNC(common,padString),
 		_lrStr
 	];
 } forEach (getArray (_cfg >> "frequencies"));

framework/fbcb2_main/util/fn_generateElementFrequencyRecordText.sqf

@@ -1,5 +1,8 @@
 // called from milsim_fnc_processFBCB2RadioFrequencies ONLY
 // this function is called recursively to process all child elements of a battalion element in missionConfigFile
+
+#include "../script_component.hpp"
+
 params [
 	["_elementCfg", configNull, [configNull]],
 	["_shouldProcessChildCfgs", true]
@@ -40,9 +43,9 @@ _freqLeadingSpace = _freqLeadingSpace joinString "";
 private _headers = [
 	format[
 		"<font size='%1' color='%2' face='%3'>%4</font>",
-		milsim_fbcb2_recordTitleSize,
-		milsim_fbcb2_recordTitleColor,
-		milsim_fbcb2_recordTitleFont,
+		GVAR(recordTitleSize),
+		GVAR(recordTitleColor),
+		GVAR(recordTitleFont),
 		_recordTitle
 	],
 	format[
@@ -51,8 +54,8 @@ private _headers = [
 		_ELEMENT_FREQ_SIZE,
 		_ELEMENT_FREQ_FONT,
 		_FREQ_TEXT_COLOR,
-		["ROLE", "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
-		["SR", "right", " ", _FREQ_PAD_LENGTH] call milsim_fnc_padString,
+		["ROLE", "right", " ", _FREQ_PAD_LENGTH] call EFUNC(common,padString),
+		["SR", "right", " ", _FREQ_PAD_LENGTH] call EFUNC(common,padString),
 		"LR"
 	]
 ];
@@ -65,16 +68,30 @@ private _allText = [];
 
 // get all child elements recursively and format them
 if (_shouldProcessChildCfgs) then {
+	[
+		LEVEL_TRACE,
+		QUOTE(COMPONENT),
+		"Processing child elements for battalion element %1",
+		[]
+	] call EFUNC(common,log);
+
 	[_battalionElement, {
 		params ["_cfg", "_recurseCounter"];
 		// add config
-		private _lines = [_cfg, _recurseCounter+1] call milsim_fnc_formatRadioElementForDiary;
+		private _lines = [_cfg, _recurseCounter+1] call FUNC(formatRadioElementForDiary);
 		// private _lines = [_cfg, _indentCount] call t;
 		_allText pushBack (_lines joinString "<br/>");
-	}] call milsim_fnc_recurseSubclasses;
+	}] call EFUNC(common,recurseSubclasses);
 } else {
+	[
+		LEVEL_TRACE,
+		QUOTE(COMPONENT),
+		"Skipping processing of child elements for battalion element %1",
+		[]
+	] call EFUNC(common,log);
+
 	// or if the param was false, just add the battalion element
-	private _lines = [_battalionElement, 1] call milsim_fnc_formatRadioElementForDiary;
+	private _lines = [_battalionElement, 1] call FUNC(formatRadioElementForDiary);
 	// private _lines = [_cfg, _indentCount] call t;
 	_allText pushBack (_lines joinString "<br/>");
 };

framework/init/functions/fn_addAARChatHandler.sqf

@@ -0,0 +1,20 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+[
+	"saveaar", 
+	{
+		[] remoteExec["ocap_fnc_exportData", 2];
+	},
+	"admin"
+] call CBA_fnc_registerChatCommand;
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"OCAP chat handler registered",
+	[player] call EFUNC(common,addPlayerInfoToArray)
+] call EFUNC(common,log);
+
+nil;

framework/init/functions/fn_addRespawnChatHandler.sqf

@@ -0,0 +1,41 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+[
+	"respawn", 
+	{
+		_clientID = _thisArgs select 0;
+		player setDamage 1;
+
+		private _timeWentUnconscious = player getVariable [QGVARMAIN(lastTimeKnockedOut), -1];
+		private _durationSpentUnconscious = -1;
+		if (_timeWentUnconscious > - 1) then {
+			_durationSpentUnconscious = diag_tickTime - _timeWentUnconscious;
+		};
+
+		// log to server RPT
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"CHAT COMMAND RESPAWN",
+			[player, [
+				["durationSpentUnconscious", _durationSpentUnconscious]
+			]] call EFUNC(common,addPlayerInfoToArray)
+		] remoteExec [QEFUNC(common,log), 2];
+
+		// systemChat to all remote machines
+		format["%1 claims they were glitched and respawned (%2)", name player, netID player] remoteExec["systemChat", -_clientID];
+	},
+	"all",
+	[clientOwner]
+] call CBA_fnc_registerChatCommand;
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"respawn chat handler registered",
+	[player] call EFUNC(common,addPlayerInfoToArray)
+] call EFUNC(common,log);
+
+nil;

framework/init/functions/fn_checkMissionSettings.sqf

@@ -0,0 +1,41 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface || !is3DENPreview) exitWith {};
+
+private _warningText = [];
+
+if (getText(missionConfigFile >> "author") in ["MISSION AUTHOR", ""]) then {
+	_warningText pushBack "<t font='EtelkaMonospacePro' size='0.7'>mission_settings\author</t> is blank or default!";
+};
+if (getText(missionConfigFile >> "onLoadName") in ["THIS APPEARS ON TOP OF THE LOADING SCREEN IMAGE", ""]) then {
+	_warningText pushBack "<t font='EtelkaMonospacePro' size='0.7'>mission_settings\onLoadName</t> is blank or default!";
+};
+
+if (getText(missionConfigFile >> "briefingName") in ["THIS IS THE NAME ON THE #MISSIONS LIST", ""]) then {
+	_warningText pushBack "<t font='EtelkaMonospacePro' size='0.7'>mission_settings\briefingName</t> is blank or default!";
+};
+if (getText(missionConfigFile >> "overviewText") in ["THIS IS WHERE YOU DESCRIBE THE MISSION IN THE #MISSION LIST", ""]) then {
+	_warningText pushBack "<t font='EtelkaMonospacePro' size='0.7'>mission_settings\overviewText</t> is blank or default!";
+};
+
+if (getText(missionConfigFile >> "missionSeries") in ["MY SERIES NAME", ""]) then {
+	_warningText pushBack "<t font='EtelkaMonospacePro' size='0.7'>mission_settings\missionSeries</t> is blank or default!";
+};
+
+if (count GVARMAIN(baseObjects) isEqualTo 0) then {
+	_warningText pushBack "No respawn points placed!";
+};
+
+if (count _warningText > 0) then {
+	[{
+        if (isNull (call BIS_fnc_displayMission)) exitWith {};
+
+        (_this#0) spawn {
+			[_this joinString "<br/>", "Issues found!", true, false] call BIS_fnc_guiMessage;
+		};
+        [_this#1] call CBA_fnc_removePerFrameHandler;
+
+    }, 1, _warningText] call CBA_fnc_addPerFrameHandler;
+};
+
+nil;

framework/init/functions/fn_initClient.sqf

@@ -0,0 +1,46 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+// make sure the server has finished init
+waitUntil {!isNil QGVARMAIN(complete)};
+
+["InitializePlayer", [player, true]] call BIS_fnc_dynamicGroups;
+
+// run primary init functions
+call FUNC(addAARChatHandler);
+call FUNC(addRespawnChatHandler);
+call FUNC(setDefaults);
+
+// Initialize a holder for managing local diary records
+// store records in format:
+// [subject, [
+//		[title, diaryRecord]
+// ]]
+EGVAR(common,diaryRecords) = createHashMap;
+
+
+// initialize other modules
+call EFUNC(client,initClient);
+call EFUNC(mapcopy,initClient);
+call EFUNC(reinsert,initClient);
+call EFUNC(resupply,initClient);
+call EFUNC(triageIcons,initClient);
+call EFUNC(vehicleFlags,initClient);
+call EFUNC(zeus,initClient);
+call EFUNC(fbcb2_main,initClient);
+call EFUNC(fbcb2_assets,initClient);
+
+
+call FUNC(checkMissionSettings);
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"initClient complete",
+	[]
+] call EFUNC(common,log);
+
+localNamespace setVariable [QGVAR(complete), true];
+
+nil;

framework/init/functions/fn_initServer.sqf

@@ -0,0 +1,70 @@
+#include "..\script_component.hpp"
+
+if (!isServer) exitWith {};
+
+// array of all respawn modules in the mission representing "bases"
+GVARMAIN(baseObjects) = allMissionObjects "ModuleRespawnPosition_F";
+publicVariable QGVARMAIN(baseObjects);
+
+// Initializes the Dynamic Groups framework and groups
+["Initialize", [true]] call BIS_fnc_dynamicGroups;
+
+// initialize other modules
+call EFUNC(common,logMissionInfo);
+call EFUNC(fbcb2_assets,initServer);
+call EFUNC(reinsert,initServer);
+
+// globally disable zeus lightning bolt functionality
+_curators = allMissionObjects "ModuleCurator_F";
+{
+	_x removeCuratorAddons ["CuratorOnly_Modules_F_Curator_Lightning"]; 
+	_x removeCuratorAddons ["A3_Modules_F_Curator_Lightning"]; 
+} foreach _curators;
+
+// add dead unit time marking for custom garbage cleanup function
+addMissionEventHandler ["EntityKilled", {
+	params ["_unit", "_killer", "_instigator", "_useEffects"];
+
+	if not (_unit isKindOf "CAManBase") exitWith {};
+
+	_unit setVariable["milsim_death_time", time];
+	
+	_unit addEventHandler ["Deleted", {
+		params ["_entity"];
+		_remainsCollector = _entity getVariable["milsim_garbage_collected", false];
+		_decayTime = time - (_entity getVariable ["milsim_death_time", time]);
+
+		_i = allUsers select { (getUserInfo _x)#1 isEqualTo _ownerId;};
+		_owner = if ( _i isEqualTo []) then [ { "server" }, { (getUserInfo (_i#0))#3 }];
+
+		diag_log format["isServer: %5, deleted object owned by: %1 via remainsCollector: %2 after %3 seconds of type: %4", _owner, str (not _remainsCollector), _decayTime, _entity, isServer];
+	}];
+}];
+
+
+// add zeus deletion logging to curator objects
+{
+	_x addEventHandler ["CuratorObjectDeleted", {
+		params ["_curator", "_entity"];
+
+		_decayTime = time - (_entity getVariable ["milsim_death_time", time]);
+		diag_log format["deleted object: %1 via curator: %2 after %3 seconds", _entity, name _curator, _decayTime];
+	}];
+} foreach _curators;
+
+// declare init complete to other modules
+missionNamespace setVariable [QGVARMAIN(complete), true, true];
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	format["%1: version %2", QGVARMAIN(complete), QUOTE(VERSION_STR)],
+	[["version", QUOTE(VERSION_STR)]]
+] call EFUNC(common,log);
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"postInit complete",
+	[]
+] call EFUNC(common,log);

framework/init/functions/fn_setDefaults.sqf

@@ -0,0 +1,36 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+enableSaving[false, false];
+
+enableRadio false;
+enableSentences false;
+
+missionNamespace setVariable ["ACE_maxWeightDrag", 2400]; 
+missionNamespace setVariable ["ACE_maxWeightCarry", 1800]; 
+
+if(isClass(configfile >> "CfgPatches" >> "rhs_main")) then {
+    rhs_vehicleRadioChatter = 0;
+};
+
+waitUntil {time > 0};
+
+enableEnvironment[false, true];
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"Defaults set",
+	[
+		["enableSaving", [false, false]],
+		["enableRadio", false],
+		["enableSentences", false],
+		["ACE_maxWeightDrag", 2400],
+		["ACE_maxWeightCarry", 1800],
+		["rhs_vehicleRadioChatter", 0],
+		["enableEnvironment", [false, true]]
+	]
+] call EFUNC(common,log);
+
+nil;

framework/init/script_component.hpp

@@ -0,0 +1,3 @@
+#define COMPONENT init
+#define COMPONENT_BEAUTIFIED Init
+#include "../script_mod.hpp"

framework/mapcopy/functions/fn_addCBASettings.sqf

@@ -0,0 +1,24 @@
+#include "..\script_component.hpp"
+
+[
+	QGVAR(setting_enable),
+	"CHECKBOX",
+	"Allow Map Copying",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true, // default value
+	true, // is global
+	{
+		params ["_value"];
+		[
+			QGVAR(setting_enable),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"CREATED SETTINGS",
+	[]
+] call EFUNC(common,log);

framework/mapcopy/functions/fn_getMapMarkers.sqf

@@ -0,0 +1,15 @@
+#include "..\script_component.hpp"
+// serializes markers on local machine and returns them as array
+
+_markerData = [];
+
+{
+	_marker = toArray _x;
+	_marker resize 15;
+	if ( toString _marker == "_USER_DEFINED #" ) then {
+		_marker = _x call FUNC(mapMarkerToString);
+		_markerData pushBack _marker;
+	};
+} forEach allMapMarkers;
+
+_markerData;

framework/mapcopy/functions/fn_initClient.sqf

@@ -0,0 +1,60 @@
+#include "..\script_component.hpp"
+
+////////////////////////////////////////////////////////////////////
+// Create action to copy map markers on all inheritors of CAManBase
+////////////////////////////////////////////////////////////////////
+private _mapCopyAction =
+[
+	QGVAR(actionID),
+	"Copy Map",
+	"\a3\ui_f\data\igui\cfg\actions\talk_ca.paa",
+	{
+		params ["_target", "_player", "_params"];
+		if (!isPlayer _target) exitWith {
+			format["%1 is not a player", name _target] call CBA_fnc_notify;
+		};
+		format["Copying map markers from %1", name _target] call CBA_fnc_notify;
+		[QGVAR(mapCopyRequest), _this, _target] call CBA_fnc_targetEvent;
+	},
+	{
+		params ["_target", "_player", "_params"];
+		[QGVAR(setting_enable)] call CBA_settings_fnc_get && {
+			('ItemMap' in (assignedItems _player)) &&
+			('ItemMap' in (assignedItems _target)) &&
+			([_player, _target, []] call ace_common_fnc_canInteractWith)
+		};
+	}
+] call ace_interact_menu_fnc_createAction;
+["CAManBase", 0, ["ACE_MainActions"], _mapCopyAction, true] call ace_interact_menu_fnc_addActionToClass;
+
+////////////////////////////////////////////////////////////////////
+// Create CBA event to receive requests
+////////////////////////////////////////////////////////////////////
+[QGVAR(mapCopyRequest), {
+	params ["_me", "_requester", "_params"];
+	format["Your map is being copied by %1", name _requester] call CBA_fnc_notify;
+	private _myMarkers = _this call FUNC(getMapMarkers);
+	[QGVAR(mapCopyResponse), [_me, _myMarkers], _requester] call CBA_fnc_targetEvent;
+}] call CBA_fnc_addEventHandler;
+
+////////////////////////////////////////////////////////////////////
+// Create CBA event to receive responses
+////////////////////////////////////////////////////////////////////
+[QGVAR(mapCopyResponse), {
+	params [["_responder", objNull, [objNull]], ["_markerList", [], [[]]]];
+	if ('ItemMap' in (assignedItems player)) then {
+		[_markerList] call FUNC(loadMapMarkers);
+		format["Copied %1 markers from %2", count _markerList, name _responder] call CBA_fnc_notify;
+	} else {
+		format["You need a map to copy onto!"] call CBA_fnc_notify;
+	};
+}] call CBA_fnc_addEventHandler;
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"initClient complete",
+	[]
+] call EFUNC(common,log);
+
+localNamespace setVariable [QGVAR(complete), true];

framework/mapcopy/functions/fn_loadMapMarkers.sqf

@@ -0,0 +1,8 @@
+#include "..\script_component.hpp"
+// accepts an array of serialized markers and adds them to local map
+
+params [["_markerList", [], [[]]]];
+
+{
+	_x call FUNC(stringToMapMarker);
+} foreach _markerList;

framework/mapcopy/script_component.hpp

@@ -0,0 +1,3 @@
+#define COMPONENT mapcopy
+#define COMPONENT_BEAUTIFIED Map Copy
+#include "../script_mod.hpp"

framework/performance/functions/fn_addCBASettings.sqf

@@ -0,0 +1,153 @@
+#include "..\script_component.hpp"
+
+//---------------------
+//	Garbage Collection
+//---------------------
+
+[
+	QGVAR(emptyGroupCleanup_enable),
+	"CHECKBOX",
+	"Empty Group Cleanup Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true,
+	true,
+	{
+		params ["_value"];
+		[
+			QGVAR(emptyGroupCleanup_enable),
+			_value
+		] call EFUNC(common,logSettingChanged);
+
+		if (!isNull (missionNamespace getVariable [QGVAR(emptyGroupCleanupPFH), locationNull])) then {
+			deleteLocation GVAR(emptyGroupCleanupPFH);
+		};
+
+		call FUNC(addEmptyGroupCleanupPFH);
+	}
+] call CBA_fnc_addSetting;
+
+[
+	QGVAR(deadUnitCleanup_enable),
+	"CHECKBOX",
+	"Dead Unit Cleanup Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true,
+	true,
+	{
+		params ["_value"];
+		[
+			QGVAR(deadUnitCleanup_enable),
+			_value
+		] call EFUNC(common,logSettingChanged);
+
+		if (!isNull (missionNamespace getVariable [QGVAR(deadUnitCleanupPFH), locationNull])) then {
+			deleteLocation GVAR(deadUnitCleanupPFH);
+		};
+
+		call FUNC(addDeadUnitCleanupPFH);
+	}
+] call CBA_fnc_addSetting;
+
+//---------------------
+//	Server CPS
+//---------------------
+
+[
+	QGVAR(server_cps_enable),
+	"CHECKBOX",
+	"Server CPS Metrics Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true,
+	true,
+	{
+		params ["_value"];
+		[
+			QGVAR(cps_enable),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+[QGVAR(cps_enable), true] call CBA_settings_fnc_set;
+
+[
+	QGVAR(server_cps_interval),
+	"TIME",
+	"Server CPS Metrics Interval",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	[60,300,120],
+	true,
+	{
+		if (!isServer) exitWith {};
+		
+		params ["_value"];
+
+		[
+			QGVAR(cps_interval),
+			_value
+		] call EFUNC(common,logSettingChanged);
+		
+		_cpsPFH = missionNamespace getVariable [QGVAR(server_cps_handler), ObjNull];
+		if (!isNull _cpsPFH) then {
+			_cpsPFH call CBA_fnc_deletePerFrameHandlerObject;
+		};
+
+		[] call FUNC(addServerStatsPFH);
+	}
+] call CBA_fnc_addSetting;
+
+
+//---------------------
+//	Client CPS
+//---------------------
+
+[
+	QGVAR(client_cps_enable),
+	"CHECKBOX",
+	"Client CPS Metrics Enabled",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	true,
+	true,
+	{
+		params ["_value"];
+		[
+			QGVAR(client_cps_enable),
+			_value
+		] call EFUNC(common,logSettingChanged);
+	}
+] call CBA_fnc_addSetting;
+
+[QGVAR(client_cps_enable), true] call CBA_settings_fnc_set;
+
+[
+	QGVAR(client_cps_interval),
+	"TIME",
+	"Client CPS Metrics Interval",
+	[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
+	[60,300,120],
+	true,
+	{
+		if (!hasInterface) exitWith {};
+		
+		params ["_value"];
+
+		[
+			QGVAR(client_cps_interval),
+			_value
+		] call EFUNC(common,logSettingChanged);
+
+		_cpsPFH = player getVariable [QGVAR(client_cps_handler), ObjNull];
+		if (!isNull _cpsPFH) then {
+			_cpsPFH call CBA_fnc_deletePerFrameHandlerObject;
+		};
+
+		[] call FUNC(addClientStatsPFH);
+	}
+] call CBA_fnc_addSetting;
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"CREATED SETTINGS",
+	[]
+] call EFUNC(common,log);

framework/performance/functions/fn_addClientStatsPFH.sqf

@@ -0,0 +1,38 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"Initializing client stats PFH",
+	[]
+] call EFUNC(common,log);
+
+_cpsPFH = [
+	{ 
+		[] call FUNC(calculateClientStats);
+	},
+	QGVAR(client_cps_interval) call CBA_settings_fnc_get,
+	[],
+	{ 
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"Client PFH loaded",
+			[["pfhInterval", QGVAR(client_cps_interval) call CBA_settings_fnc_get]]
+		] call EFUNC(common,log);
+	},
+	{ 	[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"Client PFH unloaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ QGVAR(client_cps_enable) call CBA_settings_fnc_get },
+	{ false },
+	[]
+] call CBA_fnc_createPerFrameHandlerObject;
+
+player setVariable [QGVAR(client_cps_handler), _cpsPFH];

framework/performance/functions/fn_addDNI_PlayerFPS.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 if ( !hasInterface ) exitWith {};
 
 diag_log text "[MILSIM] (DNI) writing variable loop";

framework/performance/functions/fn_addDeadUnitCleanupPFH.sqf

@@ -0,0 +1,55 @@
+#include "..\script_component.hpp"
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"Initializing dead unit deletion PFH",
+	[]
+] call EFUNC(common,log);
+
+GVAR(deadUnitCleanupPFH) = [
+	{ 
+		_maxTime = getMissionConfigValue ["corpseRemovalMaxTime", 300] * 1.5;
+		_maxDead = getMissionConfigValue ["corpseLimit", 80];
+
+		// _dead = allDead select { (_x isKindOf "CAManBase") and ( ( (time - (_x getVariable ["milsim_death_time", time] ) ) > (_maxTime * 1.5) ) ) };
+		// _dead = _dead apply { [ (time - (_x getVariable ["milsim_death_time", time] ) ), _x ] };
+
+		_dead = [];
+		{
+			if not (_x isKindOf "CAManBase") then { continue };
+			if not (isInRemainsCollector _x) then { continue };
+			_dead pushBack [time - (_x getVariable ["milsim_death_time", time] ), _x];
+		} forEach allDead;
+
+		_dead sort false;
+		_toDelete = 0 max ( (count _dead ) - _maxDead );
+		_dead = _dead select [0, _toDelete];
+		{
+			_unit = _x#1;
+			_unit setVariable ["milsim_garbage_collected", true];
+			deleteVehicle (_unit);
+		} foreach _dead;
+	},
+	450,
+	[],
+	{ // on creation
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"dead unit deletion PFH loaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ // on deletion
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"dead unit deletion PFH unloaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ (missionNamespace getVariable [QGVAR(deadUnitCleanup_enable), false]) },
+	{ false },
+	[]
+] call CBA_fnc_createPerFrameHandlerObject;

framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf

@@ -0,0 +1,71 @@
+#include "..\script_component.hpp"
+
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"Initializing empty group deletion PFH",
+	[]
+] call EFUNC(common,log);
+
+GVAR(emptyGroupCleanupPFH) = [
+	{ 
+		{
+			if ((count units _x) == 0) then {
+				if (local _x) then {
+					[
+						LEVEL_INFO,
+						QUOTE(COMPONENT),
+						"DELETING EMPTY GROUP",
+						[
+							["groupId", groupId _x],
+							["netId", netId _x]
+						]
+					] call EFUNC(common,log);
+					deleteGroup _x;
+				} else {
+					if (isServer) then {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"NON LOCAL EMPTY GROUP",
+ 							[
+								["groupId", groupId _x],
+								["groupOwner", groupOwner _x]
+							]
+						] call EFUNC(common,log);
+					} else {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"EMPTY REMOTE GROUP",
+							[
+								["groupId", groupId _x]
+							]
+						] call EFUNC(common,log);
+					};
+				};
+			};
+		} forEach allGroups;
+	},
+	300,
+	[],
+	{ // on creation
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"Empty group deletion PFH loaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ // on deletion
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"Empty group deletion PFH unloaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) },
+	{ not (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) },
+	[]
+] call CBA_fnc_createPerFrameHandlerObject;

framework/performance/functions/fn_addServerStatsPFH.sqf

@@ -1,28 +1,48 @@
+#include "..\script_component.hpp"
+
 if (!isServer) exitWith {};
 
-missionNamespace setVariable["milsim_raw_cps", 0];
-missionNamespace setVariable["milsim_cps", 0];
+missionNamespace setVariable[QGVAR(raw_cps), 0];
+missionNamespace setVariable[QGVAR(cps), 0];
 
-publicVariable "milsim_raw_cps";
-publicVariable "milsim_cps";
+publicVariable QGVAR(raw_cps);
+publicVariable QGVAR(cps);
 
-diag_log text format ["[MILSIM] (server) initializing Server Stats PFH"];
+[
+	LEVEL_INFO,
+	QUOTE(COMPONENT),
+	"Initializing server stats PFH",
+	[]
+] call EFUNC(common,log);
 
 _serverCpsPFH = [
 	{ 
-		[] call milsim_fnc_calculateServerStats;
+		[] call FUNC(calculateServerStats);
 	},
-	"milsim_server_cps_interval" call CBA_settings_fnc_get,
+	QGVAR(server_cps_interval) call CBA_settings_fnc_get,
 	[],
-	{ diag_log text format ["[MILSIM] (server) Server PFH loaded with interval %1 seconds", "milsim_server_cps_interval" call CBA_settings_fnc_get ] },
-	{ diag_log text format ["[MILSIM] (server) Server PFH unloaded"] },
-	{ "milsim_server_cps_enable" call CBA_settings_fnc_get },
+	{ 
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"Server PFH loaded",
+			[["pfhInterval", QGVAR(server_cps_interval) call CBA_settings_fnc_get]]
+		] call EFUNC(common,log);
+	},
+	{ 	[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			"Server PFH unloaded",
+			[]
+		] call EFUNC(common,log);
+	},
+	{ QGVAR(server_cps_enable) call CBA_settings_fnc_get },
 	{ false },
 	[]
 ] call CBA_fnc_createPerFrameHandlerObject;
 
 
-missionNamespace setVariable ["milsim_server_cps_handler", _serverCpsPFH];
+missionNamespace setVariable [QGVAR(server_cps_handler), _serverCpsPFH];
 
 _playerCpsPFH = [
 	{ 

framework/performance/functions/fn_calculateClientStats.sqf

@@ -1,3 +1,5 @@
+#include "..\script_component.hpp"
+
 [] spawn {
 	// warning: while loop without suspension executes multiple times per frame
 	private _counter = 0;
@@ -8,8 +10,8 @@
 		_counter = _counter + 1;
 	};
 	// in an empty mission, the _counter may go well over 2000 times per frame!
-	diag_log text format ["[MILSIM] (client) Average Execution: %1 times per frame", _counter / (diag_frameNo - _frameNo)];
-	player setVariable ["milsim_player_raw_cps", _counter / (diag_frameNo - _frameNo), true];
+	private _rawCPS = _counter / (diag_frameNo - _frameNo);
+	player setVariable [QGVAR(player_raw_cps), _rawCPS, true];
 
 	// with suspension
 	private _counter = 0;
@@ -21,9 +23,23 @@
 		uiSleep 0.001; // waits at least 1 frame
 	};
 	// _counter says one per frame, as expected
-	diag_log text format ["[MILSIM] (client) Average Execution: %1 times per frame", _counter / (diag_frameNo - _frameNo)];
-	player setVariable ["milsim_player_cps", _counter / (diag_frameNo - _frameNo), true];
+	private _playerCPS = _counter / (diag_frameNo - _frameNo);
+	player setVariable [QGVAR(player_cps), _playerCPS, true];
 
+	// log to RPT
+	[
+		
+		{_this remoteExec [QEFUNC(common,log), 2]},
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			format ["Average Execution: %1 times per frame", _playerCPS],
+			[
+				["playerRawCPS", _rawCPS],
+				["playerCPS", _playerCPS]
+			]
+		]
+	] call CBA_fnc_directCall;
 };
 
 nil;

framework/performance/functions/fn_calculateServerStats.sqf

@@ -0,0 +1,52 @@
+#include "..\script_component.hpp"
+
+[] spawn {
+	// warning: while loop without suspension executes multiple times per frame
+	private _counter = 0;
+	private _endTime = diag_tickTime + 5;
+	private _frameNo = diag_frameNo;
+	while { diag_tickTime < _endTime } do
+	{
+		_counter = _counter + 1;
+	};
+
+	private _rawCPS = _counter / (diag_frameNo - _frameNo);
+	missionNamespace setVariable [QGVAR(server_raw_cps), _rawCPS];
+
+	// with suspension
+	private _counter = 0;
+	private _endTime = diag_tickTime + 5;
+	private _frameNo = diag_frameNo;
+	while { diag_tickTime < _endTime } do
+	{
+		_counter = _counter + 1;
+		uiSleep 0.001; // waits at least 1 frame
+	};
+
+	private _serverCPS = _counter / (diag_frameNo - _frameNo);
+	missionNamespace setVariable [QGVAR(server_cps), _counter / (diag_frameNo - _frameNo)];
+
+	// log to RPT
+	[
+		
+		{_this call EFUNC(common,log);},
+		[
+			LEVEL_INFO,
+			QUOTE(COMPONENT),
+			format ["Average Server Execution: %1 times per frame", _serverCPS],
+			[
+				["serverRawCPS", _rawCPS],
+				["serverCPS", _serverCPS]
+			]
+		]
+	] call CBA_fnc_directCall;
+
+	[QGVARMAIN(serverEfficiency), [
+		[
+			["float", QGVARMAIN(raw_cps), missionNamespace getVariable [QGVAR(server_raw_cps), -1]],
+			["float", QGVARMAIN(cps), missionNamespace getVariable [QGVAR(server_cps), -1]]
+		]
+	]] call CBA_fnc_localEvent;
+};
+
+nil;

framework/performance/script_component.hpp

@@ -0,0 +1,3 @@
+#define COMPONENT performance
+#define COMPONENT_BEAUTIFIED Performance Monitoring
+#include "../script_mod.hpp"

framework/reinsert/client/fn_addAceSelfActions.sqf

@@ -0,0 +1,65 @@
+#include "..\script_component.hpp"
+
+params [
+	["_types", [], [[]]], // classnames to assign these action to
+	["_useInheritance", false, [false]]
+]; 
+
+{ // forEach _types
+	private _classToAddActionsTo = _x;
+
+	private _fileForReinsertAction = [
+		QGVAR(fileReinsertRequestAction),
+		"File Re-insert Request",
+		"\A3\ui_f\data\igui\cfg\simpleTasks\types\takeoff_ca.paa",
+		{ // statement
+			params ["_target", "_player", "_params"];
+			// find nearest base or location
+			private _base = [_player] call EFUNC(common,getNearestBase);
+			private _baseName = [_base] call EFUNC(common,getNameOfBase);
+			// send event to server
+			[QGVAR(fileReinsertRequest), [_player, _base]] call CBA_fnc_serverEvent;
+			// notify player their request was filed
+			[["Re-insert Request Filed"], [format["Location: %1", _baseName]]] call CBA_fnc_notify;
+		},
+		{ // condition
+			params ["_target", "_player", "_params"];
+			// find nearest base or location
+			private _base = [_player] call EFUNC(common,getNearestBase);
+			private _baseDistance = _player distance _base;
+
+			private _maxRangeToReady = [QGVAR(setting_maxRangeToReady)] call CBA_settings_fnc_get;
+			private _existingQueue = missionNamespace getVariable [QGVAR(reinsertionQueue), []];
+
+			// check if module is enabled, player is near a base, and player is not already in the queue
+			// (serverTime - GVAR(missionStartServerTime)) > 60*5 && // only allow after 15 minutes
+			[QGVAR(setting_enabled)] call CBA_settings_fnc_get &&
+			(_baseDistance < _maxRangeToReady) &&
+			not (_player in (_existingQueue apply {_x#0}))
+		}
+	] call ace_interact_menu_fnc_createAction;
+	[_classToAddActionsTo, 1, ["ACE_SelfActions"], _fileForReinsertAction, _useInheritance] call ace_interact_menu_fnc_addActionToClass;
+
+	private _removeFileForReinsertAction = [
+		QGVAR(removeReinsertRequestAction),
+		"Remove Re-insert Request",
+		"\A3\ui_f\data\igui\cfg\simpleTasks\types\land_ca.paa",
+		{ // statement
+			params ["_target", "_player", "_params"];
+			// send event to server
+			[QGVAR(removeReinsertRequest), [_player]] call CBA_fnc_serverEvent;
+			// notify player their request was rescinded
+			"Re-insert Request Rescinded" call CBA_fnc_notify;
+		},
+		{ // condition
+			params ["_target", "_player", "_params"];
+			private _existingQueue = missionNamespace getVariable [QGVAR(reinsertionQueue), []];
+
+			// check if module is enabled, player is in the queue
+			// (serverTime - GVAR(missionStartServerTime)) > 60*5 && // only allow after 15 minutes
+			[QGVAR(setting_enabled)] call CBA_settings_fnc_get &&
+			(_player in (_existingQueue apply {_x#0}))
+		}
+	] call ace_interact_menu_fnc_createAction;
+	[_classToAddActionsTo, 1, ["ACE_SelfActions"], _removeFileForReinsertAction, _useInheritance] call ace_interact_menu_fnc_addActionToClass;
+} forEach _types;

framework/reinsert/client/fn_addCheckQueueSelfAction.sqf

@@ -0,0 +1,28 @@
+#include "..\script_component.hpp"
+
+params [
+	["_types", [], [[]]], // classnames to assign these action to
+	["_useInheritance", false, [false]]
+];
+
+{ // forEach _types
+	private _classToAddActionsTo = _x;
+
+	private _checkReinsertQueueAction = [
+		QGVAR(checkReinsertQueue),
+		"[PILOT] Check Re-insert Queue",
+		"\A3\ui_f\data\igui\cfg\simpleTasks\types\land_ca.paa",
+		{
+			params ["_target", "_player", "_params"];
+			// request notification from the server
+			call FUNC(requestShowQueue);
+			// reset last check time
+			localNamespace setVariable [QGVAR(lastReinsertQueueCheck), diag_tickTime];
+		},
+		{
+			GVAR(setting_enabled);
+		} // condition
+	] call ace_interact_menu_fnc_createAction;
+	[_classToAddActionsTo, 1, ["ACE_SelfActions"], _checkReinsertQueueAction, _useInheritance] call ace_interact_menu_fnc_addActionToClass;
+
+} forEach _types;

framework/reinsert/client/fn_initClient.sqf

@@ -0,0 +1,54 @@
+#include "..\script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+// ACE SELF-INTERACTIONS FOR FILING AND RESCINDING REINSERT REQUESTS NEAR BASE - ALL PLAYERS
+localNamespace setVariable [QGVAR(fileForReinsertClassesAdded), []];
+// add actions to current class
+[["CAManBase"], true] call FUNC(addAceSelfActions);
+
+/////////////////////////////////////////////////////
+// PILOTS ONLY
+// ACE SELF-INTERACTIONS FOR CHECKING REINSERT QUEUE - ONLY FOR PILOTS
+localNamespace setVariable [QGVAR(checkReinsertQueueClassesAdded), []];
+localNamespace setVariable [QGVAR(lastReinsertQueueCheck), diag_tickTime];
+
+// add actions to pilot classes, and don't apply to child classes
+// [["B_Helipilot_F", "B_helicrew_F"], false] call FUNC(addCheckQueueSelfAction);
+/////////////////////////////////////////////////////
+
+
+// ADD TIMER FOR PILOTS - IF REINSERT LIST NOT CHECKED FOR 20 MINUTES, SHOW NOTIFICATION AUTOMATICALLY
+if ((typeOf player) in ["B_Helipilot_F", "B_helicrew_F"]) then {
+	[{
+		// if module not enabled and pilot forced check not enabled, exit
+		if (not (
+			[QGVAR(setting_enabled)] call CBA_settings_fnc_get and
+			[QGVAR(setting_pilotForcedCheckEnabled)] call CBA_settings_fnc_get
+		)) exitWith {};
+
+		// if last check was less than X minutes ago, skip
+		private _lastCheck = localNamespace getVariable [QGVAR(lastReinsertQueueCheck), diag_tickTime];
+		private _requiredCheckInterval = [QGVAR(setting_pilotForcedCheckInterval)] call CBA_settings_fnc_get;
+		if (
+			diag_tickTime - _lastCheck <
+			_requiredCheckInterval
+		) exitWith {}; // if last check was less than X minutes ago, skip
+
+		// last check was greater than X minutes ago
+		// reset last check time
+		localNamespace setVariable [QGVAR(lastReinsertQueueCheck), diag_tickTime];
+		// request notification from the server
+		call FUNC(requestShowQueue);
+	}, 30] call CBA_fnc_addPerFrameHandler;
+};
+/////////////////////////////////////////////////////
+
+[
+	LEVEL_DEBUG,
+	QUOTE(COMPONENT),
+	"initClient complete",
+	[]
+] call EFUNC(common,log);
+
+localNamespace setVariable [QGVAR(complete), true];