Merge branch 'v0.96.8-APR-UNSTABLE' into master

Apricot-ale · Nov 13, 2024 · 4aa3e0f · 4aa3e0f
2 parents 6067238 + 6f8acc7
commit 4aa3e0f
Show file tree

Hide file tree

Showing 460 changed files with 28,211 additions and 15,656 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,19 +12,19 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - uses: docker://node:10-alpine
+      - uses: docker://node:20-alpine
         name: Setup Node
 
       - name: Install dependencies
-        working-directory: _tools
+        working-directory: _tools/build-tool
         run: npm install
 
       - name: Assemble and pack
-        working-directory: _tools
+        working-directory: _tools/build-tool
         run: npx gulp
 
       - uses: actions/upload-artifact@master
         with:
           name: PBO-Files
-          path: _tools/build/pbo
+          path: build/pbo
 
diff --git a/.gitignore b/.gitignore
@@ -1,55 +1,11 @@
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
+# dev mission.sqm
+/Missionframework/mission.sqm
 
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# Tools local configs
+/_tools/config.ps1
 
 # Build directory
 /build/
-/_tools/build/
-/_tools/node_modules/
 
 # KP-Steam
 steam_appid.txt

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,22 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Launch game",
+            "type": "shell",
+            "command": "powershell -c '. ${workspaceFolder}/_tools/vscode/Run-Game.ps1'",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build"
+            }
+        },
+        {
+            "label": "Setup",
+            "type": "shell",
+            "command": "powershell -c '. ${workspaceFolder}/_tools/vscode/Invoke-Setup.ps1'",
+            "problemMatcher": []
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.96.8 (TBD)
+* Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA)
+* Added: Ability to carry ressource crates.
+* Added: Scripts/configs to setup and run development environment from VSCode tasks
+* Updated: Italian localization. Thanks to [k4s0](https://github.com/k4s0)
+* Tweaked: Splitted the config file in separate files, as it was getting quite big.
+* Tweaked: Unified the prefix of all variables to `KPLIB_`.
+* Tweaked: Arsenal presets are now in the presets folder.
+* Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal.
+* Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset.
+* Tweaked: Parameter value variables are having a `param` prefix now.
+* Tweaked: Comments/structure of the config file. Also added some category prefix sorting to some config variables.
+* Tweaked: GM East enemy preset, lower the chance for unarmed BRDM.
+* Tweaked: Moved mission build tool into subdirectory
+* Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total.
+* Fixed: Sector monitor got stuck after sector cap was reached until restarting the server.
+* Fixed: FOB truck got mass set, but should've just apply to FOB boxes.
+* Fixed: Chernarus Winter (and summer) weren't recognized for ignored buildings list for civ rep loss.
+
 ## 0.96.7a (2020-09-12)
 * Added: Contact DLC static weapon backpacks to default blacklist.
 * Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA)

diff --git a/LICENSE.md b/LICENSE.md
@@ -2,6 +2,18 @@ MIT License
 
 Copyright (c) 2015 [GreuhZbug](https://github.com/GreuhZbug), [Wyqer](https://github.com/Wyqer)
 
+-----
+
+In this project there could be files with a different license than the
+general project license. In this case the file header will state the
+license. Folders could also contain a separate LICENSE file. In this
+case all content in that folder and all subfolders are published under
+that license instead.
+
+* GNU General Public License v3.0 (\KP)
+
+-----
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

diff --git a/Missionbasefiles/kp_liberation.pja310/mission.sqm b/Missionbasefiles/kp_liberation.pja310/mission.sqm
@@ -3827,7 +3827,7 @@ class Mission
 			dataType="Marker";
 			position[]={6960.8052,0,11203.651};
 			name="capture_45";
-			text="Applejakerie Village";
+			text="Ajak's Village";
 			type="n_art";
 			colorName="ColorEAST";
 			id=714;

diff --git a/Missionframework/KPLIB_debriefs.hpp → Missionframework/CfgDebriefing.hpp b/Missionframework/KPLIB_debriefs.hpp → Missionframework/CfgDebriefing.hpp
@@ -1,17 +1,23 @@
 /*
-    File: KPLIB_debriefs.hpp
+    File: CfgDebriefing.hpp
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2020-05-09
-    Last Update: 2020-05-09
+    Last Update: 2020-05-10
     License: MIT License - http://www.opensource.org/licenses/MIT
 
     Description:
         Debriefing defines for KP Liberation.
 */
 
 class End1 {
-    title =	$STR_SORRY;
+    title = $STR_SORRY;
     subtitle = "";
     description = $STR_COMMANDER_NOT_AUTHORIZED;
     pictureBackground = "";
 };
+class End2 {
+    title = $STR_SORRY;
+    subtitle = "";
+    description = $STR_CBA_IS_REQUIRED;
+    pictureBackground = "";
+};
diff --git a/Missionframework/CfgFunctions.hpp b/Missionframework/CfgFunctions.hpp
@@ -3,7 +3,9 @@ class KPLIB {
         file = "functions";
 
         class addActionsFob             {};
+        class addActionsFullHeal        {};
         class addActionsPlayer          {};
+        class addArtyToSupport          {};
         class addObjectInit             {};
         class addRopeAttachEh           {};
         class allowCrewInImmobile       {};
@@ -24,6 +26,7 @@ class KPLIB {
         class crGetMulti                {};
         class crGlobalMsg               {};
         class doSave                    {};
+        class fullHeal                  {};
         class fillStorage               {};
         class forceBluforCrew           {};
         class getAdaptiveVehicle        {};
@@ -39,6 +42,7 @@ class KPLIB {
         class getLocationName           {};
         class getMilitaryId             {};
         class getMobileRespawns         {};
+        class getMobileRespawnName      {};
         class getNearbyPlayers          {};
         class getNearestBluforObjective {};
         class getNearestFob             {};
@@ -48,6 +52,7 @@ class KPLIB {
         class getOpforCap               {};
         class getOpforFactor            {};
         class getOpforSpawnPoint        {};
+        class getOpforSpawnPointSAM     {};
         class getPlayerCount            {};
         class getResistanceTier         {};
         class getSaveableParam          {};
@@ -62,9 +67,10 @@ class KPLIB {
         class handlePlacedZeusObject    {};
         class hasPermission             {};
         class initSectors               {};
-        class isBigtownActive           {};
+        class isCapitalActive           {};
         class isClassUAV                {};
         class isRadio                   {};
+        class lambs_enableReinforcements{};
         class log                       {};
         class potatoScan                {};
         class protectObject             {};

diff --git a/Missionframework/GREUH/GREUH_config.sqf b/Missionframework/GREUH/GREUH_config.sqf
@@ -1,8 +1,8 @@
-// Permettre aux joueurs de modifier leur distance de vue
+// Allow players to change their view distance
 GREUH_allow_viewdistance = true;
 
-// Permettre aux joueurs de modifier la qualité de l environnement
+// llow players to modify the quality of the environment
 GREUH_allow_worldquality = true; 
 
-// Permettre aux joueurs de modifier leurs escouades
+// Allow players to modify their squads
 GREUH_allow_customsquads = true;
diff --git a/Missionframework/GREUH/Scripts/GREUH_actionmanager.sqf b/Missionframework/GREUH/Scripts/GREUH_actionmanager.sqf
@@ -1,6 +1,6 @@
 _idact = -1;
 while { true } do {
-	waitUntil{ sleep 0.3; alive player };
-	_idact = player addAction ["<t color='#FF8000'>" + localize "STR_GREUH_EXTENDED_OPTIONS_ACTIONMENU" + "</t>","GREUH\scripts\GREUH_dialog.sqf","",-1000,false,true];
-	waitUntil{ sleep 0.3; !alive player};
+    waitUntil{ sleep 0.3; alive player };
+    _idact = player addAction ["<t color='#FF8000'>" + localize "STR_GREUH_EXTENDED_OPTIONS_ACTIONMENU" + "</t>","GREUH\scripts\GREUH_dialog.sqf","",-1000,false,true];
+    waitUntil{ sleep 0.3; !alive player};
 };
diff --git a/Missionframework/GREUH/Scripts/GREUH_activate.sqf b/Missionframework/GREUH/Scripts/GREUH_activate.sqf
@@ -13,29 +13,29 @@ desired_vehvolume = 100;
 
 greuh_options_profile = profileNamespace getVariable "GREUH_OPTIONS_PROFILE";
 if ( !isNil "greuh_options_profile" ) then {
-	desiredviewdistance_inf = greuh_options_profile select 0;
-	desiredviewdistance_veh = greuh_options_profile select 1;
-	desiredviewdistance_obj = greuh_options_profile select 2;
-	show_teammates = greuh_options_profile select 3;
-	show_platoon = greuh_options_profile select 4;
-	if ( count greuh_options_profile > 5 ) then {
-		desired_vehvolume = greuh_options_profile select 5;
-		if ( isNil "desired_vehvolume" ) then {
-			desired_vehvolume = 100;
-		};
-	};
-	if ( count greuh_options_profile > 6 ) then {
-		show_nametags = greuh_options_profile select 6;
-		if ( isNil "show_nametags" ) then {
-			show_nametags = false;
-		};
-	};
-	if ( count greuh_options_profile > 7) then {
-		desired_fps = greuh_options_profile select 7;
-		if ( isNil "desired_fps" ) then {
-			desired_fps = 0;
-		};
-	};
+    desiredviewdistance_inf = greuh_options_profile select 0;
+    desiredviewdistance_veh = greuh_options_profile select 1;
+    desiredviewdistance_obj = greuh_options_profile select 2;
+    show_teammates = greuh_options_profile select 3;
+    show_platoon = greuh_options_profile select 4;
+    if ( count greuh_options_profile > 5 ) then {
+        desired_vehvolume = greuh_options_profile select 5;
+        if ( isNil "desired_vehvolume" ) then {
+            desired_vehvolume = 100;
+        };
+    };
+    if ( count greuh_options_profile > 6 ) then {
+        show_nametags = greuh_options_profile select 6;
+        if ( isNil "show_nametags" ) then {
+            show_nametags = false;
+        };
+    };
+    if ( count greuh_options_profile > 7) then {
+        desired_fps = greuh_options_profile select 7;
+        if ( isNil "desired_fps" ) then {
+            desired_fps = 0;
+        };
+    };
 };
 
 [] call compile preprocessFileLineNumbers "GREUH\GREUH_config.sqf";

diff --git a/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf b/Missionframework/GREUH/Scripts/GREUH_cache_units.sqf
@@ -4,14 +4,14 @@ waitUntil { !isNil "nametags_distance" };
 
 while { true } do {
 
-	_scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == GRLIB_side_friendly ) } ] call BIS_fnc_conditionalSelect;
-	_scanned_units = [ _scanned_units, { (_x == leader group player ) || (_x distance player < nametags_distance) } ] call BIS_fnc_conditionalSelect;
-	_scanned_units = [ _scanned_units, { (_x != player) && (( vehicle player ) != ( vehicle _x )) } ] call BIS_fnc_conditionalSelect;
-	GRLIB_nametag_units = [] + _scanned_units;
+    _scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == KPLIB_side_player ) } ] call BIS_fnc_conditionalSelect;
+    _scanned_units = [ _scanned_units, { (_x == leader group player ) || (_x distance player < nametags_distance) } ] call BIS_fnc_conditionalSelect;
+    _scanned_units = [ _scanned_units, { (_x != player) && (( vehicle player ) != ( vehicle _x )) } ] call BIS_fnc_conditionalSelect;
+    KPLIB_nametag_units = [] + _scanned_units;
 
-	_scanned_groups = [ allGroups, { ( side _x == side player ) && ( isplayer (leader _x) ) } ] call BIS_fnc_conditionalSelect;
-	_scanned_groups = [ _scanned_groups, { ( count units _x > 1 ) || ( count units _x == 1 && leader _x != player ) } ] call BIS_fnc_conditionalSelect;
-	GRLIB_overlay_groups = [] + _scanned_groups;
+    _scanned_groups = [ allGroups, { ( side _x == side player ) && ( isplayer (leader _x) ) } ] call BIS_fnc_conditionalSelect;
+    _scanned_groups = [ _scanned_groups, { ( count units _x > 1 ) || ( count units _x == 1 && leader _x != player ) } ] call BIS_fnc_conditionalSelect;
+    KPLIB_overlay_groups = [] + _scanned_groups;
 
-	sleep 1;
-};
+    sleep 1;
+};