Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental

Conflicts:
	Sources/epoch_code/System/task_control.fsm

Server_Install_Pack/sc/BattlEye/remoteexec.txt

@@ -1 +1 @@
-5 "" !="bis_fnc_execvm \[\[.+\],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(deadplayerdetonate|triggerantagonist|playersetvariable|missioncomms) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer|client_bitePlayer) \[.+\]"
+5 "" !="bis_fnc_execvm \[\[.+\],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(deadplayerdetonate|triggerantagonist|playersetvariable|missioncomms) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer|client_bitePlayer|serverlootobject) \[.+\]"

Sources/epoch_config/Configs/CfgEpochClient.hpp

@@ -104,6 +104,7 @@ class CfgEpochClient
 	#include "CfgEpochClient\utes.hpp"
 	#include "CfgEpochClient\vr.hpp"
     #include "CfgEpochClient\Zargabad.hpp"
+	#include "CfgEpochClient\Tanoa.hpp"
 	#include "CfgEpochClient\WorldInteractions.hpp"
 };
 class CfgEpochSapper

Sources/epoch_config/Configs/CfgEpochClient/Tanoa.hpp

@@ -0,0 +1,19 @@
+/*
+	Author: Aaron Clark - EpochMod.com
+
+    Contributors:
+
+	Description:
+	Epoch gamemode config for Zargabad
+
+    Licence:
+    Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
+
+    Github:
+    https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_config/Configs/CfgEpochClient/Tanoa.hpp
+*/
+class Tanoa {
+	blockedArea[] = {};
+	// main config
+	TrashClasses[] = { "Trash", "TrashSmall", "TrashVehicle", "PumpkinPatch", "TrashFood", "HempFiber" };
+};

Sources/epoch_config/Configs/CfgEpochClient/WorldInteractions.hpp

@@ -2,6 +2,38 @@ class CfgWorldInteractions  {
     class Water {
         water = 1;
     };
+    class BankTerminal {
+        bankTerminal = 1;
+    };
+    class Rocks {
+        rock = 1;
+    };
+    class HempFiber {
+        HempFiber = 1;
+    };
+    class PumpkinPatch {
+        PumpkinPatch = 1;
+    };
+    class Bushes {
+        bush = 1;
+    };
+    class Trash {
+        Trash = 1;
+    };
+    class TrashSmall {
+        TrashSmall = 1;
+    };
+    class Trees {
+        tree = 1;
+    };
+    class Cinder {
+        cinder = 1;
+    };
+    class Wrecks {
+        wreck = 1;
+    };
+
+    
     class barrelwater_f_p3d : Water {};
     class water_source_f_p3d : Water {};
     class waterbarrel_f_p3d : Water {};
@@ -18,28 +50,24 @@ class CfgWorldInteractions  {
     class misc_concbox_ep1_p3d : Water {};
     class Land_water_tank : Water {};
     class Land_Pumpa : Water {};
-
+    class watertank_01_f_p3d : Water {};
-    class BankTerminal {
+    class watertank_02_f_p3d : Water {};
-        bankTerminal = 1;
+    class watertank_04_f_p3d : Water {};
-    };
+    class watertank_03_f_p3d : Water {};
-    class atm_01_f_p3d : BankTerminal {};
+    class atm_01_f_p3d : bankTerminal {};
-    class phonebooth_01_f_p3d : BankTerminal {};
+    class phonebooth_01_f_p3d : bankTerminal {};
-    class atm_02_f_p3d : BankTerminal {};
+    class atm_02_f_p3d : bankTerminal {};
-    class phonebooth_02_f_p3d : BankTerminal {};
+    class phonebooth_02_f_p3d : bankTerminal {};
-    class nastenka_p3d : BankTerminal {};
+    class nastenka_p3d : bankTerminal {};
-    class nastenka2_p3d : BankTerminal {};
+    class nastenka2_p3d : bankTerminal {};
-    class nastenka3_p3d : BankTerminal {};
+    class nastenka3_p3d : bankTerminal {};
-    class phone_box_south_p3d : BankTerminal {};
+    class phone_box_south_p3d : bankTerminal {};
-    class mailboxsouth_p3d : BankTerminal {};
+    class mailboxsouth_p3d : bankTerminal {};
-    class Land_PhoneBooth_02_F : BankTerminal {};
+    class Land_PhoneBooth_02_F : bankTerminal {};
-    class Land_PhoneBooth_01_F : BankTerminal {};
+    class Land_PhoneBooth_01_F : bankTerminal {};
-    class Land_Atm_01_F : BankTerminal {};
+    class Land_Atm_01_F : bankTerminal {};
-    class Land_Atm_02_F : BankTerminal {};
+    class Land_Atm_02_F : bankTerminal {};
-    class Land_Laptop_device_F : BankTerminal {};
+    class Land_Laptop_device_F : bankTerminal {};
-
-    class Rocks {
-        rock = 1;
-    };
     class sharpstone_03_lc_p3d : Rocks {};
     class sharpstone_02_lc_p3d : Rocks {};
     class sharpstone_01_lc_p3d : Rocks {};
@@ -116,21 +144,30 @@ class CfgWorldInteractions  {
     class r_tk_boulder_01_ep1_p3d : Rocks {};
     class r_tk_boulder_02_ep1_p3d : Rocks {};
     class r_tk_rock_01_ep1_p3d : Rocks {};
-
+    class cliff_stone_big_lc_f_p3d : Rocks {};
-    class HempFiber {
+    class cliff_wall_long_f_p3d : Rocks {};
-        HempFiber = 1;
+    class cliff_stone_medium_lc_f_p3d : Rocks {};
-    };
+    class cliff_stone_small_lc_f_p3d : Rocks {};
+    class cliff_boulder_f_p3d : Rocks {};
+    class cliff_peak_f_p3d : Rocks {};
+    class cliff_wall_round_f_p3d : Rocks {};
+    class cliff_stonecluster_f_p3d : Rocks {};
+    class cliff_wall_tall_f_p3d : Rocks {};
+    class lavaboulder_03_f_p3d : Rocks {};
+    class lavastone_small_lc_f_p3d : Rocks {};
+    class lavaboulder_02_f_p3d : Rocks {};
+    class lavaboulder_01_f_p3d : Rocks {};
+    class lavastone_big_lc_f_p3d : Rocks {};
+    class lavastonecluster_large_f_p3d : Rocks {};
+    class lavaboulder_04_f_p3d : Rocks {};
+    class lavastonecluster_small_f_p3d : Rocks {};
+    class cliff_stone_medium_f_p3d : Rocks {};
+    class lavastone_big_f_p3d : Rocks {};
+    class lavastone_small_f_p3d : Rocks {};
+    class cliff_surfacemine_f_p3d : Rocks {};
     class p_fiberplant_ep1_p3d : HempFiber {};
-
-    class PumpkinPatch {
-        PumpkinPatch = 1;
-    };
     class p_pumpkin_summer_p3d : PumpkinPatch {};
     class pumpkin_p3d : PumpkinPatch {};
-
-    class Trash {
-        Trash = 1;
-    };
     class sack_f_p3d : Trash {};
     class garbagebags_f_p3d : Trash {};
     class pallets_f_p3d : Trash {};
@@ -216,15 +253,19 @@ class CfgWorldInteractions  {
     class stand_meat_ep1_p3d : Trash {};
     class bags_ep1_p3d : Trash {};
     class misc_garb_heap_ep1_p3d : Trash {};
-
+    class woodencrate_01_stack_x3_f_p3d : Trash {};
-    class TrashSmall {
+    class garbageheap_03_f_p3d : Trash {};
-        TrashSmall = 1;
+    class garbageheap_04_f_p3d : Trash {};
-    };
+    class garbageheap_02_f_p3d : Trash {};
+    class garbageheap_01_f_p3d : Trash {};
+    class woodencrate_01_stack_x5_f_p3d : Trash {};
+    class woodencrate_01_f_p3d : Trash {};
+    class clothesline_01_short_f_p3d : Trash {};
+    class boat_01_abandoned_red_f_p3d : Trash {};
+    class grave_01_f_p3d : Trash {};
+    class grave_03_f_p3d : Trash {};
     class misc_postbox_p3d : TrashSmall {};
-
+    class garbagebin_02_f_p3d : TrashSmall {};
-    class Trees {
-        tree = 1;
-    };
     class t_ficusb1s_f_p3d : Trees {};
     class t_oleae1s_f_p3d : Trees {};
     class t_ficusb2s_f_p3d : Trees {};
@@ -397,10 +438,28 @@ class CfgWorldInteractions  {
     class misc_trunk_torzo_ep1_p3d : Trees {};
     class t_juniperusc2s_ep1_p3d : Trees {};
     class misc_trunk_water_ep1_p3d : Trees {};
-
+    class t_cocosnucifera3s_tall_f_p3d : Trees {};
-    class Bushes {
+    class t_leucaena_f_p3d : Trees {};
-        bush = 1;
+    class t_ficus_medium_f_p3d : Trees {};
-    };
+    class t_cyathea_f_p3d : Trees {};
+    class t_ficus_small_f_p3d : Trees {};
+    class woodenplanks_01_f_p3d : Trees {};
+    class t_cocosnucifera2s_small_f_p3d : Trees {};
+    class t_millettia_f_p3d : Trees {};
+    class t_inocarpus_f_p3d : Trees {};
+    class t_cocosnucifera3s_bend_f_p3d : Trees {};
+    class t_agathis_wide_f_p3d : Trees {};
+    class timberpile_01_f_p3d : Trees {};
+    class d_treestump_cut_small_f_p3d : Trees {};
+    class d_treestump_natural_small_f_p3d : Trees {};
+    class d_treestump_natural_large_f_p3d : Trees {};
+    class t_albizia_f_p3d : Trees {};
+    class t_agathis_tall_f_p3d : Trees {};
+    class t_palaquium_f_p3d : Trees {};
+    class t_ficus_big_f_p3d : Trees {};
+    class t_rhizophora_f_p3d : Trees {};
+    class t_cacao_ripe_f_p3d : Trees {};
+    class d_treestump_cut_large_f_p3d : Trees {};
     class b_ficusc2d_f_p3d : Bushes {};
     class b_ficusc1s_f_p3d : Bushes {};
     class b_neriumo2d_f_p3d : Bushes {};
@@ -457,15 +516,24 @@ class CfgWorldInteractions  {
     class str_liskac_p3d : Bushes {};
     class dd_bush02_p3d : Bushes {};
     class b_pistacial1s_ep1_p3d : Bushes {};
-
+    class b_colored_red_f_p3d : Bushes {};
-    class Cinder {
+    class b_colored_yellow_f_p3d : Bushes {};
-        cinder = 1;
+    class b_cestrum_f_p3d : Bushes {};
-    };
+    class b_calochlaena_f_p3d : Bushes {};
+    class b_gardenia_f_p3d : Bushes {};
+    class b_gardenia_dec_01_f_p3d : Bushes {};
+    class b_gardenia_dec_02_f_p3d : Bushes {};
+    class b_leucaena_f_p3d : Bushes {};
+    class t_pritchardia_f_p3d : Bushes {};
+    class b_pipermeth_f_p3d : Bushes {};
+    class t_banana_f_p3d : Bushes {};
+    class t_banana_slim_f_p3d : Bushes {};
+    class t_banana_wild_f_p3d : Bushes {};
+    class b_rhizophora_f_p3d : Bushes {};
+    class b_neriumo2d_tanoa_f_p3d : Bushes {};
+    class b_calochlaena_f_p3d : Bushes {};
     class cinderblocks_f_p3d : Cinder {};
-
+    class cinderblocks_01_f_p3d : Cinder {};
-    class Wrecks {
-        wreck = 1;
-    };
     class wall_tin_4_2_p3d : Wrecks {};
     class mil_wiredfence_f_p3d : Wrecks {};
     class cages_f_p3d : Wrecks {};
@@ -546,5 +614,33 @@ class CfgWorldInteractions  {
     class wall_indfnc_3_d_p3d : Wrecks {};
     class t72_wrecked_p3d : Wrecks {};
     class t72_wrecked_turret_p3d : Wrecks {};
+    class parkingmeter_01_f_p3d : Wrecks {};
+    class pipefence_01_m_d_f_p3d : Wrecks {};
+    class pipefence_01_m_8m_f_p3d : Wrecks {};
+    class pipefence_01_m_gate_v2_f_p3d : Wrecks {};
+    class fuelstation_02_prices_f_p3d : Wrecks {};
+    class tinwall_01_m_4m_v2_f_p3d : Wrecks {};
+    class pipefence_01_m_pole_f_p3d : Wrecks {};
+    class wiredfence_01_16m_f_p3d : Wrecks {};
+    class wiredfence_01_8m_d_f_p3d : Wrecks {};
+    class wiredfence_01_8m_f_p3d : Wrecks {};
+    class netfence_01_m_8m_f_p3d : Wrecks {};
+    class netfence_01_m_d_f_p3d : Wrecks {};
+    class netfence_01_m_4m_f_p3d : Wrecks {};
+    class tinwall_02_l_4m_f_p3d : Wrecks {};
+    class tinwall_02_l_8m_f_p3d : Wrecks {};
+    class bulldozer_01_wreck_f_p3d : Wrecks {};
+    class excavator_01_wreck_f_p3d : Wrecks {};
+    class railwaycar_01_tank_f_p3d : Wrecks {};
+    class railwaycar_01_passenger_f_p3d : Wrecks {};
+    class locomotive_01_v3_f_p3d : Wrecks {};
+    class bulldozer_01_abandoned_f_p3d : Wrecks {};
+    class locomotive_01_v1_f_p3d : Wrecks {};
+    class locomotive_01_v2_f_p3d : Wrecks {};
+    class excavator_01_abandoned_f_p3d : Wrecks {};
+
+
+
+
 
 };

Sources/epoch_config/Configs/CfgRemoteExec.hpp

@@ -225,7 +225,11 @@ class CfgRemoteExec
       allowedTargets=2;
       jip = 0;
     };
-	class EPOCH_server_createmarker {
+	class EPOCH_server_makeMarker {
+      allowedTargets=2;
+      jip = 0;
+    };
+	class EPOCH_server_removeMarker {
       allowedTargets=2;
       jip = 0;
     };

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=527;
+build=530;

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=528;
+build=530;

Sources/epoch_server/compile/epoch_server/EPOCH_server_makeMarker.sqf

@@ -6,18 +6,15 @@
 	Description:
 	Create map marker for everyone, group or individual.
 
-	ToDo:
-	Create delete marker(s) remoteexec function
-
 	Parameter(s):
-	_this select 0: ARRAY - [Target Type 0-Player 1-Group Members 2-Multiple players 3-All players, Object(s) - Player, Group, Array of Players or markerName for option 3]
+	_this select 0: ARRAY - [Target Type 0-Player 1-Group Members 2-All players 3-Multiple custom players, Object(s) - Player, Group, Array of Players or markerName for option 3]
 	_this select 1-9: STRING(S) - Marker parameters.
 
     Licence:
     Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
 
     Github:
-    https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf
+    https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf
 */
 params ["_trgt","_mPos",["_mShape","ICON"],["_mType","mil_dot"],["_mText",""],["_mColor","ColorBlack"],["_mSize",[0.7,0.7]],"_mBrush","_mDir","_mAlpha",["_mrkrName",""]];
 private ["_trgtType","_trgtObj"];
@@ -44,15 +41,6 @@ switch _trgtType do {
 	};
 	
 	case 2: {
-		if(isArray _trgtObj && count _trgtObj > 0)then{
-			{
-			[_x,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_x];
-			}foreach _trgtObj;
-		};
-	};
-
-	case 3: {
-		if(count playableUnits > 0)then{//TODO: Test JIP, if so remove check for players, maybe.
 			if(_trgtObj == "")then{_trgtObj=diag_tickTime;};
 			_mrkr = createMarker [_mrkrName, _mPos];
 			_mrkr setMarkerShape _mShape;
@@ -64,6 +52,15 @@ switch _trgtType do {
 			if!(isNil "_mDir")then{_mrkr setMarkerDir _mDir;};
 			if!(isNil "_mAlpha")then{_mrkr setMarkerAlpha _mAlpha;};
 	};
+	
+	case 3: {
+		if(isArray _trgtObj && count _trgtObj > 0)then{
+			{
+			[_x,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_x];
+			}foreach _trgtObj;
 		};
+	};
+
+	
 	default {diag_log format["Epoch: ADMIN: Marker failed at %1 called by %2.", _mPos, _trgt];};
 };

Sources/epoch_server/compile/epoch_server/EPOCH_server_removeMarker.sqf

@@ -0,0 +1,54 @@
+/*
+	Author: Andrew Gregory - EpochMod.com
+
+    Contributors:
+
+	Description:
+	Delete map marker.
+
+	Parameter(s):
+	_this select 0: OBJECT (Player) / ARRAY - Players.
+	_this select 1: INTEGER - 0 - Player Only, 1 - Player Group, 2 - Everyone, 3 - Custom Array of players.
+	_this select 2: STRING - Marker Name
+
+    Licence:
+    Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
+
+    Github:
+    https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_server/EPOCH_server_deleteMarker.sqf
+*/
+params [["_trgtObj",[]],["_trgtType",0],["_mrkrName",""]];
+diag_log format["Epoch: ADMIN: Deleting marker %1 | %2.", _mrkrName, _trgtObj];
+
+
+switch _trgtType do {
+
+	case 0: {
+		if(isPlayer _trgtObj)then{
+			[_mrkrName] remoteExec ['EPOCH_fnc_deleteMarker',_trgtObj];
+		};
+	};
+
+	case 1: {
+		if!(isNull _trgtObj)then{
+			{
+			[_mrkrName] remoteExec ['EPOCH_fnc_deleteMarker',_x];
+			}foreach (units group _trgtObj);
+		};
+	};
+	
+	case 2: {
+			deleteMarker _mrkrName;
+	};
+	
+	case 3: {
+		if(isArray _trgtObj && count _trgtObj > 0)then{
+			{
+			[_mrkrName] remoteExec ['EPOCH_fnc_deleteMarker',_x];
+			}foreach _trgtObj;
+		};
+	};
+
+	
+	default {diag_log format["Epoch: ADMIN: Marker delete failed at %1 called by %2.", _mPos, _trgt];};
+};

Sources/epoch_server/config.cpp

@@ -122,7 +122,8 @@ class CfgServerFunctions
 			class server_teleportPlayer {};
 			class returnConfig {};
 			class serverCommand {};
-			class server_createMarker {};
+			class server_makeMarker {};
+			class server_removeMarker {};
 		};
 		class epoch_missions {
 			class Server_createObject {};

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=527;
+build=530;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=527;
+build=530;

build.txt

@@ -1 +1 @@
-528
+530