Merge branch 'dev'

Author: armazac

addons/overthrow_main.pbo

@@ -104,6 +104,7 @@ class CfgFunctions
 			class illegalInCar {};
 			class detectedByReputation {};
 			class detectedByReputationNATO {};
+			class gangRep {};
 		};
 
 		class Interaction
@@ -140,6 +141,7 @@ class CfgFunctions
 			class notifyMinor {};
 			class notifyBig {};
 			class notifyGood {};
+			class notifyBad {};
 			class notifySilent {};
 			class notifyVehicle {};
 			class playerDecision {};
@@ -256,10 +258,6 @@ class CfgFunctions
 			class sell {};
 			class sellAll {};
 
-			/* Gun Dealer */
-			class getMission {};
-			class assignMission {};
-
 			/* Factory */
 			class factoryQueueAdd {};
 			class factoryQueueRemove {};
@@ -276,6 +274,10 @@ class CfgFunctions
 
 			/* Jobs */
 			class setJobWaypoint {};
+			class requestJobResistance {};
+			class requestJobGang {};
+			class requestJobShop {};
+			class requestJobFaction {};
 
 			/* Safe */
 			class safePutMoney {};
@@ -332,6 +334,7 @@ class CfgFunctions
 			class nearestLocation {};
 			class nearestMobster {};
 			class nearestObjective {};
+			class nearestObjectiveNoComms {};
 			class nearestPositionRegion {};
 			class nearestTown {};
 			class getRegion {};
@@ -577,13 +580,17 @@ class CfgFunctions
 			class formOrJoinGang {};
 			class formGang {};
 			class addToGang {};
+			class gangJoinResistance {};
 		};
 
 		class GUER
 		{
 			file = "\overthrow_main\functions\factions\GUER";
 			class jobSystem {};
 			class assignJob {};
+			class acceptJob {};
+			class denyJob {};
+			class startJob {};
 			class jobLoop {};
 			class GUERLoop {};
 		};
@@ -604,6 +611,7 @@ class CfgFunctions
 		{
 			file = "\overthrow_main\functions\util";
 			class getOwner {};
+			class getOwnerUnit {};
       		class hasOwner {};
 			class setOwner {};
 			class unitStock {};
@@ -612,6 +620,8 @@ class CfgFunctions
 			class sortByInplace {};
 			class findReplace {};
 			class exportPrices {};
+			class datestamp {};
+			class logVerbose {};
 		};
 
 		/*

addons/overthrow_main/CfgFunctions.hpp

@@ -33,6 +33,8 @@ class CfgVehicles {
 	//Overthrow Vehicles
 	class I_Truck_02_box_F;
 	class OT_I_Truck_recovery : I_Truck_02_box_F {
+		scope = 2;
+		author = "ARMAzac";
 		displayName = "KamAZ Recovery";
 		class Library {
 			libTextDesc = "The Field Assistance and Recovery Truck (FART) is a specialized heavy truck used for field repairs and gear recovery after a battle. It can recover all items and bodies within a 150m radius into it's cargohold.";

addons/overthrow_main/CfgVehicles.hpp

@@ -35,6 +35,16 @@ class CfgWeapons {
         class ItemInfo: InventoryItem_Base_F {
             mass = 250;
         };
+    };
+	class OT_Lumber: OT_ItemCore {
+        scope = 2;
+        picture = "\overthrow_main\ui\items\wood_x_ca.paa";
+        displayName = "Lumber";
+        descriptionShort = "Lumber or timber is a type of wood that has been processed into beams and planks, a stage in the process of wood production.";
+        descriptionUse = "";
+        class ItemInfo: InventoryItem_Base_F {
+            mass = 200;
+        };
     };
 	class OT_Steel: OT_ItemCore {
         scope = 2;

addons/overthrow_main/CfgWeapons.hpp

@@ -5,7 +5,7 @@ OT_economicData = [
     [[5180.36,10351,0],"Gliniska Farm"],
     [[1352.23,8005,0],"Topolin Farm"],
     [[1223.91,8923.21,0],"Topolin Quarry"],
-    [[5210.57,5668.39,0],"Huta Sawmill"]
+    [[5210.57,5668.39,0],"Huta Sawmill","OT_Wood","OT_Lumber"]
 ];
 OT_factoryPos = [7343.56,2838.22,0];
 OT_factoryVehicleSpawn = [7350.82,2841.75,0];

addons/overthrow_main/campaign/missions/OverthrowMpLivonia.Enoch/data/economy.sqf

@@ -4,7 +4,7 @@ OT_economicData = [
     [[9456.82,7552.04,0],"Lami Lumberyard","","OT_Wood"],
     [[8389.24,10229.8,0],"Tanoa Sugar Company","OT_Sugarcane","OT_Sugar"],
     [[10945.1,7860.1,0],"Kotomo Banana Plantation","","ACE_Banana"],
-    [[11761.2,6949.91,0],"Sawmill","OT_Wood"],
+    [[11761.2,6949.91,0],"Sawmill","OT_Wood","OT_Lumber"],
     [[5511.58,11888.2,0],"Saint-Julien Lumberyard","","OT_Wood"],
     [[8878.1,11889.1,0],"Galili Lumberyard","","OT_Wood"],
     [[12507.4,7820.99,0],"Ouméré Banana Plantations","","ACE_Banana"],

addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/data/economy.sqf

@@ -4,7 +4,7 @@ OT_economicData = [
     [[9456.82,7552.04,0],"Lami Lumberyard","","OT_Wood"],
     [[8389.24,10229.8,0],"Tanoa Sugar Company","OT_Sugarcane","OT_Sugar"],
     [[10945.1,7860.1,0],"Kotomo Banana Plantation","","ACE_Banana"],
-    [[11761.2,6949.91,0],"Sawmill","OT_Wood"],
+    [[11761.2,6949.91,0],"Sawmill","OT_Wood","OT_Lumber"],
     [[5511.58,11888.2,0],"Saint-Julien Lumberyard","","OT_Wood"],
     [[8878.1,11889.1,0],"Galili Lumberyard","","OT_Wood"],
     [[12507.4,7820.99,0],"Ouméré Banana Plantations","","ACE_Banana"],

addons/overthrow_main/campaign/missions/OverthrowSpTanoa.Tanoa/data/economy.sqf

@@ -0,0 +1,36 @@
+OT_gangNames = [
+"Sons of %2",
+"%1 Boyz",
+"Sons of Anarchy",
+"%1 People's Front",
+"People's Front of %1",
+"Bloodhound Gang",
+"Legion of the Concrete Jungle",
+"Gangsters Incorporated",
+"ACAB",
+"Devil's Tribe",
+"%1 Raiders",
+"Neighbourhood Bullies",
+"Dungeons and Dragons",
+"The Crackheads",
+"The Snitches",
+"Organised Morons",
+"The Gay Mafia",
+"The %1 Death Squad",
+"Raiders of %1",
+"The Always Sunny in %1 Gang",
+"%1 Crew",
+"Cool and the Gang",
+"Ganja Boyz",
+"NWA",
+"Angel Cartel",
+"The T-Birds",
+"Rat Pack",
+"Scooby Gang",
+"The Stooges",
+"Bad Company",
+"Black Sun Empire",
+"Teddy Killerz",
+"Zombie Cats",
+"The Runners" //Patreon: Fital Shell
+];

addons/overthrow_main/data/gangnames.sqf

@@ -17,9 +17,9 @@ private _activeshops = server getVariable [format["activeshopsin%1",_town],[]];
 
 private _dest = [];
 
-if(count _activeshops > 0) then {
+if(count _activeshops > 0 && (random 100) > 50) then {
     _shop = selectRandom _activeshops;
-    _dest = _shop select 0;
+    _dest = (_shop select 0) findEmptyPosition [3,50,OT_civType_local];
 }else{
     _dest = _town call OT_fnc_getRandomRoadPosition;
 };

addons/overthrow_main/functions/AI/NPC/fn_initCivilianGroup.sqf

@@ -12,9 +12,8 @@ _unit setVariable ["hometown",_town,false];
 [_unit, (OT_voices_local call BIS_fnc_selectRandom)] remoteExecCall ["setSpeaker", 0, _unit];
 _unit forceAddUniform (OT_CRIM_Clothes call BIS_fnc_selectRandom);
 
-private _loadout = (format["gang%1",_gangid]) call OT_fnc_getRandomLoadout;
-
-_unit setUnitLoadout [_loadout,true];
+private _gang = OT_civilians getVariable [format["gang%1",_gangid],[]];
+_unit setUnitLoadout [_gang select 5,true];
 
 if((random 100) < 50) then {
 	_unit addItem "OT_Ganja";