diff --git a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnBoatLoot.sqf b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnBoatLoot.sqf index 830d9473..7d2200e3 100644 --- a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnBoatLoot.sqf +++ b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnBoatLoot.sqf @@ -15,16 +15,18 @@ //[[[cog import generate_private_arrays ]]] private ["_shipwrecks","_item","_markers"]; //[[[end]]] -_worldSize = worldSize/2; -_shipwrecks = nearestTerrainObjects [ [_worldSize, _worldSize], [], _worldSize, false ]; -{ - // 20 percent chance for loot to spawn - if ((random 1) <= 0.4) then { - _item = createVehicle["container_epoch", _x, [], 0, "NONE"]; - _item setMass 220; +if (getNumber(configFile >> "CfgEpoch" >> worldname >> "shipwreckLootEnabled") isEqualTo 1) then { + _worldSize = worldSize/2; + _shipwrecks = nearestTerrainObjects [ [_worldSize, _worldSize], [], _worldSize, false ]; + { + // 20 percent chance for loot to spawn + if ((random 1) <= 0.4) then { + _item = createVehicle["container_epoch", _x, [], 0, "NONE"]; + _item setMass 220; - if (EPOCH_SHOW_BOATLOOT) then { - _markers = ["Shipwreck",_x] call EPOCH_server_createGlobalMarkerSet; + if (EPOCH_SHOW_BOATLOOT) then { + _markers = ["Shipwreck",_x] call EPOCH_server_createGlobalMarkerSet; + }; }; - }; -} foreach _shipwrecks; + } foreach _shipwrecks; +}; diff --git a/Sources/epoch_server_settings/config.cpp b/Sources/epoch_server_settings/config.cpp index 25ea8b79..fb30d055 100644 --- a/Sources/epoch_server_settings/config.cpp +++ b/Sources/epoch_server_settings/config.cpp @@ -74,7 +74,7 @@ class CfgEpoch traderBlds[] = {"House", "Building"}; traderHomes[] = {"House", "Building"}; traderUniforms[] = {"U_OG_leader", "U_C_Poloshirt_stripped", "U_C_Poloshirt_blue", "U_C_Poloshirt_burgundy", "U_C_Poloshirt_tricolour", "U_C_Poloshirt_salmon", "U_C_Poloshirt_redwhite", "U_C_Poor_1", "U_C_WorkerCoveralls", "U_C_Journalist", "U_C_Scientist", "U_OrestesBody"}; - containerPos[] = {}; + shipwreckLootEnabled = 1; telePos[] = {}; lightPos[] = { {-16.623,-8.50195,-10.5417}, diff --git a/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h b/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h index 1e917b90..93ba0b39 100644 --- a/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h +++ b/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h @@ -30,7 +30,7 @@ class Bootcamp_ACR : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Desert_E.h b/Sources/epoch_server_settings/configs/maps/Desert_E.h index a73df1c8..ce66b50b 100644 --- a/Sources/epoch_server_settings/configs/maps/Desert_E.h +++ b/Sources/epoch_server_settings/configs/maps/Desert_E.h @@ -30,7 +30,7 @@ class Desert_E : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Malden.h b/Sources/epoch_server_settings/configs/maps/Malden.h index 2571bc6d..959b8807 100644 --- a/Sources/epoch_server_settings/configs/maps/Malden.h +++ b/Sources/epoch_server_settings/configs/maps/Malden.h @@ -25,7 +25,6 @@ class Malden : Default {"Airport",5} }; 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[] = {}; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h b/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h index 6b1468d9..95863155 100644 --- a/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h +++ b/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h @@ -30,7 +30,7 @@ class Mountains_ACR : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Napf.h b/Sources/epoch_server_settings/configs/maps/Napf.h index c1b713ad..49d8b42c 100644 --- a/Sources/epoch_server_settings/configs/maps/Napf.h +++ b/Sources/epoch_server_settings/configs/maps/Napf.h @@ -30,7 +30,7 @@ class Napf : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Porto.h b/Sources/epoch_server_settings/configs/maps/Porto.h index 73b10ee9..c4485913 100644 --- a/Sources/epoch_server_settings/configs/maps/Porto.h +++ b/Sources/epoch_server_settings/configs/maps/Porto.h @@ -30,7 +30,7 @@ class Porto : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h b/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h index 1c0dafae..1203a188 100644 --- a/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h +++ b/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h @@ -29,8 +29,9 @@ class ProvingGrounds_PMC : Default {"VegetationFir",1}, {"ViewPoint",1} }; + shipwreckLootEnabled = 0; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Sara.h b/Sources/epoch_server_settings/configs/maps/Sara.h index fa353461..a929738a 100644 --- a/Sources/epoch_server_settings/configs/maps/Sara.h +++ b/Sources/epoch_server_settings/configs/maps/Sara.h @@ -30,7 +30,7 @@ class Sara : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/SaraLite.h b/Sources/epoch_server_settings/configs/maps/SaraLite.h index f6b29071..450388aa 100644 --- a/Sources/epoch_server_settings/configs/maps/SaraLite.h +++ b/Sources/epoch_server_settings/configs/maps/SaraLite.h @@ -30,7 +30,7 @@ class SaraLite : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h b/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h index c9bf2e90..50539a9e 100644 --- a/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h +++ b/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h @@ -30,7 +30,7 @@ class Sara_dbe1 : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h b/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h index d0444bee..7385cd83 100644 --- a/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h +++ b/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h @@ -29,8 +29,9 @@ class Shapur_BAF : Default {"VegetationFir",1}, {"ViewPoint",1} }; + shipwreckLootEnabled = 0; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Utes.h b/Sources/epoch_server_settings/configs/maps/Utes.h index aad53c1d..bf0965a1 100644 --- a/Sources/epoch_server_settings/configs/maps/Utes.h +++ b/Sources/epoch_server_settings/configs/maps/Utes.h @@ -30,7 +30,7 @@ class Utes : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h b/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h index f9f44013..56cb9c24 100644 --- a/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h +++ b/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h @@ -30,7 +30,7 @@ class Woodland_ACR : Default {"ViewPoint",1} }; traderBlds[] = {"House", "Building"}; - containerPos[] = {}; + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/altis.h b/Sources/epoch_server_settings/configs/maps/altis.h index ad1afb15..36ead027 100644 --- a/Sources/epoch_server_settings/configs/maps/altis.h +++ b/Sources/epoch_server_settings/configs/maps/altis.h @@ -26,47 +26,6 @@ class Altis : Default {"Airport",5} }; 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[] = { - { 8599.97, 24513.6, 0 }, - { 6282.61, 22654, 0 }, - { 3431.42, 22447.1, 0 }, - { 3524.53, 22718.1, 0 }, - { 3528.63, 22747.7, 0 }, - { 2185.4, 21454.6, 0 }, - { 2180.42, 21429.5, 0 }, - { 2105.21, 23439.7, 0 }, - { 2352.68, 19379.2, 0 }, - { 3022.73, 13520.1, 0 }, - { 2997.03, 13502.6, 0 }, - { 1940.41, 10095.8, 0 }, - { 7454.79, 9247.77, 0 }, - { 7485.66, 9255.52, 0 }, - { 12060.5, 6203.39, 0 }, - { 12059.2, 6183.42, 0 }, - { 14205.4, 7549.47, 0 }, - { 14373.1, 7688.5, 0 }, - { 14376.8, 7715.9, 0 }, - { 13115, 9491.82, 0 }, - { 13666, 11913.7, 0 }, - { 13682.8, 11890.2, 0 }, - { 15209.5, 14341.1, 0 }, - { 15326.2, 14361.6, 0 }, - { 15340.7, 14291.1, 0 }, - { 15351.3, 14278.1, 0 }, - { 15419.5, 14287.1, 0 }, - { 15951.8, 9707.72, 0 }, - { 22199.6, 5697.94, 0 }, - { 22279.2, 8641.17, 0 }, - { 26135.7, 19798.5, 0 }, - { 27908.6, 24460.4, 0 }, - { 23164.5, 24046.1, 0 }, - { 21016.3, 20024.2, 0 }, - { 18776.8, 18291.9, 0 }, - { 17361.2, 18792.1, 0 }, - { 17598.9, 18813.6, 0 }, - { 17560, 18928.3, 0 }, - { 17702.8, 19466.5, 0 } - }; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/bornholm.h b/Sources/epoch_server_settings/configs/maps/bornholm.h index fdd93181..f7b68c42 100644 --- a/Sources/epoch_server_settings/configs/maps/bornholm.h +++ b/Sources/epoch_server_settings/configs/maps/bornholm.h @@ -30,53 +30,6 @@ class Bornholm : Default {"ViewPoint",1} }; traderBlds[] = { "Land_bo_A_GeneralStore_01", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_i_Garage_V1_F", "Land_i_Shed_Ind_F", "Land_i_Shop_01_V1_F" }; - containerPos[] = { - { 18276.7, 5930.02, 0.105503 }, - { 18142.7, 7628.1, 0.147504 }, - { 18373, 9326.29, -0.0195802 }, - { 18429.3, 9653.04, 0.0745009 }, - { 15894.8, 10978.7, 0.155209 }, - { 13107, 12840.1, 0.060528 }, - { 12081.4, 14079.6, 0.159698 }, - { 10485, 14763.4, 0.00850928 }, - { 7643.97, 16718.9, 0.0803894 }, - { 5647.32, 18407.6, 0.144234 }, - { 3693.63, 20478.6, 0.0152661 }, - { 1398.27, 12447.5, 0.135922 }, - { 1416.68, 10925.5, 0.228794 }, - { 1507.54, 9632.03, 0.287258 }, - { 2357, 5879.23, 0.113886 }, - { 6615.51, 3727.44, 0.234562 }, - { 8881.91, 2446.3, 0.096174 }, - { 9450.38, 2165.44, 0.0539615 }, - { 9757.82, 1885.78, 0.139444 }, - { 10919.3, 1326.26, 0.137976 }, - { 11691.1, 1116.76, 0.44969 }, - { 12315.6, 890.317, 0.0811119 }, - { 13411.1, 589.964, 0.159001 }, - { 14730.6, 338.716, 0.382669 }, - { 16252.7, 975.236, 0.020526 }, - { 17007.2, 2213.23, 0.00994802 }, - { 16815.7, 3624.59, 0.166415 }, - { 18434.4, 6221.01, 0.075858 }, - { 18440.5, 7046.81, 0.125163 }, - { 18470.3, 6651.96, 0.095651 }, - { 16904.5, 2948.45, 0.0231119 }, - { 17085.8, 1873.29, 0.0425238 }, - { 15044.3, 94.8836, 0.0266737 }, - { 14128.8, 570.867, 0.233156 }, - { 7761.55, 3241.01, 0.374451 }, - { 4603.31, 4481.2, 0.0859278 }, - { 2954, 5100.5, 0.0802823 }, - { 1343.62, 6652.17, 0.0688806 }, - { 1436.73, 14426.6, 1.10503 }, - { 1832.78, 15933.8, 0.675109 }, - { 4210.6, 20421, 0.219392 }, - { 4778, 19805.7, -0.0322686 }, - { 7218.53, 16901.3, 0.0510412 }, - { 19394.9, 22393.8, 0.0649745 }, - { 19819.5, 22216.8, 0.0780932 } - }; telePos[] = { { "Transport_C_EPOCH", { -0.415527, -7.05298, -10.3098 }, "", { 14121.2, 11331.5, 0.000305176 } }, { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 1322.18, 8733.92, 0.0136757 } }, diff --git a/Sources/epoch_server_settings/configs/maps/esseker.h b/Sources/epoch_server_settings/configs/maps/esseker.h index 2a0fd8e2..b094763c 100644 --- a/Sources/epoch_server_settings/configs/maps/esseker.h +++ b/Sources/epoch_server_settings/configs/maps/esseker.h @@ -30,9 +30,7 @@ class Esseker : Default {"ViewPoint",1} }; traderBlds[] = { "Land_i_House_Big_02_V3_dam_F", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_sara_domek_zluty", "Land_Tovarna2", "Land_Shed_Ind02", "Land_i_House_Big_01_V3_dam_F", "Land_HouseV2_02_Interier", "Land_i_House_Small_01_V3_dam_F", "Land_HouseV_1I4", "Land_dum_rasovna", "Land_FuelStation_Build_F", "Land_CarService_F", "Land_u_House_Small_02_V1_F", "Land_i_Stone_HouseSmall_V1_F", "Land_i_Stone_Shed_V1_F"}; - - containerPos[] = {}; - + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/stratis.h b/Sources/epoch_server_settings/configs/maps/stratis.h index 5ca2c046..03eab01b 100644 --- a/Sources/epoch_server_settings/configs/maps/stratis.h +++ b/Sources/epoch_server_settings/configs/maps/stratis.h @@ -166,20 +166,6 @@ class Stratis : Default {"ViewPoint",1} }; 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[] = { - { 2583.59, 6024.51, 0 }, - { 3830.73, 7823.08, 0 }, - { 5153.42, 7048.41, 0 }, - { 6871.89, 5628.74, 0 }, - { 4429.52, 2354.84, 0 }, - { 2907.18, 543.774, 0 }, - { 2213.17, 1095.78, 0 }, - { 1663.35, 2728.73, 0 }, - { 1661.67, 2861.41, 0 }, - { 1646.04, 2882.86, 0 }, - { 1748.63, 3488.93, 0 }, - { 1461.86, 4783.48, 0 } - }; telePos[] = { // N [-0.286865,8.17383,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/takistan.h b/Sources/epoch_server_settings/configs/maps/takistan.h index e4cf8e2b..804215ee 100644 --- a/Sources/epoch_server_settings/configs/maps/takistan.h +++ b/Sources/epoch_server_settings/configs/maps/takistan.h @@ -30,9 +30,7 @@ class Takistan : Default {"ViewPoint",1} }; 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[] = {}; - + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/tanoa.h b/Sources/epoch_server_settings/configs/maps/tanoa.h index 61f4eda7..cbe0ef8f 100644 --- a/Sources/epoch_server_settings/configs/maps/tanoa.h +++ b/Sources/epoch_server_settings/configs/maps/tanoa.h @@ -190,24 +190,7 @@ class Tanoa : Default {"B_T_VTOL_01_infantry_F",1}, {"B_T_VTOL_01_vehicle_F",1} }; - 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" }; - - // shipwrecks - containerPos[] = { - {5417.12,7233.08,0}, - {10745.6,5659.3,0}, - {4550.64,7004.8,0}, - {4529.56,7067.6,0}, - {12755.3,5956.91,0}, - {12752.4,5924.02,0}, - {4082.7,9994.33,0}, - {4843.83,12908.4,0}, - {3425.5,4455.52,0}, - {8851.5,14416.5,0}, - {10472.7,14135.5,0}, - {10538.3,14127.5,0} - }; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/vr.h b/Sources/epoch_server_settings/configs/maps/vr.h index 9681d02b..6b9f53dd 100644 --- a/Sources/epoch_server_settings/configs/maps/vr.h +++ b/Sources/epoch_server_settings/configs/maps/vr.h @@ -21,7 +21,7 @@ class VR : Default radioactiveLocationsCount = 0; allowedVehiclesList[] = {}; 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[] = {}; + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] diff --git a/Sources/epoch_server_settings/configs/maps/zargabad.h b/Sources/epoch_server_settings/configs/maps/zargabad.h index e0552d0e..a6ee1916 100644 --- a/Sources/epoch_server_settings/configs/maps/zargabad.h +++ b/Sources/epoch_server_settings/configs/maps/zargabad.h @@ -30,9 +30,7 @@ class Zargabad : Default {"ViewPoint",1} }; 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[] = {}; - + shipwreckLootEnabled = 0; telePos[] = { // N [-0.286865,8.17383,-10.3098] // S [-0.415527,-7.05298,-10.3098] @@ -43,7 +41,7 @@ class Zargabad : Default //{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" }, { "Transport_C_EPOCH", { -0.415527,-7.05298,-10.3098 }, "", "south" } }; - + propsPos[] = { };