From 5c8552afc6befd8f460f42dce2d8fd912bdc634f Mon Sep 17 00:00:00 2001 From: He-Man Date: Tue, 30 Oct 2018 23:15:29 +0100 Subject: [PATCH] useage of new teleporter class --- .../EPOCH_server_createTeleport.sqf | 10 +--------- .../configs/maps/Bootcamp_ACR.h | 13 +++++-------- .../configs/maps/Desert_E.h | 13 +++++-------- .../configs/maps/IslaDuala3.h | 13 +++++-------- .../configs/maps/Kapaulio.h | 13 +++++-------- .../epoch_server_settings/configs/maps/Malden.h | 15 +++++++-------- .../configs/maps/Mountains_ACR.h | 16 ++++++++-------- .../epoch_server_settings/configs/maps/Napf.h | 15 +++++++-------- .../configs/maps/Panthera3.h | 13 +++++-------- .../epoch_server_settings/configs/maps/Porto.h | 13 +++++-------- .../configs/maps/ProvingGrounds_PMC.h | 13 +++++-------- .../epoch_server_settings/configs/maps/Sara.h | 15 +++++++-------- .../configs/maps/SaraLite.h | 15 +++++++-------- .../configs/maps/Sara_dbe1.h | 15 +++++++-------- .../configs/maps/Shapur_BAF.h | 13 +++++-------- .../epoch_server_settings/configs/maps/Utes.h | 13 +++++-------- .../configs/maps/Winthera3.h | 13 +++++-------- .../configs/maps/Woodland_ACR.h | 15 +++++++-------- .../configs/maps/abramia.h | 13 +++++-------- .../epoch_server_settings/configs/maps/altis.h | 15 +++++++-------- .../configs/maps/australia.h | 16 ++++++++-------- .../configs/maps/bornholm.h | 10 +++++++--- .../configs/maps/chernarus.h | 14 +++++++------- .../configs/maps/chernarus_summer.h | 14 +++++++------- .../configs/maps/chernarusredux.h | 14 +++++++------- .../epoch_server_settings/configs/maps/dingor.h | 13 +++++-------- .../configs/maps/esseker.h | 14 +++++++------- .../configs/maps/lingor3.h | 13 +++++-------- .../configs/maps/stratis.h | 12 +++++------- .../configs/maps/takistan.h | 17 +++++++---------- .../epoch_server_settings/configs/maps/tanoa.h | 16 +++++++--------- Sources/epoch_server_settings/configs/maps/vr.h | 11 +++++------ .../configs/maps/zargabad.h | 14 ++++++-------- 33 files changed, 196 insertions(+), 256 deletions(-) diff --git a/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf index 17544302..15961734 100644 --- a/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf +++ b/Sources/epoch_server/compile/epoch_server/EPOCH_server_createTeleport.sqf @@ -110,13 +110,7 @@ if !(_debugBox isEqualTo "") then { } forEach(getArray(_configWorld >> "propsPos")); { - _enterClass = _x select 0; - - _useWorldPos = false; - if (count _x >= 5) then { - _useWorldPos = (_x select 4) isEqualTo "true"; - }; - _pos1 = _x select 1; + _x params ["_enterClass","_pos1","_exitClass","_pos",["_useWorldPos",false]]; // allow forth position element to set direction if set _dir1 = 0; @@ -129,8 +123,6 @@ if !(_debugBox isEqualTo "") then { _pos1 = asltoatl (_debug modeltoworldworld _pos1); }; - _exitClass = _x select 2; - _pos = _x select 3; // allow forth position element to set direction if set if (_pos isEqualType [] && {count _pos >= 4}) then { _dir2 = _pos deleteAt 3; diff --git a/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h b/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h index 93ba0b39..10d77c7f 100644 --- a/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h +++ b/Sources/epoch_server_settings/configs/maps/Bootcamp_ACR.h @@ -32,14 +32,11 @@ class Bootcamp_ACR : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", "north" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Desert_E.h b/Sources/epoch_server_settings/configs/maps/Desert_E.h index ce66b50b..b05656ad 100644 --- a/Sources/epoch_server_settings/configs/maps/Desert_E.h +++ b/Sources/epoch_server_settings/configs/maps/Desert_E.h @@ -32,14 +32,11 @@ class Desert_E : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "south" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/IslaDuala3.h b/Sources/epoch_server_settings/configs/maps/IslaDuala3.h index f6897600..c306dc44 100644 --- a/Sources/epoch_server_settings/configs/maps/IslaDuala3.h +++ b/Sources/epoch_server_settings/configs/maps/IslaDuala3.h @@ -18,14 +18,11 @@ class IslaDuala3 : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "center" } // temp for now + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "center" } // temp for now }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Kapaulio.h b/Sources/epoch_server_settings/configs/maps/Kapaulio.h index 66118dd8..239deb51 100644 --- a/Sources/epoch_server_settings/configs/maps/Kapaulio.h +++ b/Sources/epoch_server_settings/configs/maps/Kapaulio.h @@ -18,14 +18,11 @@ class Kapaulio : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "center" } // temp for now + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "center" } // temp for now }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Malden.h b/Sources/epoch_server_settings/configs/maps/Malden.h index 959b8807..f0ffd857 100644 --- a/Sources/epoch_server_settings/configs/maps/Malden.h +++ b/Sources/epoch_server_settings/configs/maps/Malden.h @@ -26,14 +26,13 @@ class Malden : Default }; 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" }; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 3074.63,8474.27,0.00150394 } }, - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 2335.17, 3394.12, 0.000732422 } }, - { "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", { 8224.4,8756.69,0.00099802 } } - //{ "Transport_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 3074.63,8474.27,0.00150394 } }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 2335.17, 3394.12, 0.000732422 } }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", { 8224.4,8756.69,0.00099802 } } }; propsPos[] = { // Phones and ATMs diff --git a/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h b/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h index 95863155..b1eba82b 100644 --- a/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h +++ b/Sources/epoch_server_settings/configs/maps/Mountains_ACR.h @@ -32,14 +32,14 @@ class Mountains_ACR : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", "north" }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", "west" }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 180}, "", "east" }, + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "south" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Napf.h b/Sources/epoch_server_settings/configs/maps/Napf.h index 49d8b42c..ba28122b 100644 --- a/Sources/epoch_server_settings/configs/maps/Napf.h +++ b/Sources/epoch_server_settings/configs/maps/Napf.h @@ -32,14 +32,13 @@ class Napf : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", "north" }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", "west" }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", "east" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Panthera3.h b/Sources/epoch_server_settings/configs/maps/Panthera3.h index 6f54f20d..cd13f173 100644 --- a/Sources/epoch_server_settings/configs/maps/Panthera3.h +++ b/Sources/epoch_server_settings/configs/maps/Panthera3.h @@ -18,14 +18,11 @@ class Panthera3 : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "center" } // temp for now + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "center" } // temp for now }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Porto.h b/Sources/epoch_server_settings/configs/maps/Porto.h index c4485913..77815925 100644 --- a/Sources/epoch_server_settings/configs/maps/Porto.h +++ b/Sources/epoch_server_settings/configs/maps/Porto.h @@ -32,14 +32,11 @@ class Porto : Default traderBlds[] = {"House", "Building"}; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "south" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h b/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h index 1203a188..0e4a14c2 100644 --- a/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h +++ b/Sources/epoch_server_settings/configs/maps/ProvingGrounds_PMC.h @@ -33,14 +33,11 @@ class ProvingGrounds_PMC : Default traderBlds[] = {"House", "Building"}; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "south" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Sara.h b/Sources/epoch_server_settings/configs/maps/Sara.h index a929738a..e3a8eec6 100644 --- a/Sources/epoch_server_settings/configs/maps/Sara.h +++ b/Sources/epoch_server_settings/configs/maps/Sara.h @@ -32,14 +32,13 @@ class Sara : Default traderBlds[] = {"House", "Building"}; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", "north" }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098 -90}, "", "west" }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", "east" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/SaraLite.h b/Sources/epoch_server_settings/configs/maps/SaraLite.h index 450388aa..0880cc10 100644 --- a/Sources/epoch_server_settings/configs/maps/SaraLite.h +++ b/Sources/epoch_server_settings/configs/maps/SaraLite.h @@ -32,14 +32,13 @@ class SaraLite : Default traderBlds[] = {"House", "Building"}; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", "north" }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", "west" }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", "east" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h b/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h index 50539a9e..738b7716 100644 --- a/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h +++ b/Sources/epoch_server_settings/configs/maps/Sara_dbe1.h @@ -32,14 +32,13 @@ class Sara_dbe1 : Default traderBlds[] = {"House", "Building"}; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", "north" }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", "west" }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", "east" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h b/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h index 7385cd83..3699abf4 100644 --- a/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h +++ b/Sources/epoch_server_settings/configs/maps/Shapur_BAF.h @@ -33,14 +33,11 @@ class Shapur_BAF : Default traderBlds[] = {"House", "Building"}; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "south" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Utes.h b/Sources/epoch_server_settings/configs/maps/Utes.h index bf0965a1..5b964584 100644 --- a/Sources/epoch_server_settings/configs/maps/Utes.h +++ b/Sources/epoch_server_settings/configs/maps/Utes.h @@ -32,14 +32,11 @@ class Utes : Default traderBlds[] = {"House", "Building"}; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "south" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Winthera3.h b/Sources/epoch_server_settings/configs/maps/Winthera3.h index 2750dc4f..a92a7d1e 100644 --- a/Sources/epoch_server_settings/configs/maps/Winthera3.h +++ b/Sources/epoch_server_settings/configs/maps/Winthera3.h @@ -18,14 +18,11 @@ class Winthera3 : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "center" } // temp for now + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "center" } // temp for now }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h b/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h index 56cb9c24..eefa6594 100644 --- a/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h +++ b/Sources/epoch_server_settings/configs/maps/Woodland_ACR.h @@ -32,14 +32,13 @@ class Woodland_ACR : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", "north" }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", "west" }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", "east" } }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/abramia.h b/Sources/epoch_server_settings/configs/maps/abramia.h index 11288d5f..c8d6a69e 100644 --- a/Sources/epoch_server_settings/configs/maps/abramia.h +++ b/Sources/epoch_server_settings/configs/maps/abramia.h @@ -18,14 +18,11 @@ class abramia : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "center" } // temp for now + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "center" } // temp for now }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/altis.h b/Sources/epoch_server_settings/configs/maps/altis.h index 9911f7a1..81af94ba 100644 --- a/Sources/epoch_server_settings/configs/maps/altis.h +++ b/Sources/epoch_server_settings/configs/maps/altis.h @@ -27,14 +27,13 @@ class Altis : Default }; 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" }; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - - { "Transport_C_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 13326.5, 14515.2, 0.16426 } }, // Trader city 1 - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 6192.46, 16834, 0.00154114 } }, // Trader city 2 - { "Transport_E_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", { 18451.9, 14278.1, 0.00143814 } } // Trader city 3 + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 13326.5, 14515.2, 0.16426 } }, // Trader city 1 + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 6192.46, 16834, 0.00154114 } }, // Trader city 2 + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", { 18451.9, 14278.1, 0.00143814 } } // Trader city 3 }; propsPos[] = { //trader city #1 diff --git a/Sources/epoch_server_settings/configs/maps/australia.h b/Sources/epoch_server_settings/configs/maps/australia.h index c5f9d276..ec977415 100644 --- a/Sources/epoch_server_settings/configs/maps/australia.h +++ b/Sources/epoch_server_settings/configs/maps/australia.h @@ -31,14 +31,14 @@ class Australia : Default }; traderBlds[] = { "Land_A_FuelStation_Build", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_A_Office01", "Land_Ind_Garage01", "Land_Ind_Workshop01_04", "Land_Ind_Workshop01_L", "Land_Shed_Ind02", "Land_Tovarna2", "Land_sara_hasic_zbroj" }; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_C_EPOCH", { -0.415527, -7.05298, -10.3098 }, "", { 24398.3, 13971.6, 0 } }, // Central - { "Transport_E_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", { 34751.5, 13431.9, 0 } }, // East - { "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 19032.7, 33974.6, 0 } }, // North - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 4056.35, 19435.9, 0 } } // West + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.415527, -7.05298, -10.3098, 180}, "", { 24398.3, 13971.6, 0 } }, // Central + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", { 34751.5, 13431.9, 0 } }, // East + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 19032.7, 33974.6, 0 } }, // North + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 4056.35, 19435.9, 0 } } // West }; propsPos[] = { // North camp diff --git a/Sources/epoch_server_settings/configs/maps/bornholm.h b/Sources/epoch_server_settings/configs/maps/bornholm.h index f7b68c42..f1fa8651 100644 --- a/Sources/epoch_server_settings/configs/maps/bornholm.h +++ b/Sources/epoch_server_settings/configs/maps/bornholm.h @@ -31,9 +31,13 @@ class Bornholm : Default }; 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" }; 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 } }, - { "Transport_E_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", { 15639.3, 191.995, 0.000153065 } } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.415527, -7.05298, -10.3098, 180}, "", { 14121.2, 11331.5, 0.000305176 } }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 1322.18, 8733.92, 0.0136757 } }, + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", { 15639.3, 191.995, 0.000153065 } } }; propsPos[] = { { "ProtectionZone_Invisible_F", { 13818.4, 6886.48, 0.278801 }, 0.17135 }, diff --git a/Sources/epoch_server_settings/configs/maps/chernarus.h b/Sources/epoch_server_settings/configs/maps/chernarus.h index 6270190f..6e13bf41 100644 --- a/Sources/epoch_server_settings/configs/maps/chernarus.h +++ b/Sources/epoch_server_settings/configs/maps/chernarus.h @@ -31,13 +31,13 @@ class Chernarus : Default }; traderBlds[] = { "Land_A_FuelStation_Build", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_A_Office01", "Land_Ind_Garage01", "Land_Ind_Workshop01_04", "Land_Ind_Workshop01_L", "Land_Shed_Ind02", "Land_Tovarna2", "Land_sara_hasic_zbroj" }; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 4569.52, 4524.24, 0.201431 } }, // South West - { "Transport_E_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", { 12077.8, 5121.92, 0.00144958 } }, // South East - { "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 10688.6, 9428.98, 0.00144958 } } // North East + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 4569.52, 4524.24, 0.201431 } }, // South West + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", { 12077.8, 5121.92, 0.00144958 } }, // South East + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 10688.6, 9428.98, 0.00144958 } } // North East }; propsPos[] = { // phones diff --git a/Sources/epoch_server_settings/configs/maps/chernarus_summer.h b/Sources/epoch_server_settings/configs/maps/chernarus_summer.h index b729f2f1..cdaed4c0 100644 --- a/Sources/epoch_server_settings/configs/maps/chernarus_summer.h +++ b/Sources/epoch_server_settings/configs/maps/chernarus_summer.h @@ -31,13 +31,13 @@ class Chernarus_Summer : Default }; traderBlds[] = { "Land_A_FuelStation_Build", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_A_Office01", "Land_Ind_Garage01", "Land_Ind_Workshop01_04", "Land_Ind_Workshop01_L", "Land_Shed_Ind02", "Land_Tovarna2", "Land_sara_hasic_zbroj" }; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 4569.52, 4524.24, 0.201431 } }, // South West - { "Transport_E_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", { 12077.8, 5121.92, 0.00144958 } }, // South East - { "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 10688.6, 9428.98, 0.00144958 } } // North East + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 4569.52, 4524.24, 0.201431 } }, // South West + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", { 12077.8, 5121.92, 0.00144958 } }, // South East + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 10688.6, 9428.98, 0.00144958 } } // North East }; propsPos[] = { // phones diff --git a/Sources/epoch_server_settings/configs/maps/chernarusredux.h b/Sources/epoch_server_settings/configs/maps/chernarusredux.h index 2f5af4b0..1f418324 100644 --- a/Sources/epoch_server_settings/configs/maps/chernarusredux.h +++ b/Sources/epoch_server_settings/configs/maps/chernarusredux.h @@ -31,13 +31,13 @@ class ChernarusRedux : Default }; traderBlds[] = { "Land_A_FuelStation_Build", "Land_A_GeneralStore_01", "Land_A_GeneralStore_01a", "Land_A_Office01", "Land_Ind_Garage01", "Land_Ind_Workshop01_04", "Land_Ind_Workshop01_L", "Land_Shed_Ind02", "Land_Tovarna2", "Land_sara_hasic_zbroj" }; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 4569.52, 4524.24, 0.201431 } }, // South West - { "Transport_E_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", { 12077.8, 5121.92, 0.00144958 } }, // South East - { "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 10688.6, 9428.98, 0.00144958 } } // North East + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 4569.52, 4524.24, 0.201431 } }, // South West + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", { 12077.8, 5121.92, 0.00144958 } }, // South East + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 10688.6, 9428.98, 0.00144958 } } // North East }; propsPos[] = { // phones diff --git a/Sources/epoch_server_settings/configs/maps/dingor.h b/Sources/epoch_server_settings/configs/maps/dingor.h index 660875ba..6dc0497b 100644 --- a/Sources/epoch_server_settings/configs/maps/dingor.h +++ b/Sources/epoch_server_settings/configs/maps/dingor.h @@ -18,14 +18,11 @@ class dingor : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "center" } // temp for now + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "center" } // temp for now }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/esseker.h b/Sources/epoch_server_settings/configs/maps/esseker.h index b094763c..aeb76ccf 100644 --- a/Sources/epoch_server_settings/configs/maps/esseker.h +++ b/Sources/epoch_server_settings/configs/maps/esseker.h @@ -32,13 +32,13 @@ class Esseker : Default 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"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 5073.31, 8903.09, 0 } }, - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 4407.77, 6054.78, 0 } }, - { "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", { 8692.93, 3854.72, 0 } } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 5073.31, 8903.09, 0 } }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 4407.77, 6054.78, 0 } }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", { 8692.93, 3854.72, 0 } } }; propsPos[] = { diff --git a/Sources/epoch_server_settings/configs/maps/lingor3.h b/Sources/epoch_server_settings/configs/maps/lingor3.h index 4e5f3a6d..6cd2cca1 100644 --- a/Sources/epoch_server_settings/configs/maps/lingor3.h +++ b/Sources/epoch_server_settings/configs/maps/lingor3.h @@ -18,14 +18,11 @@ class lingor3 : Default traderBlds[] = {"House", "Building"}; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // 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_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", "center" } // temp for now + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", "center" } // temp for now }; propsPos[] = { }; diff --git a/Sources/epoch_server_settings/configs/maps/stratis.h b/Sources/epoch_server_settings/configs/maps/stratis.h index 03eab01b..09c0bab8 100644 --- a/Sources/epoch_server_settings/configs/maps/stratis.h +++ b/Sources/epoch_server_settings/configs/maps/stratis.h @@ -167,13 +167,11 @@ class Stratis : Default }; 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" }; telePos[] = { - - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - - { "Transport_C_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 4089.82, 4597.71, 0.00143433 } } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 4089.82, 4597.71, 0.00143433 } } }; propsPos[] = { { "Land_Castle_01_wall_08_F", { 1830.55, 3389.67, 0 }, 285.304 }, diff --git a/Sources/epoch_server_settings/configs/maps/takistan.h b/Sources/epoch_server_settings/configs/maps/takistan.h index 804215ee..d27b214e 100644 --- a/Sources/epoch_server_settings/configs/maps/takistan.h +++ b/Sources/epoch_server_settings/configs/maps/takistan.h @@ -32,16 +32,13 @@ class Takistan : Default 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" }; shipwreckLootEnabled = 0; telePos[] = { - - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - - - { "Transport_N_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 4695.13,9215.56,0.00141907 } }, - { "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", { 6028.83,1118.3,0.00149536 } }, - { "Transport_C_EPOCH", { 13.5127, 0.410156, -10.3098 }, "", { 6817.97,4988.9,0.00137329 } } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 4695.13,9215.56,0.00141907 } }, + { "TP_Booth_EPOCH", { -14.4316, 0.112793, -10.3098, -90}, "", { 6028.83,1118.3,0.00149536 } }, + { "TP_Booth_EPOCH", { 13.5127, 0.410156, -10.3098, 90}, "", { 6817.97,4988.9,0.00137329 } } }; propsPos[] = { diff --git a/Sources/epoch_server_settings/configs/maps/tanoa.h b/Sources/epoch_server_settings/configs/maps/tanoa.h index cbe0ef8f..19707d55 100644 --- a/Sources/epoch_server_settings/configs/maps/tanoa.h +++ b/Sources/epoch_server_settings/configs/maps/tanoa.h @@ -192,15 +192,13 @@ class Tanoa : Default }; 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" }; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - - // template city { "Transport_C_EPOCH", { -0.286865,8.17383,-10.3098 }, "", "north" }, - { "Transport_W_EPOCH", { -14.4316,0.112793,-10.3098 }, "", { 2015.21,10659.6,0 } }, - { "Transport_C_EPOCH", { -0.286865,8.17383,-10.3098 }, "", { 5027.48,5210.25,0 } }, - { "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", { 11779.6,13056.5,0 } } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -14.4316,0.112793,-10.3098, -90}, "", { 2015.21,10659.6,0 } }, + { "TP_Booth_EPOCH", { -0.286865,8.17383,-10.3098, 0}, "", { 5027.48,5210.25,0 } }, + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", { 11779.6,13056.5,0 } } }; propsPos[] = { // Western Trader Camp diff --git a/Sources/epoch_server_settings/configs/maps/vr.h b/Sources/epoch_server_settings/configs/maps/vr.h index 6b9f53dd..4811a2fb 100644 --- a/Sources/epoch_server_settings/configs/maps/vr.h +++ b/Sources/epoch_server_settings/configs/maps/vr.h @@ -23,12 +23,11 @@ class VR : Default 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" }; shipwreckLootEnabled = 0; telePos[] = { - - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_C_EPOCH", { -0.286865, 8.17383, -10.3098 }, "", { 4089.82, 4597.71, 0.00143433 } } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { -0.286865, 8.17383, -10.3098, 0}, "", { 4089.82, 4597.71, 0.00143433 } } }; lightPos[] = {}; debugBoxClass = ""; diff --git a/Sources/epoch_server_settings/configs/maps/zargabad.h b/Sources/epoch_server_settings/configs/maps/zargabad.h index a6ee1916..0af558cd 100644 --- a/Sources/epoch_server_settings/configs/maps/zargabad.h +++ b/Sources/epoch_server_settings/configs/maps/zargabad.h @@ -32,14 +32,12 @@ class Zargabad : Default 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" }; shipwreckLootEnabled = 0; telePos[] = { - // N [-0.286865,8.17383,-10.3098] - // S [-0.415527,-7.05298,-10.3098] - // E [13.5127,0.410156,-10.3098] - // W [-14.4316,0.112793,-10.3098] - { "Transport_N_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "north" }, - //{ "Transport_W_EPOCH", { -14.4316, 0.112793, -10.3098 }, "", "west" }, - //{ "Transport_E_EPOCH", { 13.5127,0.410156,-10.3098 }, "", "east" }, - { "Transport_C_EPOCH", { -0.415527,-7.05298,-10.3098 }, "", "south" } + // N [-0.286865,8.17383,-10.3098, 0] + // S [-0.415527,-7.05298,-10.3098, 180] + // E [13.5127,0.410156,-10.3098, 90] + // W [-14.4316,0.112793,-10.3098, -90] + { "TP_Booth_EPOCH", { 13.5127,0.410156,-10.3098, 90}, "", "north" }, + { "TP_Booth_EPOCH", { -0.415527,-7.05298,-10.3098, 180}, "", "south" } }; propsPos[] = {