diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 7b57ebb6..5078d3a4 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo differ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index 19337448..779f6231 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo differ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index 67260bad..20d9c8b1 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 4487aec8..4477e94f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Altis.pbo and b/Server_Install_Pack/mpmissions/epoch.Altis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 2c3e91e5..ea0a896a 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Australia.pbo and b/Server_Install_Pack/mpmissions/epoch.Australia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index 288d7a57..2d66fbc0 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index e4f4475c..7cf37d9f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo and b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 4f153cb0..029503c5 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index c6a3d685..53ac84f5 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index debc406f..12d9652e 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo and b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index bebe5b03..e7cf0c58 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo and b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index 19524131..b0bb421b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Napf.pbo b/Server_Install_Pack/mpmissions/epoch.Napf.pbo index a0256661..8f3b0b8b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Napf.pbo and b/Server_Install_Pack/mpmissions/epoch.Napf.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 4006f72d..6d196558 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Porto.pbo and b/Server_Install_Pack/mpmissions/epoch.Porto.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index f1d9cb9c..45728b39 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo and b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 2d9d8fdf..334f3adf 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index 3aab55b6..91f48248 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo and b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index a9b3b364..a08af2e2 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index bc34924f..99b37ab6 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo and b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 423030cc..b0fc24ce 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo and b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index efd2a2f2..52c229a9 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo and b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo index ec46a08a..ee0b3e5c 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo and b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Tanoa_RyanZed.pbo b/Server_Install_Pack/mpmissions/epoch.Tanoa_RyanZed.pbo index 7ea5ada2..dd334fed 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Tanoa_RyanZed.pbo and b/Server_Install_Pack/mpmissions/epoch.Tanoa_RyanZed.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 0daf44aa..61a545dc 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.VR.pbo and b/Server_Install_Pack/mpmissions/epoch.VR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index e9ef7174..5283e2d9 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 94007170..3f8f367b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo and b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 8b3d5b98..908eda2e 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.utes.pbo and b/Server_Install_Pack/mpmissions/epoch.utes.pbo differ diff --git a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp index f8006f90..fcfa3f92 100644 --- a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp +++ b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp @@ -421,9 +421,9 @@ class CfgBuildingLootPos class Land_i_Barracks_V1_F : Land_i_Barracks_V2_F {}; class Land_d_Windmill01_F : Default { - pelicanPos[] = {{{-2.92773,2.72852,0.965859},132.301}}; - shoeboxPos[] = {{{-1.11328,1.94141,-2.32494},0}}; - palletPos[] = {{{-1.2168,-0.789063,-2.31882},360}}; + pelicanPos[] = {{{-0.800781,0.158203,0.943356},133}}; + shoeboxPos[] = {{{-1.06055,1.63477,-2.32494},242}}; + palletPos[] = {{{-1.2168,-0.791016,-2.31882},0}}; }; class Land_u_Shed_Ind_F : Default { @@ -888,15 +888,15 @@ class CfgBuildingLootPos class Land_i_House_Big_02_V3_F : Land_i_House_Big_02_V1_F {}; class Land_i_House_Small_03_V1_F : Default { - shelfPos[] = {{{0.273438,1.06055,-0.398047},178.213},{{5.03125,4.3418,-0.398025},55.5188}}; - fridgePos[] = {{{1.30078,3.96289,-0.398048},85.9457}}; - bedPos[] = {{{-4.09961,3.68945,-0.39807},268.584}}; - couchPos[] = {{{-4.36719,-0.742188,-0.398075},183.015}}; - wardrobePos[] = {{{-2.23438,-1.9375,-0.397993},183.121},{{5.0918,1.56055,-0.397933},90.0051}}; - cookerPos[] = {{{1.32813,2.72852,-0.398477},89.3721}}; - chairPos[] = {{{-1.32031,-3.61523,-0.694491},357.783},{{-2.01563,4.09961,-0.398058},39.0805},{{2.7168,-5.76758,-0.398058},216.364},{{4.70508,-5.81641,-0.398057},145.992}}; - tablePos[] = {{{4.98828,-2.87695,-0.398071},89.3266}}; - palletPos[] = {{{-2.04102,-5.83398,-10},360}}; + shelfPos[] = {{{-0.678711,4.01953,-0.0356882},270},{{5.26367,4.1875,-0.0356882},89}}; + fridgePos[] = {{{1.34668,1.80469,-0.0356882},91.2}}; + bedPos[] = {{{-4.05957,3.81641,-0.0356882},267}}; + couchPos[] = {{{-4.2793,-0.507813,-0.0356882},180}}; + wardrobePos[] = {{{-1.69336,-1.98828,-0.0356882},180},{{5.06543,1.43945,-0.0356882},89}}; + cookerPos[] = {{{1.24902,2.82031,-0.0356882},89.2}}; + chairPos[] = {{{-1.80762,4.16406,-0.0356882},40},{{2.73828,-5.79297,-0.0356882},219},{{4.80957,-5.86719,-0.0356882},149}}; + tablePos[] = {{{4.98535,-2.73438,-0.0356882},89}}; + palletPos[] = {{{-2.04004,-5.83203,-10},0}}; }; class Land_u_House_Small_02_V1_F : Default { diff --git a/Sources/epoch_config/Configs/CfgBuildingLootPos.json b/Sources/epoch_config/Configs/CfgBuildingLootPos.json index 66967597..056c96e1 100644 --- a/Sources/epoch_config/Configs/CfgBuildingLootPos.json +++ b/Sources/epoch_config/Configs/CfgBuildingLootPos.json @@ -5560,31 +5560,31 @@ "pelicanPos": [ [ [ - -2.92773, - 2.72852, - 0.965859 + -0.800781, + 0.158203, + 0.943356 ], - 132.301 + 133 ] ], "shoeboxPos": [ [ [ - -1.11328, - 1.94141, + -1.06055, + 1.63477, -2.32494 ], - 0 + 242 ] ], "palletPos": [ [ [ -1.2168, - -0.789063, + -0.791016, -2.31882 ], - 360 + 0 ] ], "_inherit": "Default" @@ -10357,131 +10357,123 @@ "shelfPos": [ [ [ - 0.273438, - 1.06055, - -0.398047 + -0.678711, + 4.01953, + -0.0356882 ], - 178.213 + 270 ], [ [ - 5.03125, - 4.3418, - -0.398025 + 5.26367, + 4.1875, + -0.0356882 ], - 55.5188 + 89 ] ], "fridgePos": [ [ [ - 1.30078, - 3.96289, - -0.398048 + 1.34668, + 1.80469, + -0.0356882 ], - 85.9457 + 91.2 ] ], "bedPos": [ [ [ - -4.09961, - 3.68945, - -0.39807 + -4.05957, + 3.81641, + -0.0356882 ], - 268.584 + 267 ] ], "couchPos": [ [ [ - -4.36719, - -0.742188, - -0.398075 + -4.2793, + -0.507813, + -0.0356882 ], - 183.015 + 180 ] ], "wardrobePos": [ [ [ - -2.23438, - -1.9375, - -0.397993 + -1.69336, + -1.98828, + -0.0356882 ], - 183.121 + 180 ], [ [ - 5.0918, - 1.56055, - -0.397933 + 5.06543, + 1.43945, + -0.0356882 ], - 90.0051 + 89 ] ], "cookerPos": [ [ [ - 1.32813, - 2.72852, - -0.398477 + 1.24902, + 2.82031, + -0.0356882 ], - 89.3721 + 89.2 ] ], "chairPos": [ [ [ - -1.32031, - -3.61523, - -0.694491 + -1.80762, + 4.16406, + -0.0356882 ], - 357.783 + 40 ], [ [ - -2.01563, - 4.09961, - -0.398058 + 2.73828, + -5.79297, + -0.0356882 ], - 39.0805 + 219 ], [ [ - 2.7168, - -5.76758, - -0.398058 + 4.80957, + -5.86719, + -0.0356882 ], - 216.364 - ], - [ - [ - 4.70508, - -5.81641, - -0.398057 - ], - 145.992 + 149 ] ], "tablePos": [ [ [ - 4.98828, - -2.87695, - -0.398071 + 4.98535, + -2.73438, + -0.0356882 ], - 89.3266 + 89 ] ], "palletPos": [ [ [ - -2.04102, - -5.83398, + -2.04004, + -5.83203, -10 ], - 360 + 0 ] ], "_inherit": "Default" diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 089f2cee..36df9da5 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=629; +build=630; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 089f2cee..36df9da5 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=629; +build=630; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 089f2cee..36df9da5 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=629; +build=630; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 089f2cee..36df9da5 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=629; +build=630; diff --git a/Sources/mpmissions/epoch.Porto/treeView.txt b/Sources/mpmissions/epoch.Porto/treeView.txt index 466df21f..9aaee6a9 100644 Binary files a/Sources/mpmissions/epoch.Porto/treeView.txt and b/Sources/mpmissions/epoch.Porto/treeView.txt differ diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt b/Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt index c8594c8f..098bcd0e 100644 Binary files a/Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt and b/Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Sara/treeView.txt b/Sources/mpmissions/epoch.Sara/treeView.txt index b7219193..e28c2ac7 100644 Binary files a/Sources/mpmissions/epoch.Sara/treeView.txt and b/Sources/mpmissions/epoch.Sara/treeView.txt differ diff --git a/Sources/mpmissions/epoch.SaraLite/treeView.txt b/Sources/mpmissions/epoch.SaraLite/treeView.txt index 56284128..cdb9a614 100644 Binary files a/Sources/mpmissions/epoch.SaraLite/treeView.txt and b/Sources/mpmissions/epoch.SaraLite/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Sara_dbe1/treeView.txt b/Sources/mpmissions/epoch.Sara_dbe1/treeView.txt index 111a0625..b056bbe0 100644 Binary files a/Sources/mpmissions/epoch.Sara_dbe1/treeView.txt and b/Sources/mpmissions/epoch.Sara_dbe1/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Shapur_BAF/treeView.txt b/Sources/mpmissions/epoch.Shapur_BAF/treeView.txt index 072fac6a..ef31a315 100644 Binary files a/Sources/mpmissions/epoch.Shapur_BAF/treeView.txt and b/Sources/mpmissions/epoch.Shapur_BAF/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Stratis/treeView.txt b/Sources/mpmissions/epoch.Stratis/treeView.txt index a9810597..81a73ea9 100644 Binary files a/Sources/mpmissions/epoch.Stratis/treeView.txt and b/Sources/mpmissions/epoch.Stratis/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Takistan/treeView.txt b/Sources/mpmissions/epoch.Takistan/treeView.txt index b784217f..b1217259 100644 Binary files a/Sources/mpmissions/epoch.Takistan/treeView.txt and b/Sources/mpmissions/epoch.Takistan/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Tanoa/treeView.txt b/Sources/mpmissions/epoch.Tanoa/treeView.txt index 0c32da90..b6d39261 100644 Binary files a/Sources/mpmissions/epoch.Tanoa/treeView.txt and b/Sources/mpmissions/epoch.Tanoa/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Tanoa_RyanZed/treeView.txt b/Sources/mpmissions/epoch.Tanoa_RyanZed/treeView.txt index 9232d222..f643fd76 100644 Binary files a/Sources/mpmissions/epoch.Tanoa_RyanZed/treeView.txt and b/Sources/mpmissions/epoch.Tanoa_RyanZed/treeView.txt differ diff --git a/Sources/mpmissions/epoch.VR/treeView.txt b/Sources/mpmissions/epoch.VR/treeView.txt index eaa3c628..0b551f24 100644 Binary files a/Sources/mpmissions/epoch.VR/treeView.txt and b/Sources/mpmissions/epoch.VR/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Woodland_ACR/treeView.txt b/Sources/mpmissions/epoch.Woodland_ACR/treeView.txt index 90183202..5be62f3c 100644 Binary files a/Sources/mpmissions/epoch.Woodland_ACR/treeView.txt and b/Sources/mpmissions/epoch.Woodland_ACR/treeView.txt differ diff --git a/Sources/mpmissions/epoch.Zargabad/treeView.txt b/Sources/mpmissions/epoch.Zargabad/treeView.txt index 52073453..2f960784 100644 Binary files a/Sources/mpmissions/epoch.Zargabad/treeView.txt and b/Sources/mpmissions/epoch.Zargabad/treeView.txt differ diff --git a/Sources/mpmissions/epoch.utes/treeView.txt b/Sources/mpmissions/epoch.utes/treeView.txt index 874d621e..5ebd61ba 100644 Binary files a/Sources/mpmissions/epoch.utes/treeView.txt and b/Sources/mpmissions/epoch.utes/treeView.txt differ diff --git a/build.txt b/build.txt index 427e85d2..0975e259 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -629 +630