diff --git a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp index 236d8d35..214ea770 100644 --- a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp +++ b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp @@ -5504,6 +5504,8 @@ class CfgBuildingLootPos shelfPos[] = {{{-7.83765,0.891602,-13.6092},89.0666}}; }; class Land_Church_04_yellow_damaged_F : Land_Church_04_damaged_F {}; + class Land_Church_04_small_yellow_damaged_F : Land_Church_04_damaged_F {}; + class Land_Church_04_small_white_damaged_F : Land_Church_04_damaged_F {}; class Land_Shed_09_F : Default { toiletPos[] = {{{2.00146,2.98535,-1.41129},-315.669}}; @@ -5534,6 +5536,7 @@ class CfgBuildingLootPos toolRackPos[] = {{{1.8606,1.22266,-2.95108},270.933}}; }; class Land_Chapel_02_white_F : Land_Chapel_02_yellow_F {}; + class Land_Chapel_02_yellow_damaged_F : Land_Chapel_02_yellow_F {}; class Land_FuelStation_03_shop_F : Default { lockerPos[] = {{{-1.84961,1.02539,-1.57671},1.28944}}; @@ -5645,6 +5648,7 @@ class CfgBuildingLootPos pelicanPos[] = {{{-0.458252,-0.527344,-0.916962},270.183}}; shoeboxPos[] = {{{0.724121,-0.551758,-0.817841},269.683}}; }; + class Land_GuardBox_01_smooth_F : Land_GuardBox_01_brown_F {}; class Land_GuardHouse_02_grey_F : Default { toiletPos[] = {{{0.530762,1.94946,-1.55855},180.265}}; @@ -5862,6 +5866,7 @@ class CfgBuildingLootPos filingPos[] = {{{1.83643,1.72363,-1.32912},49.5219}}; cabinetPos[] = {{{-1.18335,1.97168,-0.0212402},90.0218}}; }; + class Land_Workshop_02 : Land_Workshop_02_grey_F {}; class Land_Camp_House_01_brown_F : Default { freezerPos[] = {{{-2.50635,1.896,-1.40231},-180.087}}; @@ -5996,6 +6001,244 @@ class CfgBuildingLootPos palletPos[] = {{{0.143555,-1.85425,-1.54256},-138.466}}; pelicanPos[] = {{{1.07861,0.757813,-1.59256},132.034}}; }; + class Land_House_2W02_F : Default + { + lockerPos[] = {{{8.26245,-2.01172,-1.29372},-179.593}}; + chairPos[] = {{{5.63354,-1.72656,-1.29372},-149.096},{{0.497314,-3.39844,-4.04601},-94.0974}}; + bedPos[] = {{{2.25171,-1.78906,-1.29372},-178.097}}; + wardrobePos[] = {{{4.53442,-1.11328,-1.29372},89.9038}}; + tablePos[] = {{{8.59448,2.43457,-1.29372},89.9038},{{1.20142,-1.34473,-4.046},-90.594}}; + couchPos[] = {{{5.67554,-2.68945,-4.04601},-0.0961609}}; + kitchenSinkPos[] = {{{5.80127,1.92871,-4.04601},-0.0961609}}; + fridgePos[] = {{{4.52075,1.9541,-4.04601},-0.596161}}; + filingPos[] = {{{-0.488037,-1.9834,-4.046},-180.094}}; + shoeboxPos[] = {{{6.87524,3.76074,-1.29372},-144.596}}; + }; + class Land_Barn_03_large_F : Default + { + toolRackPos[] = {{{6.61719,-16.4053,-2.74434},-269.74},{{-6.8667,17.2676,-2.80023},-89.2434}}; + couchPos[] = {{{5.51953,-9.6123,-2.64548},0.256897}}; + shelfPos[] = {{{6.48975,-2.69922,-2.64665},-269.744}}; + filingPos[] = {{{6.37305,3.93848,-2.64786},-269.744}}; + tablePos[] = {{{6.11621,10.0693,-2.59874},-269.744}}; + palletPos[] = {{{-0.0932617,-7.35107,-2.64671},-333.744},{{1.1958,6.01904,-2.64749},-333.744},{{-4.70313,-16.9983,-2.64497},-333.742}}; + lockerPos[] = {{{-6.5083,10.1785,-2.64897},-90.2434}}; + chairPos[] = {{{-6.32617,3.60254,-2.64784},-89.2435}}; + pelicanPos[] = {{{0.800781,-1.2168,-2.64641},-333.744}}; + freezerPos[] = {{{-6.47705,-3.26514,-2.64664},-89.7435}}; + cabinetPos[] = {{{-6.87207,-7.88037,-1.39577},0.256409}}; + }; + class Land_Chapel_02_white_damaged_F : Default + { + cabinetPos[] = {{{0.052002,2.60254,-0.223801},88.0755}}; + shoeboxPos[] = {{{-0.791992,1.43945,-1.7845},-236.925}}; + pelicanPos[] = {{{0.629883,1.46484,-1.83058},34.0754}}; + }; + class Land_Barn_04_F : Default + { + lockerPos[] = {{{9.65771,-6.89404,-5.42911},-269.83}}; + tablePos[] = {{{9.59326,-12.1714,-5.42911},-270.33}}; + freezerPos[] = {{{9.69189,-17.8008,-5.42911},-270.83}}; + couchPos[] = {{{7.27979,-24.9019,-5.42912},-269.83},{{6.70459,21.9866,-5.42911},-89.3298}}; + toolRackPos[] = {{{-2.85596,-26.1216,-5.67912},-179.325}}; + kitchenSinkPos[] = {{{-11.0654,-23.2974,-5.42912},-90.3378}}; + shelfPos[] = {{{-11.2788,-12.4233,-5.42909},-90.3299}}; + chairPos[] = {{{-10.897,9.86206,-5.42911},-90.3299}}; + filingPos[] = {{{-11.147,20.0383,-5.42911},-90.3299}}; + bedPos[] = {{{9.32568,9.59277,-5.42911},1.16998}}; + palletPos[] = {{{-0.682617,13.0063,-5.42911},-320.83},{{-0.995605,1.47925,-5.42911},-320.83},{{-0.950684,-10.4038,-5.42911},-320.83}}; + cabinetPos[] = {{{-0.469727,-3.85327,-4.02902},0.169983},{{-0.882324,7.05762,-4.02902},-180.33}}; + pelicanPos[] = {{{-1.21729,-6.91553,-5.42911},-320.83}}; + }; + class Land_HouseRuin_Big_03_F : Default + { + lockerPos[] = {{{-0.298828,1.43628,-0.563751},-1.6514}}; + tablePos[] = {{{2.71484,-7.93481,-0.528076},-181.152},{{-2.49902,-5.8208,-4.53437},-180.152}}; + cabinetPos[] = {{{-0.124023,-5.51294,0.739464},-89.651}}; + palletPos[] = {{{1.77832,-1.35889,-0.541603},-296.151}}; + pelicanPos[] = {{{2.84375,3.90625,-0.622795},-235.151}}; + freezerPos[] = {{{3.6123,-2.46631,-4.53437},-0.151398}}; + shoeboxPos[] = {{{0.601563,-3.89233,-4.53437},-296.151}}; + toolRackPos[] = {{{-0.152344,1.61084,-4.69476},-0.151398}}; + }; + class Land_House_2W05_F : Default + { + shelfPos[] = {{{-1.31348,-3.78125,-0.614944},90.1683}}; + tablePos[] = {{{-3.20996,-4.66699,-0.61496},180.169},{{-7.2373,-3.7417,-0.614944},269.19}}; + bedPos[] = {{{-5.18945,-3.71338,-0.615128},180.669}}; + wardrobePos[] = {{{-6.86035,0.986816,-0.614944},-0.331471}}; + palletPos[] = {{{-6.17773,3.14014,-3.39426},318.807}}; + chairPos[] = {{{-2.69922,4.47168,-3.39426},139.168}}; + kitchenSinkPos[] = {{{-6.83887,0.984375,-3.32794},0.168529}}; + cookerPos[] = {{{-5.56934,0.970703,-3.3284},0.168528}}; + freezerPos[] = {{{-1.58105,0.523438,-3.32794},89.6683}}; + lockerPos[] = {{{2.5,-4.72559,-3.32794},180.183}}; + shoeboxPos[] = {{{2.23535,-1.84131,-3.32794},227.669}}; + cabinetPos[] = {{{-4.52832,1.78467,-2.12309},269.169}}; + filingPos[] = {{{-7.31055,-4.76025,-3.32794},220.189}}; + couchPos[] = {{{-5.05664,-3.95459,-3.32794},89.6918}}; + }; + class Land_ServiceHangar_01_R_F : Default + { + bedPos[] = {{{-8.82129,13.5615,0.101723},1.86125}}; + couchPos[] = {{{1.35547,13.8799,0.10144},-89.6406}}; + filingPos[] = {{{8.84619,14.7227,0.10144},-0.139984}}; + chairPos[] = {{{19.1294,5.94238,0.10144},57.3598}}; + palletPos[] = {{{-0.0253906,4.54102,0.10144},135.353}}; + freezerPos[] = {{{-9.18848,-21.7852,0.10144},-89.6406}}; + kitchenSinkPos[] = {{{-9.18311,-10.0264,0.10144},-90.1407}}; + toolRackPos[] = {{{20.3262,-10.2637,-0.198578},90.3598}}; + pelicanPos[] = {{{-8.63672,14.2441,3.2434},-37.1392}}; + }; + class Land_ServiceHangar_01_L_F : Default + { + tablePos[] = {{{19.8408,-0.854492,0.10144},89.8598},{{-3.48633,-6.07422,0.151443},89.8598}}; + toolRackPos[] = {{{16.2842,-14.498,0.00143433},-178.64}}; + lockerPos[] = {{{-4.4834,-2.72949,0.10144},-0.140579}}; + couchPos[] = {{{-8.46973,-5.95215,0.10144},-180.14}}; + cabinetPos[] = {{{-3.10645,-7.71289,1.25152},-180.14}}; + palletPos[] = {{{6.44043,-2.83496,0.10144},-224.64},{{1.59961,9.62305,0.10144},-224.64}}; + pelicanPos[] = {{{-4.42285,-7.98926,3.2434},-224.64}}; + freezerPos[] = {{{-3.47998,-3.26855,3.2434},89.3598}}; + kitchenSinkPos[] = {{{-6.60205,-2.74707,3.2434},-0.139893}}; + filingPos[] = {{{-9.30469,10.9053,0.10144},-90.1401}}; + shoeboxPos[] = {{{-6.11035,0.168945,0.10144},36.3598}}; + shelfPos[] = {{{-9.36572,0.804688,0.10144},-90.6408}}; + }; + class Land_House_1W09_F : Default + { + bedPos[] = {{{-5.75293,-3.6355,-1.95078},-89.992}}; + wardrobePos[] = {{{-0.455078,-2.76147,-1.95308},89.9418}}; + tablePos[] = {{{-5.05762,-0.39917,-1.95308},-0.0493622},{{-4.22949,0.766113,-1.95308},179.951}}; + couchPos[] = {{{-3.87598,3.30054,-1.95306},-88.5532}}; + kitchenSinkPos[] = {{{-1.0498,4.04663,-1.95308},0.0102386}}; + shelfPos[] = {{{-6.34277,0.527588,-1.95308},180.451}}; + fridgePos[] = {{{0.643555,4.08569,-1.95308},-1.03757}}; + cabinetPos[] = {{{-0.199219,1.18066,-0.653},179.991}}; + }; + class Land_i_Shed_Ind_old_F : Land_i_Shed_Ind_F {}; + class Land_House_1W11_F : Default + { + chairPos[] = {{{-6.56348,-4.94678,-2.82291},125.298}}; + kitchenSinkPos[] = {{{-4.26074,-1.10059,-2.63437},-90.2121}}; + cookerPos[] = {{{-4.23242,-2.32324,-2.63535},-89.7121}}; + fridgePos[] = {{{-4.26172,-3.20313,-2.63483},-90.7024}}; + couchPos[] = {{{1.51855,-1.4209,-2.63501},-89.7433}}; + tablePos[] = {{{1.86035,-5.79834,-2.63776},179.757}}; + filingPos[] = {{{-4.33887,-5.80518,-2.63535},-90.1906}}; + shelfPos[] = {{{-2.21582,-0.454834,-2.63448},-0.229721}}; + }; + class Land_Bunker_02_double_F : Default + { + pelicanPos[] = {{{0.244141,1.23438,-1.0304},0.391693}}; + shoeboxPos[] = {{{-1.68115,-0.110352,-1.003},-85.1081}}; + }; + class Land_ChurchRuin_01_F : Default + { + toolRackPos[] = {{{3.11914,9.71777,-4.80076},-270.589}}; + pelicanPos[] = {{{-1.94141,6.78662,3.36325},-124.089}}; + tablePos[] = {{{1.98047,13.0469,3.37797},-310.089}}; + shoeboxPos[] = {{{1.55762,10.1948,3.38235},-52.0876}}; + filingPos[] = {{{-2.36426,13.0542,-4.75348},-42.0814}}; + }; + class Land_Radar_01_antenna_base_F : Default + { + couchPos[] = {{{12.3984,-6.6084,-2.80344},91.4998}}; + tablePos[] = {{{11.5742,-0.556152,-2.80344},0},{{11.3271,2.91089,0.91214},270},{{-5.354,-5.59375,-2.80344},270}}; + cabinetPos[] = {{{15.04,2.47559,-1.60373},178.499}}; + kitchenSinkPos[] = {{{14.7104,7.146,-2.80344},89.4997},{{-1.38916,-7.43359,-2.80344},179.999}}; + freezerPos[] = {{{12.3062,4.57568,-2.80344},179.499},{{1.3374,-2.45532,-2.80344},0}}; + filingPos[] = {{{9.8374,9.08032,-2.80344},298.5},{{9.28223,8.64697,0.91214},270.5}}; + palletPos[] = {{{5.95947,-4.19141,-2.80344},0},{{-12.7056,0.493164,-3.58148},0}}; + chairPos[] = {{{4.47119,8.6228,-2.80344},0},{{14.4839,8.72168,0.91214},52.4999}}; + pelicanPos[] = {{{5.93896,7.9231,0.91214},0},{{-10.0767,-5.8999,0.91214},250.5}}; + bedPos[] = {{{13.6646,-4.34521,0.91214},91.4998}}; + wardrobePos[] = {{{9.38037,-5.86157,0.91214},270.5}}; + toiletPos[] = {{{14.5366,-2.77368,0.91214},129}}; + toolRackPos[] = {{{6.88965,-7.75659,0.412262},180.501}}; + shoeboxPos[] = {{{-7.0498,-5.88892,0.91214},0}}; + lockerPos[] = {{{2.16211,-5.36938,0.91214},89.9998}}; + }; + class Land_Barracks_02_F : Default + { + bedPos[] = {{{-7.14502,-2.94336,-1.69466},179.861},{{-3.91992,-3,-1.69458},180.361},{{-0.823242,-2.97656,-1.69458},179.861},{{2.42285,-3.00195,-1.69451},180.36}}; + lockerPos[] = {{{-5.61523,3.95898,-1.69442},-1.13996},{{0.778809,3.97168,-1.69442},-0.139748}}; + pelicanPos[] = {{{-2.67236,3.05078,-1.69442},-54.6392}}; + couchPos[] = {{{-8.85254,2.11719,-1.69441},180.36}}; + chairPos[] = {{{4.37158,3.60352,-1.69442},51.8602}}; + shoeboxPos[] = {{{-2.34229,-3.26074,-1.69442},-0.639492}}; + }; + class Land_House_1W07_F : Default + { + bedPos[] = {{{-4.49951,-4.56738,-3.0888},270.459}}; + wardrobePos[] = {{{0.74292,-6.35938,-3.0888},89.9583}}; + tablePos[] = {{{-2.31177,-7.79688,-3.0888},179.959},{{-7.02124,-0.893555,-3.0888},269.959}}; + chairPos[] = {{{-5.16357,-7.55566,-3.0888},218.959}}; + kitchenSinkPos[] = {{{1.74707,0.276367,-3.0888},269.959}}; + cookerPos[] = {{{1.76929,1.57324,-3.0888},269.959}}; + shelfPos[] = {{{1.61548,2.87207,-3.0888},270.459}}; + lockerPos[] = {{{5.55713,-3.02832,-3.0888},179.458}}; + couchPos[] = {{{-1.4563,0.137695,-3.0888},0.458786}}; + filingPos[] = {{{-6.63892,3.31152,-3.0888},0.958698}}; + }; + class Land_Caravan_01_rust_F : Default + { + filingPos[] = {{{-0.486816,4.37793,0.127487},-34.7552}}; + chairPos[] = {{{0.625244,4.11426,0.127472},32.2445}}; + shoeboxPos[] = {{{-0.400391,2.91211,0.127472},120.244}}; + pelicanPos[] = {{{0.701172,1.00879,0.127457},81.2444}}; + cabinetPos[] = {{{-0.584473,-2.14258,0.626373},87.7648}}; + }; + class Land_Workshop_01_grey_F : Default + { + toolRackPos[] = {{{3.61719,-5.99658,-1.32436},179.757}}; + lockerPos[] = {{{0.861328,-0.762451,-0.92437},270.257}}; + tablePos[] = {{{4.36963,-3.40991,-0.92437},90.2567}}; + palletPos[] = {{{1.94678,-3.24048,-0.92437},-81.2434}}; + filingPos[] = {{{0.710938,-5.68384,-0.924368},269.742}}; + freezerPos[] = {{{4.44385,-1.05884,-1.06803},89.757}}; + }; + class Land_Workshop_01_F : Land_Workshop_01_grey_F {}; + class Land_GuardTower_01_F : Default + { + pelicanPos[] = {{{-0.831787,-5.53809,5.15538},269.518}}; + shoeboxPos[] = {{{0.747803,-5.30566,5.15538},316.018}}; + }; + class Land_Shed_10_F : Default + { + chairPos[] = {{{3.27002,-1.91553,-0.0551071},134.086}}; + shelfPos[] = {{{0.726074,1.1333,-0.0225372},0.0866686}}; + shoeboxPos[] = {{{3.38086,0.840332,-0.0225372},225.087}}; + }; + class Land_House_1W02_F : Default + { + bedPos[] = {{{3.77148,2.33789,-2.12524},1.68378}}; + wardrobePos[] = {{{5.02881,-0.820313,-2.12385},90.162}}; + kitchenSinkPos[] = {{{0.736572,2.91016,-2.12385},90.1843}}; + cookerPos[] = {{{0.704346,1.64551,-2.12462},90.207}}; + shelfPos[] = {{{-1.13184,1.79688,-2.1237},-90.2927}}; + chairPos[] = {{{-2.92407,-0.946289,-2.12376},114.694}}; + cabinetPos[] = {{{0.165283,-1.62695,-0.973625},-90.2936}}; + }; + class Land_House_1W01_F : Default + { + bedPos[] = {{{-3.89453,1.14844,-2.84573},181.144}}; + wardrobePos[] = {{{-1.96582,4.72363,-2.84727},90.1434}}; + couchPos[] = {{{1.53223,4.3623,-2.84727},270.65}}; + tablePos[] = {{{2.8772,0.212891,-2.84727},179.164}}; + cabinetPos[] = {{{-1.18311,1.69629,-1.5972},-0.856155}}; + lockerPos[] = {{{4.3623,4.71582,-2.89729},89.6738}}; + }; + class Land_ControlTower_02_F : Default + { + pelicanPos[] = {{{9.23242,4.7627,-9.63004},58.8888},{{9.84766,-5.00781,-1.10828},124.837}}; + lockerPos[] = {{{3.4043,2.37793,-5.51505},179.858}}; + tablePos[] = {{{1.63086,-2.09277,-1.07005},-90.1634}}; + palletPos[] = {{{5.34961,-0.560547,-1.07005},-134.663}}; + shelfPos[] = {{{7.81445,2.52246,-1.07005},90.3363}}; + shoeboxPos[] = {{{1.77539,1.2583,-1.07005},129.343}}; + toolRackPos[] = {{{4.60352,5.68457,-9.68005},-0.142899}}; + }; }; /*[[[end]]]*/ diff --git a/Tools/SQF/saveLootPositions_v2/saveLootPositions_v2_Codes.sqf b/Tools/SQF/saveLootPositions_v2/saveLootPositions_v2_Codes.sqf index ee7d65e9..cbc35c6f 100644 --- a/Tools/SQF/saveLootPositions_v2/saveLootPositions_v2_Codes.sqf +++ b/Tools/SQF/saveLootPositions_v2/saveLootPositions_v2_Codes.sqf @@ -54,7 +54,24 @@ if (isnil "LootMarkersPositions" && isnil "LootMarkers") then { "Land_HouseRuin_Small_01_half_F", "Land_CoalPlant_01_Conveyor_F", "Land_Cross_01_small_F", - "Land_GuardTower_02_F" + "Land_GuardTower_02_F", + "Land_Church_04_small_red_damaged_F", + "Land_Slum_House01_ruins_F", + "Land_HighVoltageEnd_F", + "Land_WaterTower_02_F", + "Land_Shed_05_ruins_F", + "Land_Cowshed_01_A_F", + "Land_Cowshed_01_C_F", + "Land_Shed_Ind_old_ruins_F", + "Land_Smokestack_03_F", + "Land_Smokestack_02_F", + "Land_Radar_01_cooler_F", + "Land_Substation_01_F", + "Land_Radar_01_airshaft_F", + "Land_MobileRadar_01_generator_F", + "Land_HouseRuin_Big_02_half_F", + "Land_CoalPlant_01_LoadingHouse_F", + "Land_DeerStand_01_F" ]; _skipstrings = [ "land_powerwire", @@ -91,7 +108,8 @@ if (isnil "LootMarkersPositions" && isnil "LootMarkers") then { "barrier", "bagfence", "luggage", - "helipad" + "helipad", + "pump" ]; LootMarkersPositions = []; LootMarkers = []; @@ -134,7 +152,6 @@ if (isnil "LootMarkersPositions" && isnil "LootMarkers") then { Itemarray = ["toilet_epoch","Shelf_EPOCH","Fridge_EPOCH","Bunk_EPOCH","Couch_EPOCH","wardrobe_epoch","cooker_epoch","ChairRed_EPOCH","Filing_epoch","Pelican_EPOCH","Table_EPOCH","Locker_EPOCH","ToolRack_EPOCH","Shoebox_EPOCH","Tarp_EPOCH","Freezer_EPOCH","Cabinet_EPOCH","KitchenSink_epoch"]; -Skipbuildings = ["Land_Mil_Barracks_L","Land_Mil_Guardhouse","Land_Mil_ControlTower_ruins","Land_Mil_ControlTower","Land_Mil_Barracks","Land_Mil_House","Land_SS_hangar","Land_a_stationhouse","Land_Misc_WaterStation","Land_HouseV_3I4","Land_HouseV_3I3","Land_HouseV_3I2","Land_HouseV_3I1","Land_HouseV_2T2","Land_HouseV_2T1","Land_HouseV_2L","Land_HouseV_2I","Land_HouseV_1t","Land_HouseV_1L2","Land_Church_04_small_red_damaged_F","Land_Slum_House01_ruins_F","Land_HighVoltageEnd_F","Land_WaterTower_02_F","Land_Shed_05_ruins_F"]; ItemArrayCount = count Itemarray; SkippedBuildings = []; Item = objNull; @@ -182,7 +199,7 @@ player allowdamage false; else { Building = nearestbuilding player; }; - if (isClass(missionConfigFile >> "CfgBuildingLootPos" >> (typeof cursorobject)) || (typeof Building) in Skipbuildings) then { + if (isClass(missionConfigFile >> "CfgBuildingLootPos" >> (typeof cursorobject))) then { systemchat format ['WARNING !!! %1 is already in LootList!!!',typeof Building]; hint format ['WARNING !!! %1 is already in LootList!!!',typeof Building]; Building = ObjNull;