Merge branch 'github-master' into github-unstable

igorkis-scrts · Mar 14, 2023 · 8a74622 · 8a74622
2 parents 3ed39d5 + 98d5983
commit 8a74622
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/A3A/addons/core/Includes/script_version.hpp b/A3A/addons/core/Includes/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 2
 #define MINOR 1
-#define PATCHLVL 8
+#define PATCHLVL 9
 #define BUILD 0
diff --git a/A3A/addons/core/Templates/Templates/3CBF/3CBF_AI_SOV_CW.sqf b/A3A/addons/core/Templates/Templates/3CBF/3CBF_AI_SOV_CW.sqf
@@ -487,8 +487,8 @@ _militaryLoadoutData set ["sidearms", ["rhs_weap_makarov_pm"]];
 
 private _policeLoadoutData = _loadoutData call _fnc_copyLoadoutData; 
 _policeLoadoutData set ["uniforms", ["rhs_uniform_afghanka_moldovan_ttsko_blue"]];
-_policeLoadoutData set ["vests", ["rhs_suspender_AK8_chestrig", "rhs_suspender_AK", "rhs_suspender_AK4", "rhs_6sh92_radio"]];
-_policeLoadoutData set ["helmets", ["rhs_fieldcap_m88_moldovan_ttsko_blue_back", "rhs_fieldcap_m88_moldovan_ttsko_blue", "rhs_suspender_SKS"]];
+_policeLoadoutData set ["vests", ["rhs_suspender_AK8_chestrig", "rhs_suspender_AK", "rhs_suspender_AK4", "rhs_suspender_SKS"]];
+_policeLoadoutData set ["helmets", ["rhs_fieldcap_m88_moldovan_ttsko_blue_back", "rhs_fieldcap_m88_moldovan_ttsko_blue"]];
 _policeLoadoutData set ["SMGs", [
 ["uk3cb_sks_02", "", "", "", ["rhs_30Rnd_762x39mm", "rhs_30Rnd_762x39mm", "rhs_30Rnd_762x39mm_tracer"], [], ""],
 ["uk3cb_sks_01", "", "", "", ["uk3cb_10rnd_magazine_sks", "uk3cb_10rnd_magazine_sks", "uk3cb_10rnd_magazine_sks_GT"], [], ""],

diff --git a/A3A/addons/core/functions/init/fn_initVarServer.sqf b/A3A/addons/core/functions/init/fn_initVarServer.sqf
@@ -127,9 +127,6 @@ DECLARE_SERVER_VAR(areOccupantsDefeated, false);
 DECLARE_SERVER_VAR(areInvadersDefeated, false);
 DECLARE_SERVER_VAR(areRivalsDefeated, false);
 DECLARE_SERVER_VAR(isRivalsDiscoveryQuestAssigned, false);
-//Cold War mode for 3CBF or 3CBF + GM
-DECLARE_SERVER_VAR(A3A_coldWarMode, false);
-
 
 ////////////////////////////////////
 //     SERVER ONLY VARIABLES     ///
@@ -556,12 +553,6 @@ if (A3A_hasACE) then {
 	[] call A3A_fnc_aceModCompat;
 };
 
-//it affects first run only, then date will be serialized and set by loadStat
-//vidda has unique lightning config that needs to be preserved
-if (A3A_coldWarMode && {(toLowerANSI worldName) isNotEqualTo "blud_vidda"}) then {
-	setDate [1993, 5, 1, 7, 0];
-};
-
 ////////////////////////////////////
 //     ACRE ITEM MODIFICATIONS   ///
 ////////////////////////////////////

diff --git a/ForkChangelog.md b/ForkChangelog.md
@@ -5,6 +5,11 @@
 - (Aegis) AUKUS, NATO, CSAT, AAF factions (Aegis factions are beta/experimental so they could be used only via their dev branch versions of Aegis, Atlas and Opposing Force mods)
 - (Aegis) CHDKZ and Ion PMC Rival factions (Aegis factions are beta/experimental so they could be used only via their dev branch versions of Aegis, Atlas and Opposing Force mods) -->
 
+## 2.1.9
+### Changes
+- Cold War Mode Soviet police crash fix
+- Simplified Chinese localization fixes
+
 ## 2.1.8
 ### Changes
 - Korean localization fixes