V11.4.0

A3A/addons/core/CfgFunctions.hpp

@@ -42,6 +42,7 @@ class CfgFunctions
             class interrogate {};
             class isBuildingPosition {};
             class landThreatEval {};
+            class liberateDeserter {};
             class liberaterefugee {};
             class liberatePOW {};
             class liberateFlee {};
@@ -143,6 +144,7 @@ class CfgFunctions
             class vehicleBoxRestore {};
             class initPetros {};
             class isFrontline {};
+            class isFrontlineNoFIA {};
             class arePositionsConnected {};
             class joinMultipleGroups {};
             class localizar {};
@@ -280,6 +282,11 @@ class CfgFunctions
             class spawnVehicle {};
             class spawnVehicleAtMarker {};
             class spawnVehiclePrecise {};
+            class RivalsCreateUnit {};
+            class RivalsCreateVehicleCrew {};
+            class RivalsCrewTypeForVehicle {};
+            class RivalsSpawnGroup {};
+            class RivalsSpawnVehicle {};
             class VEHdespawner {};
             class vehKilledOrCaptured {};
             class wavedAttack {};
@@ -356,6 +363,7 @@ class CfgFunctions
             class cityinfo {};
             class clientIdleChecker {};
             class credits {};
+            class initACE {};
             class initACEUnconsciousHandler {};
             class initBases {};
             class initUtilityItems {};
@@ -368,6 +376,7 @@ class CfgFunctions
             class initVarServer {};
 
             class initVehClassToCrew {};
+            class initRivalsVehClassToCrew {};
             class initZones {};
             class initZeusLogging {};
             class modBlacklist {};
@@ -403,6 +412,7 @@ class CfgFunctions
             class AS_Zombies {};
             class CON_Outpost_Zombies {};
             class CON_Outpost {};
+            class CON_Outpost_Compet {};
             class CON_MilAdmin {};
             class convoy {};
             class DES_Antenna {};
@@ -419,6 +429,7 @@ class CfgFunctions
             class LOG_Helicrash {};;
             class missionRequest {};
             class REP_Antenna {};
+            class RES_Deserters {};
             class RES_Prisoners {};
             class RES_Refugees {};
             class RES_Informer {};
@@ -427,6 +438,7 @@ class CfgFunctions
             class RIV_ENC_Rivals {};
             class RIV_ATT_Cell {};
             class RIV_ATT_Hideout {};
+            class RIV_ATT_Transfer {};
             class RIV_AS_Traitor {};
             class RIV_SUPP_Salvage {};
             class RIV_RES_Prisoners {};
@@ -534,6 +546,7 @@ class CfgFunctions
             class garrisonDialog {};
             class postmortem {};
             class reDress {};
+            class reDressFaction {};
             class reinfPlayer {};
             class spawnHCGroup {};
             class vehiclePrice {};
@@ -670,6 +683,7 @@ class CfgFunctions
             class SUP_tankRoutine {};
             class SUP_UAV {};
             class SUP_UAVRoutine {};
+            class SUP_UAVAvailable {};
             class SUP_QRFVehAirdrop {};
             class SUP_QRFVehAirdropAvailable {};
             class SUP_howitzer {};
@@ -765,6 +779,7 @@ class CfgFunctions
             class countAttachedObjects {};
             class createDataObject {};
             class createNamespace {};
+            class createRandomIdentity {};
             class deleteNamespace {};
             class getAdmin {};
             class isEngineer {};

A3A/addons/core/CfgVehicles.hpp

@@ -6,45 +6,184 @@ class CfgVehicles
     {
         armor = 2000;
     };
+    // Rebel AI unit types
 
+    //don't need to change this one?
+    class I_G_Survivor_F;
+    class a3a_unit_reb_unarmed : I_G_Survivor_F {};
+
+    class I_G_Soldier_F;
+    class a3a_unit_reb : I_G_Soldier_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_medic_F;
+    class a3a_unit_reb_medic : I_G_medic_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_Sharpshooter_F;
+    class a3a_unit_reb_sniper : I_G_Sharpshooter_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_Soldier_M_F;
+    class a3a_unit_reb_marksman : I_G_Soldier_M_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_Soldier_LAT_F;
+    class a3a_unit_reb_lat : I_G_Soldier_LAT_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_Soldier_AR_F;
+    class a3a_unit_reb_mg : I_G_Soldier_AR_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_Soldier_exp_F;
+    class a3a_unit_reb_exp : I_G_Soldier_exp_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_Soldier_GL_F;
+    class a3a_unit_reb_gl : I_G_Soldier_GL_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_Soldier_SL_F;
+    class a3a_unit_reb_sl : I_G_Soldier_SL_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_engineer_F;
+    class a3a_unit_reb_eng : I_G_engineer_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_Soldier_AT_F;
+    class a3a_unit_reb_at : I_Soldier_AT_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_Soldier_AA_F;
+    class a3a_unit_reb_aa : I_Soldier_AA_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class I_G_officer_F;
+    class a3a_unit_reb_petros : I_G_officer_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    // Base side types
+
+    class B_G_Soldier_F;
+    class a3a_unit_west : B_G_Soldier_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class O_G_Soldier_F;
+    class a3a_unit_east : O_G_Soldier_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class O_G_Soldier_lite_F;
+    class a3a_unit_riv : O_G_Soldier_lite_F {
+        backpack = "";
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch"};
+        magazines[] = {};
+        weapons[] = {"Throw","Put"};
+    };
+
+    class C_Man_1;
+    class a3a_unit_civ : C_Man_1 {};
+
     class NATO_Box_Base;
 
-	class A3AU_Build_Box_base: NATO_Box_Base
-	{
-		author = AUTHOR;
-		hiddenSelections[] = 
-		{
-			"Camo_Signs",
-			"Camo"
-		};
-		hiddenSelectionsTextures[] = 
-		{
-			QPATHTOFOLDER(Pictures\items\AmmoBox_signs_CA.paa),
-			QPATHTOFOLDER(Pictures\items\AmmoBox_black_CO.paa)
-		};
-	};
-
-	class A3AU_Build_Box_Large_1: A3AU_Build_Box_base
-	{
-		mapSize = 2.3399999;
-		class SimpleObject
-		{
-			eden = 1;
-			animate[] = {};
-			hide[] = {};
-			verticalOffset = 0.15000001;
-			verticalOffsetWorld = 0;
-			init = "''";
-		};
-		editorPreview = QPATHTOFOLDER(Pictures\items\A3AU_Build_Box_Large_1.jpg);
-		_generalMacro = "Box_NATO_WpsLaunch_F";
-		scope = 2;
-		displayName = "Build Box (Large)";
-		model = "\A3\weapons_F\AmmoBoxes\WpnsBox_long_F";
-		icon = "iconCrateLong";
-		class TransportMagazines{};
-		class TransportWeapons{};
-		class TransportItems{};
-		class TransportBackpacks{};
-	};
+
+    class A3AU_Build_Box_base: NATO_Box_Base
+	  {
+		  author = AUTHOR;
+		  hiddenSelections[] = 
+		  {
+			  "Camo_Signs",
+			  "Camo"
+		  };
+		  hiddenSelectionsTextures[] = 
+		  {
+			  QPATHTOFOLDER(Pictures\items\AmmoBox_signs_CA.paa),
+			  QPATHTOFOLDER(Pictures\items\AmmoBox_black_CO.paa)
+		  };
+	  };
+
+	  class A3AU_Build_Box_Large_1: A3AU_Build_Box_base
+	  {
+		  mapSize = 2.3399999;
+		  class SimpleObject
+		  {
+			  eden = 1;
+			  animate[] = {};
+			  hide[] = {};
+			  verticalOffset = 0.15000001;
+			  verticalOffsetWorld = 0;
+			  init = "''";
+		  };
+		  editorPreview = QPATHTOFOLDER(Pictures\items\A3AU_Build_Box_Large_1.jpg);
+		  _generalMacro = "Box_NATO_WpsLaunch_F";
+		  scope = 2;
+		  displayName = "Build Box (Large)";
+		  model = "\A3\weapons_F\AmmoBoxes\WpnsBox_long_F";
+		  icon = "iconCrateLong";
+		  class TransportMagazines{};
+		  class TransportWeapons{};
+		  class TransportItems{};
+		  class TransportBackpacks{};
+	  };
 };

A3A/addons/core/Includes/common.inc

@@ -6,7 +6,7 @@
 #include "LogMacros.inc"
 
 //Template macros
-#define Faction(SIDE) (switch SIDE do {case west:{A3A_faction_occ}; case east:{A3A_faction_inv}; case resistance:{A3A_faction_reb}; case civilian:{A3A_faction_civ}; default {Error_1("Bad side passed passed to Faction(side), Side: %1", SIDE); createHashMap};})
+#define Faction(SIDE) (switch SIDE do {case west:{A3A_faction_occ}; case east:{A3A_faction_inv}; case resistance:{A3A_faction_reb}; case civilian:{A3A_faction_civ}; case opfor:{A3A_faction_riv}; default {Error_1("Bad side passed passed to Faction(side), Side: %1", SIDE); createHashMap};})
 #define FactionGet(FAC, VAR) (A3A_faction_##FAC get VAR)
 #define FactionGetOrDefault(FAC, VAR, DEF) (A3A_faction_##FAC getOrDefault [VAR, DEF])
 #define FactionGetTiered(FAC, VAR) (switch true do {case (tierWar < 5):{(A3A_faction_##FAC get VAR) select 0}; case (tierWar < 8 && {tierWar > 4}):{(A3A_faction_##FAC get VAR) select 1}; case (tierWar > 7):{(A3A_faction_##FAC get VAR) select 2}; default {Error("Something wrong.");""};})

A3A/addons/core/Includes/script_version.hpp

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

A3A/addons/core/Params.hpp

@@ -38,8 +38,8 @@ class Params
     class limitedFT
     {
         title = $STR_params_allowFT;
-        values[] = {0,1,2};
-        texts[] = {$STR_params_allowFT_0, $STR_params_allowFT_1,$STR_params_civ_traffic_none};
+        values[] = {0,1,2,3};
+        texts[] = {$STR_params_allowFT_0, $STR_params_allowFT_1, $STR_params_allowFT_2, $STR_params_civ_traffic_none};
         default = 0;
     };
     class civTraffic
@@ -300,7 +300,7 @@ class Params
         title = $STR_A3AU_sway_enabled;
         values[] = {0,25,50,75,100};
         texts[] = {"0%","25%","50%","75%","100%"};
-        default = 1;
+        default = 100;
     };
 
     class Spacer60

A3A/addons/core/Scripts/SpectumDevice/sa_ewar.sqf

@@ -84,7 +84,8 @@ sa_scan_friendly_foe={
 					private _safeLandPos = [_unit,1,250,2,0,4,0] call BIS_fnc_findSafePos;
 					_wp = (group _unit) addWaypoint [_safeLandPos, 1];
 					_wp setWaypointBehaviour "SAFE";
-					_wp setWaypointType "GETOUT";
+					//_wp setWaypointType "GETOUT";
+					_wp setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"]; /////NEEDS TO BE TESTED
 					private _time = time;
 					waitUntil {sleep 0.1, (getPos _unit) select 2 <1.3/*  || time - _time <= 30 */};
 					{

A3A/addons/core/Stringtable.xml

@@ -2724,8 +2724,8 @@
                 <Russian>Выбрана полная победа&lt;br/&gt;Чтобы выполнить это условие победы, захватите все аванпосты, ресурсы, фабрики, морские порты, военные базы и аэропорты и поддерживайте большую поддержку населения, чем ваши враги.</Russian>
             </Key>
             <Key ID="STR_antistasi_journal_entry_text_Default_economic">
-                <Original>Economic Victory Selected&lt;br/&gt;To complete this win condition, Gain more than 2 million units of currency.</Original>
-                <Russian>Экономическая победа выбрана&lt;br/&gt;Чтобы выполнить это условие победы, получите более 2 миллионов единиц валюты.</Russian>
+                <Original>Economic Victory Selected&lt;br/&gt;To complete this win condition, Gain more than a set amount of currency.&lt;br/&gt;Calculated as: amount of resources on the map * 100,000&lt;br/&gt;Needed amount on current map : %1%2</Original>
+                <Russian>Экономическая победа выбрана&lt;br/&gt;Чтобы выполнить это условие победы, получите больше установленной суммы валюты.&lt;br/&gt;Рассчитывается как: количество ресурсов на карте * 100,000.&lt;br/&gt;Необходимая сумма на текущей карте : %1%2</Russian>
             </Key>
             <Key ID="STR_antistasi_journal_entry_text_Default_logistical">
                 <Original>Logistical Victory Selected&lt;br/&gt;To complete this win condition, capture all seaports, military bases, and airports, and maintain more population support than your enemies.</Original>