0.3.9.0543

Tanoa container positions thanks to Sparky
Tanoa Apex vehicles added
give attributes should not return anything if data is 0 even if random
is used

Sources/epoch_code/compile/functions/EPOCH_giveAttributes.sqf

@@ -4,9 +4,8 @@ private ["_return","_addPlus","_editableVars","_selectedVar","_varName","_celcui
 params ["_selectedVarName",["_data",0],["_randomizeData",0]];
 _addPlus = if (_data > 0) then {"+"} else {""};
 _return = "";
-if (_data != 0) then {
+_customVarIndex = EPOCH_customVars find _selectedVarName;
-    _customVarIndex = EPOCH_customVars find _selectedVarName;
+if (_customVarIndex != -1) then {
-    if (_customVarIndex != -1) then {
     _varName = format["EPOCH_player%1",_selectedVarName];
     _limits = EPOCH_customVarLimits select _customVarIndex;
 	_limits params [["_max",100],["_min",0]];
@@ -20,6 +19,7 @@ if (_data != 0) then {
 	if (_randomizeData isEqualTo 1) then {
 		_data = round(random _data);
 	};
+    if (_data != 0) then {
     	_newValue = ((_currentVal + _data) min _max) max _min;
     	missionNamespace setVariable [_varName, _newValue];
     	if (_selectedVarName == "Temp") then {
@@ -31,4 +31,5 @@ if (_data != 0) then {
     	};
     };
 };
+
 _return

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=542;
+build=543;

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=542;
+build=543;

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=542;
+build=543;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=542;
+build=543;

Sources/epoch_server_settings/configs/maps/tanoa.h

@@ -25,8 +25,274 @@ class Tanoa : Default
 		{"NameCityCapital",4},
 		{"Airport",5}
 	};
+
+	allowedVehiclesList[] = {
+		{"C_Offroad_01_EPOCH",6},
+		{"C_Quadbike_01_EPOCH",6},
+		{"C_Hatchback_01_EPOCH",8},
+		{"C_Hatchback_02_EPOCH",8},
+		{"C_SUV_01_EPOCH",8},
+		{"C_Rubberboat_EPOCH",3},
+		{"C_Rubberboat_02_EPOCH",3},
+		{"C_Rubberboat_03_EPOCH",3},
+		{"C_Rubberboat_04_EPOCH",3},
+		{"C_Van_01_box_EPOCH",6},
+		{"C_Van_01_transport_EPOCH",6},
+		{"C_Boat_Civil_01_EPOCH",5},
+		{"C_Boat_Civil_01_police_EPOCH",3},
+		{"C_Boat_Civil_01_rescue_EPOCH",3},
+		{"B_Heli_Light_01_EPOCH",2},
+		{"B_SDV_01_EPOCH",2},
+		{"B_MRAP_01_EPOCH",3},
+		{"I_MRAP_03_EPOCH", 3},
+		{"B_Truck_01_transport_EPOCH",1},
+		{"B_Truck_01_covered_EPOCH",2},
+		{"B_Truck_01_mover_EPOCH",1},
+		{"B_Truck_01_box_EPOCH",1},
+		{"O_Truck_02_covered_EPOCH",2},
+		{"O_Truck_02_transport_EPOCH",1},
+		{"O_Truck_03_covered_EPOCH",1},
+		{"O_Truck_02_box_EPOCH",1},
+		{"I_Heli_light_03_unarmed_EPOCH",1},
+		{"O_Heli_Light_02_unarmed_EPOCH",1},
+		{"I_Heli_Transport_02_EPOCH",1},
+		{"O_Heli_Transport_04_EPOCH",1},
+		{"O_Heli_Transport_04_bench_EPOCH",1},
+		{"O_Heli_Transport_04_box_EPOCH",1},
+		{"O_Heli_Transport_04_covered_EPOCH",1},
+		{"B_Heli_Transport_03_unarmed_EPOCH",1},
+		{"jetski_epoch",5},
+		{"K01",1},
+		{"K02",1},
+		{"K03",1},
+		{"K04",1},
+		{"ebike_epoch",5},
+		{"mosquito_epoch",4},
+		{"C_Heli_Light_01_civil_EPOCH",3},
+		// apex
+		{"C_Boat_Transport_02_F",1},
+		{"C_Scooter_Transport_01_F",3},
+		{"C_Offroad_02_unarmed_F",2},
+		{"I_C_Offroad_02_unarmed_F",2},
+		{"B_T_LSV_01_unarmed_F",2},
+		{"O_LSV_02_unarmed_F",2},
+		{"O_T_LSV_02_unarmed_F",2},
+		{"C_Plane_Civil_01_F",3},
+		{"C_Plane_Civil_01_racing_F",1},
+		{"B_CTRG_LSV_01_light_F",2},
+		{"B_LSV_01_unarmed_F",2},
+		{"O_T_VTOL_02_infantry_F",1},
+		{"O_T_VTOL_02_vehicle_F",1},
+		{"B_T_VTOL_01_infantry_F",1},
+		{"B_T_VTOL_01_vehicle_F",1}
+	};
+	allowedVehiclesList_CUP[] = {
+		{"C_Offroad_01_EPOCH",4},
+		{"C_Quadbike_01_EPOCH",4},
+		{"C_Hatchback_01_EPOCH",5},
+		{"C_Hatchback_02_EPOCH",5},
+		{"C_SUV_01_EPOCH",5},
+		{"C_Rubberboat_EPOCH",2},
+		{"C_Rubberboat_02_EPOCH",2},
+		{"C_Rubberboat_03_EPOCH",2},
+		{"C_Rubberboat_04_EPOCH",2},
+		{"C_Van_01_box_EPOCH",4},
+		{"C_Van_01_transport_EPOCH",4},
+		{"C_Boat_Civil_01_EPOCH",5},
+		{"C_Boat_Civil_01_police_EPOCH",2},
+		{"C_Boat_Civil_01_rescue_EPOCH",2},
+		{"B_Heli_Light_01_EPOCH",2},
+		{"B_SDV_01_EPOCH",2},
+		{"B_MRAP_01_EPOCH",2},
+		{"I_MRAP_03_EPOCH", 2},
+		{"B_Truck_01_transport_EPOCH",1},
+		{"B_Truck_01_covered_EPOCH",2},
+		{"B_Truck_01_mover_EPOCH",1},
+		{"B_Truck_01_box_EPOCH",1},
+		{"O_Truck_02_covered_EPOCH",2},
+		{"O_Truck_02_transport_EPOCH",1},
+		{"O_Truck_03_covered_EPOCH",1},
+		{"O_Truck_02_box_EPOCH",1},
+		{"I_Heli_light_03_unarmed_EPOCH",1},
+		{"O_Heli_Light_02_unarmed_EPOCH",1},
+		{"I_Heli_Transport_02_EPOCH",1},
+		{"O_Heli_Transport_04_EPOCH",1},
+		{"O_Heli_Transport_04_bench_EPOCH",1},
+		{"O_Heli_Transport_04_box_EPOCH",1},
+		{"O_Heli_Transport_04_covered_EPOCH",1},
+		{"B_Heli_Transport_03_unarmed_EPOCH",1},
+		{"jetski_epoch",3},
+		{"K01",1},
+		{"K02",1},
+		{"K03",1},
+		{"K04",1},
+		{"ebike_epoch",3},
+		{"mosquito_epoch",3},
+		{"C_Heli_Light_01_civil_EPOCH",2},
+		{"CUP_C_Fishing_Boat_Chernarus",2},
+		{"CUP_C_LR_Transport_CTK",2},
+		{"CUP_B_Zodiac_USMC",2},
+		{"CUP_C_Skoda_Red_CIV",2},
+		{"CUP_C_Skoda_White_CIV",2},
+		{"CUP_C_Skoda_Blue_CIV",2},
+		{"CUP_C_Skoda_Green_CIV",2},
+		{"CUP_C_SUV_CIV",2},
+		{"CUP_B_HMMWV_Transport_USA",2},
+		{"CUP_B_HMMWV_Unarmed_USA",2},
+		{"CUP_C_SUV_TK",2},
+		{"CUP_B_LR_Transport_CZ_D",2},
+		{"CUP_C_Datsun_Covered",2},
+		{"CUP_C_Datsun_Plain",2},
+		{"CUP_C_Datsun_Tubeframe",2},
+		{"CUP_C_Datsun_4seat",2},
+		{"CUP_C_Datsun",2},
+		{"CUP_C_Golf4_green_Civ",2},
+		{"CUP_C_Golf4_red_Civ",2},
+		{"CUP_C_Golf4_blue_Civ",2},
+		{"CUP_C_Golf4_black_Civ",2},
+		{"CUP_C_Golf4_kitty_Civ",2},
+		{"CUP_C_Golf4_reptile_Civ",2},
+		{"CUP_C_Golf4_camodigital_Civ",2},
+		{"CUP_C_Golf4_camodark_Civ",2},
+		{"CUP_C_Golf4_camo_Civ",2},
+		{"CUP_B_M1030",2},
+		{"CUP_C_Ural_Civ_03",2},
+		{"CUP_C_Ural_Open_Civ_03",2},
+		{"CUP_C_Ural_Civ_02",2},
+		{"CUP_B_TowingTractor_USMC",2},
+		{"CUP_C_C47_CIV",2},
+		{"CUP_B_LR_Transport_CZ_W",2},
+		{"CUP_C_Golf4_white_Civ",2},
+		{"CUP_C_Golf4_whiteblood_Civ",2},
+		{"CUP_C_Golf4_yellow_Civ",2},
+		{"CUP_C_Octavia_CIV",2},
+		{"CUP_C_Ural_Civ_01",2},
+		{"CUP_C_Ural_Open_Civ_01",2},
+		{"CUP_B_Ural_CDF",2},
+		{"CUP_B_Ural_Open_CDF",2},
+		{"CUP_C_Ural_Open_Civ_02",2},
+		{"CUP_B_HMMWV_Ambulance_USA",2},
+		{"CUP_C_UAZ_Unarmed_TK_CIV",2},
+		{"CUP_C_UAZ_Open_TK_CIV",2},
+		{"CUP_B_UAZ_Unarmed_CDF",2},
+		{"CUP_B_Ural_Empty_CDF",2},
+		{"CUP_C_DC3_CIV",2},
+		//apex
+		{"C_Boat_Transport_02_F",1},
+		{"C_Scooter_Transport_01_F",3},
+		{"C_Offroad_02_unarmed_F",2},
+		{"I_C_Offroad_02_unarmed_F",2},
+		{"B_T_LSV_01_unarmed_F",2},
+		{"O_LSV_02_unarmed_F",2},
+		{"O_T_LSV_02_unarmed_F",2},
+		{"C_Plane_Civil_01_F",3},
+		{"C_Plane_Civil_01_racing_F",1},
+		{"B_CTRG_LSV_01_light_F",2},
+		{"B_LSV_01_unarmed_F",2},
+		{"O_T_VTOL_02_infantry_F",1},
+		{"O_T_VTOL_02_vehicle_F",1},
+		{"B_T_VTOL_01_infantry_F",1},
+		{"B_T_VTOL_01_vehicle_F",1}
+	};
+
+	//todo update for tanoa
 	traderBlds[] = { "Land_Kiosk_blueking_F", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_i_Garage_V1_F", "Land_i_Shed_Ind_F", "Land_i_Shop_01_V1_F" };
-	containerPos[] = {};
+
+	containerPos[] = {
+		{6699.68,6362.79,0},
+		{6703.61,6397.45,0},
+		{6822.56,6372.19,0},
+		{6793.3,6340.08,0},
+		{6155.24,6234.1,0},
+		{7732.76,6635.02,0},
+		{9452.6,6318.77,0},
+		{10618.9,6274.72,0},
+		{10865.6,6057.09,0},
+		{11420.2,6011.57,0},
+		{12344.9,6629.59,0},
+		{12688.2,6539.59,0},
+		{13291.3,7450.53,0},
+		{14044.4,8080.97,0},
+		{14686,9565.74,0},
+		{14717.6,10870.8,0},
+		{14517.8,11457.2,0},
+		{12606.1,12862.7,0},
+		{12850.8,14382,0},
+		{13344.5,13666.7,0},
+		{12144.3,14094.3,0},
+		{12530,13890.3,0},
+		{11906.6,14272.1,0},
+		{11628.9,14424.4,0},
+		{10509.5,14524.4,0},
+		{10316.5,14618.8,0},
+		{8046.28,14875.4,0},
+		{7359.38,14811,0},
+		{7682.78,14681.3,0},
+		{7678.56,14975.4,0},
+		{5391.22,14701.8,0},
+		{5364.17,14421,0},
+		{7531.44,13656.5,0},
+		{6585.34,13343,0},
+		{6413.87,13143.3,0},
+		{5056.82,11643,0},
+		{5376.29,11030.4,0},
+		{4821.13,9838.67,0},
+		{4245.93,8678.53,0},
+		{3999.34,8356.94,0},
+		{4497.19,8138.68,0},
+		{5325.31,7813.17,0},
+		{718.539,11105.1,0},
+		{891.104,11528.1,0},
+		{2247.98,10776.5,0},
+		{1873.79,10160.6,0},
+		{1833.21,11577.6,0},
+		{1624.9,13169.4,0},
+		{3360.84,13984,0},
+		{3933.91,12826.7,0},
+		{4313.98,12628.4,0},
+		{3981.75,11541.1,0},
+		{1025.88,7263.22,0},
+		{2883.53,5524.39,0},
+		{4179.79,6312.8,0},
+		{3019.96,7232.15,0},
+		{2394.54,8455.85,0},
+		{1392.46,8440.72,0},
+		{1052.34,8035.64,0},
+		{2320.39,1788.79,0},
+		{3862.94,1900.28,0},
+		{5586.73,3053.1,0},
+		{6970.57,4446.89,0},
+		{4667.11,5440.89,0},
+		{3921.08,4488.73,0},
+		{3939.74,3593.87,0},
+		{2833.62,3795.92,0},
+		{1698.57,4431.1,0},
+		{8380.95,4959.63,0},
+		{8735.24,4967.98,0},
+		{8598.11,4763.32,0},
+		{8553.23,5175.41,0},
+		{9040.74,4859.53,0},
+		{8719.9,4668.56,0},
+		{8650.27,4128.95,0},
+		{8953.42,3031.87,0},
+		{9649.72,2293.59,0},
+		{10021.3,2402.18,0},
+		{10562.1,1978.47,0},
+		{12392.6,1468.92,0},
+		{13415.5,3136.6,0},
+		{13015.9,3633.42,0},
+		{13192.1,4046.44,0},
+		{12473.4,5365.8,0},
+		{13560.3,5248.79,0},
+		{13211.4,5313.89,0},
+		{13285.1,4939.87,0},
+		{13522.4,4988.95,0},
+		{12920.1,5508.12,0},
+		{12845,5377.42,0},
+		{9780.59,4650.8,0},
+		{8557.23,4599.56,0},
+		{8906.21,3409.44,0}
+	};
 	telePos[] = {
 		// N [-0.286865,8.17383,-10.3098]
 		// S [-0.415527,-7.05298,-10.3098]

build.txt

@@ -1 +1 @@
-542
+543