diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 75f47268..b44aa415 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 6555a959..ed148b2f 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 40a3de3b..693ade7a 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 25c28363..67d3a417 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 994192c0..ec226a1f 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 9cc953ad..8266310f 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 cd0f3216..621b9fa7 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 014977e1..d4620593 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 c50e6e6f..02472042 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 5ced4143..a88432fb 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 f86088e0..efd041c1 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 a8e463ce..23161dd6 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 ac3f13cf..663edd37 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 70bf09b2..d26ac6e5 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 b1bf7a93..fd953003 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 504a989e..88f42f75 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 9714ade4..fcf15f23 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 9517712c..4e96a2fb 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 01576a68..439523ac 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 f4822672..276cd2d4 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 37858cec..c1998c4c 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 f385b9e8..7df59e65 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.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index c5e8b59c..3341a575 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 48f0ca87..463534df 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 3b862a62..89aff739 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 560ad83e..b4578936 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 93416add..e6c63fc4 100644 --- a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp +++ b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp @@ -10382,6 +10382,7 @@ class CfgBuildingLootPos { {7.58691,1.3418,1.75143}, 267 } }; }; + class Land_Barracks_01_camo_F : Land_Barracks_01_grey_F {}; class Land_Church_02_F : Default { chairPos[] = { { {0.820313,-15.8745,-3.31618}, 360 }, @@ -10453,6 +10454,560 @@ class CfgBuildingLootPos { {-2.06567,0.0991211,5.35874}, 0 } }; }; + class Land_Airport_01_terminal_F : Default { + shelfPos[] = { + { {-8.92432,3.9043,-4.02355}, 180 } + }; + tablePos[] = { + { {6.97095,8.64941,-4.05115}, 360 }, + { {-15.301,1.44824,-4.03527}, 270 } + }; + lockerPos[] = { + { {-3.4248,2.5918,-4.02355}, 270 } + }; + toolRackPos[] = { + { {-10.52,2.11914,-4.17527}, 90 } + }; + shoeboxPos[] = { + { {-1.11304,-2.05566,-4.17527}, 120 }, + { {8.36523,4.32715,-4.05115}, 211 } + }; + palletPos[] = { + { {-4.90723,6.66016,-4.02355}, 180 }, + { {-8.74316,8.28613,-4.02355}, 180 } + }; + freezerPos[] = { + { {-7.42358,4.20898,-4.02355}, 181 } + }; + cabinetPos[] = { + { {3.85596,0.212891,-2.82126}, 180 } + }; + }; + class Land_dp_smallTank_F : Default { + shoeboxPos[] = { + { {-2.18872,0.745605,5.52527}, 360 } + }; + }; + class Land_House_Big_02_F : Default { + shelfPos[] = { + { {-6.26172,7.39502,-1.45192}, 271.405 } + }; + fridgePos[] = { + { {-4.95996,-0.250977,-1.45192}, 92.4045 } + }; + couchPos[] = { + { {-4.02734,8.32373,-1.45192}, 266 } + }; + wardrobePos[] = { + { {-7.33887,-0.602051,-1.45192}, 200 } + }; + cookerPos[] = { + { {-10.1758,2.96045,-1.45192}, 262.405 } + }; + chairPos[] = { + { {9.18945,-5.94482,-1.45192}, 210 } + }; + filingPos[] = { + { {5.15137,3.5791,-1.45192}, 80.4045 } + }; + tablePos[] = { + { {2.33398,3.50146,-1.45192}, 360 } + }; + toolRackPos[] = { + { {-2.30566,4.39014,-1.45192}, 178.405 } + }; + shoeboxPos[] = { + { {5.00391,1.60986,-1.45192}, 33.4045 } + }; + palletPos[] = { + { {-0.859375,8.72803,-1.45192}, 178.405 } + }; + freezerPos[] = { + { {-10.1797,1.22607,-1.45192}, 271.405 } + }; + }; + class Land_DPP_01_waterCooler_F : Default { + shoeboxPos[] = { + { {3.26855,1.49414,-1.96692}, 200 } + }; + palletPos[] = { + { {0.692383,1.22388,-10}, 200 }, + { {-1.78516,-2.64307,-10}, 200 } + }; + }; + class Land_DPP_01_smallFactory_F : Default { + shelfPos[] = { + { {0.342773,4.88306,-10}, 180 } + }; + shoeboxPos[] = { + { {-10.8447,1.93359,3.08963}, 320 } + }; + palletPos[] = { + { {-1.5752,5.64551,-10}, 190 } + }; + }; + class Land_GantryCrane_01_F : Default { + pelicanPos[] = { + { {-0.723633,1.46777,9.01571}, 120 } + }; + shoeboxPos[] = { + { {1.89746,-0.496094,9.39161}, 220 } + }; + }; + class Land_MobileCrane_01_F : Default { + shelfPos[] = { + { {10.7402,-2.49805,-19.0618}, 91 } + }; + lockerPos[] = { + { {10.5547,2.62158,-19.065}, 90 } + }; + shoeboxPos[] = { + { {7.84961,-3.33984,-8.30899}, 300 } + }; + palletPos[] = { + { {14.0488,-2.7959,-14.0393}, 270 }, + { {15.6523,1.0332,-12.8083}, 250 } + }; + }; + class Land_MobileCrane_01_hook_F : Land_MobileCrane_01_F {}; + class Land_SCF_01_shed_F : Default { + palletPos[] = { + { {9.55371,0.875,-10}, 270 }, + { {-9.4187,-14.084,-10}, 270 } + }; + }; + class Land_Shop_City_05_F : Default { + couchPos[] = { + { {-0.138672,-10.7393,-7.28326}, 274 } + }; + shoeboxPos[] = { + { {1.63086,13.9697,-7.02897}, 190.8 } + }; + palletPos[] = { + { {-9.44238,15.4424,-10}, 190.8 } + }; + }; + class Land_MultistoryBuilding_01_F : Default { + shelfPos[] = { + { {15.0352,5.12891,-21.0171}, 360 } + }; + lockerPos[] = { + { {10.4814,-13.9253,-21.0171}, 179.8 } + }; + toolRackPos[] = { + { {9.27246,-3.62622,-21.0171}, 269 } + }; + shoeboxPos[] = { + { {21.5146,4.90503,-21.0171}, 30 } + }; + palletPos[] = { + { {10.1982,4.39917,-21.0171}, 182.8 }, + { {12.5723,-8.16211,-21.0171}, 182.8 } + }; + cabinetPos[] = { + { {19.5664,5.21143,-19.7702}, 88.8 } + }; + }; + class Land_MultistoryBuilding_03_F : Default { + shelfPos[] = { + { {-1.05566,4.97437,-26}, 100 } + }; + chairPos[] = { + { {-6.9209,-1.37549,-24.2517}, 100 } + }; + filingPos[] = { + { {-1.14063,4.07007,-26}, 100 } + }; + toolRackPos[] = { + { {-2.94629,8.3147,-25.7446}, 3 } + }; + shoeboxPos[] = { + { {-1.65137,-12.4939,-26}, 100 } + }; + palletPos[] = { + { {-5.52832,4.54736,-26}, 0 } + }; + cabinetPos[] = { + { {-0.852539,6.11084,-24.5986}, 180 } + }; + }; + class Land_MultistoryBuilding_04_F : Default { + shelfPos[] = { + { {-8.16956,9.50293,-36.322}, 100 } + }; + chairPos[] = { + { {3.35938,-9.11426,-36.322}, 340 }, + { {-8.71216,-6.77441,-36.322}, 110 } + }; + filingPos[] = { + { {-8.41406,-4.76172,-36.322}, 160 } + }; + shoeboxPos[] = { + { {11.5045,-8.82324,-36.322}, 100 } + }; + palletPos[] = { + { {1.19971,-13.2129,-36.322}, 100 }, + { {-3.46057,13.7285,-36.322}, 100 }, + { {6.96362,13.7822,-36.322}, 70 } + }; + cabinetPos[] = { + { {12.7135,6.69727,-35.3042}, 0 } + }; + }; + class Land_Cathedral_01_F : Default { + chairPos[] = { + { {-7.57324,-0.583008,-9.39412}, 43 } + }; + tablePos[] = { + { {0.451172,-12.4187,-7.82105}, 13 } + }; + shoeboxPos[] = { + { {-9.78125,-9.85229,-9.39412}, 43 } + }; + palletPos[] = { + { {7.71191,-0.686768,-9.39412}, 360 } + }; + }; + class Land_Airport_01_hangar_F : Default { + shelfPos[] = { + { {14.9707,4.25635,-3}, 81 }, + { {-3.5625,15.9639,-3}, 1 }, + { {-8.81055,15.979,-3}, 1 } + }; + toolRackPos[] = { + { {12.5303,-10.4146,-2.62908}, 181 } + }; + palletPos[] = { + { {-13.75,-8.90918,-3}, 191 }, + { {-14.0654,14.2466,-3}, 84 } + }; + }; + class Land_Airport_02_controlTower_F : Default { + shelfPos[] = { + { {-0.619141,0.914063,-10.799}, 359 } + }; + filingPos[] = { + { {0.871582,2.76172,2.18546}, 183 }, + { {-0.985352,2.78906,2.18546}, 181 } + }; + pelicanPos[] = { + { {1.77051,5.9082,3.09551}, 53 } + }; + shoeboxPos[] = { + { {-2.04199,5.11133,3.09551}, 53 } + }; + palletPos[] = { + { {-0.614746,-1.76758,-10.7145}, 90 } + }; + cabinetPos[] = { + { {0.940918,1.02539,0.285469}, 90 } + }; + }; + class Land_Airport_02_terminal_F : Default { + chairPos[] = { + { {10.875,-2.83594,-1.4043}, 90 } + }; + tablePos[] = { + { {10.9907,-0.375,-1.4043}, 90 } + }; + lockerPos[] = { + { {4.18457,2.45215,-1.40867}, 270 }, + { {4.19165,4.24609,-1.40868}, 270 } + }; + shoeboxPos[] = { + { {7.94824,2.00195,-0.939405}, 60 } + }; + palletPos[] = { + { {4.65234,-0.265625,-1.40867}, 90 } + }; + cabinetPos[] = { + { {10.6372,5.38281,-0.141179}, 90 } + }; + }; + class Land_Airport_02_hangar_right_F : Default { + shelfPos[] = { + { {5.99121,9.65039,-7.25818}, 90 }, + { {6.23975,-14.0654,-7.72174}, 90 }, + { {9.82324,-12.6621,-7.71869}, 179 } + }; + lockerPos[] = { + { {6.06519,-17.5381,-7.72373}, 90 } + }; + toolRackPos[] = { + { {12.8186,-7.41309,-7.25818}, 90 } + }; + shoeboxPos[] = { + { {6.60205,-19.917,-1.86625}, 230 } + }; + cabinetPos[] = { + { {6.375,-21.5215,-6.16557}, 179 } + }; + }; + class Land_Airport_02_hangar_left_F : Default { + shelfPos[] = { + { {-12.5098,-8.36523,-7.24053}, 272 }, + { {6.09326,20.5518,-7.25266}, 0 }, + { {-5.78027,-23.7773,-1.23606}, 272 } + }; + shoeboxPos[] = { + { {-4.53125,20.251,-1.24107}, 144 } + }; + }; + class Land_DPP_01_mainFactory_F : Default { + shelfPos[] = { + { {12.4868,5.71582,-4.25747}, 360 } + }; + toolRackPos[] = { + { {11.915,-0.972656,-10.5492}, 272 } + }; + shoeboxPos[] = { + { {12.3447,6.52246,-5.56747}, 50 } + }; + palletPos[] = { + { {-5.20117,11.5381,-9.74186}, 84 }, + { {-9.70508,11.4258,-9.73776}, 84 }, + { {20.9487,-3.17871,-7.43347}, 50 } + }; + }; + class Land_CombineHarvester_01_wreck_F : Default { + shoeboxPos[] = { + { {1.24243,-1.62891,0.0273294}, 272 } + }; + palletPos[] = { + { {2.77905,1.94629,-1.88333}, 272 } + }; + }; + class Land_SCF_01_generalBuilding_F : Default { + shelfPos[] = { + { {1.65527,-13.3105,-4.84338}, 360 }, + { {-5.47607,-13.2764,-0.342323}, 360 }, + { {-1.80737,-22.2637,-4.84338}, 170 } + }; + toolRackPos[] = { + { {-4.11987,-13.1016,-4.84338}, 1.99998 } + }; + shoeboxPos[] = { + { {-2.5481,-22.7988,9.69048}, 122 } + }; + palletPos[] = { + { {2.17529,-16.9023,-0.342323}, 1.99998 }, + { {-2.24731,-18.9658,-0.342323}, 1.99998 }, + { {-0.242432,-21.7676,-4.84338}, 340 } + }; + }; + class Land_SCF_01_washer_F : Default { + shelfPos[] = { + { {5.99902,1.37305,2.18735}, 180 }, + { {-3.38672,6.87158,-1.80765}, 180 } + }; + shoeboxPos[] = { + { {-1.32813,2.7832,2.18735}, 159 } + }; + palletPos[] = { + { {-0.738281,4.4375,3.22431}, 180 }, + { {3.9248,7.34766,-1.76456}, 360 } + }; + }; + class Land_SCF_01_shredder_F : Default { + shoeboxPos[] = { + { {1.08203,-6.02979,-1.39866}, 229 } + }; + palletPos[] = { + { {-0.345703,-5.55029,-1.39866}, 159 } + }; + }; + class Land_SCF_01_clarifier_F : Default { + shelfPos[] = { + { {4.23633,-5.50244,-2.00547}, 270 } + }; + shoeboxPos[] = { + { {-1.63477,1.06299,8.53659}, 215 } + }; + palletPos[] = { + { {3.67383,-3.10547,-10}, 240 }, + { {-5.26855,-2.09424,-10}, 240 } + }; + }; + class Land_SCF_01_feeder_F : Default { + shoeboxPos[] = { + { {-0.84668,8.46875,-3.38788}, 240 } + }; + palletPos[] = { + { {-2.33984,15.1572,-2.61678}, 240 } + }; + }; + class Land_SCF_01_chimney_F : Default { + pelicanPos[] = { + { {-2.99512,-3.04297,24.3271}, 200 } + }; + shoeboxPos[] = { + { {0.0537109,1.75391,24.3271}, 200 } + }; + }; + class Land_SCF_01_boilerBuilding_F : Default { + shelfPos[] = { + { {22.2256,1.09546,-8.65179}, 90 }, + { {22.4199,2.60059,-17.6125}, 270 }, + { {-1.29102,23.6138,-13.1725}, 90 } + }; + toolRackPos[] = { + { {14.8506,-0.107178,-17.8281}, 180 } + }; + shoeboxPos[] = { + { {10.8652,14.1597,-17.8272}, 350 } + }; + palletPos[] = { + { {16.4326,1.20996,-13.1888}, 358 }, + { {15.5107,13.283,-13.177}, 358 }, + { {11.7666,-17.9785,-17.695}, 190 }, + { {-23.1025,15.8513,-17.6078}, 190 } + }; + cabinetPos[] = { + { {10.6318,3.73242,-11.8678}, 358 } + }; + }; + class Land_SCF_01_crystallizer_F : Default { + shelfPos[] = { + { {5.98633,5.46533,-0.536706}, 360 }, + { {-8.78906,-0.0581055,-0.536711}, 180 } + }; + shoeboxPos[] = { + { {8.37891,5.93506,-2.93731}, 230 } + }; + palletPos[] = { + { {1.06738,0.640137,-0.536709}, 360 }, + { {-3.97168,0.850098,4.92104}, 350 } + }; + }; + class Land_SCF_01_crystallizerTowers_F : Default { + shelfPos[] = { + { {1.4541,-0.650879,-7.24714}, 360 } + }; + shoeboxPos[] = { + { {-4.73145,1.5752,12.2733}, 140 } + }; + palletPos[] = { + { {-0.708008,-0.354492,-7.24714}, 270 } + }; + }; + class Land_Radar_Small_F : Default { + shelfPos[] = { + { {0.581055,3.92749,-10}, 200 } + }; + palletPos[] = { + { {-4.85449,-0.675781,-10}, 169 } + }; + }; + class Land_MiningShovel_01_abandoned_F : Default { + shelfPos[] = { + { {3.3916,-2.8252,-0.647353}, 70 } + }; + shoeboxPos[] = { + { {-0.786133,-7.95947,3.74709}, 139 } + }; + palletPos[] = { + { {-2.4502,-4.36426,-0.484981}, 179 }, + { {-0.444336,-9.64648,-0.484981}, 149 } + }; + }; + class Land_SM_01_reservoirTower_F : Default { + shelfPos[] = { + { {-0.0371094,1.45996,-1.95632}, 180 } + }; + shoeboxPos[] = { + { {-3.44531,-2.54688,-1.98985}, 211 } + }; + palletPos[] = { + { {0.893555,-3.41504,-1.98556}, 251 } + }; + }; + class Land_HaulTruck_01_abandoned_F : Default { + shoeboxPos[] = { + { {-0.0493164,-3.35742,1.27724}, 151 } + }; + palletPos[] = { + { {-1.08545,-5.21582,1.27749}, 181 } + }; + }; + class Land_Warehouse_01_F : Default { + shelfPos[] = { + { {5.69727,-20.2239,-10}, 360 } + }; + palletPos[] = { + { {2.49023,-21.2285,-10}, 161 }, + { {-1.92578,21.6052,-10}, 161 } + }; + }; + class Land_Warehouse_02_F : Default { + shelfPos[] = { + { {8.18945,-11.0618,-3.96959}, 360 } + }; + palletPos[] = { + { {-1.94727,-11.8555,-3.96959}, 360 }, + { {11.3662,-11.8032,-3.96959}, 360 } + }; + }; + class Land_SM_01_shelter_narrow_F : Default { + palletPos[] = { + { {-2.53125,11.0098,-10}, 360 }, + { {4.07813,-10.8501,-10}, 360 } + }; + }; + class Land_SM_01_shelter_wide_F : Default { + palletPos[] = { + { {-7.67676,5.47681,-10}, 360 }, + { {7.57324,-6.09155,-10}, 360 } + }; + }; + class Land_SM_01_shed_unfinished_F : Default { + shelfPos[] = { + { {-3.42773,8.58179,-1.648}, 350 } + }; + filingPos[] = { + { {-4.98242,-1.33374,-1.648}, 100 } + }; + shoeboxPos[] = { + { {-4.00879,1.89185,-1.648}, 80 } + }; + palletPos[] = { + { {1.77051,2.32544,-1.648}, 360 } + }; + }; + class Land_SY_01_reclaimer_F : Default { + shelfPos[] = { + { {-14.377,5.68848,-2.27833}, 360 } + }; + shoeboxPos[] = { + { {-11.6846,1.34912,-2.27688}, 220 } + }; + palletPos[] = { + { {-15.2012,-1.79639,-10}, 220 } + }; + }; + class Land_SM_01_shed_F : Default { + shelfPos[] = { + { {-5.92969,-1.72266,-1.60012}, 180 }, + { {9.05469,-1.71729,-1.60012}, 180 }, + { {8.64551,8.68945,-1.60012}, 0 } + }; + toolRackPos[] = { + { {-1.58496,8.8877,-1.60012}, 0 } + }; + shoeboxPos[] = { + { {-6.93652,2.11621,-1.60012}, 140 } + }; + palletPos[] = { + { {-3.1377,-0.233398,-1.60012}, 170 } + }; + freezerPos[] = { + { {-5.04785,1.56201,-1.60012}, 90 } + }; + cabinetPos[] = { + { {-8.79102,-1.59473,-0.300119}, 0 } + }; + }; + + diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 7b642bf6..47db6d75 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=536; +build=537; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 7b642bf6..47db6d75 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=536; +build=537; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 7b642bf6..47db6d75 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=536; +build=537; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 7b642bf6..47db6d75 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=536; +build=537; diff --git a/Tools/SQF/saveLootPositionsVector.sqf b/Tools/SQF/saveLootPositionsVector.sqf index 0947203e..c6482e46 100644 --- a/Tools/SQF/saveLootPositionsVector.sqf +++ b/Tools/SQF/saveLootPositionsVector.sqf @@ -413,7 +413,7 @@ EPOCH_KeyDownCustom = { if (_ctrl) then { - EPB = []; "if (isclass _x) then {EPB pushBack (configName _x); true}" configClasses (configFile >> "CfgBuildingLootPos") + EPB = []; "if (isclass _x) then {EPB pushBack (configName _x); true}" configClasses (getMissionConfig "CfgBuildingLootPos") } else { _buildLoading = objNull; @@ -424,16 +424,11 @@ EPOCH_KeyDownCustom = { }; _buildingPos = getPosATL _buildLoading; - _config = missionConfigFile; + _customLoot = true; _lootCount = 0; - if!(isClass (_config >> "CfgBuildingLootPos" >> typeOf _buildLoading))then{ - _config = configFile; - _customLoot = false; - }; - - if(isClass (_config >> "CfgBuildingLootPos" >> typeOf _buildLoading))then{ + if(isClass (getMissionConfig "CfgBuildingLootPos" >> typeOf _buildLoading))then{ { _thisLoot = _x select 1; @@ -450,7 +445,7 @@ EPOCH_KeyDownCustom = { _newLoot setDir _dir; _lootCount = _lootCount + 1; - }forEach getArray(_config >> "CfgBuildingLootPos" >> typeOf _buildLoading >> _thisRawLootPos); + }forEach getArray(getMissionConfig "CfgBuildingLootPos" >> typeOf _buildLoading >> _thisRawLootPos); } forEach EPOCH_lootClassesRaw; @@ -528,7 +523,7 @@ EPOCH_dbg_saveLootPos = { _ppos = EP_building worldToModel (getposATL _x); _directionOffset = [_x,EP_building] call EPOCH_dirOffset; _config_str = _config_str + format[' { %1, %2 }%3', _ppos call EPOCH_dbg_replaceBrackets, _directionOffset,if (_forEachIndex isEqualTo _countArray) then {_br} else {("," + _br)}]; - } forEach _objectsArray; + } forEach _objectsArray - [EPOCH_vehTarget]; _config_str = _config_str + " };" + _br; }; } forEach EPOCH_lootClassesRaw; @@ -567,7 +562,7 @@ EPOCH_LOOT = { _building = EP_building; - _config = configFile >> 'CfgBuildingLootPos' >> (typeOf _building); + _config = getMissionConfig 'CfgBuildingLootPos' >> (typeOf _building); _buildingPos = (getPosATL _building); @@ -699,9 +694,7 @@ KK_boundingBox = { case 0: { _worldPos set [2, _intersectPosASL select 2]; }; - case 1: { - _worldPos set [2, _intersectPosASL select 2]; - }; + case 1; case 2; case 3; case 4; diff --git a/build.txt b/build.txt index 3e43b029..d12c9d64 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -536 +537