Merge pull request #513 from EpochModTeam/experimental

0.3.8.0427

Server_Install_Pack/@epochhive/epochconfig.hpp

@@ -10,7 +10,6 @@ timeDifference = 0; // Server uses real time this will allow you to offset just
 timeMultiplier = 4; // Sets a time multiplier for in-game time. The command range is now capped at 0.1 - 120 to avoid performance problems.
 lootMultiplier = 0.5; // 1 = max loot bias. This controls how much loot can payout per Epoch loot container.
 // Events
-WeatherChangeTime = 1200; // This controls how fast the weather changes as well as how fast shipping containers and earthquakes happen.
 WeatherStaticForecast[] = {}; // Default: {75.5,0,{0,0,0},0,{1,1}}; // Clear day; {19,1,{1,1,40},1,{5,5}}; // Cold Foggy Rainy Overcast Windy; Format: {temp <scalar>,rain <scalar>,fog <array>,overcast <scalar>,wind <array>}
 events[] = {
     { 3600, "CarnivalSpawner" }, // SECOND <scalar>, EVENT <string>

Sources/epoch_code/compile/EPOCH_consumeItem.sqf

@@ -115,6 +115,9 @@ switch _interactOption do {
 	case 2: _unifiedInteract; //Drink 2
 	case 3: { // Build 3
 		closeDialog 0;
+		_buildingJammerRange = ["CfgEpochClient", "buildingJammerRange", 75] call EPOCH_fnc_returnConfigEntryV2;
+		_buildingCountLimit = ["CfgEpochClient", "buildingCountLimit", 200] call EPOCH_fnc_returnConfigEntryV2;
+
 		_buildClass = getText(configfile >> "CfgMagazines" >> _item >> "buildClass");
 		if (_buildClass != "") then {
 			_isStorage = getNumber(configfile >> "CfgMagazines" >> _item >> "isStorage");
@@ -135,24 +138,27 @@ switch _interactOption do {
 								// base building
 								_pos = player modelToWorldVisual[0, 5, 0];
 								_pos set[2, getPosATL player select 2];
+
+								if (_buildClass isKindOf "ThingX") then {
+									// prevent spawning if another simulated object exists still
+									_otherObjects = nearestObjects[player, [_buildClass], _buildingJammerRange];
+									if (_otherObjects isEqualTo []) then {
 										_object=createVehicle[_buildClass,_pos,[],0,"CAN_COLLIDE"];
 										_object setDir ((getDir player) - 180);
-
-								if (_buildClass != "PlotPole_EPOCH") then {
-									if (_object isKindOf "ThingX") then {
 										if (([player, _item] call BIS_fnc_invRemove) == 1) then {
 											[_object] spawn EPOCH_simulSwap;
 										};
 									} else {
-										[_object,_item] spawn EPOCH_staticMove;
+										["<t size = '1.6' color = '#99ffffff'>Building Disallowed: Frequency Unstable</t>", 5] call Epoch_dynamicText;
 									};
 								} else {
-									_object spawn EPOCH_countdown;
+									_object=createVehicle[_buildClass,_pos,[],0,"CAN_COLLIDE"];
+									_object setDir ((getDir player) - 180);
+									[_object,_item] spawn EPOCH_staticMove;
 								};
-
+								// _object spawn EPOCH_countdown;
 								[format["<t size='1.6' color='#99ffffff'>Press '%1' to drop object.</t>", "1"], 5] call Epoch_dynamicText;
 
-
 							} else {
 								["<t size = '1.6' color = '#99ffffff'>Need Energy< / t>", 5] call Epoch_dynamicText;
 							};
@@ -165,7 +171,7 @@ switch _interactOption do {
 		};
 	};
 	case 4: { // Refuel 4
-		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 6];
+		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 30];
 		if (cursorTarget in _vehicles) then {
 			_vehicle = cursorTarget;
 			_currentFuel = fuel _vehicle;
@@ -185,9 +191,8 @@ switch _interactOption do {
 		};
 	};
 	case 5: {
-		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 6];
+		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 30];
 		_canCapacity = _interactAttributes param [0,10];
-
 		if (cursorTarget in _vehicles) then {
 			_vehicle = cursorTarget;
 			_fuelCapacity = getNumber (configfile >> "CfgVehicles" >> (typeOf _vehicle) >> "fuelCapacity");
@@ -224,7 +229,7 @@ switch _interactOption do {
 	case 8: _unifiedInteract; //Cold -1
 	case 9: _unifiedInteract; //Energy 100
 	case 10: { // Repair 10 - Lite
-		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 6];
+		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 30];
 		_vehicle = cursorTarget;
 		if (_vehicle in _vehicles) then {
 
@@ -261,7 +266,7 @@ switch _interactOption do {
 		};
 	};
 	case 11: { // Repair 11 - Heavy
-		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 6];
+		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 30];
 		_vehicle = cursorTarget;
 		if (_vehicle in _vehicles) then {
 			if (_item call _removeItem) then {

Sources/epoch_code/compile/vehicles/EPOCH_client_gearVehicle.sqf

@@ -14,7 +14,7 @@
 */
 closeDialog 0;
 if (!isNull cursorTarget) then {
-	_vehicles = player nearEntities[["LandVehicle", "Ship", "Air", "Tank"], 6];
+	_vehicles = player nearEntities[["LandVehicle", "Ship", "Air", "Tank"], 30];
 	if (cursorTarget in _vehicles) then {
 		player action["Gear", cursorTarget];
 	};

Sources/epoch_config/Configs/cfgCrafting.hpp

@@ -359,7 +359,7 @@ class CfgCrafting
 	};
 	class ItemCorrugated : Item
 	{
-		usedIn[] = {"KitShelf","ItemCorrugatedLg"};
+		usedIn[] = {"KitShelf","ItemCorrugatedLg","VehicleRepairLg"};
 		nearby[] = {{"Fire", "", "fire", {1,{"ALL"}}, 3, 1, 1, 0}};
 		recipe[] = { { "ItemScraps", 2 } };
 		previewPosition[] = {0.791088,1,0.300004};
@@ -717,7 +717,7 @@ class CfgCrafting
 	};
 	class ItemCorrugatedLg : Item
 	{
-		usedIn[] = { "VehicleRepairLg", "KitPlotPole", "KitTankTrap", "KitHesco3" };
+		usedIn[] = { "KitPlotPole", "KitTankTrap", "KitHesco3" };
 		recipe[] = { { "ItemCorrugated", 3 } };
 		nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
 		previewPosition[] = {0.797491,1,0.32899};

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=424; 
+build=427; 

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=424; 
+build=427; 

Sources/epoch_server/compile/epoch_missions/EPOCH_Server_fillContainer.sqf

@@ -4,7 +4,7 @@
     Contributors:
 
 	Description:
-	Server side spawing of shipwreck loots
+	Server side spawing of mission loots
 
     Licence:
     Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
@@ -13,7 +13,8 @@
     https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_fillContainer.sqf
 */
 private["_player","_container","_clearFirst","_pos","_chance","_weps","_mags","_items"];
-params ["_player",["_token","",[""]],["_container",objNull,[objNull]],["_clearFirst",false],["_chance",25],["_pos",getPosATL _player]];
+params ["_player",["_token","",[""]],["_container",objNull,[objNull]],["_clearFirst",false],["_chance",25]];
+_pos = getPosATL _player;
 
 if !([_player,_token]call EPOCH_server_getPToken)exitWith{};
 

Sources/epoch_server/init/server_variables.sqf

@@ -32,7 +32,6 @@ _configArray = [
     ["StaticDateTime", []],
     ["timeDifference", 0],
     ["lootMultiplier", 0.5],
-    ["WeatherChangeTime", 1200],
     ["WeatherStaticForecast", []],
     ["showEarthQuakes", true],
     ["showShippingContainers", true],

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=424; 
+build=427; 

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=424; 
+build=427; 

Sources/epoch_server_settings/configs/CfgLootTable.h

@@ -1273,7 +1273,7 @@ class CfgLootTable
 				{ { "H_90_EPOCH", "item" }, 1 },
 				{ { "H_91_EPOCH", "item" }, 1 },
 				{ { "H_92_EPOCH", "item" }, 1 },
-				{ { "H_104_EPOCH", "item" }, 1 },
+				{ { "H_104_EPOCH", "item" }, 1 }
 				//{ { "wolf_mask_epoch", "item" }, 1 },
 				//{ { "pkin_mask_epoch", "item" }, 1 },
 				//{ { "clown_mask_epoch", "item" }, 1 }

Sources/epoch_server_settings/configs/CfgLootTable_CUP.h

@@ -1835,7 +1835,7 @@ class CfgLootTable_CUP
 				{ { "H_90_EPOCH", "item" }, 1 },
 				{ { "H_91_EPOCH", "item" }, 1 },
 				{ { "H_92_EPOCH", "item" }, 1 },
-				{ { "H_104_EPOCH", "item" }, 1 },
+				{ { "H_104_EPOCH", "item" }, 1 }
 				//{ { "wolf_mask_epoch", "item" }, 1 },
 				//{ { "pkin_mask_epoch", "item" }, 1 },
 				//{ { "clown_mask_epoch", "item" }, 1 }

Sources/epoch_server_settings/configs/maps/Napf.h

@@ -38,7 +38,7 @@ class Napf : Default
 		// W [-14.4316,0.112793,-10.3098]
 			{ "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", "north" },
 			{ "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", "west" },
-			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" },
+			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" }
 			//{ "Transport_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" }
 	};
 	propsPos[] = {

Sources/epoch_server_settings/configs/maps/Sara.h

@@ -38,7 +38,7 @@ class Sara : Default
 		// W [-14.4316,0.112793,-10.3098]
 			{ "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", "north" },
 			{ "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", "west" },
-			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" },
+			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" }
 			//{ "Transport_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" }
 	};
 	propsPos[] = {

Sources/epoch_server_settings/configs/maps/SaraLite.h

@@ -38,7 +38,7 @@ class SaraLite : Default
 		// W [-14.4316,0.112793,-10.3098]
 			{ "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", "north" },
 			{ "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", "west" },
-			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" },
+			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" }
 			//{ "Transport_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" }
 	};
 	propsPos[] = {

Sources/epoch_server_settings/configs/maps/Sara_dbe1.h

@@ -38,7 +38,7 @@ class Sara_dbe1 : Default
 		// W [-14.4316,0.112793,-10.3098]
 			{ "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", "north" },
 			{ "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", "west" },
-			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" },
+			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" }
 			//{ "Transport_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" }
 	};
 	propsPos[] = {

Sources/epoch_server_settings/configs/maps/Woodland_ACR.h

@@ -38,7 +38,7 @@ class Woodland_ACR : Default
 		// W [-14.4316,0.112793,-10.3098]
 			{ "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", "north" },
 			{ "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", "west" },
-			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" },
+			{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" }
 			//{ "Transport_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" }
 	};
 	propsPos[] = {

Sources/epoch_server_settings/configs/maps/takistan.h

@@ -428,6 +428,6 @@ class Takistan : Default
 			{ "C_man_w_worker_F", { 4719.34,9204.96,0.00131226 }, 202.364 },
 			//Central Traders//
 			{ "C_man_hunter_1_F", { 6822.1,4978.7,0.00137329 }, 88.9175 },
-			{ "C_man_hunter_1_F", { 6829.11,5004.53,0.00158691 }, 179.875 },
+			{ "C_man_hunter_1_F", { 6829.11,5004.53,0.00158691 }, 179.875 }
 	};
 };

build.txt

@@ -1 +1 @@
-424 
+427