fix: prevent group_diag from prematurely marking patrol groups for deletion

Tags patrol groups (KPLIB_patrol_group) so group_diag skips them, and
cleans up the tag + enables deleteGroupWhenEmpty only once the patrol
lifecycle is complete. Prevents the '_grp was nil' log spam by fixing
the root cause rather than just silencin the symptom.

.gitea/workflows/build.yml

@@ -3,11 +3,11 @@ name: Build Mission PBO
 on:
   push:
     branches: [main, master]
-    tags: ['v*']
+    tags: ["v*"]
   workflow_dispatch:
 
 env:
-  PBO_NAME: CTI_34_KP_Liberation_v0.96.7a_Ruha.ruha.pbo
+  PBO_NAME: "KPLib-Ruha.ruha.pbo"
 
 jobs:
   pack:
@@ -16,28 +16,31 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install armake2
-        run: cargo install armake2
+      - run: mkdir build
 
       - name: Pack mission folder into PBO
-        run: armake2 pack "$PWD" "${{ env.PBO_NAME }}"
+        uses: docker://arwynfr/armake2:debian
+        with:
+          args: pack src "build/${{ env.PBO_NAME }}"
 
       - name: Verify PBO integrity
-        run: armake2 inspect "${{ env.PBO_NAME }}"
+        uses: docker://arwynfr/armake2:debian
+        with:
+          args: inspect "build/${{ env.PBO_NAME }}"
 
       - name: Upload PBO as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.PBO_NAME }}
-          path: ${{ github.workspace }}/${{ env.PBO_NAME }}
+          path: build/${{ env.PBO_NAME }}
+          if-no-files-found: error
 
   deploy:
-    if: false
     needs: [pack]
     runs-on: ubuntu-latest
     steps:
       - name: Download PBO artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: ${{ env.PBO_NAME }}
 
@@ -46,6 +49,7 @@ jobs:
         with:
           host: ${{ secrets.SERVER_HOST }}
           username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          password: ${{ secrets.SERVER_PASSWORD }}
+          # key: ${{ secrets.SSH_PRIVATE_KEY }}
           source: ${{ env.PBO_NAME }}
-          target: /path/to/server/mpmissions/
+          target: /home/arma3server/serverfiles/mpmissions/

.gitignore

@@ -1,12 +1,12 @@
-*.pbo
-*.bisign
-*.bikey
-*.zip
-*.log
-*.rpt
-*.psd
-*.bak
-*.tmp
-*.swp
+src/*.pbo
+src/*.bisign
+src/*.bikey
+src/*.zip
+src/*.log
+src/*.rpt
+src/*.psd
+src/*.bak
+src/*.tmp
+src/*.swp
 .vs/
 __history/

presets/civilians/custom.sqf

@@ -1,51 +0,0 @@
-/*
-    Needed Mods:
-    - None
-
-    Optional Mods:
-    - None
-*/
-
-// Civilian classnames.
-civilians = [
-    "C_Man_Fisherman_01_F",
-    "C_man_w_worker_F",
-    "C_man_1_1_F",
-    "C_man_p_beggar_F",
-    "C_Man_Messenger_01_F",
-    "C_man_hunter_1_F",
-    "C_journalist_F",
-    "C_Journalist_01_War_F",
-    "C_man_shorts_2_F",
-    "C_Man_UtilityWorker_01_F",
-    "C_man_1",
-    "C_Man_casual_1_F",
-    "C_Man_casual_2_F",
-    "C_Man_casual_3_F",
-    "C_Man_casual_4_F",
-    "C_Man_casual_5_F",
-    "C_Man_casual_6_F",
-    "C_man_polo_1_F",
-    "C_man_polo_2_F",
-    "C_man_polo_3_F",
-    "C_man_polo_4_F",
-    "C_man_polo_5_F",
-    "C_man_polo_6_F"
-];
-
-// Civilian vehicle classnames.
-civilian_vehicles = [
-    "C_Quadbike_01_F",
-    "C_Hatchback_01_F",
-    "C_Hatchback_01_sport_F",
-    "C_Offroad_01_F",
-    "C_Offroad_01_repair_F",
-    "C_SUV_01_F",
-    "C_Van_01_fuel_F",
-    "C_Van_01_transport_F",
-    "C_Van_01_box_F",
-    "C_Truck_02_fuel_F",
-    "C_Truck_02_transport_F",
-    "C_Truck_02_covered_F",
-    "C_Truck_02_box_F"
-];

presets/opfor/rhs_afrf.sqf

@@ -1,149 +0,0 @@
-/*
-    Needed Mods:
-    - RHS AFRF
-
-    Optional Mods:
-    - None
-*/
-
-// Enemy infantry classes
-opfor_officer = "rhs_msv_emr_officer";                                  // Officer
-opfor_squad_leader = "rhs_msv_emr_sergeant";                            // Squad Leader
-opfor_team_leader = "rhs_msv_emr_efreitor";                             // Team Leader
-opfor_sentry = "rhs_msv_emr_rifleman";                                  // Rifleman (Lite)
-opfor_rifleman = "rhs_msv_emr_rifleman";                                // Rifleman
-opfor_rpg = "rhs_msv_emr_LAT";                                          // Rifleman (LAT)
-opfor_grenadier = "rhs_msv_emr_grenadier";                              // Grenadier
-opfor_machinegunner = "rhs_msv_emr_arifleman";                          // Autorifleman
-opfor_heavygunner = "rhs_msv_emr_machinegunner";                        // Heavy Gunner
-opfor_marksman = "rhs_msv_emr_marksman";                                // Marksman
-opfor_sharpshooter = "rhs_msv_emr_marksman";                            // Sharpshooter
-opfor_sniper = "rhs_msv_emr_marksman";                                  // Sniper
-opfor_at = "rhs_msv_emr_at";                                            // AT Specialist
-opfor_aa = "rhs_msv_emr_aa";                                            // AA Specialist
-opfor_medic = "rhs_msv_emr_medic";                                      // Combat Life Saver
-opfor_engineer = "rhs_msv_emr_engineer";                                // Engineer
-opfor_paratrooper = "rhs_msv_emr_RShG2";                                // Paratrooper
-
-// Enemy vehicles used by secondary objectives.
-opfor_mrap = "rhs_tigr_msv";                                            // GAZ-233011
-opfor_mrap_armed = "rhs_tigr_sts_msv";                                  // GAZ-233014 (Armed)
-opfor_transport_helo = "RHS_Mi8mt_Cargo_vvsc";                          // Mi-8MT (Cargo)
-opfor_transport_truck = "RHS_Ural_MSV_01";                              // Ural-4320 Transport (Covered)
-opfor_ammobox_transport = "RHS_Ural_Open_MSV_01";                       // Ural-4320 Transport (Open) -> Has to be able to transport resource crates!
-opfor_fuel_truck = "RHS_Ural_Fuel_MSV_01";                              // Ural-4320 Fuel
-opfor_ammo_truck = "rhs_gaz66_ammo_msv";                                // GAZ-66 Ammo
-opfor_fuel_container = "Land_Pod_Heli_Transport_04_fuel_F";             // Taru Fuel Pod
-opfor_ammo_container = "Land_Pod_Heli_Transport_04_ammo_F";             // Taru Ammo Pod
-opfor_flag = "rhs_Flag_Russia_F";                                       // Flag
-
-/* Adding a value to these arrays below will add them to a one out of however many in the array, random pick chance.
-Therefore, adding the same value twice or three times means they are more likely to be chosen more often. */
-
-/* Militia infantry. Lightweight soldier classnames the game will pick from randomly as sector defenders.
-Think of them like garrison or military police forces, which are more meant to control the local population instead of fighting enemy armies. */
-militia_squad = [
-    "RUS_MSV_sr_efreitor",                                             // Rifleman
-    "RUS_MSV_sr_grenadier",                                             // Rifleman
-    "RUS_MSV_sr_gunner",                                             // Rifleman
-    "RUS_MSV_sr_juniorsergeant",                                                  // Rifleman (AT)
-    "RUS_MSV_sr_machinegunner",                                            // Autorifleman
-    "RUS_MSV_sr_private",                                             // Marksman
-    "RUS_MSV_sr_riflemangrenadierassistant",                                                // Medic
-    "RUS_MSV_sr_riflemanmachinegunnerassistant"                                              // Engineer
-];
-
-// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders.
-militia_vehicles = [
-    "rhs_tigr_sts_msv"                                                  // GAZ-233014 (Armed)
-];
-
-// Militia vehicles. Lightweight vehicle classnames the game will pick from randomly as sector defenders. Can also be empty for only infantry milita.
-opfor_vehicles = [
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_bmp2d_msv",                                                    // BMP-2D
-    "rhs_bmp2k_msv",                                                    // BMP-2K
-    "rhs_brm1k_msv",                                                    // BRM-1K
-    "rhs_zsu234_aa",                                                    // ZSU-23-4V
-    "rhs_zsu234_aa",                                                    // ZSU-23-4V
-    "rhs_t80",                                                          // T80
-    "rhs_t80",                                                          // T80
-    "rhs_t90a_tv",                                                      // T90A
-    "rhs_t90sab_tv"                                                     // T90SA (2016)
-];
-
-// All enemy vehicles that can spawn as sector defenders and patrols but at a lower enemy combat readiness (aggression levels).
-opfor_vehicles_low_intensity = [
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_btr80_msv",                                                    // BTR-80
-    "rhs_btr80a_msv"                                                    // BTR-80A
-];
-
-// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at high enemy combat readiness (aggression levels).
-opfor_battlegroup_vehicles = [
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "RHS_Ural_Open_MSV_01",                                             // Ural-4320 Transport
-    "RHS_Ural_MSV_01",                                                  // Ural-4320 Transport (Covered)
-    "rhs_bmp2d_msv",                                                    // BMP-2D
-    "rhs_bmp2k_msv",                                                    // BMP-2K
-    "rhs_brm1k_msv",                                                    // BRM-1K
-    "rhs_zsu234_aa",                                                    // ZSU-23-4V
-    "rhs_zsu234_aa",                                                    // ZSU-23-4V
-    "rhs_t80",                                                          // T80
-    "rhs_t80",                                                          // T80
-    "rhs_t90a_tv",                                                      // T90A
-    "RHS_Mi24P_AT_vvsc",                                                // Mi-24P (AT)
-    "RHS_Mi24V_AT_vvsc",                                                // Mi-24V (AT)
-    "RHS_Mi8mt_Cargo_vvsc",                                             // Mi-8MT (Cargo)
-    "RHS_Ka52_vvsc"                                                     // Ka-52
-];
-
-// All enemy vehicles that can spawn as battlegroups, either assaulting or as reinforcements, at lower enemy combat readiness (aggression levels).
-opfor_battlegroup_vehicles_low_intensity = [
-    "rhs_tigr_msv",                                                     // GAZ-233011
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "rhs_tigr_sts_msv",                                                 // GAZ-233014 (Armed)
-    "RHS_Ural_Open_MSV_01",                                             // Ural-4320 Transport
-    "rhs_btr80_msv",                                                    // BTR-80
-    "rhs_btr80a_msv",                                                   // BTR-80A
-    "rhs_zsu234_aa",                                                    // ZSU-23-4V
-    "RHS_Mi24P_AT_vvsc",                                                // Mi-24P (AT)
-    "RHS_Mi24V_AT_vvsc",                                                // Mi-24V (AT)
-    "RHS_Mi8mt_Cargo_vvsc"                                              // Mi-8MT (Cargo)
-];
-
-/* All vehicles that spawn within battlegroups (see the above 2 arrays) and also hold 8 soldiers as passengers.
-If something in this array can't hold all 8 soldiers then buggy behaviours may occur.    */
-opfor_troup_transports = [
-    "RHS_Ural_Open_MSV_01",                                             // Ural-4320 Transport
-    "RHS_Ural_MSV_01",                                                  // Ural-4320 Transport (Covered)
-    "rhs_btr80_msv",                                                    // BTR-80
-    "rhs_btr80a_msv",                                                   // BTR-80A
-    "rhs_bmp2d_msv",                                                    // BMP-2D
-    "RHS_Mi8mt_Cargo_vvsc",                                             // Mi-8MT (Cargo)
-    "RHS_Mi24P_AT_vvsc",                                                // Mi-24P (AT)
-    "RHS_Mi24V_AT_vvsc"                                                 // Mi-24V (AT)
-];
-
-// Enemy rotary-wings that will need to spawn in flight.
-opfor_choppers = [
-    "RUS_VKS_ka52",                                             // Mi-8MT (Cargo)
-    "RUS_VKS_mi24p",                                                // Mi-24P (AT)
-    "RUS_VKS_mi28n",                                                // Mi-24V (AT)
-    "RUS_VKS_mi8mt",                                                     // Ka-52
-    "RUS_VKS_mi8mtv2"
-];
-
-// Enemy fixed-wings that will need to spawn in the air.
-opfor_air = [
-    "RHS_Su25SM_vvs",                                                  // Su-25
-    "RUS_VKS_su25sm",                                              // Su-25 (KH29)
-    "RUS_VKS_mig29s",
-    "RUS_VKS_mig29smt",
-    "RUS_VKS_tu95ms6"
-];