From 88408ff502b69f331c2f221804ffb1593e1db3ea Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Fri, 18 Aug 2023 20:48:58 +0100 Subject: [PATCH 01/16] Correct NPC plot weighting Resolves issue where NPCs in cluster and heatmap would be 100x too highly weighted --- Mappalachia/Class/Database.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mappalachia/Class/Database.cs b/Mappalachia/Class/Database.cs index 5c55807..e1807fb 100644 --- a/Mappalachia/Class/Database.cs +++ b/Mappalachia/Class/Database.cs @@ -457,7 +457,8 @@ public static List GetNPCCoords(string npc, string spaceFormID, do { coordinates.Add(new MapDataPoint(reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2)) { - weight = reader.GetFloat(3), + // Weight in DB and UI is presented as 1-100%, but weights on-map should be 0-1 to represent the expected count of the NPC + weight = reader.GetFloat(3) / 100f, }); } From 77b91a006ce012ede2dd8de61e6e370f6a396a11 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Mon, 21 Aug 2023 00:29:51 +0100 Subject: [PATCH 02/16] fo76utils update Amends commands to render decals and more correctly use new arguments --- BackgroundRenderer/BackgroundRenderer.cs | 5 +++-- README.md | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BackgroundRenderer/BackgroundRenderer.cs b/BackgroundRenderer/BackgroundRenderer.cs index 0b15a16..f1b960c 100644 --- a/BackgroundRenderer/BackgroundRenderer.cs +++ b/BackgroundRenderer/BackgroundRenderer.cs @@ -222,10 +222,11 @@ public static void Main() double cameraX = space.xCenter - (space.nudgeX * (renderResolution / 4096d) / scale); double cameraY = space.yCenter + (space.nudgeY * (renderResolution / 4096d) / scale); + // -rq 1 + 2 + 12 + 32 + 256 string renderCommand = $"{utilsRenderPath} \"{fo76DataPath}\\SeventySix.esm\" {renderFile} {resolution} {resolution} " + $"\"{fo76DataPath}\" {terrainString} -w 0x{space.formID} -l 0 -cam {scale} 180 0 0 {cameraX} {cameraY} {cameraZ} " + - $"-light 1.8 65 180 -lcolor 1.1 0xD6CCC7 0.9 -1 -1 -hqm meshes -rq 15 -a -scol 1 -ssaa {SSAA} " + - $"-ltxtres 512 -mip 1 -lmip 2 -mlod 0 -ndis 1 -xm babylon -xm fog -xm cloud -xm effects"; + $"-light 1.8 65 180 -lcolor 1.1 0xD6CCC7 0.9 -1 -1 -rq 303 -ssaa {SSAA} " + + $"-ltxtres 512 -mip 1 -lmip 2 -mlod 0 -ndis 1 -xm babylon -xm fog -xm cloud"; string resizeCommand = $"\"{magickPath}\" convert {renderFile} -resize {nativeResolution}x{nativeResolution} " + $"-quality {(space.isWorldspace ? worldspaceQuality : cellQuality)} JPEG:{convertedFile}"; diff --git a/README.md b/README.md index 13287c0..3ddecbc 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ If you fancy doing some data mining or development with Mappalachia then you may * Members of the FO76 Datamining Discord, for helping out with FO76Edit and Edit Scripts, and offering valuable knowledge and feedback based on their own experiences datamining and creating Fallout 76 maps. * [fo76utils](https://github.com/fo76utils) for their excellent and powerful render tool, used to render backgrounds for all cell maps and the Appalachia satellite map option. * Gilpo for providing great ideas and feedback for new Mappalachia features. +* Duchess Flame for useful feature feedback, driving community engagement and moral support. * frame for reporting and helping to test DPI scaling issues. * Everyone who ever gave feedback to the original Mappalachia. Your feedback, comments, questions, and PMs were essential to defining and guiding the features I have been able to bring to life here. From 3a1bbc68863f85979fda97577a21cf9ac36770f7 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Tue, 22 Aug 2023 21:24:39 +0100 Subject: [PATCH 03/16] Update to game version 1.7.6.7 --- Database/gameVersion.csv | 2 +- Database/summary.txt | 314 +++++++++++++----- FO76Edit/Output/Skipped_spaces.csv | 3 + Mappalachia/Properties/AssemblyInfo.cs | 4 +- .../mapmarker/AgriculturalCenterMarker.svg | 2 +- Mappalachia/img/mapmarker/AirfieldMarker.svg | 2 +- .../img/mapmarker/AmusementParkMarker.svg | 2 +- .../mapmarker/AppalachianAntiquesMarker.svg | 2 +- .../img/mapmarker/ArktosPharmaMarker.svg | 2 +- .../img/mapmarker/BloodEagleMarker.svg | 2 +- Mappalachia/img/mapmarker/BoSMarker.svg | 2 +- .../img/mapmarker/BrownstoneMarker.svg | 2 +- Mappalachia/img/mapmarker/BunkerMarker.svg | 2 +- Mappalachia/img/mapmarker/CabinMarker.svg | 2 +- .../img/mapmarker/CapitalBuildingMarker.svg | 2 +- Mappalachia/img/mapmarker/CastleMarker.svg | 2 +- Mappalachia/img/mapmarker/CaveMarker.svg | 2 +- Mappalachia/img/mapmarker/ChurchMarker.svg | 2 +- Mappalachia/img/mapmarker/CityMarker.svg | 2 +- .../img/mapmarker/CountryClubMarker.svg | 2 +- .../img/mapmarker/CowSpotsCreameryMarker.svg | 2 +- Mappalachia/img/mapmarker/CultistMarker.svg | 2 +- Mappalachia/img/mapmarker/DamMarker.svg | 2 +- .../mapmarker/ElectricalSubstationMarker.svg | 2 +- .../img/mapmarker/ElevatedHighwayMarker.svg | 2 +- .../img/mapmarker/EncampmentMarker.svg | 2 +- Mappalachia/img/mapmarker/FactoryMarker.svg | 2 +- Mappalachia/img/mapmarker/FarmMarker.svg | 2 +- .../img/mapmarker/FillingStationMarker.svg | 2 +- Mappalachia/img/mapmarker/FissureMarker.svg | 2 +- Mappalachia/img/mapmarker/ForestedMarker.svg | 2 +- .../img/mapmarker/GoodneighborMarker.svg | 2 +- Mappalachia/img/mapmarker/GraveyardMarker.svg | 2 +- .../img/mapmarker/HammerWingMarker.svg | 2 +- .../img/mapmarker/HighTechBuildingMarker.svg | 2 +- Mappalachia/img/mapmarker/HospitalMarker.svg | 2 +- .../img/mapmarker/HouseTrailerMarker.svg | 2 +- .../img/mapmarker/IndustrialDomeMarker.svg | 2 +- Mappalachia/img/mapmarker/LandmarkMarker.svg | 2 +- .../img/mapmarker/LegendaryPurveyorMarker.svg | 2 +- .../img/mapmarker/LibertaliaMarker.svg | 4 +- .../img/mapmarker/LighthouseMarker.svg | 2 +- .../img/mapmarker/LookoutTowerMarker.svg | 2 +- Mappalachia/img/mapmarker/LowRiseMarker.svg | 2 +- Mappalachia/img/mapmarker/MansionMarker.svg | 2 +- .../img/mapmarker/MilitaryBaseMarker.svg | 2 +- Mappalachia/img/mapmarker/MonorailMarker.svg | 2 +- Mappalachia/img/mapmarker/MonumentMarker.svg | 2 +- .../img/mapmarker/NukaColaQuantumPlant.svg | 2 +- Mappalachia/img/mapmarker/OfficeMarker.svg | 2 +- Mappalachia/img/mapmarker/OverlookMarker.svg | 2 +- .../img/mapmarker/PalaceWindingPathMarker.svg | 2 +- Mappalachia/img/mapmarker/PierMarker.svg | 2 +- Mappalachia/img/mapmarker/PondLakeMarker.svg | 2 +- .../img/mapmarker/PowerPlantMarker.svg | 2 +- Mappalachia/img/mapmarker/PumpkinMarker.svg | 2 +- Mappalachia/img/mapmarker/QuarryMarker.svg | 2 +- .../img/mapmarker/RadioTowerMarker.svg | 2 +- .../img/mapmarker/RadioactiveAreaMarker.svg | 2 +- .../img/mapmarker/RaiderSettlementMarker.svg | 2 +- Mappalachia/img/mapmarker/RailroadMarker.svg | 2 +- Mappalachia/img/mapmarker/SancHillsMarker.svg | 2 +- Mappalachia/img/mapmarker/SatelliteMarker.svg | 2 +- .../img/mapmarker/SettlementMarker.svg | 2 +- Mappalachia/img/mapmarker/SewerMarker.svg | 2 +- Mappalachia/img/mapmarker/SkiResortMarker.svg | 2 +- Mappalachia/img/mapmarker/SkullRingMarker.svg | 2 +- Mappalachia/img/mapmarker/TeapotMarker.svg | 2 +- .../img/mapmarker/TopOfTheWorldMarker.svg | 2 +- Mappalachia/img/mapmarker/TownMarker.svg | 2 +- Mappalachia/img/mapmarker/TownRuinsMarker.svg | 2 +- .../img/mapmarker/TrainStationMarker.svg | 2 +- Mappalachia/img/mapmarker/TrainTrackMark.svg | 2 +- Mappalachia/img/mapmarker/Vault51Marker.svg | 2 +- Mappalachia/img/mapmarker/Vault63Marker.svg | 2 +- Mappalachia/img/mapmarker/Vault76Marker.svg | 2 +- Mappalachia/img/mapmarker/Vault79Marker.svg | 2 +- Mappalachia/img/mapmarker/Vault94Marker.svg | 2 +- Mappalachia/img/mapmarker/Vault96Marker.svg | 2 +- Mappalachia/img/mapmarker/VaultMarker.svg | 2 +- .../img/mapmarker/WhitespringResort.svg | 2 +- Mappalachia/img/mapmarker/WoodShackMarker.svg | 2 +- README.md | 2 +- 83 files changed, 323 insertions(+), 160 deletions(-) diff --git a/Database/gameVersion.csv b/Database/gameVersion.csv index df65c22..2b6e172 100644 --- a/Database/gameVersion.csv +++ b/Database/gameVersion.csv @@ -1,2 +1,2 @@ version -1.7.5.4 +1.7.6.7 diff --git a/Database/summary.txt b/Database/summary.txt index 589b9d8..fb2431b 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -3,9 +3,9 @@ mappalachia.db ==SQLite version== 3.42.0 2023-05-16 12:36:15 831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0 ==Checksum== -774cfc573b047262fb1a1556d0caf2f6 +e5e2ac1061cfc337f12208c8631a09ac ==File Size== -432553984 +433545216 ==Tables== Entity_Info Map_Markers Region Standard_Search Game_Version NPC_Search Scrap_Search @@ -14,9 +14,9 @@ Lock_Levels Position_Data Space_Info Index_PositionData_CoverAll Index_ScrapSearch_CompMagSpace Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Game Version== -1.7.5.4 +1.7.6.7 ==Mean Average X/Y/Z Coord== --11821.0372556831|4403.9931860146|11750.2063964995 +-11795.8442961587|4399.09453280373|11729.6305187877 ==Min/Max X/Y/Z Coord== -402000|407637|-407387|380538|-34417|136069 ==100 most common xyz coordinates + count== @@ -24,41 +24,46 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace 2432|64|-2816|64 2432|64|-2560|61 2433|59|-3072|60 +-128|4608|512|42 +3584|0|256|41 39101|14406|35188|40 624|-1848|-1112|38 3696|-6968|-1112|37 -125269|-37601|6630|36 +-43|4777|519|36 +1988|4809|518|36 +2085|2161|519|36 +2116|3301|514|36 2928|-2360|-1112|36 +3642|-626|273|36 +3816|1208|263|36 +4115|2168|262|36 0|0|0|35 -128|1664|-608|34 -1216|2352|128|32 960|2352|128|32 --43|4777|519|30 -1988|4809|518|30 -2085|2161|519|30 -2116|3301|514|30 -3642|-626|273|30 -3816|1208|263|30 -4115|2168|262|30 +1408|-384|256|32 +2547|4482|512|32 1024|1792|-608|29 -129108|-37082|6630|28 -79616|-138368|30208|28 -1408|-384|256|28 -11852|-31565|3080|27 -8774|-28029|3591|27 --128|4608|512|27 -79616|-138368|28096|26 0|1024|0|26 +256|1536|0|26 512|1024|256|25 1280|1792|-608|25 +1536|0|0|25 1648|-1848|-1112|25 -3584|0|256|25 -6016|-32034|3328|24 -6016|-32034|4096|24 +-2850|4792|572|24 0|256|0|24 0|768|0|24 -256|1536|0|24 -1536|0|0|24 +1920|1664|512|24 +2176|1664|512|24 +2176|1920|512|24 -256|256|0|23 -256|1024|0|23 -19952|104540|11034|22 @@ -76,6 +81,10 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace -6|-11|-2289|21 0|-256|0|21 512|1024|0|21 +1280|3840|512|21 +1408|-128|256|21 +1920|-2944|0|21 +1920|-2176|0|21 33690|77021|21776|21 -79616|-138368|31616|20 -13119|2726|-100|20 @@ -84,9 +93,6 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace -844|-790|-163|20 -512|640|0|20 768|1792|-608|20 -1920|1664|512|20 -2176|1664|512|20 -2176|1920|512|20 32976|74016|21728|20 -19709|103409|11034|19 -1456|-3072|-896|19 @@ -94,7 +100,10 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace -256|768|0|19 0|1024|256|19 512|1280|-512|19 -1408|-128|256|19 +512|1536|0|19 +768|1536|0|19 +1024|1536|0|19 +3072|1280|256|19 -19828|103268|11034|18 -12138|-29760|3079|18 -7129|-27618|3591|18 @@ -105,35 +114,26 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace -512|-1040|512|18 -384|1664|-608|18 256|-256|0|18 +256|4224|512|18 448|1431|-330|18 512|-512|0|18 +512|4224|512|18 768|768|-512|18 -1024|-256|0|18 -1024|768|0|18 -1280|3840|512|18 -1920|-2944|0|18 -1920|-2176|0|18 -2547|4482|512|18 -2943|-2815|-384|18 -3595|1426|384|18 -4107|1170|512|18 -4107|1426|512|18 --1024|-784|128|17 --512|256|0|17 +896|-1024|-128|18 ==Z outliers== 68 ==Average X Bounds Width== -21.7521210075413 +21.7373730704765 ==Average Y Bounds Width== -16.261060435347 +16.2519580448945 ==Average Z Bounds Width== -15.2419573026065 +15.2311489642004 ==Average Z Rotation== -4.10258915226095 +4.10122008166594 ==Average display name string length== -2.69200217499232 +2.71848997730711 ==Average editorID string length== -24.9965483817584 +24.997659795764 ==Map Markers== Appalachia|AgriculturalCenterMarker|Vault-Tec Agricultural Research Center|-117195|19445 Appalachia|AirfieldMarker|Crashed Plane|147706|58411 @@ -508,7 +508,7 @@ Appalachia|TrainTrackMark|Mount Blair Trainyard|-132583|-121600 Appalachia|TrainTrackMark|New Appalachian Central Trainyard|13435|-21413 Appalachia|Vault51Marker|Vault 51|-125273|202332 Appalachia|Vault63Marker|Vault 63|-96290|-146559 -Appalachia|Vault76Marker|Vault 76|-103763|94019 +Appalachia|Vault76Marker|Vault 76|-103725|94055 Appalachia|Vault79Marker|Vault 79|145375|186773 Appalachia|Vault94Marker|Vault 94|145156|137186 Appalachia|Vault96Marker|Vault 96|31362|-160241 @@ -527,7 +527,7 @@ Appalachia|WoodShackMarker|Southhampton Estate|169981|125109 Appalachia|WoodShackMarker|Toxic Larry's Meat 'n Go|115473|39450 Appalachia|WoodShackMarker|Treetops|162220|-26927 ==Total Unique entities== -42299 +42304 ==Regions== Space|Region|subRegions|maxVerts Appalachia|76Border|1|55 @@ -740,8 +740,8 @@ AVRMedicalCenter01|Box|194 AlleghenyAsylum01||14278 AlleghenyAsylum01|Box|730 AlleghenyAsylum01|Sphere|5 -Appalachia||3013892 -Appalachia|Box|63368 +Appalachia||3013971 +Appalachia|Box|63372 Appalachia|Ellipsoid|3 Appalachia|Line|1802 Appalachia|Plane|105 @@ -926,6 +926,9 @@ MorgantownHighSchoolDungeon|Box|159 MorgantownHighSchoolDungeon|Sphere|1 MountBlairWarehouseBasement01||312 MountBlairWarehouseBasement01|Box|7 +NPEVault7601||6951 +NPEVault7601|Box|137 +NPEVault7601|Line|2 NukaColaQuantumPlant01||5164 NukaColaQuantumPlant01|Box|313 OrwellOrchardsShelter01||2156 @@ -1005,7 +1008,7 @@ SugarGroveMissileSilo01|Box|629 TheCraterCore01||1233 TheCraterCore01|Box|47 TheCraterCore01|Plane|9 -TheNukashine01||1474 +TheNukashine01||1475 TheNukashine01|Box|63 TheRustyPick01||2355 TheRustyPick01|Box|87 @@ -1111,10 +1114,10 @@ WhitespringBunker01||15833 WhitespringBunker01|Box|500 WhitespringMall01||6803 WhitespringMall01|Box|137 -WhitespringRefuge01||11272 +WhitespringRefuge01||11274 WhitespringRefuge01|Box|224 -XPDPitt01Foundry||16372 -XPDPitt01Foundry|Box|559 +XPDPitt01Foundry||16376 +XPDPitt01Foundry|Box|555 XPDPitt01Foundry|Plane|6 XPDPitt01Foundry|Sphere|1 XPDPitt01Industrial||18698 @@ -1144,7 +1147,7 @@ AlleghenyAsylum01|Advanced (Level 1)|6 AlleghenyAsylum01|Expert (Level 2)|6 AlleghenyAsylum01|Master (Level 3)|1 AlleghenyAsylum01|Novice (Level 0)|3 -Appalachia||3080472 +Appalachia||3080555 Appalachia|Advanced (Level 1)|319 Appalachia|Barred|1 Appalachia|Chained|1 @@ -1364,6 +1367,8 @@ MorgantownHighSchoolDungeon||5558 MorgantownHighSchoolDungeon|Advanced (Level 1)|1 MorgantownHighSchoolDungeon|Expert (Level 2)|2 MountBlairWarehouseBasement01||319 +NPEVault7601||7089 +NPEVault7601|Novice (Level 0)|1 NukaColaQuantumPlant01||5465 NukaColaQuantumPlant01|Advanced (Level 1)|4 NukaColaQuantumPlant01|Expert (Level 2)|4 @@ -1459,7 +1464,7 @@ SugarGroveMissileSilo01|Requires Terminal|1 TheCraterCore01||1287 TheCraterCore01|Master (Level 3)|1 TheCraterCore01|Requires Key|1 -TheNukashine01||1537 +TheNukashine01||1538 TheRustyPick01||2442 TheWayward01||1717 TheWayward01|Expert (Level 2)|1 @@ -1591,7 +1596,7 @@ WhitespringMall01|Advanced (Level 1)|1 WhitespringMall01|Expert (Level 2)|1 WhitespringMall01|Master (Level 3)|3 WhitespringMall01|Novice (Level 0)|8 -WhitespringRefuge01||11467 +WhitespringRefuge01||11469 WhitespringRefuge01|Advanced (Level 1)|2 WhitespringRefuge01|Inaccessible|21 WhitespringRefuge01|Novice (Level 0)|6 @@ -1693,35 +1698,35 @@ AlleghenyAsylum01|SOUN|4 AlleghenyAsylum01|STAT|11109 AlleghenyAsylum01|TERM|7 AlleghenyAsylum01|TXST|475 -Appalachia|ACTI|21744 +Appalachia|ACTI|21747 Appalachia|ALCH|264 Appalachia|AMMO|59 Appalachia|ARMO|103 Appalachia|ASPC|2377 Appalachia|BNDS|10367 -Appalachia|BOOK|484 +Appalachia|BOOK|485 Appalachia|CNCY|257 -Appalachia|CONT|12377 +Appalachia|CONT|12394 Appalachia|DOOR|2505 -Appalachia|FLOR|45228 -Appalachia|FURN|14976 +Appalachia|FLOR|45224 +Appalachia|FURN|14972 Appalachia|HAZD|994 -Appalachia|IDLM|16926 +Appalachia|IDLM|16935 Appalachia|KEYM|36 -Appalachia|LIGH|8244 -Appalachia|LVLI|71518 -Appalachia|MISC|35717 -Appalachia|MSTT|23092 -Appalachia|NOTE|177 -Appalachia|NPC_|7395 +Appalachia|LIGH|8245 +Appalachia|LVLI|71650 +Appalachia|MISC|35714 +Appalachia|MSTT|23087 +Appalachia|NOTE|178 +Appalachia|NPC_|7369 Appalachia|PROJ|93 -Appalachia|SCOL|353359 +Appalachia|SCOL|353356 Appalachia|SECH|253 Appalachia|SOUN|5920 -Appalachia|STAT|2383847 +Appalachia|STAT|2383807 Appalachia|TACT|62 Appalachia|TERM|370 -Appalachia|TXST|62611 +Appalachia|TXST|62615 Appalachia|WEAP|164 ArktosPharmaLab01|ACTI|354 ArktosPharmaLab01|ASPC|14 @@ -2885,6 +2890,28 @@ MountBlairWarehouseBasement01|NPC_|1 MountBlairWarehouseBasement01|SCOL|8 MountBlairWarehouseBasement01|SOUN|3 MountBlairWarehouseBasement01|STAT|244 +NPEVault7601|ACTI|179 +NPEVault7601|ALCH|30 +NPEVault7601|ARMO|8 +NPEVault7601|ASPC|7 +NPEVault7601|BNDS|6 +NPEVault7601|BOOK|14 +NPEVault7601|CONT|118 +NPEVault7601|DOOR|16 +NPEVault7601|FURN|173 +NPEVault7601|IDLM|28 +NPEVault7601|LIGH|296 +NPEVault7601|LVLI|10 +NPEVault7601|MISC|811 +NPEVault7601|MSTT|1249 +NPEVault7601|NPC_|66 +NPEVault7601|SCOL|66 +NPEVault7601|SECH|3 +NPEVault7601|SOUN|14 +NPEVault7601|STAT|3936 +NPEVault7601|TERM|9 +NPEVault7601|TXST|33 +NPEVault7601|WEAP|18 NukaColaQuantumPlant01|ACTI|36 NukaColaQuantumPlant01|ALCH|2 NukaColaQuantumPlant01|ASPC|14 @@ -3394,6 +3421,7 @@ TheNukashine01|LIGH|42 TheNukashine01|LVLI|28 TheNukashine01|MISC|273 TheNukashine01|MSTT|45 +TheNukashine01|NOTE|1 TheNukashine01|NPC_|1 TheNukashine01|SCOL|68 TheNukashine01|SOUN|8 @@ -4098,7 +4126,7 @@ WhitespringRefuge01|LIGH|455 WhitespringRefuge01|LVLI|93 WhitespringRefuge01|MISC|367 WhitespringRefuge01|MSTT|131 -WhitespringRefuge01|NOTE|3 +WhitespringRefuge01|NOTE|5 WhitespringRefuge01|NPC_|43 WhitespringRefuge01|SCOL|174 WhitespringRefuge01|STAT|9386 @@ -4262,7 +4290,7 @@ AlleghenyAsylum01|TestElevDoorTriggerARef077|1 AlleghenyAsylum01|TestElevDoorTriggerARef078|1 AlleghenyAsylum01|TestElevDoorTriggerARef079|1 AlleghenyAsylum01|W05_JonahItoRef|1 -Appalachia||3076011 +Appalachia||3076094 Appalachia|76ExitEventQuest_CenterMaker|1 Appalachia|76ExitEventSpawnAreaRef001|1 Appalachia|76ExitEventSpawnAreaRef002|1 @@ -11576,6 +11604,111 @@ MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_01_PackIn012|1 MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_02_PackIn012|1 MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_03_PackIn012|1 MountBlairWarehouseBasement01||319 +NPEVault7601||6986 +NPEVault7601|76CharGenPerkBoardTriggerRef005|1 +NPEVault7601|76ExitTriggerREF02|1 +NPEVault7601|76TrailerCoupleEnabler001|1 +NPEVault7601|76TrailerOverseerEnabler001|1 +NPEVault7601|76TrailerPartyEnabler001|1 +NPEVault7601|76TrailerRoomPipboyEnabler001|1 +NPEVault7601|76TrailerStandeeEnabler001|1 +NPEVault7601|76TrailerTrainingEnabler001|1 +NPEVault7601|76TrailerVaultDoorExitEnabler001|1 +NPEVault7601|76TrailerVaultExitEnabler001|1 +NPEVault7601|76TrailerVaultExitHugEnabler001|1 +NPEVault7601|76TrailerWorkersEnabler001|1 +NPEVault7601|76Trailer_IntroCouple_Actor_Barney001|1 +NPEVault7601|76Trailer_IntroCouple_Actor_Carol001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Alice001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Barney001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Biscuit001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Carol001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Cody001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Kathy001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Louise001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Margret001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Markie001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Phyllis001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Ron001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Sandy001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Violet001|1 +NPEVault7601|76Trailer_IntroParty_Actor_Will001|1 +NPEVault7601|76Trailer_IntroReactorLight04|1 +NPEVault7601|76Trailer_IntroReactorLight05|1 +NPEVault7601|76Trailer_IntroReactorLight06|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Foreman001|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker05|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker07|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker08|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker09|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker10|1 +NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001|1 +NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001|1 +NPEVault7601|76Trailer_IntroStandee_Actor_Sandy001|1 +NPEVault7601|76Trailer_IntroStandee_Actor_Violet001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Alice001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Biscuit001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Cody001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Louise001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Margret001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Markie001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Overseer03|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Overseer04|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Phyllis001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Ron001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Sandy001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Violet001|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Will001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Alice001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Barney001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Carol001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Cody001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Louise001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Margret001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Markie001|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Ron001|1 +NPEVault7601|CAMPTriggerMarker002|1 +NPEVault7601|CharGenEndMarker002|1 +NPEVault7601|CharGenTrailerRef005|1 +NPEVault7601|Chargen_BreadcrumbQT01_Ref|1 +NPEVault7601|Chargen_BreadcrumbQT02_Ref|1 +NPEVault7601|Chargen_BreadcrumbQT03_Ref|1 +NPEVault7601|Chargen_BreadcrumbQT04_Ref|1 +NPEVault7601|Chargen_BreadcrumbQT05_Ref|1 +NPEVault7601|Chargen_BreadcrumbQT06_Ref|1 +NPEVault7601|Chargen_BreadcrumbQT07_Ref|1 +NPEVault7601|Face01Light002|1 +NPEVault7601|Face02Light002|1 +NPEVault7601|Face03Light002|1 +NPEVault7601|Face04Light002|1 +NPEVault7601|Face05Light002|1 +NPEVault7601|Face06Light002|1 +NPEVault7601|Intro_Party_TrailerEnabler005|1 +NPEVault7601|NPE_LoadoutObjects_EnableMarker_Ref|1 +NPEVault7601|NameOverrideTestMarker001|1 +NPEVault7601|PipeRoomExtFilter002|1 +NPEVault7601|PipeRoomIntFilter002|1 +NPEVault7601|PipeRoomNoFilter002|1 +NPEVault7601|RS01A_Contact_DoorQTMarker02|1 +NPEVault7601|TestChargenDinerScene001|1 +NPEVault7601|TrailerEnabler005|1 +NPEVault7601|XMarkerHeading_CharGen06Start01|1 +NPEVault7601|XMarkerHeading_CharGen06Start02|1 +NPEVault7601|XMarkerHeading_CharGen06Start03|1 +NPEVault7601|XMarkerHeading_CharGen06Start04|1 +NPEVault7601|XMarkerHeading_CharGen06Start05|1 +NPEVault7601|XMarkerHeading_CharGen06Start06|1 NukaColaQuantumPlant01||5457 NukaColaQuantumPlant01|BMO_BunkerKeyLocker|1 NukaColaQuantumPlant01|BMO_LockernoteBox|1 @@ -12001,7 +12134,7 @@ TheCraterCore01|W05_Sandbox_AllRef|1 TheCraterCore01|W05_Sandbox_BottomRef|1 TheCraterCore01|W05_Sandbox_TopRef|1 TheCraterCore01|XPD_ARG_XMarker|1 -TheNukashine01||1532 +TheNukashine01||1533 TheNukashine01|P01A_Nukashine_BivRef|1 TheNukashine01|P01A_Nukashine_PastSecretDoorTrigger|1 TheNukashine01|P01A_Nukashine_SpeakeasyTrigger|1 @@ -13351,7 +13484,7 @@ WhitespringMall01|TestElevDoorTriggerARef130|1 WhitespringMall01|TestElevDoorTriggerARef134|1 WhitespringMall01|TestElevDoorTriggerARef136|1 WhitespringMall01|WhitespringMall_Interior_DirectTravelPoint|1 -WhitespringRefuge01||11294 +WhitespringRefuge01||11296 WhitespringRefuge01|EX001_WhitespringRefuge_ElevToMall_LoadDoor01|1 WhitespringRefuge01|EX001_WhitespringRefuge_ElevToMall_LoadDoor02|1 WhitespringRefuge01|EX001_WhitespringRefuge_ElevToMall_LoadDoor03|1 @@ -14076,7 +14209,7 @@ AlleghenyAsylum01|100|15013 Appalachia|50|42 Appalachia|75|136 Appalachia|85|72 -Appalachia|100|3081269 +Appalachia|100|3081352 ArktosPharmaLab01|50|1 ArktosPharmaLab01|75|1 ArktosPharmaLab01|100|17160 @@ -14156,6 +14289,7 @@ MorgantownApartment01|100|1362 MorgantownHighSchool01|100|5953 MorgantownHighSchoolDungeon|100|5561 MountBlairWarehouseBasement01|100|319 +NPEVault7601|100|7090 NukaColaQuantumPlant01|100|5477 OrwellOrchardsShelter01|100|2209 OverseersHome01|100|1250 @@ -14197,7 +14331,7 @@ SugarGrove02|100|271 SugarGroveMissileSilo01|75|4 SugarGroveMissileSilo01|100|15686 TheCraterCore01|100|1289 -TheNukashine01|100|1537 +TheNukashine01|100|1538 TheRustyPick01|100|2442 TheWayward01|100|1719 ThunderMtPowerPlant01|100|9415 @@ -14248,7 +14382,7 @@ WestTek02|75|1 WestTek02|100|5126 WhitespringBunker01|100|16333 WhitespringMall01|100|6940 -WhitespringRefuge01|100|11496 +WhitespringRefuge01|100|11498 XPDPitt01Foundry|50|9 XPDPitt01Foundry|75|11 XPDPitt01Foundry|100|16918 @@ -14395,9 +14529,9 @@ Appalachia|Rubber|1990|1203 Appalachia|Screw|1175|1056 Appalachia|Silver|262|221 Appalachia|Spring|1283|1252 -Appalachia|Steel|15458|9220 +Appalachia|Steel|15449|9217 Appalachia|Ultracite|1|1 -Appalachia|Wood|4764|3327 +Appalachia|Wood|4761|3324 ArktosPharmaLab01|Acid|48|33 ArktosPharmaLab01|Adhesive|10|3 ArktosPharmaLab01|Aluminum|31|25 @@ -15756,6 +15890,31 @@ MountBlairWarehouseBasement01|Screw|1|1 MountBlairWarehouseBasement01|Spring|1|1 MountBlairWarehouseBasement01|Steel|13|9 MountBlairWarehouseBasement01|Wood|2|2 +NPEVault7601|Acid|34|26 +NPEVault7601|Adhesive|78|24 +NPEVault7601|Aluminum|66|42 +NPEVault7601|Antiseptic|54|24 +NPEVault7601|Asbestos|6|6 +NPEVault7601|Ceramic|32|20 +NPEVault7601|Circuitry|54|18 +NPEVault7601|Cloth|210|111 +NPEVault7601|Copper|19|19 +NPEVault7601|Cork|30|18 +NPEVault7601|Crystal|36|12 +NPEVault7601|Fiberglass|43|37 +NPEVault7601|Gear|62|25 +NPEVault7601|Glass|299|162 +NPEVault7601|Lead|16|8 +NPEVault7601|Leather|108|54 +NPEVault7601|Nuclear Material|6|6 +NPEVault7601|Oil|66|24 +NPEVault7601|Plastic|128|77 +NPEVault7601|Rubber|12|6 +NPEVault7601|Screw|62|31 +NPEVault7601|Silver|54|36 +NPEVault7601|Spring|72|30 +NPEVault7601|Steel|205|109 +NPEVault7601|Wood|154|89 NukaColaQuantumPlant01|Adhesive|13|5 NukaColaQuantumPlant01|Aluminum|20|17 NukaColaQuantumPlant01|Asbestos|5|3 @@ -17188,7 +17347,7 @@ Appalachia|Honey Beast|19.18|7 Appalachia|Insect|16.23|229 Appalachia|Liberator|16.61|456 Appalachia|Mega Sloth|17.63|8 -Appalachia|Mirelurk|31.9|169 +Appalachia|Mirelurk|31.09|167 Appalachia|Mole Miner|60.64|192 Appalachia|Mole Rat|14.69|518 Appalachia|Rad Ant|25.0|14 @@ -17197,11 +17356,11 @@ Appalachia|Rad Scorpion|15.8|100 Appalachia|Rad Toad|17.41|48 Appalachia|Radroach|25.0|2 Appalachia|Robot|38.48|417 -Appalachia|Scorched|55.46|1113 +Appalachia|Scorched|55.25|1108 Appalachia|Snallygaster|67.03|26 Appalachia|Stingwing|57.15|6 Appalachia|Super Mutant|45.7|794 -Appalachia|Tick|85.29|17 +Appalachia|Tick|64.29|7 Appalachia|Vicious Dog|15.4|497 Appalachia|Wolf|19.98|182 Appalachia|Yao Guai|10.55|129 @@ -17354,6 +17513,7 @@ WestTek01|Super Mutant|100.0|41 004E10F3|MountBlairWarehouseBasement01|Warehouse Basement|0|97|-1344|-702|896|-2112|-576|0|0|1.0 0051EF4D|CharGen05|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 00616199|XPDPitt01Industrial|The Pitt - Industrial|0|-4744|-1415|-20382|10894|-15918|13088|0|0|1.0 +006BEEC5|NPEVault7601|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 0011F9E7|Vault94Entrance|Vault 94 Entrance|0|5684|15752|2952|8417|14390|17114|0|0|1.0 0051EF57|CharGen02|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 0060F37B|WatogaHighSchoolDungeon|Watoga High School|0|-1571|2284|-5728|2585|-1296|5864|0|0|1.0 @@ -17399,4 +17559,4 @@ WestTek01|Super Mutant|100.0|41 003F880F|FoundationInt01|Foundation Interior|0|3171|-6042|-3576|9919|-15956|3872|1400|1800|1.7 006240BB|WhitespringRefuge01|Whitespring Refuge|0|-8840|10960|-16336|-1344|5056|16864|0|0|1.0 ==Instance IDs Count Vs Distinct== -3946002|3946002 +3953178|3953178 diff --git a/FO76Edit/Output/Skipped_spaces.csv b/FO76Edit/Output/Skipped_spaces.csv index 705de9f..e0e4192 100644 --- a/FO76Edit/Output/Skipped_spaces.csv +++ b/FO76Edit/Output/Skipped_spaces.csv @@ -446,6 +446,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00608AC5,,,0 0063220D,PackInZetanTubePackInStorageCell,,0 0063540D,,,0 +006C6DBD,PackInSCORES14CollectronpackinAutoMinerStorageCell,,0 00004007,zCUT76DangerRoom,76 PVP Playground,0 000042C3,zCUTTestDrewIndScraps,Quick Test Cell,0 0003D983,PackInLvlBloodbugAmbushCeilingShortPackInStorageCell,,0 @@ -668,6 +669,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 005275BC,,,0 00569020,PackInLGTv96sublightterminalResearchWarmStorageCell,,0 00574628,zCUTCOMPDeleteThis,Quick Test Cell,0 +006EFE6C,DebugSamuelC01,Quick Test Cell,0 00007DCB,WarehouseFallout4,Quick Test Cell,0 001228D7,PackInPACKMtnTopShrubs02StorageCell,,0 00122FDF,,,0 @@ -2107,3 +2109,4 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00528A13,,,0 005544E7,PackInLGTv96SScagelightWarmStorageCell,,0 005A5883,zCUTSheltersUnusedBoSBunker,Bunker Shelter,0 +006EABA3,PackInF1EnclaveMobileRelayTentPKINStorageCell,,0 diff --git a/Mappalachia/Properties/AssemblyInfo.cs b/Mappalachia/Properties/AssemblyInfo.cs index 600a603..c5773c6 100644 --- a/Mappalachia/Properties/AssemblyInfo.cs +++ b/Mappalachia/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.7.0")] -[assembly: AssemblyFileVersion("1.7.7.0")] +[assembly: AssemblyVersion("1.7.7.1")] +[assembly: AssemblyFileVersion("1.7.7.1")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Mappalachia/img/mapmarker/AgriculturalCenterMarker.svg b/Mappalachia/img/mapmarker/AgriculturalCenterMarker.svg index 22540cf..a4e310b 100644 --- a/Mappalachia/img/mapmarker/AgriculturalCenterMarker.svg +++ b/Mappalachia/img/mapmarker/AgriculturalCenterMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/AirfieldMarker.svg b/Mappalachia/img/mapmarker/AirfieldMarker.svg index efb3f36..97ea28c 100644 --- a/Mappalachia/img/mapmarker/AirfieldMarker.svg +++ b/Mappalachia/img/mapmarker/AirfieldMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/AmusementParkMarker.svg b/Mappalachia/img/mapmarker/AmusementParkMarker.svg index 4459ecb..905c53e 100644 --- a/Mappalachia/img/mapmarker/AmusementParkMarker.svg +++ b/Mappalachia/img/mapmarker/AmusementParkMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/AppalachianAntiquesMarker.svg b/Mappalachia/img/mapmarker/AppalachianAntiquesMarker.svg index 62cfbbc..0360a3a 100644 --- a/Mappalachia/img/mapmarker/AppalachianAntiquesMarker.svg +++ b/Mappalachia/img/mapmarker/AppalachianAntiquesMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/ArktosPharmaMarker.svg b/Mappalachia/img/mapmarker/ArktosPharmaMarker.svg index 82aa8cb..43058cb 100644 --- a/Mappalachia/img/mapmarker/ArktosPharmaMarker.svg +++ b/Mappalachia/img/mapmarker/ArktosPharmaMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/BloodEagleMarker.svg b/Mappalachia/img/mapmarker/BloodEagleMarker.svg index c320ad5..ea5ef26 100644 --- a/Mappalachia/img/mapmarker/BloodEagleMarker.svg +++ b/Mappalachia/img/mapmarker/BloodEagleMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/BoSMarker.svg b/Mappalachia/img/mapmarker/BoSMarker.svg index f10ef2e..3333b5b 100644 --- a/Mappalachia/img/mapmarker/BoSMarker.svg +++ b/Mappalachia/img/mapmarker/BoSMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/BrownstoneMarker.svg b/Mappalachia/img/mapmarker/BrownstoneMarker.svg index e1289cb..e922760 100644 --- a/Mappalachia/img/mapmarker/BrownstoneMarker.svg +++ b/Mappalachia/img/mapmarker/BrownstoneMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/BunkerMarker.svg b/Mappalachia/img/mapmarker/BunkerMarker.svg index ca5ce50..65c38fb 100644 --- a/Mappalachia/img/mapmarker/BunkerMarker.svg +++ b/Mappalachia/img/mapmarker/BunkerMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CabinMarker.svg b/Mappalachia/img/mapmarker/CabinMarker.svg index 8465dcd..e3de095 100644 --- a/Mappalachia/img/mapmarker/CabinMarker.svg +++ b/Mappalachia/img/mapmarker/CabinMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CapitalBuildingMarker.svg b/Mappalachia/img/mapmarker/CapitalBuildingMarker.svg index af6dce3..ac80e73 100644 --- a/Mappalachia/img/mapmarker/CapitalBuildingMarker.svg +++ b/Mappalachia/img/mapmarker/CapitalBuildingMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CastleMarker.svg b/Mappalachia/img/mapmarker/CastleMarker.svg index 801b1b8..91a6d8b 100644 --- a/Mappalachia/img/mapmarker/CastleMarker.svg +++ b/Mappalachia/img/mapmarker/CastleMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CaveMarker.svg b/Mappalachia/img/mapmarker/CaveMarker.svg index 3edc94b..59896bd 100644 --- a/Mappalachia/img/mapmarker/CaveMarker.svg +++ b/Mappalachia/img/mapmarker/CaveMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/ChurchMarker.svg b/Mappalachia/img/mapmarker/ChurchMarker.svg index f857600..024ecc1 100644 --- a/Mappalachia/img/mapmarker/ChurchMarker.svg +++ b/Mappalachia/img/mapmarker/ChurchMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CityMarker.svg b/Mappalachia/img/mapmarker/CityMarker.svg index bf03c2c..4b52f8a 100644 --- a/Mappalachia/img/mapmarker/CityMarker.svg +++ b/Mappalachia/img/mapmarker/CityMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CountryClubMarker.svg b/Mappalachia/img/mapmarker/CountryClubMarker.svg index 8642885..d806559 100644 --- a/Mappalachia/img/mapmarker/CountryClubMarker.svg +++ b/Mappalachia/img/mapmarker/CountryClubMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CowSpotsCreameryMarker.svg b/Mappalachia/img/mapmarker/CowSpotsCreameryMarker.svg index cebf7fd..b07ba61 100644 --- a/Mappalachia/img/mapmarker/CowSpotsCreameryMarker.svg +++ b/Mappalachia/img/mapmarker/CowSpotsCreameryMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/CultistMarker.svg b/Mappalachia/img/mapmarker/CultistMarker.svg index 58c999b..d7655c6 100644 --- a/Mappalachia/img/mapmarker/CultistMarker.svg +++ b/Mappalachia/img/mapmarker/CultistMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/DamMarker.svg b/Mappalachia/img/mapmarker/DamMarker.svg index 17ae633..cee96b4 100644 --- a/Mappalachia/img/mapmarker/DamMarker.svg +++ b/Mappalachia/img/mapmarker/DamMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/ElectricalSubstationMarker.svg b/Mappalachia/img/mapmarker/ElectricalSubstationMarker.svg index dcbcadd..bc44c98 100644 --- a/Mappalachia/img/mapmarker/ElectricalSubstationMarker.svg +++ b/Mappalachia/img/mapmarker/ElectricalSubstationMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/ElevatedHighwayMarker.svg b/Mappalachia/img/mapmarker/ElevatedHighwayMarker.svg index c9cb269..f12d5e6 100644 --- a/Mappalachia/img/mapmarker/ElevatedHighwayMarker.svg +++ b/Mappalachia/img/mapmarker/ElevatedHighwayMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/EncampmentMarker.svg b/Mappalachia/img/mapmarker/EncampmentMarker.svg index 0c83c44..c80b952 100644 --- a/Mappalachia/img/mapmarker/EncampmentMarker.svg +++ b/Mappalachia/img/mapmarker/EncampmentMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/FactoryMarker.svg b/Mappalachia/img/mapmarker/FactoryMarker.svg index c304afb..cbf3143 100644 --- a/Mappalachia/img/mapmarker/FactoryMarker.svg +++ b/Mappalachia/img/mapmarker/FactoryMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/FarmMarker.svg b/Mappalachia/img/mapmarker/FarmMarker.svg index 7c32a50..9e00155 100644 --- a/Mappalachia/img/mapmarker/FarmMarker.svg +++ b/Mappalachia/img/mapmarker/FarmMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/FillingStationMarker.svg b/Mappalachia/img/mapmarker/FillingStationMarker.svg index f004be8..f948110 100644 --- a/Mappalachia/img/mapmarker/FillingStationMarker.svg +++ b/Mappalachia/img/mapmarker/FillingStationMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/FissureMarker.svg b/Mappalachia/img/mapmarker/FissureMarker.svg index 083e41e..44a9d5a 100644 --- a/Mappalachia/img/mapmarker/FissureMarker.svg +++ b/Mappalachia/img/mapmarker/FissureMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/ForestedMarker.svg b/Mappalachia/img/mapmarker/ForestedMarker.svg index 8389d2c..931216b 100644 --- a/Mappalachia/img/mapmarker/ForestedMarker.svg +++ b/Mappalachia/img/mapmarker/ForestedMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/GoodneighborMarker.svg b/Mappalachia/img/mapmarker/GoodneighborMarker.svg index 17b73c4..c331341 100644 --- a/Mappalachia/img/mapmarker/GoodneighborMarker.svg +++ b/Mappalachia/img/mapmarker/GoodneighborMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/GraveyardMarker.svg b/Mappalachia/img/mapmarker/GraveyardMarker.svg index 217f2e5..e9ab4bf 100644 --- a/Mappalachia/img/mapmarker/GraveyardMarker.svg +++ b/Mappalachia/img/mapmarker/GraveyardMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/HammerWingMarker.svg b/Mappalachia/img/mapmarker/HammerWingMarker.svg index 22e5272..7157c8a 100644 --- a/Mappalachia/img/mapmarker/HammerWingMarker.svg +++ b/Mappalachia/img/mapmarker/HammerWingMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/HighTechBuildingMarker.svg b/Mappalachia/img/mapmarker/HighTechBuildingMarker.svg index 6d59a60..49f9f59 100644 --- a/Mappalachia/img/mapmarker/HighTechBuildingMarker.svg +++ b/Mappalachia/img/mapmarker/HighTechBuildingMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/HospitalMarker.svg b/Mappalachia/img/mapmarker/HospitalMarker.svg index ba2f56f..94271c4 100644 --- a/Mappalachia/img/mapmarker/HospitalMarker.svg +++ b/Mappalachia/img/mapmarker/HospitalMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/HouseTrailerMarker.svg b/Mappalachia/img/mapmarker/HouseTrailerMarker.svg index 0aa9498..59bca3d 100644 --- a/Mappalachia/img/mapmarker/HouseTrailerMarker.svg +++ b/Mappalachia/img/mapmarker/HouseTrailerMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/IndustrialDomeMarker.svg b/Mappalachia/img/mapmarker/IndustrialDomeMarker.svg index ee035f1..84926df 100644 --- a/Mappalachia/img/mapmarker/IndustrialDomeMarker.svg +++ b/Mappalachia/img/mapmarker/IndustrialDomeMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/LandmarkMarker.svg b/Mappalachia/img/mapmarker/LandmarkMarker.svg index a1f17c6..f024e69 100644 --- a/Mappalachia/img/mapmarker/LandmarkMarker.svg +++ b/Mappalachia/img/mapmarker/LandmarkMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/LegendaryPurveyorMarker.svg b/Mappalachia/img/mapmarker/LegendaryPurveyorMarker.svg index d3b5f2e..9b57062 100644 --- a/Mappalachia/img/mapmarker/LegendaryPurveyorMarker.svg +++ b/Mappalachia/img/mapmarker/LegendaryPurveyorMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/LibertaliaMarker.svg b/Mappalachia/img/mapmarker/LibertaliaMarker.svg index f42ab12..69d1773 100644 --- a/Mappalachia/img/mapmarker/LibertaliaMarker.svg +++ b/Mappalachia/img/mapmarker/LibertaliaMarker.svg @@ -1,13 +1,13 @@ - + - + diff --git a/Mappalachia/img/mapmarker/LighthouseMarker.svg b/Mappalachia/img/mapmarker/LighthouseMarker.svg index c783964..c4d33f6 100644 --- a/Mappalachia/img/mapmarker/LighthouseMarker.svg +++ b/Mappalachia/img/mapmarker/LighthouseMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/LookoutTowerMarker.svg b/Mappalachia/img/mapmarker/LookoutTowerMarker.svg index 7cc5289..fbea293 100644 --- a/Mappalachia/img/mapmarker/LookoutTowerMarker.svg +++ b/Mappalachia/img/mapmarker/LookoutTowerMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/LowRiseMarker.svg b/Mappalachia/img/mapmarker/LowRiseMarker.svg index 03edda0..3aac34c 100644 --- a/Mappalachia/img/mapmarker/LowRiseMarker.svg +++ b/Mappalachia/img/mapmarker/LowRiseMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/MansionMarker.svg b/Mappalachia/img/mapmarker/MansionMarker.svg index 7eeae6a..2769554 100644 --- a/Mappalachia/img/mapmarker/MansionMarker.svg +++ b/Mappalachia/img/mapmarker/MansionMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/MilitaryBaseMarker.svg b/Mappalachia/img/mapmarker/MilitaryBaseMarker.svg index 7b87a07..7d7111e 100644 --- a/Mappalachia/img/mapmarker/MilitaryBaseMarker.svg +++ b/Mappalachia/img/mapmarker/MilitaryBaseMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/MonorailMarker.svg b/Mappalachia/img/mapmarker/MonorailMarker.svg index cd9034a..f7dacd8 100644 --- a/Mappalachia/img/mapmarker/MonorailMarker.svg +++ b/Mappalachia/img/mapmarker/MonorailMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/MonumentMarker.svg b/Mappalachia/img/mapmarker/MonumentMarker.svg index baf4873..14ca325 100644 --- a/Mappalachia/img/mapmarker/MonumentMarker.svg +++ b/Mappalachia/img/mapmarker/MonumentMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/NukaColaQuantumPlant.svg b/Mappalachia/img/mapmarker/NukaColaQuantumPlant.svg index 22b3dc5..60ff80b 100644 --- a/Mappalachia/img/mapmarker/NukaColaQuantumPlant.svg +++ b/Mappalachia/img/mapmarker/NukaColaQuantumPlant.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/OfficeMarker.svg b/Mappalachia/img/mapmarker/OfficeMarker.svg index 7ee2bba..aa7a39d 100644 --- a/Mappalachia/img/mapmarker/OfficeMarker.svg +++ b/Mappalachia/img/mapmarker/OfficeMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/OverlookMarker.svg b/Mappalachia/img/mapmarker/OverlookMarker.svg index abb85e3..a300190 100644 --- a/Mappalachia/img/mapmarker/OverlookMarker.svg +++ b/Mappalachia/img/mapmarker/OverlookMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/PalaceWindingPathMarker.svg b/Mappalachia/img/mapmarker/PalaceWindingPathMarker.svg index 9dcfdf8..7787889 100644 --- a/Mappalachia/img/mapmarker/PalaceWindingPathMarker.svg +++ b/Mappalachia/img/mapmarker/PalaceWindingPathMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/PierMarker.svg b/Mappalachia/img/mapmarker/PierMarker.svg index 81f00cd..0522da7 100644 --- a/Mappalachia/img/mapmarker/PierMarker.svg +++ b/Mappalachia/img/mapmarker/PierMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/PondLakeMarker.svg b/Mappalachia/img/mapmarker/PondLakeMarker.svg index a0e0ea5..ffa2295 100644 --- a/Mappalachia/img/mapmarker/PondLakeMarker.svg +++ b/Mappalachia/img/mapmarker/PondLakeMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/PowerPlantMarker.svg b/Mappalachia/img/mapmarker/PowerPlantMarker.svg index 579608d..6a946a8 100644 --- a/Mappalachia/img/mapmarker/PowerPlantMarker.svg +++ b/Mappalachia/img/mapmarker/PowerPlantMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/PumpkinMarker.svg b/Mappalachia/img/mapmarker/PumpkinMarker.svg index 91aca03..25f7b9a 100644 --- a/Mappalachia/img/mapmarker/PumpkinMarker.svg +++ b/Mappalachia/img/mapmarker/PumpkinMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/QuarryMarker.svg b/Mappalachia/img/mapmarker/QuarryMarker.svg index fea814c..bd5f38f 100644 --- a/Mappalachia/img/mapmarker/QuarryMarker.svg +++ b/Mappalachia/img/mapmarker/QuarryMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/RadioTowerMarker.svg b/Mappalachia/img/mapmarker/RadioTowerMarker.svg index 5d416cb..250269c 100644 --- a/Mappalachia/img/mapmarker/RadioTowerMarker.svg +++ b/Mappalachia/img/mapmarker/RadioTowerMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/RadioactiveAreaMarker.svg b/Mappalachia/img/mapmarker/RadioactiveAreaMarker.svg index b5daa34..a989cf2 100644 --- a/Mappalachia/img/mapmarker/RadioactiveAreaMarker.svg +++ b/Mappalachia/img/mapmarker/RadioactiveAreaMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/RaiderSettlementMarker.svg b/Mappalachia/img/mapmarker/RaiderSettlementMarker.svg index 4de0e2b..d9fe53e 100644 --- a/Mappalachia/img/mapmarker/RaiderSettlementMarker.svg +++ b/Mappalachia/img/mapmarker/RaiderSettlementMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/RailroadMarker.svg b/Mappalachia/img/mapmarker/RailroadMarker.svg index cad8f03..d7f4724 100644 --- a/Mappalachia/img/mapmarker/RailroadMarker.svg +++ b/Mappalachia/img/mapmarker/RailroadMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/SancHillsMarker.svg b/Mappalachia/img/mapmarker/SancHillsMarker.svg index 7ddb281..dcbe01d 100644 --- a/Mappalachia/img/mapmarker/SancHillsMarker.svg +++ b/Mappalachia/img/mapmarker/SancHillsMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/SatelliteMarker.svg b/Mappalachia/img/mapmarker/SatelliteMarker.svg index 397083b..312ee71 100644 --- a/Mappalachia/img/mapmarker/SatelliteMarker.svg +++ b/Mappalachia/img/mapmarker/SatelliteMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/SettlementMarker.svg b/Mappalachia/img/mapmarker/SettlementMarker.svg index a896975..49bdfa2 100644 --- a/Mappalachia/img/mapmarker/SettlementMarker.svg +++ b/Mappalachia/img/mapmarker/SettlementMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/SewerMarker.svg b/Mappalachia/img/mapmarker/SewerMarker.svg index 87d7512..081acd4 100644 --- a/Mappalachia/img/mapmarker/SewerMarker.svg +++ b/Mappalachia/img/mapmarker/SewerMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/SkiResortMarker.svg b/Mappalachia/img/mapmarker/SkiResortMarker.svg index 8c675c9..435b0ea 100644 --- a/Mappalachia/img/mapmarker/SkiResortMarker.svg +++ b/Mappalachia/img/mapmarker/SkiResortMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/SkullRingMarker.svg b/Mappalachia/img/mapmarker/SkullRingMarker.svg index ecc68c4..ab922e3 100644 --- a/Mappalachia/img/mapmarker/SkullRingMarker.svg +++ b/Mappalachia/img/mapmarker/SkullRingMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/TeapotMarker.svg b/Mappalachia/img/mapmarker/TeapotMarker.svg index d16b91d..9ca74a9 100644 --- a/Mappalachia/img/mapmarker/TeapotMarker.svg +++ b/Mappalachia/img/mapmarker/TeapotMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/TopOfTheWorldMarker.svg b/Mappalachia/img/mapmarker/TopOfTheWorldMarker.svg index acb5966..9498a20 100644 --- a/Mappalachia/img/mapmarker/TopOfTheWorldMarker.svg +++ b/Mappalachia/img/mapmarker/TopOfTheWorldMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/TownMarker.svg b/Mappalachia/img/mapmarker/TownMarker.svg index 79c8b88..9288309 100644 --- a/Mappalachia/img/mapmarker/TownMarker.svg +++ b/Mappalachia/img/mapmarker/TownMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/TownRuinsMarker.svg b/Mappalachia/img/mapmarker/TownRuinsMarker.svg index ad8a117..e6514fe 100644 --- a/Mappalachia/img/mapmarker/TownRuinsMarker.svg +++ b/Mappalachia/img/mapmarker/TownRuinsMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/TrainStationMarker.svg b/Mappalachia/img/mapmarker/TrainStationMarker.svg index 0e093d8..5364de6 100644 --- a/Mappalachia/img/mapmarker/TrainStationMarker.svg +++ b/Mappalachia/img/mapmarker/TrainStationMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/TrainTrackMark.svg b/Mappalachia/img/mapmarker/TrainTrackMark.svg index 72a7897..c1104bc 100644 --- a/Mappalachia/img/mapmarker/TrainTrackMark.svg +++ b/Mappalachia/img/mapmarker/TrainTrackMark.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/Vault51Marker.svg b/Mappalachia/img/mapmarker/Vault51Marker.svg index 2be5d04..3183e96 100644 --- a/Mappalachia/img/mapmarker/Vault51Marker.svg +++ b/Mappalachia/img/mapmarker/Vault51Marker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/Vault63Marker.svg b/Mappalachia/img/mapmarker/Vault63Marker.svg index 2fa49c7..9277e6b 100644 --- a/Mappalachia/img/mapmarker/Vault63Marker.svg +++ b/Mappalachia/img/mapmarker/Vault63Marker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/Vault76Marker.svg b/Mappalachia/img/mapmarker/Vault76Marker.svg index e14e907..613aa36 100644 --- a/Mappalachia/img/mapmarker/Vault76Marker.svg +++ b/Mappalachia/img/mapmarker/Vault76Marker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/Vault79Marker.svg b/Mappalachia/img/mapmarker/Vault79Marker.svg index 5e7f32c..e135638 100644 --- a/Mappalachia/img/mapmarker/Vault79Marker.svg +++ b/Mappalachia/img/mapmarker/Vault79Marker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/Vault94Marker.svg b/Mappalachia/img/mapmarker/Vault94Marker.svg index b9c6022..8dbf054 100644 --- a/Mappalachia/img/mapmarker/Vault94Marker.svg +++ b/Mappalachia/img/mapmarker/Vault94Marker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/Vault96Marker.svg b/Mappalachia/img/mapmarker/Vault96Marker.svg index a04f074..83572ad 100644 --- a/Mappalachia/img/mapmarker/Vault96Marker.svg +++ b/Mappalachia/img/mapmarker/Vault96Marker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/VaultMarker.svg b/Mappalachia/img/mapmarker/VaultMarker.svg index c858233..d491fa7 100644 --- a/Mappalachia/img/mapmarker/VaultMarker.svg +++ b/Mappalachia/img/mapmarker/VaultMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/WhitespringResort.svg b/Mappalachia/img/mapmarker/WhitespringResort.svg index 61cdc03..ae7043b 100644 --- a/Mappalachia/img/mapmarker/WhitespringResort.svg +++ b/Mappalachia/img/mapmarker/WhitespringResort.svg @@ -1,7 +1,7 @@ - + diff --git a/Mappalachia/img/mapmarker/WoodShackMarker.svg b/Mappalachia/img/mapmarker/WoodShackMarker.svg index d9ad480..b58790a 100644 --- a/Mappalachia/img/mapmarker/WoodShackMarker.svg +++ b/Mappalachia/img/mapmarker/WoodShackMarker.svg @@ -1,7 +1,7 @@ - + diff --git a/README.md b/README.md index 3ddecbc..af454b9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Mappalachia is a Windows application for generating and exporting complex maps o [![Latest release](https://img.shields.io/github/downloads/AHeroicLlama/Mappalachia/total)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
![](https://img.shields.io/github/last-commit/AHeroicLlama/Mappalachia)
[![Latest release](https://img.shields.io/github/v/release/aheroicllama/mappalachia)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
-![](https://img.shields.io/badge/game%20version-1.7.5.4-green)
+![](https://img.shields.io/badge/game%20version-1.7.6.7-green)
[![Discord](https://img.shields.io/discord/1029499482028646400?label=Discord&logo=Discord)](https://discord.gg/Z2GMpm6rad)
[![License](https://img.shields.io/github/license/AHeroicLlama/Mappalachia)](LICENSE.md) From 91fa79d92b658a12b7b6c3792a20d2e3b496d082 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Tue, 22 Aug 2023 22:05:50 +0100 Subject: [PATCH 04/16] Merge remote-tracking branch 'AHeroicLlama/master' into development --- CommonwealthCartography/Class/Database.cs | 3 ++- Developer_Guides/ImageAssetValidation.md | 2 +- README.md | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CommonwealthCartography/Class/Database.cs b/CommonwealthCartography/Class/Database.cs index 39acf80..90bc0e2 100644 --- a/CommonwealthCartography/Class/Database.cs +++ b/CommonwealthCartography/Class/Database.cs @@ -457,7 +457,8 @@ public static List GetNPCCoords(string npc, string spaceFormID, do { coordinates.Add(new MapDataPoint(reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2)) { - weight = reader.GetFloat(3), + // Weight in DB and UI is presented as 1-100%, but weights on-map should be 0-1 to represent the expected count of the NPC + weight = reader.GetFloat(3) / 100f, }); } diff --git a/Developer_Guides/ImageAssetValidation.md b/Developer_Guides/ImageAssetValidation.md index 8e7d567..e2f8099 100644 --- a/Developer_Guides/ImageAssetValidation.md +++ b/Developer_Guides/ImageAssetValidation.md @@ -13,7 +13,7 @@ The tool will connect to the database so it know which cells, worldspaces, and m It will then cross reference to the contents of the `img` folder to verify that each space has an applicable background image file, that the image is of the correct dimensions, and that the file size looks correct. Then it will check for all map markers, also verifying that they exist and that they are of a normal file size.
Finally the tool will verify there are no extraneous image files present.
-If it detects any errors, these will be logged and again summarized once the check has been completed. In addition, `errors.txt` will be placed in `\Mappalachia\img\` containing the reported errors. +If it detects any errors, these will be logged and again summarized once the check has been completed. In addition, `errors.txt` will be placed in `\CommonwealthCartography\img\` containing the reported errors. ### Next steps With all image assets validated, you can now move on to development of the actual [end-user GUI program, Commonwealth Cartography](GUI.md). diff --git a/README.md b/README.md index 3f5f261..d05a38f 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ If you fancy doing some data mining or development with Commonwealth Cartography * Members of the FO76 Datamining Discord, for helping out with FO76Edit and Edit Scripts, and offering valuable knowledge and feedback based on their own experiences datamining and creating Fallout 76 maps. * [fo76utils](https://github.com/fo76utils) for their excellent and powerful render tool, used to render backgrounds for all cell maps and the Commonwealth satellite map option. * Gilpo for providing great ideas and feedback for new Mappalachia features. +* Duchess Flame for useful feature feedback, driving community engagement and moral support. * frame for reporting and helping to test DPI scaling issues. * Everyone who ever gave feedback to the original Mappalachia. Your feedback, comments, questions, and PMs were essential to defining and guiding the features I have been able to bring to life here. From a819b908992f6ff9a41704830280b33683df9967 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Tue, 26 Sep 2023 23:11:41 +0100 Subject: [PATCH 05/16] Correct name of Middle Mountain Pitstop --- Database/summary.txt | 4 ++-- Preprocessor/MapMarkers.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Database/summary.txt b/Database/summary.txt index fb2431b..d8bbe63 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -3,7 +3,7 @@ mappalachia.db ==SQLite version== 3.42.0 2023-05-16 12:36:15 831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0 ==Checksum== -e5e2ac1061cfc337f12208c8631a09ac +b3578e61d42d00cd7163c2e22c9f2f52 ==File Size== 433545216 ==Tables== @@ -197,7 +197,7 @@ Appalachia|CabinMarker|Investigator's Cabin|55724|-68951 Appalachia|CabinMarker|Isolated Cabin|-88356|67999 Appalachia|CabinMarker|Kiddie Corner Cabins|-12731|181510 Appalachia|CabinMarker|Marigold Pavilion|-153870|79406 -Appalachia|CabinMarker|Middle Mountain Cabins|46490|-37821 +Appalachia|CabinMarker|Middle Mountain Pitstop|46490|-37821 Appalachia|CabinMarker|New River Gorge Resort|-81063|12838 Appalachia|CabinMarker|Overlook Cabin|-49924|-46968 Appalachia|CabinMarker|Pioneer Scout Camp|3600|137867 diff --git a/Preprocessor/MapMarkers.cs b/Preprocessor/MapMarkers.cs index cb82645..ee6c080 100644 --- a/Preprocessor/MapMarkers.cs +++ b/Preprocessor/MapMarkers.cs @@ -89,6 +89,7 @@ internal static class MapMarkers { "Hornwright Air Cleanser Site #04", "Hornwright Air Purifier Site #04" }, { "Lumber Camp", "Sylvie & Sons Logging Camp" }, { "Maybell Pond", "Beckwith Farm" }, + { "Middle Mountain Cabins", "Middle Mountain Pitstop" }, { "Mine Shaft No. 9", "AMS Testing Site" }, { "Mire", "Harpers Ferry Tunnel" }, { "Morgantown Regional Airfield", "Morgantown Airport" }, From f5ee1349d857619a5499c990c2c7f178eb448601 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Tue, 10 Oct 2023 19:45:26 +0100 Subject: [PATCH 06/16] 1.7.7.2 - Update for game version 1.7.7.6 --- BackgroundRenderer/BackgroundRenderer.csproj | 2 +- Database/gameVersion.csv | 2 +- Database/summary.txt | 50 ++++++++++---------- FO76Edit/Output/Skipped_spaces.csv | 3 ++ ImageAssetChecker/ImageAssetChecker.csproj | 2 +- MapIconProcessor/MapIconProcessor.csproj | 2 +- Mappalachia/Mappalachia.csproj | 2 +- Mappalachia/Properties/AssemblyInfo.cs | 4 +- MappalachiaTests/MappalachiaTests.csproj | 6 +-- README.md | 2 +- 10 files changed, 39 insertions(+), 36 deletions(-) diff --git a/BackgroundRenderer/BackgroundRenderer.csproj b/BackgroundRenderer/BackgroundRenderer.csproj index 7a3b756..537ca46 100644 --- a/BackgroundRenderer/BackgroundRenderer.csproj +++ b/BackgroundRenderer/BackgroundRenderer.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Database/gameVersion.csv b/Database/gameVersion.csv index 2b6e172..d5b474e 100644 --- a/Database/gameVersion.csv +++ b/Database/gameVersion.csv @@ -1,2 +1,2 @@ version -1.7.6.7 +1.7.7.6 diff --git a/Database/summary.txt b/Database/summary.txt index d8bbe63..094d0cf 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -1,11 +1,11 @@ ==Database name== mappalachia.db ==SQLite version== -3.42.0 2023-05-16 12:36:15 831d0fb2836b71c9bc51067c49fee4b8f18047814f2ff22d817d25195cf350b0 +3.43.2 2023-10-10 12:14:04 4310099cce5a487035fa535dd3002c59ac7f1d1bec68d7cf317fd3e769484790 (32-bit) ==Checksum== -b3578e61d42d00cd7163c2e22c9f2f52 +881fc23d377b0f0d1c37708c5034cce5 ==File Size== -433545216 +433557504 ==Tables== Entity_Info Map_Markers Region Standard_Search Game_Version NPC_Search Scrap_Search @@ -14,9 +14,9 @@ Lock_Levels Position_Data Space_Info Index_PositionData_CoverAll Index_ScrapSearch_CompMagSpace Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Game Version== -1.7.6.7 +1.7.7.6 ==Mean Average X/Y/Z Coord== --11795.8442961587|4399.09453280373|11729.6305187877 +-11795.5309981514|4398.94244609776|11729.36151331 ==Min/Max X/Y/Z Coord== -402000|407637|-407387|380538|-34417|136069 ==100 most common xyz coordinates + count== @@ -123,17 +123,17 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Z outliers== 68 ==Average X Bounds Width== -21.7373730704765 +21.7373598248335 ==Average Y Bounds Width== -16.2519580448945 +16.2516490154475 ==Average Z Bounds Width== -15.2311489642004 +15.2311942929242 ==Average Z Rotation== -4.10122008166594 +4.10171230485765 ==Average display name string length== -2.71848997730711 +2.71823295830576 ==Average editorID string length== -24.997659795764 +24.9983454665784 ==Map Markers== Appalachia|AgriculturalCenterMarker|Vault-Tec Agricultural Research Center|-117195|19445 Appalachia|AirfieldMarker|Crashed Plane|147706|58411 @@ -527,7 +527,7 @@ Appalachia|WoodShackMarker|Southhampton Estate|169981|125109 Appalachia|WoodShackMarker|Toxic Larry's Meat 'n Go|115473|39450 Appalachia|WoodShackMarker|Treetops|162220|-26927 ==Total Unique entities== -42304 +42308 ==Regions== Space|Region|subRegions|maxVerts Appalachia|76Border|1|55 @@ -977,8 +977,8 @@ SheltersMissileSilo||442 SheltersMissileSilo|Box|51 SheltersPittTrench01||1009 SheltersPittTrench01|Box|133 -SheltersRootCellar||382 -SheltersRootCellar|Box|123 +SheltersRootCellar||463 +SheltersRootCellar|Box|132 SheltersSoundStage||790 SheltersSoundStage|Box|115 SheltersToxicWasteland||515 @@ -1431,7 +1431,7 @@ SheltersClaimCenter01||975 SheltersClaimCenter01|Requires Key|1 SheltersMissileSilo||493 SheltersPittTrench01||1142 -SheltersRootCellar||505 +SheltersRootCellar||595 SheltersSoundStage||905 SheltersToxicWasteland||527 SheltersVaultAtrium01||2268 @@ -3249,12 +3249,12 @@ SheltersPittTrench01|LIGH|7 SheltersPittTrench01|SCOL|168 SheltersPittTrench01|STAT|897 SheltersPittTrench01|TXST|56 -SheltersRootCellar|ACTI|13 -SheltersRootCellar|LIGH|9 -SheltersRootCellar|MSTT|1 +SheltersRootCellar|ACTI|14 +SheltersRootCellar|LIGH|14 +SheltersRootCellar|MSTT|4 SheltersRootCellar|SCOL|10 -SheltersRootCellar|STAT|374 -SheltersRootCellar|TXST|98 +SheltersRootCellar|STAT|446 +SheltersRootCellar|TXST|107 SheltersSoundStage|ACTI|30 SheltersSoundStage|LIGH|38 SheltersSoundStage|MSTT|16 @@ -11920,7 +11920,7 @@ SheltersCave02||608 SheltersClaimCenter01||976 SheltersMissileSilo||493 SheltersPittTrench01||1142 -SheltersRootCellar||505 +SheltersRootCellar||595 SheltersSoundStage||905 SheltersToxicWasteland||527 SheltersVaultAtrium01||2268 @@ -14313,7 +14313,7 @@ SheltersCave02|100|608 SheltersClaimCenter01|100|976 SheltersMissileSilo|100|493 SheltersPittTrench01|100|1142 -SheltersRootCellar|100|505 +SheltersRootCellar|100|595 SheltersSoundStage|100|905 SheltersToxicWasteland|100|527 SheltersVaultAtrium01|100|2268 @@ -17358,7 +17358,7 @@ Appalachia|Radroach|25.0|2 Appalachia|Robot|38.48|417 Appalachia|Scorched|55.25|1108 Appalachia|Snallygaster|67.03|26 -Appalachia|Stingwing|57.15|6 +Appalachia|Stingwing|57.14|6 Appalachia|Super Mutant|45.7|794 Appalachia|Tick|64.29|7 Appalachia|Vicious Dog|15.4|497 @@ -17553,10 +17553,10 @@ WestTek01|Super Mutant|100.0|41 0003BDBB|UncannyCaverns01|Uncanny Caverns|0|1980|4821|-2676|6636|-806|10448|0|0|1.0 0040C1A7|CraterWatchstation01|Crater Watchstation Worksite|0|-1243|-3555|-4122|1636|-8328|1218|-150|-2000|1.8 0051EF4F|CharGen03|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 -006D8953|SheltersRootCellar|Root Cellar Dungeon|0|3217|-2288|682|5752|-3736|-841|0|0|1.0 +006D8953|SheltersRootCellar|Root Cellar Dungeon|0|3217|-2261|682|5752|-3682|-841|0|0|1.0 0039E891|FreeStatesBunker07|Ransacked Bunker|0|1125|2081|-320|2570|667|3496|0|0|1.0 005CC20D|WatogaCivicCenterDungeon|Watoga Raider Arena|0|3469|339|-524|7462|-3351|4030|0|0|1.0 003F880F|FoundationInt01|Foundation Interior|0|3171|-6042|-3576|9919|-15956|3872|1400|1800|1.7 006240BB|WhitespringRefuge01|Whitespring Refuge|0|-8840|10960|-16336|-1344|5056|16864|0|0|1.0 ==Instance IDs Count Vs Distinct== -3953178|3953178 +3953268|3953268 diff --git a/FO76Edit/Output/Skipped_spaces.csv b/FO76Edit/Output/Skipped_spaces.csv index e0e4192..5c0d67d 100644 --- a/FO76Edit/Output/Skipped_spaces.csv +++ b/FO76Edit/Output/Skipped_spaces.csv @@ -575,6 +575,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00586D46,PackInDenizenPackInSettlerCamperStorageCell,,0 005FF9B2,PackInATXFenceBarbedWireGatePCKNStorageCell,,0 0067A496,PackInSCORES11FurnitureTireSwingTreePackInStorageCell,,0 +007263C2,,,0 00003040,zCUTTestPhil01,Quick Test Cell,0 000083D8,PackInSLABMedWarehouse01StorageCell,,0 0000E134,PackInPACKToxicTreeClusterSm03StorageCell,,0 @@ -1105,6 +1106,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 0051AD6F,PackInMSiloOperationsConsoleSingleTall06StorageCell,,0 005AA8A7,zCUTObservatoryLower01OLD,ATLAS Observatory Basement,0 005DB4BB,,,0 +006F779B,DebugJeffUInstanced01,Quick Test Cell,0 000043AD,PackInPACKToxicTreeStumpBranches01StorageCell,,0 000046CD,zCUTTestPurkeyMine01,Quick Test Cell,0 0000C305,PackInSLABMedChurch01StorageCell,,0 @@ -1912,6 +1914,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 005867AD,PackInATXworkshopCollectorScavengepackinRaiderCOPY0000StorageCell,,0 005B7169,PackInSheltersEntranceRootCellarLargeStorageCell,,0 0066923D,,,0 +006F898D,DebugJeffUInstanced02,Quick Test Cell,0 0000D5BF,PackInTESTTreePackInStorageCell,,0 00116EF7,76QASmoke,76 QA Smoke,0 00192DC7,PackInBld02CornerBrickACom01PackInStorageCell,,0 diff --git a/ImageAssetChecker/ImageAssetChecker.csproj b/ImageAssetChecker/ImageAssetChecker.csproj index 006903b..a214460 100644 --- a/ImageAssetChecker/ImageAssetChecker.csproj +++ b/ImageAssetChecker/ImageAssetChecker.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MapIconProcessor/MapIconProcessor.csproj b/MapIconProcessor/MapIconProcessor.csproj index 6af61db..ec88e98 100644 --- a/MapIconProcessor/MapIconProcessor.csproj +++ b/MapIconProcessor/MapIconProcessor.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Mappalachia/Mappalachia.csproj b/Mappalachia/Mappalachia.csproj index 989fccd..e010af4 100644 --- a/Mappalachia/Mappalachia.csproj +++ b/Mappalachia/Mappalachia.csproj @@ -53,7 +53,7 @@ - 7.0.8 + 7.0.12 all diff --git a/Mappalachia/Properties/AssemblyInfo.cs b/Mappalachia/Properties/AssemblyInfo.cs index c5773c6..f71a091 100644 --- a/Mappalachia/Properties/AssemblyInfo.cs +++ b/Mappalachia/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.7.1")] -[assembly: AssemblyFileVersion("1.7.7.1")] +[assembly: AssemblyVersion("1.7.7.2")] +[assembly: AssemblyFileVersion("1.7.7.2")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/MappalachiaTests/MappalachiaTests.csproj b/MappalachiaTests/MappalachiaTests.csproj index ea212d8..c038de0 100644 --- a/MappalachiaTests/MappalachiaTests.csproj +++ b/MappalachiaTests/MappalachiaTests.csproj @@ -11,9 +11,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/README.md b/README.md index af454b9..8eb6b07 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Mappalachia is a Windows application for generating and exporting complex maps o [![Latest release](https://img.shields.io/github/downloads/AHeroicLlama/Mappalachia/total)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
![](https://img.shields.io/github/last-commit/AHeroicLlama/Mappalachia)
[![Latest release](https://img.shields.io/github/v/release/aheroicllama/mappalachia)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
-![](https://img.shields.io/badge/game%20version-1.7.6.7-green)
+![](https://img.shields.io/badge/game%20version-1.7.7.6-green)
[![Discord](https://img.shields.io/discord/1029499482028646400?label=Discord&logo=Discord)](https://discord.gg/Z2GMpm6rad)
[![License](https://img.shields.io/github/license/AHeroicLlama/Mappalachia)](LICENSE.md) From 9366ccfc23b518e62954c67f2921064a48defcd0 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Sun, 15 Oct 2023 23:35:30 +0100 Subject: [PATCH 07/16] Documentation correction --- User_Guides/Customization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/User_Guides/Customization.md b/User_Guides/Customization.md index 193f10f..ab88388 100644 --- a/User_Guides/Customization.md +++ b/User_Guides/Customization.md @@ -4,7 +4,7 @@ Under the 'Map' menu, there are several options which allow you to change the appearance of the overall map; ### Title -This allows you to set a title for the map - it will show in the bottom-right, and will be the default filename when saving the map image. +This allows you to set a title for the map - it will show in the top-right, and will be the default filename when saving the map image. ### Brightness This option brings up a dialog which allows you to tweak the percentage brightness of the underlying map image. Enter any value from 5% to 300%. From 607178e1a385a6b5138ce7961f419728d006a84a Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Thu, 30 Nov 2023 18:03:30 +0000 Subject: [PATCH 08/16] Update packages --- BackgroundRenderer/BackgroundRenderer.csproj | 2 +- ImageAssetChecker/ImageAssetChecker.csproj | 2 +- MapIconProcessor/MapIconProcessor.csproj | 2 +- Mappalachia/Mappalachia.csproj | 4 ++-- MappalachiaTests/MappalachiaTests.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BackgroundRenderer/BackgroundRenderer.csproj b/BackgroundRenderer/BackgroundRenderer.csproj index 537ca46..265abc4 100644 --- a/BackgroundRenderer/BackgroundRenderer.csproj +++ b/BackgroundRenderer/BackgroundRenderer.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ImageAssetChecker/ImageAssetChecker.csproj b/ImageAssetChecker/ImageAssetChecker.csproj index a214460..aca4475 100644 --- a/ImageAssetChecker/ImageAssetChecker.csproj +++ b/ImageAssetChecker/ImageAssetChecker.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MapIconProcessor/MapIconProcessor.csproj b/MapIconProcessor/MapIconProcessor.csproj index ec88e98..d59e1fd 100644 --- a/MapIconProcessor/MapIconProcessor.csproj +++ b/MapIconProcessor/MapIconProcessor.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Mappalachia/Mappalachia.csproj b/Mappalachia/Mappalachia.csproj index e010af4..4034088 100644 --- a/Mappalachia/Mappalachia.csproj +++ b/Mappalachia/Mappalachia.csproj @@ -53,13 +53,13 @@ - 7.0.12 + 8.0.0 all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/MappalachiaTests/MappalachiaTests.csproj b/MappalachiaTests/MappalachiaTests.csproj index c038de0..c769920 100644 --- a/MappalachiaTests/MappalachiaTests.csproj +++ b/MappalachiaTests/MappalachiaTests.csproj @@ -11,7 +11,7 @@ - + From ccc857a543d9a7811a827da3cb598bc6a599921d Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Tue, 5 Dec 2023 20:32:52 +0000 Subject: [PATCH 09/16] 1.7.7.3 - Update for Atlantic city Updates the database for fo76 v1.7.8.8 AKA Atlantic City/Season 15. Adds support for new cells and map markers. Adds a debug mode for background renderer for manually fitting cell offsets in future --- BackgroundRenderer/BackgroundRenderer.cs | 82 +- Database/gameVersion.csv | 2 +- Database/summary.txt | 1956 +++++++++++++++++----- FO76Edit/Output/Skipped_spaces.csv | 16 +- Mappalachia/Properties/AssemblyInfo.cs | 4 +- Preprocessor/MapMarkers.cs | 14 +- Preprocessor/SpaceNudge.cs | 78 + README.md | 2 +- 8 files changed, 1722 insertions(+), 432 deletions(-) diff --git a/BackgroundRenderer/BackgroundRenderer.cs b/BackgroundRenderer/BackgroundRenderer.cs index f1b960c..15de69e 100644 --- a/BackgroundRenderer/BackgroundRenderer.cs +++ b/BackgroundRenderer/BackgroundRenderer.cs @@ -37,25 +37,28 @@ public partial class BackgroundRenderer { "FoundationSupplyRoom01", 200 }, { "FraternityHouse01", 850 }, { "FraternityHouse02", 850 }, + { "IngramMansion01", 500 }, { "LewisandSonsFarmingSupply01", 500 }, { "OverseersHome01", 675 }, { "PoseidonPlant02", 3000 }, { "RaiderCave01", 300 }, { "RaiderCave03", 300 }, { "RaiderRaidTrailerInt", 150 }, + { "SheltersRootCellar", 300 }, + { "SheltersSoundStage", 1000 }, + { "SheltersToxicWasteland", 2000 }, { "SugarGrove02", 1000 }, + { "TheCraterCore01", 100 }, { "TheWayward01", 400 }, { "TopOfTheWorld01", -1800 }, + { "VTecAgCenter01", 400 }, { "ValleyGalleria01", 700 }, { "Vault63Entrance", 4750 }, { "Vault79Entrance", -200 }, - { "VTecAgCenter01", 400 }, { "WVLumberCo01", 1000 }, + { "XPDAC02Pier", 400 }, + { "XPDAC03CommunityCenter", 600 }, { "XPDPitt02Sanctum", 700 }, - { "TheCraterCore01", 100 }, - { "SheltersSoundStage", 1000 }, - { "SheltersToxicWasteland", 2000 }, - { "SheltersRootCellar", 300 }, }; // Cells which are so small, fo76utils won't render at 16k, so we force render at native 4k @@ -65,6 +68,65 @@ public partial class BackgroundRenderer "RaiderRaidTrailerInt", }; + // Debug parameters + static readonly bool debugOn = false; + static readonly string debugEditorID = ""; + static readonly int debugNudgeX = 0; + static readonly int debugNudgeY = 0; + static readonly float debugScale = 1f; + static readonly int debugCameraZ = 65536; + + // Renders a space with parameters setup for debugging, designed to be used to find the appropriate scale/nudge/z-heights for spaces + static void DebugRender() + { + Console.WriteLine("Debug Rendering " + debugEditorID); + + SqliteConnection connection = new SqliteConnection("Data Source=" + databasePath + ";Mode=ReadOnly"); + connection.Open(); + SqliteCommand query = connection.CreateCommand(); + query.CommandText = $"SELECT spaceFormID, spaceEditorID, isWorldspace, xCenter, yCenter, xMin, xMax, yMin, yMax, nudgeX, nudgeY, nudgeScale FROM Space_Info WHERE spaceEditorID = '{debugEditorID}'"; + query.Parameters.Clear(); + SqliteDataReader reader = query.ExecuteReader(); + reader.Read(); + + Space space = new Space( + reader.GetString(0), + reader.GetString(1), + reader.GetBoolean(2), + reader.GetInt32(3), + reader.GetInt32(4), + Math.Abs(reader.GetInt32(6) - reader.GetInt32(5)), + Math.Abs(reader.GetInt32(8) - reader.GetInt32(7)), + debugNudgeX, + debugNudgeY, + debugScale); + + if (space.formID == string.Empty) + { + space.formID = "0025DA15"; + } + + int resolution = 2048; + int renderResolution = resolution; + int range = Math.Max(space.xRange, space.yRange); + double scale = ((double)resolution / range) * space.nudgeScale; + + string renderFile = $"{imageDirectory}{space.editorID}{(space.isWorldspace ? "_render_debug" : string.Empty)}.dds"; + double cameraX = space.xCenter - (space.nudgeX * (renderResolution / 4096d) / scale); + double cameraY = space.yCenter + (space.nudgeY * (renderResolution / 4096d) / scale); + + string terrainString = space.isWorldspace ? $"-btd \"{fo76DataPath}\\Terrain\\Appalachia.btd\" " : string.Empty; + + string renderCommand = $"{utilsRenderPath} \"{fo76DataPath}\\SeventySix.esm\" {renderFile} {resolution} {resolution} " + + $"\"{fo76DataPath}\" {terrainString} -w 0x{space.formID} -l 0 -cam {scale} 180 0 0 {cameraX} {cameraY} {debugCameraZ} " + + $"-light 1.8 65 180 -rq 0 -scol 1 -ssaa 0 -ltxtres 64 -mlod 4 -xm effects"; + + Process render = Process.Start("CMD.exe", "/C " + renderCommand); + render.WaitForExit(); + + Process.Start(new ProcessStartInfo { FileName = renderFile, UseShellExecute = true }); + } + public static void Main() { Console.Title = "Mappalachia Background Renderer"; @@ -90,6 +152,12 @@ public static void Main() return; } + if (debugOn) + { + DebugRender(); + return; + } + Console.WriteLine("Paste space-separated EditorIDs of Cells or Worldspaces you need rendering. Otherwise paste nothing to render all"); string arg = Console.ReadLine() ?? string.Empty; List args = arg.Split(' ').Where(a => !string.IsNullOrWhiteSpace(a)).ToList(); @@ -222,10 +290,10 @@ public static void Main() double cameraX = space.xCenter - (space.nudgeX * (renderResolution / 4096d) / scale); double cameraY = space.yCenter + (space.nudgeY * (renderResolution / 4096d) / scale); - // -rq 1 + 2 + 12 + 32 + 256 + // -rq 1 + 2 + 12 + 256 (+32 for cells) string renderCommand = $"{utilsRenderPath} \"{fo76DataPath}\\SeventySix.esm\" {renderFile} {resolution} {resolution} " + $"\"{fo76DataPath}\" {terrainString} -w 0x{space.formID} -l 0 -cam {scale} 180 0 0 {cameraX} {cameraY} {cameraZ} " + - $"-light 1.8 65 180 -lcolor 1.1 0xD6CCC7 0.9 -1 -1 -rq 303 -ssaa {SSAA} " + + $"-light 1.8 65 180 -lcolor 1.1 0xD6CCC7 0.9 -1 -1 -rq {(space.isWorldspace ? "271" : "303")} -ssaa {SSAA} " + $"-ltxtres 512 -mip 1 -lmip 2 -mlod 0 -ndis 1 -xm babylon -xm fog -xm cloud"; string resizeCommand = $"\"{magickPath}\" convert {renderFile} -resize {nativeResolution}x{nativeResolution} " + diff --git a/Database/gameVersion.csv b/Database/gameVersion.csv index d5b474e..d94091f 100644 --- a/Database/gameVersion.csv +++ b/Database/gameVersion.csv @@ -1,2 +1,2 @@ version -1.7.7.6 +1.7.8.8 diff --git a/Database/summary.txt b/Database/summary.txt index 094d0cf..1542f72 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -1,11 +1,11 @@ ==Database name== mappalachia.db ==SQLite version== -3.43.2 2023-10-10 12:14:04 4310099cce5a487035fa535dd3002c59ac7f1d1bec68d7cf317fd3e769484790 (32-bit) +3.44.2 2023-11-24 11:41:44 ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f (64-bit) ==Checksum== -881fc23d377b0f0d1c37708c5034cce5 +7c2253774ea9fb1b6c5f4e44159f3865 ==File Size== -433557504 +449691648 ==Tables== Entity_Info Map_Markers Region Standard_Search Game_Version NPC_Search Scrap_Search @@ -14,126 +14,126 @@ Lock_Levels Position_Data Space_Info Index_PositionData_CoverAll Index_ScrapSearch_CompMagSpace Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Game Version== -1.7.7.6 +1.7.8.8 ==Mean Average X/Y/Z Coord== --11795.5309981514|4398.94244609776|11729.36151331 +-11542.1491666802|4354.97236499601|11401.7878800141 ==Min/Max X/Y/Z Coord== --402000|407637|-407387|380538|-34417|136069 +-402000|407637|-407387|380538|-50907|136069 ==100 most common xyz coordinates + count== 2433|59|-2816|76 2432|64|-2816|64 2432|64|-2560|61 2433|59|-3072|60 --128|4608|512|42 -3584|0|256|41 +-128|4608|512|57 +3584|0|256|57 +2547|4482|512|46 +-43|4777|519|42 +1988|4809|518|42 +2085|2161|519|42 +2116|3301|514|42 +3642|-626|273|42 +3816|1208|263|42 +4115|2168|262|42 +0|0|0|41 39101|14406|35188|40 624|-1848|-1112|38 3696|-6968|-1112|37 -125269|-37601|6630|36 --43|4777|519|36 -1988|4809|518|36 -2085|2161|519|36 -2116|3301|514|36 +-256|256|0|36 +1408|-384|256|36 2928|-2360|-1112|36 -3642|-626|273|36 -3816|1208|263|36 -4115|2168|262|36 -0|0|0|35 +-2850|4792|572|34 -128|1664|-608|34 +0|256|0|34 +1536|0|0|34 +0|1024|0|33 +256|1536|0|33 -1216|2352|128|32 +0|768|0|32 960|2352|128|32 -1408|-384|256|32 -2547|4482|512|32 +-256|1024|0|31 +-512|768|0|30 +-512|1024|0|30 +-256|768|0|29 +0|-256|0|29 1024|1792|-608|29 -129108|-37082|6630|28 -79616|-138368|30208|28 +1920|1664|512|28 +2176|1664|512|28 +2176|1920|512|28 -11852|-31565|3080|27 -8774|-28029|3591|27 +-256|0|0|27 -79616|-138368|28096|26 -0|1024|0|26 -256|1536|0|26 -512|1024|256|25 +512|1024|256|26 +0|1280|0|25 +512|1024|0|25 +512|1536|0|25 1280|1792|-608|25 -1536|0|0|25 +1536|-256|0|25 1648|-1848|-1112|25 +1792|768|0|25 +4898|1543|-251|25 -6016|-32034|3328|24 -6016|-32034|4096|24 --2850|4792|572|24 -0|256|0|24 -0|768|0|24 -1920|1664|512|24 -2176|1664|512|24 -2176|1920|512|24 --256|256|0|23 --256|1024|0|23 +-512|256|0|24 +256|1024|0|24 +768|1536|0|24 +1024|1536|0|24 +1280|3840|512|24 +1920|-2944|0|24 +1920|-2176|0|24 +256|-256|0|23 +256|0|0|23 +512|-512|0|23 +1024|768|0|23 +1408|-128|256|23 +1536|256|0|23 -19952|104540|11034|22 -15789|103340|11026|22 -12313|-9137|4261|22 -11535|1118|-276|22 -3708|-154012|33461|22 -0|1280|0|22 +-768|0|0|22 +-512|640|0|22 +0|512|0|22 +768|1792|256|22 +896|896|256|22 +1152|1536|0|22 +1280|768|256|22 +1664|1920|512|22 +2560|-2944|0|22 33916|77986|21778|22 -12363|-8955|4261|21 -12215|-9011|4437|21 -10406|404|-459|21 --512|768|0|21 --512|1024|0|21 -6|-11|-2289|21 -0|-256|0|21 -512|1024|0|21 -1280|3840|512|21 -1408|-128|256|21 -1920|-2944|0|21 -1920|-2176|0|21 -33690|77021|21776|21 --79616|-138368|31616|20 --13119|2726|-100|20 --12975|1883|-99|20 --11529|1391|-100|20 --844|-790|-163|20 --512|640|0|20 -768|1792|-608|20 -32976|74016|21728|20 --19709|103409|11034|19 --1456|-3072|-896|19 --1024|-784|384|19 --256|768|0|19 -0|1024|256|19 -512|1280|-512|19 -512|1536|0|19 -768|1536|0|19 -1024|1536|0|19 -3072|1280|256|19 --19828|103268|11034|18 --12138|-29760|3079|18 --7129|-27618|3591|18 --4544|3056|256|18 --1024|-1040|384|18 --640|1664|-608|18 --640|5104|256|18 --512|-1040|512|18 --384|1664|-608|18 -256|-256|0|18 -256|4224|512|18 -448|1431|-330|18 -512|-512|0|18 -512|4224|512|18 -768|768|-512|18 -896|-1024|-128|18 +0|1024|256|21 +256|1280|0|21 +256|4224|512|21 +512|4224|512|21 +1024|-256|0|21 +1024|4480|512|21 +1280|-2944|0|21 +1280|3200|512|21 +1280|3328|512|21 +1280|3584|512|21 +1280|4096|512|21 ==Z outliers== -68 +74 ==Average X Bounds Width== -21.7373598248335 +21.8197249031648 ==Average Y Bounds Width== -16.2516490154475 +16.3040532222077 ==Average Z Bounds Width== -15.2311942929242 +15.2882792738574 ==Average Z Rotation== -4.10171230485765 +4.11085858994601 ==Average display name string length== -2.71823295830576 +2.73819537590652 ==Average editorID string length== -24.9983454665784 +25.0667924614091 ==Map Markers== Appalachia|AgriculturalCenterMarker|Vault-Tec Agricultural Research Center|-117195|19445 Appalachia|AirfieldMarker|Crashed Plane|147706|58411 @@ -165,6 +165,9 @@ Appalachia|BloodEagleMarker|The Vantage|23579|-68315 Appalachia|BloodEagleMarker|Twin Pine Cabins|-74440|113932 Appalachia|BloodEagleMarker|Widow's Perch|-80141|-84608 Appalachia|BoSMarker|Fort Atlas|79508|73913 +Appalachia|BoSMarker|Forward Station Alpha|116038|-87098 +Appalachia|BoSMarker|Forward Station Delta|202051|-169304 +Appalachia|BoSMarker|Forward Station Tango|-120574|75705 Appalachia|BrownstoneMarker|Black Bear Lodge|2645|182861 Appalachia|BrownstoneMarker|Excelsior Model Home|173540|107324 Appalachia|BrownstoneMarker|Fraternity Row|3191|89389 @@ -232,6 +235,9 @@ Appalachia|CultistMarker|Johnson's Acre|74465|-179824 Appalachia|CultistMarker|Kanawha County Cemetery|-176698|-24065 Appalachia|CultistMarker|Lucky Hole Mine|88918|-138108 Appalachia|CultistMarker|Moth-Home|150845|-32009 +Appalachia|CultistMarker|Organ Cave North|-100728|108640 +Appalachia|CultistMarker|Organ Cave South|-125192|89248 +Appalachia|CultistMarker|Organ Cave West|-134568|97936 Appalachia|CultistMarker|Sacrament|80253|176372 Appalachia|DamMarker|Crevasse Dam|182754|80131 Appalachia|DamMarker|Grafton Dam|7850|118972 @@ -245,6 +251,7 @@ Appalachia|ElectricalSubstationMarker|Thunder Mountain Substation TM-01|145498|1 Appalachia|ElectricalSubstationMarker|Thunder Mountain Substation TM-02|143836|-120232 Appalachia|ElevatedHighwayMarker|New River Gorge Bridge - East|-91369|13638 Appalachia|ElevatedHighwayMarker|New River Gorge Bridge - West|-123988|-10693 +Appalachia|EncampmentMarker|Blue Ridge Bunkhouse|-137037|87969 Appalachia|EncampmentMarker|Overseer's Camp|-80761|44228 Appalachia|EncampmentMarker|Overseer's Home|-55264|25824 Appalachia|EncampmentMarker|Striker Row|-113545|-167811 @@ -354,8 +361,6 @@ Appalachia|MilitaryBaseMarker|Camp McClintock|-69224|-12781 Appalachia|MilitaryBaseMarker|Firebase Hancock|109835|-172982 Appalachia|MilitaryBaseMarker|Firebase LT|166062|-55521 Appalachia|MilitaryBaseMarker|Firebase Major|141990|-60116 -Appalachia|MilitaryBaseMarker|Forward Station Alpha|116038|-87098 -Appalachia|MilitaryBaseMarker|Forward Station Delta|202051|-169304 Appalachia|MilitaryBaseMarker|Site Alpha|80945|-14506 Appalachia|MilitaryBaseMarker|Site Bravo|43039|137056 Appalachia|MilitaryBaseMarker|Site Charlie|1654|-118165 @@ -458,6 +463,7 @@ Appalachia|SancHillsMarker|Miners Monument|-28868|-82873 Appalachia|SatelliteMarker|National Isolated Radio Array|88244|-37538 Appalachia|SatelliteMarker|National Radio Astronomy Research Center|112631|-43120 Appalachia|SatelliteMarker|Sugar Grove|118973|-15204 +Appalachia|SettlementMarker|Settler's Ridge|-111939|108395 Appalachia|SettlementMarker|The Retreat|162313|45172 Appalachia|SewerMarker|The Burrows North|155171|1920 Appalachia|SewerMarker|The Burrows South|157951|-3957 @@ -467,6 +473,7 @@ Appalachia|SkiResortMarker|Sunnytop Ski Lanes|85613|131252 Appalachia|SkiResortMarker|Sunnytop Ski Lanes Base Lodge|98128|144048 Appalachia|SkiResortMarker|White Powder Winter Sports|-950|18368 Appalachia|SkullRingMarker|Ohio River Adventures|-187831|-32302 +Appalachia|SkullRingMarker|The Coop|-140577|113603 Appalachia|SkullRingMarker|The Crater|26681|198625 Appalachia|TeapotMarker|The Giant Teapot|-131984|-29819 Appalachia|TopOfTheWorldMarker|Top of the World|39089|14204 @@ -508,7 +515,7 @@ Appalachia|TrainTrackMark|Mount Blair Trainyard|-132583|-121600 Appalachia|TrainTrackMark|New Appalachian Central Trainyard|13435|-21413 Appalachia|Vault51Marker|Vault 51|-125273|202332 Appalachia|Vault63Marker|Vault 63|-96290|-146559 -Appalachia|Vault76Marker|Vault 76|-103725|94055 +Appalachia|Vault76Marker|Vault 76|-103675|93906 Appalachia|Vault79Marker|Vault 79|145375|186773 Appalachia|Vault94Marker|Vault 94|145156|137186 Appalachia|Vault96Marker|Vault 96|31362|-160241 @@ -527,7 +534,7 @@ Appalachia|WoodShackMarker|Southhampton Estate|169981|125109 Appalachia|WoodShackMarker|Toxic Larry's Meat 'n Go|115473|39450 Appalachia|WoodShackMarker|Treetops|162220|-26927 ==Total Unique entities== -42308 +43987 ==Regions== Space|Region|subRegions|maxVerts Appalachia|76Border|1|55 @@ -740,13 +747,13 @@ AVRMedicalCenter01|Box|194 AlleghenyAsylum01||14278 AlleghenyAsylum01|Box|730 AlleghenyAsylum01|Sphere|5 -Appalachia||3013971 -Appalachia|Box|63372 +Appalachia||3016750 +Appalachia|Box|63636 Appalachia|Ellipsoid|3 Appalachia|Line|1802 Appalachia|Plane|105 -Appalachia|Sphere|2349 -ArktosPharmaLab01||15649 +Appalachia|Sphere|2345 +ArktosPharmaLab01||15650 ArktosPharmaLab01|Box|1483 ArktosPharmaLab01|Line|11 ArktosPharmaLab01|Plane|13 @@ -756,7 +763,7 @@ ArktosPharmaLabDungeon|Box|1225 ArktosPharmaLabDungeon|Line|11 ArktosPharmaLabDungeon|Plane|13 ArktosPharmaLabDungeon|Sphere|4 -BelchingBetty01||5090 +BelchingBetty01||5088 BelchingBetty01|Box|124 BelchingBetty01|Line|6 BigBendTunnel01||6829 @@ -770,7 +777,7 @@ BlueRidgeOffice01|Box|16 BurdetteManorBasement01||490 BurdetteManorBasement01|Box|9 BurningMine01||5744 -BurningMine01|Box|392 +BurningMine01|Box|391 BurningMine01|Sphere|1 Burrows01||19487 Burrows01|Box|643 @@ -829,7 +836,7 @@ EmmettMountainDisposalSite01|Box|185 EmmettMountainDisposalSite01|Line|1 EmmettMountainDisposalSite01|Sphere|1 EnclaveResearchFacility01||17862 -EnclaveResearchFacility01|Box|878 +EnclaveResearchFacility01|Box|880 FortAtlas01||4947 FortAtlas01|Box|237 FortAtlasDungeon01||12349 @@ -858,7 +865,7 @@ FreeStatesBunker06|Box|38 FreeStatesBunker06|Line|1 FreeStatesBunker07||1003 FreeStatesBunker07|Box|46 -GarrahanMiningHQ01||8861 +GarrahanMiningHQ01||8860 GarrahanMiningHQ01|Box|330 GarrahanMiningHQ01|Line|3 GarrahanMiningHQ01|Sphere|7 @@ -889,6 +896,8 @@ HornwrightHQ01|Plane|3 HornwrightHQ01|Sphere|1 HornwrightSafeRoom01||1017 HornwrightSafeRoom01|Box|27 +IngramMansion01||934 +IngramMansion01|Box|2 KerwoodMine01||5287 KerwoodMine01|Box|373 KerwoodMine01|Line|7 @@ -926,9 +935,16 @@ MorgantownHighSchoolDungeon|Box|159 MorgantownHighSchoolDungeon|Sphere|1 MountBlairWarehouseBasement01||312 MountBlairWarehouseBasement01|Box|7 -NPEVault7601||6951 -NPEVault7601|Box|137 +NPECultistCave||3989 +NPECultistCave|Box|256 +NPEVault7601||6921 +NPEVault7601|Box|141 NPEVault7601|Line|2 +NVEShelter01||344 +NVEShelter01|Box|16 +NVEVault7601||6998 +NVEVault7601|Box|137 +NVEVault7601|Line|2 NukaColaQuantumPlant01||5164 NukaColaQuantumPlant01|Box|313 OrwellOrchardsShelter01||2156 @@ -944,12 +960,12 @@ PoseidonPlant02|Box|360 PoseidonPlant02|Line|2 RadioResearchCenter01||3328 RadioResearchCenter01|Box|144 -RaiderCave01||1004 -RaiderCave01|Box|12 +RaiderCave01||1350 +RaiderCave01|Box|94 RaiderCave02||1733 RaiderCave02|Box|141 -RaiderCave03||1010 -RaiderCave03|Box|18 +RaiderCave03||1529 +RaiderCave03|Box|152 RaiderRaidTrailerInt||95 RaiderRaidTrailerInt|Box|11 RiversideManor01||7072 @@ -973,6 +989,8 @@ SheltersCave02||574 SheltersCave02|Box|34 SheltersClaimCenter01||921 SheltersClaimCenter01|Box|55 +SheltersHighStakes||2533 +SheltersHighStakes|Box|133 SheltersMissileSilo||442 SheltersMissileSilo|Box|51 SheltersPittTrench01||1009 @@ -1023,7 +1041,7 @@ TopOfTheWorld01|Box|413 TopOfTheWorld01|Line|2 TopOfTheWorld01|Sphere|1 TunnelOfLoveMineshaft01||4305 -TunnelOfLoveMineshaft01|Box|113 +TunnelOfLoveMineshaft01|Box|116 TunnelOfLoveMineshaft01|Plane|1 UCB01||4434 UCB01|Box|130 @@ -1044,7 +1062,7 @@ UncannyCavernsDungeon|Sphere|3 VTecAgCenter01||3044 VTecAgCenter01|Box|92 ValleyGalleria01||8118 -ValleyGalleria01|Box|513 +ValleyGalleria01|Box|515 ValleyGalleria01|Line|1 ValleyGalleria01|Sphere|1 VanLoweTaxidermy01||1891 @@ -1063,7 +1081,7 @@ Vault79GoldVaultOperations|Box|44 Vault79Main||18141 Vault79Main|Box|705 Vault79Main|Line|5 -Vault94Dungeon||16121 +Vault94Dungeon||16120 Vault94Dungeon|Box|1349 Vault94Dungeon|Line|10 Vault94Dungeon|Sphere|4 @@ -1076,7 +1094,7 @@ Vault94Entrance|Line|1 Vault96Dungeon||20260 Vault96Dungeon|Box|1492 Vault96Dungeon|Sphere|6 -VaultTecU01||10314 +VaultTecU01||10312 VaultTecU01|Box|399 WVLumberCo01||1500 WVLumberCo01|Box|47 @@ -1112,21 +1130,49 @@ WestTek02|Box|162 WestTek02|Sphere|1 WhitespringBunker01||15833 WhitespringBunker01|Box|500 -WhitespringMall01||6803 +WhitespringMall01||6810 WhitespringMall01|Box|137 -WhitespringRefuge01||11274 -WhitespringRefuge01|Box|224 +WhitespringRefuge01||11459 +WhitespringRefuge01|Box|226 +XPDAC01Casino||13235 +XPDAC01Casino|Box|473 +XPDAC01Casino|Plane|1 +XPDAC01EntertainmentDistrict||6257 +XPDAC01EntertainmentDistrict|Box|534 +XPDAC01NightClub||2738 +XPDAC01NightClub|Box|213 +XPDAC02Aquarium||15525 +XPDAC02Aquarium|Box|516 +XPDAC02Boardwalk||9821 +XPDAC02Boardwalk|Box|760 +XPDAC02Boardwalk|Sphere|2 +XPDAC02Pier||7074 +XPDAC02Pier|Box|230 +XPDAC03CityHall||4102 +XPDAC03CityHall|Box|4 +XPDAC03CommunityCenter||4602 +XPDAC03CommunityCenter|Box|38 +XPDAC03FloodedCityCenter||19992 +XPDAC03FloodedCityCenter|Box|67 XPDPitt01Foundry||16376 XPDPitt01Foundry|Box|555 XPDPitt01Foundry|Plane|6 XPDPitt01Foundry|Sphere|1 -XPDPitt01Industrial||18698 -XPDPitt01Industrial|Box|1442 +XPDPitt01Industrial||18823 +XPDPitt01Industrial|Box|1445 XPDPitt01Industrial|Sphere|1 +XPDPitt02ACCJ||15 XPDPitt02Sanctum||17557 XPDPitt02Sanctum|Box|477 XPDPitt02Trench||19687 XPDPitt02Trench|Box|1550 +XPDRttP01SteelTower||10029 +XPDRttP01SteelTower|Box|46 +XPDRttP01SteelTowerRoof||1997 +XPDRttP01SteelTowerRoof|Box|4 +XPDRttP01SteelTowerRoof|Line|1 +XPDRttP01SteelTowerUpperFloors||6191 +XPDRttP01SteelTowerUpperFloors|Box|50 ==Total entities by LockLevel by Space== AMSHQ01||5466 AMSHQ01|Advanced (Level 1)|4 @@ -1147,18 +1193,18 @@ AlleghenyAsylum01|Advanced (Level 1)|6 AlleghenyAsylum01|Expert (Level 2)|6 AlleghenyAsylum01|Master (Level 3)|1 AlleghenyAsylum01|Novice (Level 0)|3 -Appalachia||3080555 -Appalachia|Advanced (Level 1)|319 +Appalachia||3083573 +Appalachia|Advanced (Level 1)|322 Appalachia|Barred|1 Appalachia|Chained|1 -Appalachia|Expert (Level 2)|197 -Appalachia|Inaccessible|22 +Appalachia|Expert (Level 2)|198 +Appalachia|Inaccessible|23 Appalachia|Master (Level 3)|86 -Appalachia|Novice (Level 0)|321 +Appalachia|Novice (Level 0)|337 Appalachia|Requires Key|90 Appalachia|Requires Terminal|9 Appalachia|Unknown|1 -ArktosPharmaLab01||17155 +ArktosPharmaLab01||17156 ArktosPharmaLab01|Advanced (Level 1)|3 ArktosPharmaLab01|Expert (Level 2)|2 ArktosPharmaLab01|Master (Level 3)|1 @@ -1167,7 +1213,7 @@ ArktosPharmaLabDungeon||14618 ArktosPharmaLabDungeon|Advanced (Level 1)|3 ArktosPharmaLabDungeon|Expert (Level 2)|1 ArktosPharmaLabDungeon|Master (Level 3)|1 -BelchingBetty01||5215 +BelchingBetty01||5213 BelchingBetty01|Advanced (Level 1)|1 BelchingBetty01|Requires Key|3 BelchingBetty01|Requires Terminal|1 @@ -1185,7 +1231,7 @@ BlackwaterMine01|Novice (Level 0)|3 BlackwaterMine01|Requires Key|8 BlueRidgeOffice01||766 BurdetteManorBasement01||499 -BurningMine01||6132 +BurningMine01||6131 BurningMine01|Advanced (Level 1)|2 BurningMine01|Expert (Level 2)|1 BurningMine01|Requires Key|2 @@ -1247,7 +1293,7 @@ EasternRegionalPen01|Novice (Level 0)|9 EmmettMountainDisposalSite01||4855 EmmettMountainDisposalSite01|Advanced (Level 1)|1 EmmettMountainDisposalSite01|Novice (Level 0)|1 -EnclaveResearchFacility01||18721 +EnclaveResearchFacility01||18723 EnclaveResearchFacility01|Advanced (Level 1)|4 EnclaveResearchFacility01|Expert (Level 2)|2 EnclaveResearchFacility01|Inaccessible|4 @@ -1282,7 +1328,7 @@ FreeStatesBunker06||948 FreeStatesBunker06|Expert (Level 2)|1 FreeStatesBunker07||1048 FreeStatesBunker07|Expert (Level 2)|1 -GarrahanMiningHQ01||9188 +GarrahanMiningHQ01||9187 GarrahanMiningHQ01|Advanced (Level 1)|1 GarrahanMiningHQ01|Expert (Level 2)|3 GarrahanMiningHQ01|Master (Level 3)|1 @@ -1320,6 +1366,9 @@ HornwrightHQ01|Novice (Level 0)|1 HornwrightHQ01|Requires Key|3 HornwrightSafeRoom01||1043 HornwrightSafeRoom01|Requires Key|1 +IngramMansion01||933 +IngramMansion01|Advanced (Level 1)|1 +IngramMansion01|Inaccessible|2 KerwoodMine01||5656 KerwoodMine01|Advanced (Level 1)|1 KerwoodMine01|Expert (Level 2)|2 @@ -1367,8 +1416,15 @@ MorgantownHighSchoolDungeon||5558 MorgantownHighSchoolDungeon|Advanced (Level 1)|1 MorgantownHighSchoolDungeon|Expert (Level 2)|2 MountBlairWarehouseBasement01||319 -NPEVault7601||7089 +NPECultistCave||4239 +NPECultistCave|Advanced (Level 1)|1 +NPECultistCave|Novice (Level 0)|5 +NPEVault7601||7062 +NPEVault7601|Inaccessible|1 NPEVault7601|Novice (Level 0)|1 +NVEShelter01||360 +NVEVault7601||7136 +NVEVault7601|Novice (Level 0)|1 NukaColaQuantumPlant01||5465 NukaColaQuantumPlant01|Advanced (Level 1)|4 NukaColaQuantumPlant01|Expert (Level 2)|4 @@ -1395,11 +1451,11 @@ RadioResearchCenter01|Advanced (Level 1)|3 RadioResearchCenter01|Expert (Level 2)|2 RadioResearchCenter01|Novice (Level 0)|2 RadioResearchCenter01|Requires Key|1 -RaiderCave01||1015 +RaiderCave01||1443 RaiderCave01|Novice (Level 0)|1 RaiderCave02||1873 RaiderCave02|Expert (Level 2)|1 -RaiderCave03||1028 +RaiderCave03||1681 RaiderRaidTrailerInt||106 RiversideManor01||7420 RiversideManor01|Advanced (Level 1)|2 @@ -1429,6 +1485,7 @@ SheltersCave01||534 SheltersCave02||608 SheltersClaimCenter01||975 SheltersClaimCenter01|Requires Key|1 +SheltersHighStakes||2666 SheltersMissileSilo||493 SheltersPittTrench01||1142 SheltersRootCellar||595 @@ -1477,7 +1534,7 @@ TopOfTheWorld01||4645 TopOfTheWorld01|Advanced (Level 1)|2 TopOfTheWorld01|Expert (Level 2)|1 TopOfTheWorld01|Master (Level 3)|4 -TunnelOfLoveMineshaft01||4419 +TunnelOfLoveMineshaft01||4422 UCB01||4565 UCB01|Advanced (Level 1)|2 UCB01|Novice (Level 0)|1 @@ -1494,7 +1551,7 @@ UncannyCavernsDungeon|Novice (Level 0)|2 VTecAgCenter01||3132 VTecAgCenter01|Novice (Level 0)|3 VTecAgCenter01|Requires Terminal|1 -ValleyGalleria01||8627 +ValleyGalleria01||8629 ValleyGalleria01|Advanced (Level 1)|2 ValleyGalleria01|Expert (Level 2)|3 ValleyGalleria01|Novice (Level 0)|1 @@ -1519,7 +1576,7 @@ Vault79Main|Master (Level 3)|3 Vault79Main|Novice (Level 0)|2 Vault79Main|Requires Key|2 Vault79Main|Requires Terminal|2 -Vault94Dungeon||17459 +Vault94Dungeon||17458 Vault94Dungeon|Advanced (Level 1)|5 Vault94Dungeon|Expert (Level 2)|10 Vault94Dungeon|Inaccessible|2 @@ -1530,7 +1587,7 @@ Vault94DungeonGECK|Master (Level 3)|1 Vault94Entrance||1320 Vault96Dungeon||21757 Vault96Dungeon|Advanced (Level 1)|1 -VaultTecU01||10703 +VaultTecU01||10701 VaultTecU01|Advanced (Level 1)|2 VaultTecU01|Expert (Level 2)|1 VaultTecU01|Inaccessible|2 @@ -1591,26 +1648,63 @@ WhitespringBunker01||16323 WhitespringBunker01|Advanced (Level 1)|1 WhitespringBunker01|Master (Level 3)|2 WhitespringBunker01|Novice (Level 0)|7 -WhitespringMall01||6927 +WhitespringMall01||6934 WhitespringMall01|Advanced (Level 1)|1 WhitespringMall01|Expert (Level 2)|1 WhitespringMall01|Master (Level 3)|3 WhitespringMall01|Novice (Level 0)|8 -WhitespringRefuge01||11469 +WhitespringRefuge01||11656 WhitespringRefuge01|Advanced (Level 1)|2 WhitespringRefuge01|Inaccessible|21 WhitespringRefuge01|Novice (Level 0)|6 +XPDAC01Casino||13681 +XPDAC01Casino|Advanced (Level 1)|5 +XPDAC01Casino|Inaccessible|3 +XPDAC01Casino|Master (Level 3)|5 +XPDAC01Casino|Novice (Level 0)|14 +XPDAC01Casino|Requires Terminal|1 +XPDAC01EntertainmentDistrict||6784 +XPDAC01EntertainmentDistrict|Advanced (Level 1)|4 +XPDAC01EntertainmentDistrict|Expert (Level 2)|1 +XPDAC01EntertainmentDistrict|Inaccessible|1 +XPDAC01EntertainmentDistrict|Novice (Level 0)|1 +XPDAC01NightClub||2946 +XPDAC01NightClub|Advanced (Level 1)|2 +XPDAC01NightClub|Expert (Level 2)|2 +XPDAC01NightClub|Novice (Level 0)|1 +XPDAC02Aquarium||16039 +XPDAC02Aquarium|Expert (Level 2)|1 +XPDAC02Aquarium|Novice (Level 0)|1 +XPDAC02Boardwalk||10572 +XPDAC02Boardwalk|Expert (Level 2)|1 +XPDAC02Boardwalk|Inaccessible|1 +XPDAC02Boardwalk|Master (Level 3)|1 +XPDAC02Boardwalk|Novice (Level 0)|8 +XPDAC02Pier||7303 +XPDAC02Pier|Expert (Level 2)|1 +XPDAC03CityHall||4099 +XPDAC03CityHall|Advanced (Level 1)|2 +XPDAC03CityHall|Expert (Level 2)|1 +XPDAC03CityHall|Novice (Level 0)|4 +XPDAC03CommunityCenter||4637 +XPDAC03CommunityCenter|Advanced (Level 1)|1 +XPDAC03CommunityCenter|Novice (Level 0)|2 +XPDAC03FloodedCityCenter||20046 +XPDAC03FloodedCityCenter|Advanced (Level 1)|5 +XPDAC03FloodedCityCenter|Expert (Level 2)|1 +XPDAC03FloodedCityCenter|Novice (Level 0)|7 XPDPitt01Foundry||16906 XPDPitt01Foundry|Advanced (Level 1)|16 XPDPitt01Foundry|Expert (Level 2)|5 XPDPitt01Foundry|Master (Level 3)|3 XPDPitt01Foundry|Novice (Level 0)|8 -XPDPitt01Industrial||20109 +XPDPitt01Industrial||20237 XPDPitt01Industrial|Advanced (Level 1)|24 XPDPitt01Industrial|Expert (Level 2)|3 XPDPitt01Industrial|Inaccessible|2 XPDPitt01Industrial|Master (Level 3)|1 XPDPitt01Industrial|Novice (Level 0)|2 +XPDPitt02ACCJ||15 XPDPitt02Sanctum||18023 XPDPitt02Sanctum|Advanced (Level 1)|1 XPDPitt02Sanctum|Inaccessible|4 @@ -1620,6 +1714,11 @@ XPDPitt02Trench||21217 XPDPitt02Trench|Advanced (Level 1)|4 XPDPitt02Trench|Expert (Level 2)|8 XPDPitt02Trench|Novice (Level 0)|8 +XPDRttP01SteelTower||10075 +XPDRttP01SteelTowerRoof||2002 +XPDRttP01SteelTowerUpperFloors||6237 +XPDRttP01SteelTowerUpperFloors|Advanced (Level 1)|2 +XPDRttP01SteelTowerUpperFloors|Novice (Level 0)|2 ==Total entities by Category by Space== AMSHQ01|ACTI|77 AMSHQ01|ASPC|19 @@ -1698,37 +1797,37 @@ AlleghenyAsylum01|SOUN|4 AlleghenyAsylum01|STAT|11109 AlleghenyAsylum01|TERM|7 AlleghenyAsylum01|TXST|475 -Appalachia|ACTI|21747 -Appalachia|ALCH|264 +Appalachia|ACTI|21797 +Appalachia|ALCH|265 Appalachia|AMMO|59 -Appalachia|ARMO|103 +Appalachia|ARMO|104 Appalachia|ASPC|2377 -Appalachia|BNDS|10367 -Appalachia|BOOK|485 +Appalachia|BNDS|10373 +Appalachia|BOOK|495 Appalachia|CNCY|257 -Appalachia|CONT|12394 -Appalachia|DOOR|2505 -Appalachia|FLOR|45224 -Appalachia|FURN|14972 -Appalachia|HAZD|994 -Appalachia|IDLM|16935 +Appalachia|CONT|12518 +Appalachia|DOOR|2526 +Appalachia|FLOR|45207 +Appalachia|FURN|15106 +Appalachia|HAZD|995 +Appalachia|IDLM|16918 Appalachia|KEYM|36 -Appalachia|LIGH|8245 -Appalachia|LVLI|71650 -Appalachia|MISC|35714 -Appalachia|MSTT|23087 +Appalachia|LIGH|8359 +Appalachia|LVLI|71746 +Appalachia|MISC|36053 +Appalachia|MSTT|23185 Appalachia|NOTE|178 -Appalachia|NPC_|7369 +Appalachia|NPC_|7407 Appalachia|PROJ|93 -Appalachia|SCOL|353356 +Appalachia|SCOL|353403 Appalachia|SECH|253 -Appalachia|SOUN|5920 -Appalachia|STAT|2383807 +Appalachia|SOUN|5923 +Appalachia|STAT|2385531 Appalachia|TACT|62 -Appalachia|TERM|370 -Appalachia|TXST|62615 -Appalachia|WEAP|164 -ArktosPharmaLab01|ACTI|354 +Appalachia|TERM|371 +Appalachia|TXST|62869 +Appalachia|WEAP|175 +ArktosPharmaLab01|ACTI|355 ArktosPharmaLab01|ASPC|14 ArktosPharmaLab01|BNDS|116 ArktosPharmaLab01|BOOK|3 @@ -1777,12 +1876,12 @@ BelchingBetty01|FURN|16 BelchingBetty01|HAZD|18 BelchingBetty01|LIGH|279 BelchingBetty01|LVLI|66 -BelchingBetty01|MISC|54 +BelchingBetty01|MISC|51 BelchingBetty01|MSTT|135 BelchingBetty01|NPC_|27 BelchingBetty01|SCOL|322 BelchingBetty01|SOUN|18 -BelchingBetty01|STAT|4152 +BelchingBetty01|STAT|4153 BelchingBetty01|TERM|1 BelchingBetty01|TXST|28 BigBendTunnel01|ACTI|137 @@ -1869,7 +1968,7 @@ BurningMine01|NPC_|24 BurningMine01|SCOL|151 BurningMine01|SOUN|3 BurningMine01|STAT|4878 -BurningMine01|TXST|271 +BurningMine01|TXST|270 Burrows01|ACTI|264 Burrows01|ALCH|6 Burrows01|ASPC|132 @@ -2242,7 +2341,7 @@ EnclaveResearchFacility01|MSTT|405 EnclaveResearchFacility01|NPC_|97 EnclaveResearchFacility01|SCOL|1363 EnclaveResearchFacility01|SOUN|38 -EnclaveResearchFacility01|STAT|13144 +EnclaveResearchFacility01|STAT|13146 EnclaveResearchFacility01|TACT|1 EnclaveResearchFacility01|TERM|8 EnclaveResearchFacility01|TXST|792 @@ -2474,7 +2573,7 @@ GarrahanMiningHQ01|KEYM|3 GarrahanMiningHQ01|LIGH|208 GarrahanMiningHQ01|LVLI|110 GarrahanMiningHQ01|MISC|176 -GarrahanMiningHQ01|MSTT|187 +GarrahanMiningHQ01|MSTT|186 GarrahanMiningHQ01|NOTE|1 GarrahanMiningHQ01|NPC_|34 GarrahanMiningHQ01|SCOL|466 @@ -2636,6 +2735,20 @@ HornwrightSafeRoom01|SCOL|37 HornwrightSafeRoom01|STAT|806 HornwrightSafeRoom01|TXST|20 HornwrightSafeRoom01|WEAP|1 +IngramMansion01|ACTI|11 +IngramMansion01|BOOK|6 +IngramMansion01|CONT|15 +IngramMansion01|DOOR|3 +IngramMansion01|FURN|33 +IngramMansion01|IDLM|4 +IngramMansion01|LIGH|28 +IngramMansion01|LVLI|18 +IngramMansion01|MISC|47 +IngramMansion01|MSTT|5 +IngramMansion01|NPC_|11 +IngramMansion01|SCOL|10 +IngramMansion01|STAT|744 +IngramMansion01|TERM|1 KerwoodMine01|ACTI|98 KerwoodMine01|ASPC|1 KerwoodMine01|BNDS|10 @@ -2890,28 +3003,71 @@ MountBlairWarehouseBasement01|NPC_|1 MountBlairWarehouseBasement01|SCOL|8 MountBlairWarehouseBasement01|SOUN|3 MountBlairWarehouseBasement01|STAT|244 -NPEVault7601|ACTI|179 +NPECultistCave|ACTI|62 +NPECultistCave|BNDS|2 +NPECultistCave|BOOK|1 +NPECultistCave|CONT|23 +NPECultistCave|DOOR|4 +NPECultistCave|FLOR|3 +NPECultistCave|FURN|20 +NPECultistCave|HAZD|2 +NPECultistCave|IDLM|12 +NPECultistCave|LIGH|211 +NPECultistCave|LVLI|142 +NPECultistCave|MISC|33 +NPECultistCave|MSTT|165 +NPECultistCave|NPC_|23 +NPECultistCave|SCOL|98 +NPECultistCave|STAT|3223 +NPECultistCave|TXST|221 +NPEVault7601|ACTI|178 NPEVault7601|ALCH|30 NPEVault7601|ARMO|8 NPEVault7601|ASPC|7 NPEVault7601|BNDS|6 NPEVault7601|BOOK|14 NPEVault7601|CONT|118 -NPEVault7601|DOOR|16 +NPEVault7601|DOOR|17 NPEVault7601|FURN|173 NPEVault7601|IDLM|28 NPEVault7601|LIGH|296 NPEVault7601|LVLI|10 NPEVault7601|MISC|811 NPEVault7601|MSTT|1249 -NPEVault7601|NPC_|66 -NPEVault7601|SCOL|66 +NPEVault7601|NPC_|67 +NPEVault7601|SCOL|64 NPEVault7601|SECH|3 NPEVault7601|SOUN|14 -NPEVault7601|STAT|3936 +NPEVault7601|STAT|3908 NPEVault7601|TERM|9 -NPEVault7601|TXST|33 +NPEVault7601|TXST|36 NPEVault7601|WEAP|18 +NVEShelter01|ACTI|11 +NVEShelter01|MSTT|5 +NVEShelter01|SCOL|26 +NVEShelter01|STAT|318 +NVEVault7601|ACTI|177 +NVEVault7601|ALCH|30 +NVEVault7601|ARMO|8 +NVEVault7601|ASPC|7 +NVEVault7601|BNDS|6 +NVEVault7601|BOOK|14 +NVEVault7601|CONT|118 +NVEVault7601|DOOR|16 +NVEVault7601|FURN|176 +NVEVault7601|IDLM|28 +NVEVault7601|LIGH|302 +NVEVault7601|LVLI|10 +NVEVault7601|MISC|811 +NVEVault7601|MSTT|1257 +NVEVault7601|NPC_|66 +NVEVault7601|SCOL|72 +NVEVault7601|SECH|3 +NVEVault7601|SOUN|14 +NVEVault7601|STAT|3962 +NVEVault7601|TERM|9 +NVEVault7601|TXST|33 +NVEVault7601|WEAP|18 NukaColaQuantumPlant01|ACTI|36 NukaColaQuantumPlant01|ALCH|2 NukaColaQuantumPlant01|ASPC|14 @@ -3035,20 +3191,22 @@ RadioResearchCenter01|STAT|2512 RadioResearchCenter01|TERM|3 RadioResearchCenter01|TXST|86 RaiderCave01|ACTI|13 +RaiderCave01|BNDS|13 RaiderCave01|BOOK|2 -RaiderCave01|CONT|3 -RaiderCave01|DOOR|2 +RaiderCave01|CONT|6 +RaiderCave01|DOOR|8 RaiderCave01|FLOR|1 -RaiderCave01|FURN|11 -RaiderCave01|IDLM|3 -RaiderCave01|LIGH|5 -RaiderCave01|LVLI|4 -RaiderCave01|MISC|14 -RaiderCave01|MSTT|12 -RaiderCave01|NPC_|12 -RaiderCave01|SCOL|24 -RaiderCave01|STAT|907 -RaiderCave01|TXST|3 +RaiderCave01|FURN|16 +RaiderCave01|HAZD|1 +RaiderCave01|IDLM|12 +RaiderCave01|LIGH|24 +RaiderCave01|LVLI|9 +RaiderCave01|MISC|21 +RaiderCave01|MSTT|35 +RaiderCave01|NPC_|14 +RaiderCave01|SCOL|64 +RaiderCave01|STAT|1124 +RaiderCave01|TXST|81 RaiderCave02|ACTI|20 RaiderCave02|BNDS|46 RaiderCave02|BOOK|3 @@ -3065,21 +3223,21 @@ RaiderCave02|SCOL|98 RaiderCave02|STAT|1340 RaiderCave02|TERM|1 RaiderCave02|TXST|127 -RaiderCave03|ACTI|41 -RaiderCave03|BNDS|7 +RaiderCave03|ACTI|44 +RaiderCave03|BNDS|9 RaiderCave03|BOOK|2 -RaiderCave03|CONT|6 +RaiderCave03|CONT|13 RaiderCave03|DOOR|5 RaiderCave03|FURN|13 -RaiderCave03|IDLM|18 -RaiderCave03|LIGH|5 -RaiderCave03|LVLI|28 -RaiderCave03|MISC|33 -RaiderCave03|MSTT|12 -RaiderCave03|NPC_|20 -RaiderCave03|SCOL|29 -RaiderCave03|STAT|800 -RaiderCave03|TXST|9 +RaiderCave03|IDLM|21 +RaiderCave03|LIGH|51 +RaiderCave03|LVLI|98 +RaiderCave03|MISC|50 +RaiderCave03|MSTT|81 +RaiderCave03|NPC_|14 +RaiderCave03|SCOL|32 +RaiderCave03|STAT|1109 +RaiderCave03|TXST|139 RaiderRaidTrailerInt|CONT|7 RaiderRaidTrailerInt|DOOR|1 RaiderRaidTrailerInt|FURN|2 @@ -3238,6 +3396,10 @@ SheltersClaimCenter01|SCOL|14 SheltersClaimCenter01|STAT|763 SheltersClaimCenter01|TERM|1 SheltersClaimCenter01|TXST|50 +SheltersHighStakes|ACTI|130 +SheltersHighStakes|DOOR|3 +SheltersHighStakes|LIGH|93 +SheltersHighStakes|STAT|2440 SheltersMissileSilo|ACTI|9 SheltersMissileSilo|LIGH|15 SheltersMissileSilo|MSTT|9 @@ -3520,7 +3682,7 @@ TunnelOfLoveMineshaft01|MISC|64 TunnelOfLoveMineshaft01|MSTT|32 TunnelOfLoveMineshaft01|NPC_|1 TunnelOfLoveMineshaft01|SCOL|346 -TunnelOfLoveMineshaft01|STAT|3477 +TunnelOfLoveMineshaft01|STAT|3480 TunnelOfLoveMineshaft01|TACT|1 TunnelOfLoveMineshaft01|TERM|1 TunnelOfLoveMineshaft01|TXST|62 @@ -3622,7 +3784,7 @@ VTecAgCenter01|SOUN|2 VTecAgCenter01|STAT|2457 VTecAgCenter01|TERM|7 VTecAgCenter01|TXST|49 -ValleyGalleria01|ACTI|85 +ValleyGalleria01|ACTI|87 ValleyGalleria01|ARMO|1 ValleyGalleria01|ASPC|24 ValleyGalleria01|BOOK|1 @@ -3762,7 +3924,7 @@ Vault94Dungeon|MSTT|158 Vault94Dungeon|NPC_|42 Vault94Dungeon|SCOL|1135 Vault94Dungeon|SOUN|74 -Vault94Dungeon|STAT|12853 +Vault94Dungeon|STAT|12852 Vault94Dungeon|TERM|21 Vault94Dungeon|TXST|1168 Vault94Dungeon|WEAP|13 @@ -3829,7 +3991,7 @@ VaultTecU01|BNDS|93 VaultTecU01|BOOK|1 VaultTecU01|CONT|215 VaultTecU01|DOOR|48 -VaultTecU01|FURN|205 +VaultTecU01|FURN|187 VaultTecU01|HAZD|2 VaultTecU01|IDLM|149 VaultTecU01|KEYM|1 @@ -3840,7 +4002,7 @@ VaultTecU01|MSTT|256 VaultTecU01|NOTE|3 VaultTecU01|NPC_|47 VaultTecU01|SCOL|547 -VaultTecU01|STAT|7657 +VaultTecU01|STAT|7673 VaultTecU01|TERM|18 VaultTecU01|TXST|460 WVLumberCo01|ACTI|16 @@ -4091,48 +4253,207 @@ WhitespringBunker01|STAT|12177 WhitespringBunker01|TACT|37 WhitespringBunker01|TERM|37 WhitespringBunker01|TXST|335 -WhitespringMall01|ACTI|76 +WhitespringMall01|ACTI|78 WhitespringMall01|AMMO|71 WhitespringMall01|ARMO|11 WhitespringMall01|ASPC|1 WhitespringMall01|BNDS|6 WhitespringMall01|BOOK|1 -WhitespringMall01|CONT|150 +WhitespringMall01|CONT|151 WhitespringMall01|DOOR|50 WhitespringMall01|FLOR|1 -WhitespringMall01|FURN|152 +WhitespringMall01|FURN|151 WhitespringMall01|IDLM|279 -WhitespringMall01|LIGH|164 +WhitespringMall01|LIGH|165 WhitespringMall01|LVLI|195 -WhitespringMall01|MISC|559 +WhitespringMall01|MISC|556 WhitespringMall01|MSTT|79 WhitespringMall01|NOTE|2 WhitespringMall01|NPC_|39 WhitespringMall01|SCOL|402 -WhitespringMall01|STAT|4672 +WhitespringMall01|STAT|4679 WhitespringMall01|TERM|13 WhitespringMall01|TXST|16 WhitespringMall01|WEAP|1 -WhitespringRefuge01|ACTI|93 +WhitespringRefuge01|ACTI|102 WhitespringRefuge01|ARMO|3 WhitespringRefuge01|ASPC|1 -WhitespringRefuge01|BOOK|1 -WhitespringRefuge01|CONT|162 -WhitespringRefuge01|DOOR|101 +WhitespringRefuge01|BOOK|2 +WhitespringRefuge01|CONT|158 +WhitespringRefuge01|DOOR|102 WhitespringRefuge01|FLOR|1 -WhitespringRefuge01|FURN|332 +WhitespringRefuge01|FURN|340 WhitespringRefuge01|IDLM|100 -WhitespringRefuge01|LIGH|455 -WhitespringRefuge01|LVLI|93 -WhitespringRefuge01|MISC|367 -WhitespringRefuge01|MSTT|131 +WhitespringRefuge01|LIGH|462 +WhitespringRefuge01|LVLI|96 +WhitespringRefuge01|MISC|385 +WhitespringRefuge01|MSTT|133 WhitespringRefuge01|NOTE|5 -WhitespringRefuge01|NPC_|43 -WhitespringRefuge01|SCOL|174 -WhitespringRefuge01|STAT|9386 -WhitespringRefuge01|TERM|4 -WhitespringRefuge01|TXST|42 +WhitespringRefuge01|NPC_|46 +WhitespringRefuge01|SCOL|172 +WhitespringRefuge01|STAT|9527 +WhitespringRefuge01|TERM|5 +WhitespringRefuge01|TXST|41 WhitespringRefuge01|WEAP|4 +XPDAC01Casino|ACTI|262 +XPDAC01Casino|ALCH|3 +XPDAC01Casino|ARMO|1 +XPDAC01Casino|ASPC|2 +XPDAC01Casino|BNDS|47 +XPDAC01Casino|BOOK|21 +XPDAC01Casino|CONT|225 +XPDAC01Casino|DOOR|75 +XPDAC01Casino|FURN|295 +XPDAC01Casino|HAZD|1 +XPDAC01Casino|IDLM|140 +XPDAC01Casino|KEYM|2 +XPDAC01Casino|LIGH|566 +XPDAC01Casino|LVLI|220 +XPDAC01Casino|MISC|947 +XPDAC01Casino|MSTT|285 +XPDAC01Casino|NPC_|69 +XPDAC01Casino|SCOL|377 +XPDAC01Casino|SOUN|12 +XPDAC01Casino|STAT|9876 +XPDAC01Casino|TERM|6 +XPDAC01Casino|TXST|277 +XPDAC01EntertainmentDistrict|ACTI|61 +XPDAC01EntertainmentDistrict|ASPC|1 +XPDAC01EntertainmentDistrict|CONT|61 +XPDAC01EntertainmentDistrict|DOOR|8 +XPDAC01EntertainmentDistrict|FURN|121 +XPDAC01EntertainmentDistrict|IDLM|95 +XPDAC01EntertainmentDistrict|LIGH|49 +XPDAC01EntertainmentDistrict|LVLI|59 +XPDAC01EntertainmentDistrict|MISC|64 +XPDAC01EntertainmentDistrict|MSTT|77 +XPDAC01EntertainmentDistrict|NPC_|82 +XPDAC01EntertainmentDistrict|SCOL|902 +XPDAC01EntertainmentDistrict|SECH|2 +XPDAC01EntertainmentDistrict|SOUN|7 +XPDAC01EntertainmentDistrict|STAT|4749 +XPDAC01EntertainmentDistrict|TXST|453 +XPDAC01NightClub|ACTI|32 +XPDAC01NightClub|ALCH|3 +XPDAC01NightClub|BOOK|3 +XPDAC01NightClub|CONT|30 +XPDAC01NightClub|DOOR|16 +XPDAC01NightClub|FURN|125 +XPDAC01NightClub|LIGH|142 +XPDAC01NightClub|LVLI|33 +XPDAC01NightClub|MISC|303 +XPDAC01NightClub|MSTT|80 +XPDAC01NightClub|NPC_|30 +XPDAC01NightClub|SCOL|65 +XPDAC01NightClub|SOUN|15 +XPDAC01NightClub|STAT|1907 +XPDAC01NightClub|TXST|167 +XPDAC02Aquarium|ACTI|76 +XPDAC02Aquarium|BNDS|3 +XPDAC02Aquarium|BOOK|7 +XPDAC02Aquarium|CONT|77 +XPDAC02Aquarium|DOOR|53 +XPDAC02Aquarium|FLOR|5 +XPDAC02Aquarium|FURN|118 +XPDAC02Aquarium|IDLM|73 +XPDAC02Aquarium|LIGH|713 +XPDAC02Aquarium|LVLI|122 +XPDAC02Aquarium|MISC|671 +XPDAC02Aquarium|MSTT|481 +XPDAC02Aquarium|NPC_|49 +XPDAC02Aquarium|SCOL|960 +XPDAC02Aquarium|SOUN|46 +XPDAC02Aquarium|STAT|12306 +XPDAC02Aquarium|TERM|2 +XPDAC02Aquarium|TXST|279 +XPDAC02Boardwalk|ACTI|736 +XPDAC02Boardwalk|ARMO|1 +XPDAC02Boardwalk|ASPC|1 +XPDAC02Boardwalk|BNDS|8 +XPDAC02Boardwalk|BOOK|11 +XPDAC02Boardwalk|CONT|95 +XPDAC02Boardwalk|DOOR|19 +XPDAC02Boardwalk|FLOR|1 +XPDAC02Boardwalk|FURN|155 +XPDAC02Boardwalk|HAZD|2 +XPDAC02Boardwalk|IDLM|110 +XPDAC02Boardwalk|LIGH|117 +XPDAC02Boardwalk|LVLI|207 +XPDAC02Boardwalk|MISC|303 +XPDAC02Boardwalk|MSTT|123 +XPDAC02Boardwalk|NPC_|56 +XPDAC02Boardwalk|SCOL|769 +XPDAC02Boardwalk|SECH|16 +XPDAC02Boardwalk|SOUN|25 +XPDAC02Boardwalk|STAT|7281 +XPDAC02Boardwalk|TERM|1 +XPDAC02Boardwalk|TXST|546 +XPDAC02Pier|ACTI|228 +XPDAC02Pier|BNDS|11 +XPDAC02Pier|BOOK|3 +XPDAC02Pier|CONT|64 +XPDAC02Pier|DOOR|46 +XPDAC02Pier|FURN|97 +XPDAC02Pier|IDLM|38 +XPDAC02Pier|LIGH|366 +XPDAC02Pier|LVLI|78 +XPDAC02Pier|MISC|344 +XPDAC02Pier|MSTT|176 +XPDAC02Pier|NPC_|37 +XPDAC02Pier|SCOL|302 +XPDAC02Pier|SOUN|4 +XPDAC02Pier|STAT|5396 +XPDAC02Pier|TACT|1 +XPDAC02Pier|TXST|108 +XPDAC02Pier|WEAP|5 +XPDAC03CityHall|ACTI|8 +XPDAC03CityHall|BOOK|5 +XPDAC03CityHall|CONT|53 +XPDAC03CityHall|DOOR|8 +XPDAC03CityHall|FURN|55 +XPDAC03CityHall|IDLM|2 +XPDAC03CityHall|LIGH|9 +XPDAC03CityHall|MISC|5 +XPDAC03CityHall|MSTT|8 +XPDAC03CityHall|NPC_|19 +XPDAC03CityHall|SCOL|138 +XPDAC03CityHall|SOUN|15 +XPDAC03CityHall|STAT|3777 +XPDAC03CityHall|TERM|3 +XPDAC03CityHall|WEAP|1 +XPDAC03CommunityCenter|ACTI|83 +XPDAC03CommunityCenter|BOOK|5 +XPDAC03CommunityCenter|CONT|27 +XPDAC03CommunityCenter|DOOR|33 +XPDAC03CommunityCenter|FLOR|3 +XPDAC03CommunityCenter|FURN|105 +XPDAC03CommunityCenter|IDLM|79 +XPDAC03CommunityCenter|LIGH|3 +XPDAC03CommunityCenter|LVLI|4 +XPDAC03CommunityCenter|MISC|15 +XPDAC03CommunityCenter|MSTT|16 +XPDAC03CommunityCenter|NPC_|54 +XPDAC03CommunityCenter|SCOL|33 +XPDAC03CommunityCenter|STAT|4178 +XPDAC03CommunityCenter|TERM|2 +XPDAC03FloodedCityCenter|ACTI|241 +XPDAC03FloodedCityCenter|ARMO|2 +XPDAC03FloodedCityCenter|ASPC|1 +XPDAC03FloodedCityCenter|BNDS|4 +XPDAC03FloodedCityCenter|BOOK|3 +XPDAC03FloodedCityCenter|CONT|57 +XPDAC03FloodedCityCenter|DOOR|6 +XPDAC03FloodedCityCenter|FURN|131 +XPDAC03FloodedCityCenter|IDLM|118 +XPDAC03FloodedCityCenter|LIGH|20 +XPDAC03FloodedCityCenter|LVLI|15 +XPDAC03FloodedCityCenter|MISC|33 +XPDAC03FloodedCityCenter|MSTT|70 +XPDAC03FloodedCityCenter|NPC_|95 +XPDAC03FloodedCityCenter|SCOL|717 +XPDAC03FloodedCityCenter|STAT|18542 +XPDAC03FloodedCityCenter|TERM|2 +XPDAC03FloodedCityCenter|TXST|2 XPDPitt01Foundry|ACTI|235 XPDPitt01Foundry|AMMO|18 XPDPitt01Foundry|ARMO|9 @@ -4155,7 +4476,7 @@ XPDPitt01Foundry|STAT|11229 XPDPitt01Foundry|TERM|3 XPDPitt01Foundry|TXST|574 XPDPitt01Foundry|WEAP|6 -XPDPitt01Industrial|ACTI|193 +XPDPitt01Industrial|ACTI|220 XPDPitt01Industrial|AMMO|4 XPDPitt01Industrial|ASPC|2 XPDPitt01Industrial|BNDS|144 @@ -4169,16 +4490,21 @@ XPDPitt01Industrial|IDLM|194 XPDPitt01Industrial|LIGH|291 XPDPitt01Industrial|LVLI|215 XPDPitt01Industrial|MISC|417 -XPDPitt01Industrial|MSTT|434 +XPDPitt01Industrial|MSTT|442 XPDPitt01Industrial|NOTE|2 -XPDPitt01Industrial|NPC_|82 -XPDPitt01Industrial|SCOL|1491 +XPDPitt01Industrial|NPC_|126 +XPDPitt01Industrial|SCOL|1492 XPDPitt01Industrial|SECH|8 XPDPitt01Industrial|SOUN|10 -XPDPitt01Industrial|STAT|15103 +XPDPitt01Industrial|STAT|15151 XPDPitt01Industrial|TERM|2 XPDPitt01Industrial|TXST|1088 XPDPitt01Industrial|WEAP|1 +XPDPitt02ACCJ|FURN|2 +XPDPitt02ACCJ|LIGH|5 +XPDPitt02ACCJ|SCOL|4 +XPDPitt02ACCJ|STAT|3 +XPDPitt02ACCJ|TERM|1 XPDPitt02Sanctum|ACTI|162 XPDPitt02Sanctum|ALCH|6 XPDPitt02Sanctum|BNDS|58 @@ -4221,6 +4547,40 @@ XPDPitt02Trench|STAT|15023 XPDPitt02Trench|TERM|6 XPDPitt02Trench|TXST|1300 XPDPitt02Trench|WEAP|2 +XPDRttP01SteelTower|ACTI|55 +XPDRttP01SteelTower|CONT|26 +XPDRttP01SteelTower|DOOR|23 +XPDRttP01SteelTower|FURN|48 +XPDRttP01SteelTower|IDLM|49 +XPDRttP01SteelTower|LIGH|4 +XPDRttP01SteelTower|LVLI|18 +XPDRttP01SteelTower|MISC|1 +XPDRttP01SteelTower|MSTT|13 +XPDRttP01SteelTower|NPC_|49 +XPDRttP01SteelTower|SCOL|399 +XPDRttP01SteelTower|STAT|9390 +XPDRttP01SteelTowerRoof|ACTI|8 +XPDRttP01SteelTowerRoof|CONT|7 +XPDRttP01SteelTowerRoof|DOOR|5 +XPDRttP01SteelTowerRoof|FURN|9 +XPDRttP01SteelTowerRoof|LIGH|4 +XPDRttP01SteelTowerRoof|MSTT|7 +XPDRttP01SteelTowerRoof|SCOL|57 +XPDRttP01SteelTowerRoof|SOUN|1 +XPDRttP01SteelTowerRoof|STAT|1902 +XPDRttP01SteelTowerRoof|TXST|2 +XPDRttP01SteelTowerUpperFloors|ACTI|57 +XPDRttP01SteelTowerUpperFloors|CONT|9 +XPDRttP01SteelTowerUpperFloors|DOOR|46 +XPDRttP01SteelTowerUpperFloors|FURN|67 +XPDRttP01SteelTowerUpperFloors|IDLM|76 +XPDRttP01SteelTowerUpperFloors|LIGH|3 +XPDRttP01SteelTowerUpperFloors|LVLI|6 +XPDRttP01SteelTowerUpperFloors|MSTT|5 +XPDRttP01SteelTowerUpperFloors|NPC_|45 +XPDRttP01SteelTowerUpperFloors|SCOL|79 +XPDRttP01SteelTowerUpperFloors|STAT|5847 +XPDRttP01SteelTowerUpperFloors|TXST|1 ==Total entities by Label by Space== AMSHQ01||5461 AMSHQ01|AMSHQtoBasement|1 @@ -4290,7 +4650,7 @@ AlleghenyAsylum01|TestElevDoorTriggerARef077|1 AlleghenyAsylum01|TestElevDoorTriggerARef078|1 AlleghenyAsylum01|TestElevDoorTriggerARef079|1 AlleghenyAsylum01|W05_JonahItoRef|1 -Appalachia||3076094 +Appalachia||3079120 Appalachia|76ExitEventQuest_CenterMaker|1 Appalachia|76ExitEventSpawnAreaRef001|1 Appalachia|76ExitEventSpawnAreaRef002|1 @@ -4357,7 +4717,6 @@ Appalachia|ARTSmallCranberryBogPOI17Marker|1 Appalachia|ARTSmallForestPOI02Marker|1 Appalachia|ARTSmallForestPOI04Marker|1 Appalachia|ARTSmallForestPOI05Marker|1 -Appalachia|ARTSmallForestPOI06Marker|1 Appalachia|ARTSmallForestPOI07Marker|1 Appalachia|ARTSmallForestPOI08Marker|1 Appalachia|ARTSmallForestPOI09Marker|1 @@ -4984,7 +5343,6 @@ Appalachia|DABCultPOI01|1 Appalachia|DABCultPOI02|1 Appalachia|DABCultPOI04|1 Appalachia|DABCultPOI05|1 -Appalachia|DABLargeForestPOI01Marker|1 Appalachia|DABLargeForestPOI04Marker|1 Appalachia|DABLargeForestPOI05Marker|1 Appalachia|DABLargeForestPOI07Marker|1 @@ -5625,7 +5983,6 @@ Appalachia|E09B_RealCappySwap06|1 Appalachia|E09B_RealCappySwap07|1 Appalachia|E09B_STW_EventRootMain|1 Appalachia|E09B_SpawnCenterMid|1 -Appalachia|E09B_TentTopTrigger|1 Appalachia|E09D_GWWS_BountyHunter_Spawn01|1 Appalachia|E09D_GWWS_BountyHunter_Spawn02|1 Appalachia|E09D_GWWS_BountyHunter_Spawn03|1 @@ -6829,6 +7186,7 @@ Appalachia|Moon_Herd_XMarker_ClydeEnd|1 Appalachia|Moon_Herd_XMarker_ClydeStart|1 Appalachia|Moon_Herd_XMarker_VeraEnd|1 Appalachia|Moon_Herd_XMarker_VeraStart|1 +Appalachia|Moon_Luca_BigBendMarker|1 Appalachia|Moon_SQ04_SteakhouseMarker_LocRef|1 Appalachia|MoonaLisa|1 Appalachia|MoonshinersShackRespawnMarkerRef|1 @@ -6855,7 +7213,6 @@ Appalachia|Morgantown_NukeBriefcase_GraftonDam|1 Appalachia|Morgantown_NukeBriefcase_GraftonSteel01|1 Appalachia|Morgantown_NukeBriefcase_GraftonSteel02|1 Appalachia|Morgantown_NukeBriefcase_GregsMineShack|1 -Appalachia|Morgantown_NukeBriefcase_IngramMansion|1 Appalachia|Morgantown_NukeBriefcase_Kitchen|1 Appalachia|Morgantown_NukeBriefcase_LivingRoom|1 Appalachia|Morgantown_NukeBriefcase_Mines|1 @@ -6888,6 +7245,23 @@ Appalachia|MountBlairWorkshopRef|1 Appalachia|MountainsideBB_BasementEnableMarker|1 Appalachia|MunitionsFactoryCenterMarker|1 Appalachia|MunitionsFactoryWorkshopRef|1 +Appalachia|NPEOrganCaveNorthMapMarker_Copy01|1 +Appalachia|NPEOrganCaveSouthMapMarker|1 +Appalachia|NPEOrganCaveWestMapMarker|1 +Appalachia|NPE_DQ01_Bandage_Ref|1 +Appalachia|NPE_DQ01_Bandage_Ref001|1 +Appalachia|NPE_DQ01_Bandage_Ref002|1 +Appalachia|NPE_DQ01_FoodParcel_Ref|1 +Appalachia|NPE_DQ01_FoodParcel_Ref001|1 +Appalachia|NPE_DQ01_FoodParcel_Ref002|1 +Appalachia|NPE_DQ01_MeatContainer01_Ref|1 +Appalachia|NPE_DQ01_MeatContainer02_Ref|1 +Appalachia|NPE_DQ01_MeatContainer02_SpawnCenter_Ref|1 +Appalachia|NPE_DQ01_MeatContainer03_Ref|1 +Appalachia|NPE_DQ01_Missive_Ref|1 +Appalachia|NPE_DQ01_Missive_Ref001|1 +Appalachia|NPE_DQ01_Missive_Ref002|1 +Appalachia|NPE_DQ01_StoryEventMarker_Ref|1 Appalachia|NWOT_BeneathStartMarker|1 Appalachia|NWOT_Beneath_RaiderCorpse|1 Appalachia|NWOT_Beneath_ReachedMineTrigger|1 @@ -6897,6 +7271,7 @@ Appalachia|NWOT_Pete_IdleMarker|1 Appalachia|NWOT_Pete_SandboxRoot|1 Appalachia|NWOT_PossumRef|1 Appalachia|NWOT_REF_RadioTransmitter_NW|1 +Appalachia|NorthEntranceOrganCave|1 Appalachia|NukaWorldMapMarker|1 Appalachia|Nukashine_WakeUpLocation_01|1 Appalachia|Nukashine_WakeUpLocation_02|1 @@ -7097,8 +7472,8 @@ Appalachia|P01B_Mini_Squatch01_CHMonthly01|1 Appalachia|P01B_Mini_Squatch01_CHMonthly02|1 Appalachia|P01B_Mini_Squatch01_CHMonthly03|1 Appalachia|P01B_Mini_Squatch01_CHMonthly04|1 -Appalachia|P01B_Mini_Squatch01_CHMonthly05|1 Appalachia|P01B_Mini_Squatch01_CHMonthly06|1 +Appalachia|P01B_Mini_Squatch01_CHMonthly09|1 Appalachia|P01B_Mini_Squatch01_CampSite|1 Appalachia|P01B_Mini_Squatch01_EnableMarker|1 Appalachia|P01B_Mini_Squatch01_Harpers|1 @@ -7726,8 +8101,6 @@ Appalachia|RE_Object_FF_08|1 Appalachia|RE_Object_FF_08_Trigger|1 Appalachia|RE_Object_FF_09|1 Appalachia|RE_Object_FF_09_Trigger|1 -Appalachia|RE_Object_FF_10|1 -Appalachia|RE_Object_FF_10_Trigger|1 Appalachia|RE_Object_FF_11|1 Appalachia|RE_Object_FF_11_Trigger|1 Appalachia|RE_Object_FF_12|1 @@ -8340,7 +8713,6 @@ Appalachia|RadioAstronomyResearchCenterEdgeMarker|1 Appalachia|RadioStationBravoREF|1 Appalachia|RadroachCreatureHomeland_Respawn|1 Appalachia|RaiderCave01_LoadExt|1 -Appalachia|RaiderCave03_LoadExt|1 Appalachia|RaiderVendorBotPleasantValleyRef|1 Appalachia|Raider_RadioTransmitter_Boosted|1 Appalachia|Raider_RadioTransmitter_Weak|1 @@ -8667,6 +9039,7 @@ Appalachia|Sign_The_Rusty_PickRef|1 Appalachia|SmallFissureTrigger1|1 Appalachia|SmallFissureTrigger2|1 Appalachia|SmallFissureTrigger3|1 +Appalachia|SouthEntranceOrganCave|1 Appalachia|SouthhamptonEstate_LocationCenter|1 Appalachia|SouthhamptonEstate_LocationEdge|1 Appalachia|SpawnCenter_CreatureHomelandLiberator_MamaDolce|1 @@ -9086,7 +9459,6 @@ Appalachia|UNSmallForestPOI29Marker|1 Appalachia|UNSmallForestPOI30Marker|1 Appalachia|UNSmallForestPOI31Marker|1 Appalachia|UNSmallForestPOI32Marker|1 -Appalachia|UNSmallForestPOI33Marker|1 Appalachia|UNSmallForestPOI34Marker|1 Appalachia|UNSmallForestPOI35Marker|1 Appalachia|UNSmallForestPOI36Marker|1 @@ -9506,6 +9878,7 @@ Appalachia|WelchMedicalVendingMachineRef|1 Appalachia|WendigoAmbushMarker|1 Appalachia|WendigoCaveLoadExtDUPLICATE000|1 Appalachia|WendigoCave_OutsideEntrance|1 +Appalachia|WestEntranceOrganCave|1 Appalachia|WestTekMapMarkerHeadingRef|1 Appalachia|WestTekMapMarkerRef|1 Appalachia|WhitespringBunkerLoadDoor_MainEntrance002|1 @@ -9799,7 +10172,7 @@ Appalachia|zw_skeltoncrushed|1 Appalachia|zw_trainstest|1 Appalachia|zwshipPOI|1 Appalachia|zwtest_alcoholstill|1 -ArktosPharmaLab01||17149 +ArktosPharmaLab01||17150 ArktosPharmaLab01|SFS09_Habitat_EngineeringTerminalRef|1 ArktosPharmaLab01|SFS09_Habitat_MainframeTerminalRef|1 ArktosPharmaLab01|SFS09_Habitat_Misc_TriggerSublevel|1 @@ -9839,7 +10212,7 @@ ArktosPharmaLabDungeon|DailyOps_Mode01_Respawn03_03_PackIn011|1 ArktosPharmaLabDungeon|DailyOps_ReturnDoor_PackIn011|1 ArktosPharmaLabDungeon|TestElevDoorARef102|1 ArktosPharmaLabDungeon|TestElevDoorTriggerARef085|1 -BelchingBetty01||5211 +BelchingBetty01||5209 BelchingBetty01|MTR06_BossSpawnMarker|1 BelchingBetty01|MTR06_DiseaseTrigger|1 BelchingBetty01|MTR06_FinalExamBeaconMarker|1 @@ -9965,7 +10338,7 @@ BlueRidgeOffice01|xmarker_Aries_OfficeSpot|1 BlueRidgeOffice01|xmarker_Rahmani_OfficeSpot|1 BlueRidgeOffice01|xmarker_Rahmani_OfficeSpot001|1 BurdetteManorBasement01||499 -BurningMine01||6113 +BurningMine01||6112 BurningMine01|DailyOps_Mode01_Activator00_PackIn003|1 BurningMine01|DailyOps_Mode01_Activator01_PackIn003|1 BurningMine01|DailyOps_Mode01_Activator02_PackIn003|1 @@ -10498,7 +10871,7 @@ EmmettMountainDisposalSite01|E05_Radiation_TunnelSpawnCenter04|1 EmmettMountainDisposalSite01|E05_Radiation_Turret01|1 EmmettMountainDisposalSite01|E05_Radiation_Turret02|1 EmmettMountainDisposalSite01|E05_Radiation_Turret03|1 -EnclaveResearchFacility01||18678 +EnclaveResearchFacility01||18680 EnclaveResearchFacility01|BS01_MQ07_BiohazardEscape01|1 EnclaveResearchFacility01|BS01_MQ07_BiohazardEscape02|1 EnclaveResearchFacility01|BS01_MQ07_Biohazard_Trigger|1 @@ -10901,7 +11274,7 @@ FreeStatesBunker07|W05_MQS_203P_RadcliffFurn1|1 FreeStatesBunker07|W05_MQS_203P_RadcliffFurn2|1 FreeStatesBunker07|W05_MQS_203P_ThompsonFurn1|1 FreeStatesBunker07|W05_MQS_203P_ThompsonFurn2|1 -GarrahanMiningHQ01||9176 +GarrahanMiningHQ01||9175 GarrahanMiningHQ01|GarrahanHQToExtBack|1 GarrahanMiningHQ01|GarrahanHQ_Garage01ToExt|1 GarrahanMiningHQ01|GarrahanMiningHQ_LeftExit|1 @@ -11167,6 +11540,38 @@ HornwrightSafeRoom01|W05_MQS_201P_Saferoom|1 HornwrightSafeRoom01|W05_MQS_201P_Saferoom_REF|1 HornwrightSafeRoom01|W05_MQS_201P_Saferoom_Scene_REF|1 HornwrightSafeRoom01|W05_MotherlodeAlwaysOpen|1 +IngramMansion01||905 +IngramMansion01|AC_MQ01_AbbieCowerMarker|1 +IngramMansion01|AC_MQ01_DownstairsTrigger|1 +IngramMansion01|AC_MQ01_EvelynDownstairsMarker|1 +IngramMansion01|AC_MQ01_EvelynStormAwayMarker|1 +IngramMansion01|AC_MQ01_ExitMarker|1 +IngramMansion01|AC_MQ01_HitmanGoon|1 +IngramMansion01|AC_MQ01_HitmanGoonMarker|1 +IngramMansion01|AC_MQ01_HitmanLeaderMarker|1 +IngramMansion01|AC_MQ01_MusicianRef|1 +IngramMansion01|AC_MQ01_Opportunity_AbbieStoolRef|1 +IngramMansion01|AC_MQ01_Opportunity_EvelynToAbbieMarker|1 +IngramMansion01|AC_MQ01_Opportunity_FemaleScavengerMarker|1 +IngramMansion01|AC_MQ01_Opportunity_HitmanStool|1 +IngramMansion01|AC_MQ01_Opportunity_MaleScavengerMarker|1 +IngramMansion01|AC_MQ01_Opportunity_MedicFurn|1 +IngramMansion01|AC_MQ01_Opportunity_MusicianCouch|1 +IngramMansion01|AC_MQ01_Opportunity_PlayerCouch|1 +IngramMansion01|AC_MQ01_Opportunity_ShootMarker|1 +IngramMansion01|AC_MQ01_Opportunity_VinBarFurn|1 +IngramMansion01|AC_MQ01_ScavengerFemale|1 +IngramMansion01|AC_MQ01_ScavengerMale|1 +IngramMansion01|AC_MQ01_TubaRef|1 +IngramMansion01|AC_MQ01_VinBarMarker|1 +IngramMansion01|AC_MQ04_Sins_LabTableDecorEnableMarker_REF|1 +IngramMansion01|AC_MQ04_VinSmokeFurniture_Ref|1 +IngramMansion01|AC_MQ_AbbieRef|1 +IngramMansion01|AC_MQ_AntonioRef|1 +IngramMansion01|AC_MQ_EvelynRef|1 +IngramMansion01|AC_MQ_LabDoor_Ref|1 +IngramMansion01|AC_MQ_VinRef|1 +IngramMansion01|AC_MQ_VinToAbbieMarker|1 KerwoodMine01||5593 KerwoodMine01|BS01_BarredDoor|1 KerwoodMine01|BS01_Bread_Miners|1 @@ -11604,83 +12009,96 @@ MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_01_PackIn012|1 MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_02_PackIn012|1 MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_03_PackIn012|1 MountBlairWarehouseBasement01||319 -NPEVault7601||6986 -NPEVault7601|76CharGenPerkBoardTriggerRef005|1 -NPEVault7601|76ExitTriggerREF02|1 -NPEVault7601|76TrailerCoupleEnabler001|1 -NPEVault7601|76TrailerOverseerEnabler001|1 -NPEVault7601|76TrailerPartyEnabler001|1 -NPEVault7601|76TrailerRoomPipboyEnabler001|1 -NPEVault7601|76TrailerStandeeEnabler001|1 -NPEVault7601|76TrailerTrainingEnabler001|1 -NPEVault7601|76TrailerVaultDoorExitEnabler001|1 -NPEVault7601|76TrailerVaultExitEnabler001|1 -NPEVault7601|76TrailerVaultExitHugEnabler001|1 -NPEVault7601|76TrailerWorkersEnabler001|1 -NPEVault7601|76Trailer_IntroCouple_Actor_Barney001|1 -NPEVault7601|76Trailer_IntroCouple_Actor_Carol001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Alice001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Barney001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Biscuit001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Carol001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Cody001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Kathy001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Louise001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Margret001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Markie001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Phyllis001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Ron001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Sandy001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Violet001|1 -NPEVault7601|76Trailer_IntroParty_Actor_Will001|1 -NPEVault7601|76Trailer_IntroReactorLight04|1 -NPEVault7601|76Trailer_IntroReactorLight05|1 -NPEVault7601|76Trailer_IntroReactorLight06|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Foreman001|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker05|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker07|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker08|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker09|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker10|1 -NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001|1 -NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001|1 -NPEVault7601|76Trailer_IntroStandee_Actor_Sandy001|1 -NPEVault7601|76Trailer_IntroStandee_Actor_Violet001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Alice001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Biscuit001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Cody001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Louise001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Margret001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Markie001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Overseer03|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Overseer04|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Phyllis001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Ron001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Sandy001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Violet001|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Will001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Alice001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Barney001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Carol001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Cody001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Louise001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Margret001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Markie001|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Ron001|1 -NPEVault7601|CAMPTriggerMarker002|1 -NPEVault7601|CharGenEndMarker002|1 -NPEVault7601|CharGenTrailerRef005|1 +NPECultistCave||4233 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref|1 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref001|1 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref002|1 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref003|1 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref004|1 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref005|1 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref006|1 +NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref007|1 +NPECultistCave|NPE_DQ01_InstanceMarker_Ref|1 +NPECultistCave|NorthExitOrganCave|1 +NPECultistCave|SouthExitOrganCave|1 +NPECultistCave|WestExitOrganCave|1 +NPEVault7601||6958 +NPEVault7601|76CharGenPerkBoardTriggerRef005_Copy01_Copy01|1 +NPEVault7601|76ExitTriggerREF02_Copy01_Copy01|1 +NPEVault7601|76TrailerCoupleEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerOverseerEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerPartyEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerRoomPipboyEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerStandeeEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerTrainingEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerVaultDoorExitEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerVaultExitEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerVaultExitHugEnabler001_Copy01_Copy01|1 +NPEVault7601|76TrailerWorkersEnabler001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroCouple_Actor_Barney001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroCouple_Actor_Carol001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Alice001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Barney001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Biscuit001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Carol001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Cody001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Kathy001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Louise001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Margret001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Markie001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Phyllis001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Ron001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Sandy001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Violet001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Will001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactorLight04_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactorLight05_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactorLight06_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Foreman001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker05_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker07_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker08_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker09_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker10_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroStandee_Actor_Sandy001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroStandee_Actor_Violet001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Alice001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Biscuit001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Cody001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Louise001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Margret001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Markie001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Overseer03_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Overseer04_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Phyllis001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Ron001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Sandy001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Violet001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Will001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Alice001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Barney001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Carol001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Cody001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Louise001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Margret001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Markie001_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Ron001_Copy01_Copy01|1 +NPEVault7601|CAMPTriggerMarker002_Copy01_Copy01|1 +NPEVault7601|CharGenEndMarker002_Copy01_Copy01|1 +NPEVault7601|CharGenTrailerRef005_Copy01_Copy01|1 NPEVault7601|Chargen_BreadcrumbQT01_Ref|1 NPEVault7601|Chargen_BreadcrumbQT02_Ref|1 NPEVault7601|Chargen_BreadcrumbQT03_Ref|1 @@ -11688,27 +12106,127 @@ NPEVault7601|Chargen_BreadcrumbQT04_Ref|1 NPEVault7601|Chargen_BreadcrumbQT05_Ref|1 NPEVault7601|Chargen_BreadcrumbQT06_Ref|1 NPEVault7601|Chargen_BreadcrumbQT07_Ref|1 -NPEVault7601|Face01Light002|1 -NPEVault7601|Face02Light002|1 -NPEVault7601|Face03Light002|1 -NPEVault7601|Face04Light002|1 -NPEVault7601|Face05Light002|1 -NPEVault7601|Face06Light002|1 -NPEVault7601|Intro_Party_TrailerEnabler005|1 +NPEVault7601|Face01Light002_Copy01_Copy01|1 +NPEVault7601|Face02Light002_Copy01_Copy01|1 +NPEVault7601|Face03Light002_Copy01_Copy01|1 +NPEVault7601|Face04Light002_Copy01_Copy01|1 +NPEVault7601|Face05Light002_Copy01_Copy01|1 +NPEVault7601|Face06Light002_Copy01_Copy01|1 +NPEVault7601|Intro_Party_TrailerEnabler005_Copy01_Copy01|1 NPEVault7601|NPE_LoadoutObjects_EnableMarker_Ref|1 -NPEVault7601|NameOverrideTestMarker001|1 -NPEVault7601|PipeRoomExtFilter002|1 -NPEVault7601|PipeRoomIntFilter002|1 -NPEVault7601|PipeRoomNoFilter002|1 -NPEVault7601|RS01A_Contact_DoorQTMarker02|1 -NPEVault7601|TestChargenDinerScene001|1 -NPEVault7601|TrailerEnabler005|1 +NPEVault7601|NPE_MQ01_Enjoy_VR76ExitMarker_Ref|1 +NPEVault7601|NPE_SaveFailsafe_Trigger_Ref|1 +NPEVault7601|NameOverrideTestMarker001_Copy01_Copy01|1 +NPEVault7601|PipeRoomExtFilter002_Copy01_Copy01|1 +NPEVault7601|PipeRoomIntFilter002_Copy01_Copy01|1 +NPEVault7601|PipeRoomNoFilter002_Copy01_Copy01|1 +NPEVault7601|RS01A_Contact_DoorQTMarker02_Copy01_Copy01|1 +NPEVault7601|TestChargenDinerScene001_Copy01_Copy01|1 +NPEVault7601|TrailerEnabler005_Copy01_Copy01|1 NPEVault7601|XMarkerHeading_CharGen06Start01|1 NPEVault7601|XMarkerHeading_CharGen06Start02|1 NPEVault7601|XMarkerHeading_CharGen06Start03|1 NPEVault7601|XMarkerHeading_CharGen06Start04|1 NPEVault7601|XMarkerHeading_CharGen06Start05|1 NPEVault7601|XMarkerHeading_CharGen06Start06|1 +NVEShelter01||360 +NVEVault7601||7041 +NVEVault7601|76CharGenPerkBoardTriggerRef005_Copy01|1 +NVEVault7601|76ExitTriggerREF02_Copy01|1 +NVEVault7601|76TrailerCoupleEnabler001_Copy01|1 +NVEVault7601|76TrailerOverseerEnabler001_Copy01|1 +NVEVault7601|76TrailerPartyEnabler001_Copy01|1 +NVEVault7601|76TrailerRoomPipboyEnabler001_Copy01|1 +NVEVault7601|76TrailerStandeeEnabler001_Copy01|1 +NVEVault7601|76TrailerTrainingEnabler001_Copy01|1 +NVEVault7601|76TrailerVaultDoorExitEnabler001_Copy01|1 +NVEVault7601|76TrailerVaultExitEnabler001_Copy01|1 +NVEVault7601|76TrailerVaultExitHugEnabler001_Copy01|1 +NVEVault7601|76TrailerWorkersEnabler001_Copy01|1 +NVEVault7601|76Trailer_IntroCouple_Actor_Barney001_Copy01|1 +NVEVault7601|76Trailer_IntroCouple_Actor_Carol001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Alice001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Barney001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Biscuit001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Carol001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Cody001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Kathy001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Louise001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Margret001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Markie001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Phyllis001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Ron001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Sandy001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Violet001_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Will001_Copy01|1 +NVEVault7601|76Trailer_IntroReactorLight04_Copy01|1 +NVEVault7601|76Trailer_IntroReactorLight05_Copy01|1 +NVEVault7601|76Trailer_IntroReactorLight06_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Foreman001_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker05_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker07_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker08_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker09_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker10_Copy01|1 +NVEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001_Copy01|1 +NVEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001_Copy01|1 +NVEVault7601|76Trailer_IntroStandee_Actor_Sandy001_Copy01|1 +NVEVault7601|76Trailer_IntroStandee_Actor_Violet001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Alice001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Biscuit001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Cody001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Louise001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Margret001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Markie001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Overseer03_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Overseer04_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Phyllis001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Ron001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Sandy001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Violet001_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Will001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Alice001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Barney001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Carol001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Cody001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Louise001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Margret001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Markie001_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Ron001_Copy01|1 +NVEVault7601|CAMPTriggerMarker002_Copy01|1 +NVEVault7601|CharGenEndMarker002_Copy01|1 +NVEVault7601|CharGenTrailerRef005_Copy01|1 +NVEVault7601|Face01Light002_Copy01|1 +NVEVault7601|Face02Light002_Copy01|1 +NVEVault7601|Face03Light002_Copy01|1 +NVEVault7601|Face04Light002_Copy01|1 +NVEVault7601|Face05Light002_Copy01|1 +NVEVault7601|Face06Light002_Copy01|1 +NVEVault7601|Intro_Party_TrailerEnabler005_Copy01|1 +NVEVault7601|NameOverrideTestMarker001_Copy01|1 +NVEVault7601|PipeRoomExtFilter002_Copy01|1 +NVEVault7601|PipeRoomIntFilter002_Copy01|1 +NVEVault7601|PipeRoomNoFilter002_Copy01|1 +NVEVault7601|RS01A_Contact_DoorQTMarker02_Copy01|1 +NVEVault7601|TestChargenDinerScene001_Copy01|1 +NVEVault7601|TrailerEnabler005_Copy01|1 +NVEVault7601|XMarkerHeading_CharGen01Start07|1 +NVEVault7601|XMarkerHeading_CharGen01Start08|1 +NVEVault7601|XMarkerHeading_CharGen01Start09|1 +NVEVault7601|XMarkerHeading_CharGen01Start10|1 +NVEVault7601|XMarkerHeading_CharGen01Start11|1 +NVEVault7601|XMarkerHeading_CharGen01Start12|1 NukaColaQuantumPlant01||5457 NukaColaQuantumPlant01|BMO_BunkerKeyLocker|1 NukaColaQuantumPlant01|BMO_LockernoteBox|1 @@ -11778,7 +12296,7 @@ PoseidonPlant02|WL020_Post204P_UnlockedDoor02|1 RadioResearchCenter01||3470 RadioResearchCenter01|EN03_RadioResearchDebugMarker|1 RadioResearchCenter01|MTNM02RadioResearchMarker|1 -RaiderCave01||1016 +RaiderCave01||1444 RaiderCave02||1857 RaiderCave02|BS01_MQ05_Raiders_EnableMarker_BoSProtectrons|1 RaiderCave02|BS01_MQ05_Raiders_EnableMarker_Raiders|1 @@ -11797,7 +12315,7 @@ RaiderCave02|BS01_MQ06A_Raiders_PierceRef|1 RaiderCave02|BS01_MQ06A_Raiders_ShinCaveMarker001|1 RaiderCave02|BS01_MQ06A_Raiders_ShinCaveMarker002|1 RaiderCave02|BS01_MQ06A_Raiders_ShinRef|1 -RaiderCave03||1028 +RaiderCave03||1681 RaiderRaidTrailerInt||99 RaiderRaidTrailerInt|W05_MQ_101P_A_AldridgeAliveEnableRef|1 RaiderRaidTrailerInt|W05_MQ_101P_A_AldridgeAliveRef|1 @@ -11918,6 +12436,7 @@ SettlerBugOutCave|W05_MQ_101P_B_AubrieDeadEnableMarkerRef|1 SheltersCave01||534 SheltersCave02||608 SheltersClaimCenter01||976 +SheltersHighStakes||2666 SheltersMissileSilo||493 SheltersPittTrench01||1142 SheltersRootCellar||595 @@ -12288,7 +12807,7 @@ TopOfTheWorld01|W05_MQ_101P_A_supermutant_trigger_backcorridor_07|1 TopOfTheWorld01|W05_MQ_101P_A_supermutant_trigger_backcorridor_08|1 TopOfTheWorld01|W05_MQ_101P_MegRef|1 TopOfTheWorld01|W05_MQ_101P_RaiderBRef|1 -TunnelOfLoveMineshaft01||4380 +TunnelOfLoveMineshaft01||4383 TunnelOfLoveMineshaft01|E09C_ArenaSpawn01|1 TunnelOfLoveMineshaft01|E09C_ArenaSpawn02|1 TunnelOfLoveMineshaft01|E09C_BrokenTracks_ObjectiveMarker_Radius3250|1 @@ -12431,7 +12950,7 @@ VTecAgCenter01|AgCenterMainframeRef|1 VTecAgCenter01|AgCenterMainframeTerminalREF|1 VTecAgCenter01|AgCenterTerminalREF|1 VTecAgCenter01|MacFaddernTerminalREF|1 -ValleyGalleria01||8584 +ValleyGalleria01||8586 ValleyGalleria01|DailyOps_Global_ValleyGalleria_Blocker01|1 ValleyGalleria01|DailyOps_Mode01_Activator00_PackIn002|1 ValleyGalleria01|DailyOps_Mode01_Activator01_PackIn002|1 @@ -12760,7 +13279,7 @@ Vault79Main|WendigoAmbush|1 Vault79Main|WendigoEatMarker|1 Vault79Main|testmarkerbry|1 Vault79Main|v79vent|1 -Vault94Dungeon||17440 +Vault94Dungeon||17439 Vault94Dungeon|BS013_Vault94Dungeon_Out|1 Vault94Dungeon|DailyOps_Global_Vault94_Blocker01|1 Vault94Dungeon|DailyOps_Global_Vault94_Blocker02|1 @@ -13042,7 +13561,7 @@ Vault96Dungeon|DailyOps_Mode02_Vault96_SpawnExclusion08|1 Vault96Dungeon|DailyOps_Mode02_Vault96_SpawnExclusion09|1 Vault96Dungeon|DailyOps_ReturnDoor_PackIn007|1 Vault96Dungeon|Vault96_Normal_AutoLoadDoor|1 -VaultTecU01||10632 +VaultTecU01||10630 VaultTecU01|BoSVTUCentrifugeREF|1 VaultTecU01|BoSZ04VTUMarker|1 VaultTecU01|BoSZ04VTUPowerTerminalREF|1 @@ -13464,7 +13983,7 @@ WhitespringBunker01|xSCElevatorTest|1 WhitespringBunker01|xSCModus|1 WhitespringBunker01|xSCModus2|1 WhitespringBunker01|xSCSpot|1 -WhitespringMall01||6921 +WhitespringMall01||6928 WhitespringMall01|EX002_WhitespringMall_ElevToRefuge_LoadDoor01|1 WhitespringMall01|EX002_WhitespringMall_ElevToRefuge_LoadDoor02|1 WhitespringMall01|EX002_WhitespringMall_ElevToRefuge_LoadDoor03|1 @@ -13484,7 +14003,20 @@ WhitespringMall01|TestElevDoorTriggerARef130|1 WhitespringMall01|TestElevDoorTriggerARef134|1 WhitespringMall01|TestElevDoorTriggerARef136|1 WhitespringMall01|WhitespringMall_Interior_DirectTravelPoint|1 -WhitespringRefuge01||11296 +WhitespringRefuge01||11464 +WhitespringRefuge01|AC_MQ01_Opportunity_Poster_00|1 +WhitespringRefuge01|AC_MQ01_Opportunity_Poster_01|1 +WhitespringRefuge01|AC_MQ01_Opportunity_Poster_02|1 +WhitespringRefuge01|AC_MQ01_Opportunity_Poster_03|1 +WhitespringRefuge01|AC_MQ01_Opportunity_Poster_05|1 +WhitespringRefuge01|AC_MQ02_Stage_EvelynBarFurn|1 +WhitespringRefuge01|AC_MQ02_Stage_EvelynIntroMarker|1 +WhitespringRefuge01|AC_MQ02_Stage_EvelynSuperstitionMarker|1 +WhitespringRefuge01|AC_MQ02_Stage_IntroSceneTrigger|1 +WhitespringRefuge01|AC_MQ02_Stage_OrlandoIntroMarker|1 +WhitespringRefuge01|AC_MQ02_Stage_SuperstitiousRefugeeRef|1 +WhitespringRefuge01|AC_MQ02_Stage_SuperstitiousRefugeeTrigger|1 +WhitespringRefuge01|AC_MQ_Evelyn_WhitespringRef001|1 WhitespringRefuge01|EX001_WhitespringRefuge_ElevToMall_LoadDoor01|1 WhitespringRefuge01|EX001_WhitespringRefuge_ElevToMall_LoadDoor02|1 WhitespringRefuge01|EX001_WhitespringRefuge_ElevToMall_LoadDoor03|1 @@ -13549,6 +14081,11 @@ WhitespringRefuge01|XPD_Fuel_Recipe_IngredientMarker22|1 WhitespringRefuge01|XPD_Fuel_Recipe_IngredientMarker23|1 WhitespringRefuge01|XPD_Fuel_Recipe_IngredientMarker24|1 WhitespringRefuge01|XPD_Fuel_Recipe_IngredientObjective_XMarker|1 +WhitespringRefuge01|XPD_Fuel_Training_GunActRef|1 +WhitespringRefuge01|XPD_Fuel_Training_ObjectFourMarkerRef|1 +WhitespringRefuge01|XPD_Fuel_Training_ObjectOneMarkerRef|1 +WhitespringRefuge01|XPD_Fuel_Training_ObjectThreeMarkerRef|1 +WhitespringRefuge01|XPD_Fuel_Training_ObjectTwoMarkerRef|1 WhitespringRefuge01|XPD_Giuseppe_StampsVendor_EnableMarker|1 WhitespringRefuge01|XPD_HubRE_ActorSpawnPoint|1 WhitespringRefuge01|XPD_HubRE_CenterMarker003|1 @@ -13686,7 +14223,236 @@ WhitespringRefuge01|XPD_Hub_Responders_RuckerMarker_MissionHub|1 WhitespringRefuge01|XPD_Hub_Responders_SkippyMarker|1 WhitespringRefuge01|XPD_Hub_Responders_SkippyMarker_Junk|1 WhitespringRefuge01|XPD_Hub_Responders_SkippyMarker_MissionHub|1 +WhitespringRefuge01|XPD_JeremiahRef|1 WhitespringRefuge01|XPD_WhitespringGreeterRef|1 +XPDAC01Casino||13675 +XPDAC01Casino|AC_MQ02_Stage_CasinoExitMarker|1 +XPDAC01Casino|AC_MQ02_Stage_OutsideLoungeTrigger|1 +XPDAC01Casino|AC_MQ02_Stage_PokerGameTrigger|1 +XPDAC01Casino|AC_MQ02_Stage_ShadyMobstersChair|1 +XPDAC01Casino|AC_MQ02_Stage_StanRef|1 +XPDAC01Casino|AC_MQ02_Stage_StansChair|1 +XPDAC01Casino|AC_SQ05_Casino_PersistentMarker_REF|1 +XPDAC01Casino|EXP14_HighRollersLounge_MainDoor_Ref|1 +XPDAC01Casino|TestElevDoorARef105|1 +XPDAC01Casino|TestElevDoorARef106|1 +XPDAC01Casino|TestElevDoorARef107|1 +XPDAC01Casino|TestElevDoorARef108|1 +XPDAC01Casino|TestElevDoorARef111|1 +XPDAC01Casino|TestElevDoorARef112|1 +XPDAC01Casino|TestElevDoorARef113|1 +XPDAC01Casino|TestElevDoorARef114|1 +XPDAC01Casino|XPDAC01Casino_AmbientCombat_EnableMarker|1 +XPDAC01Casino|XPDAC01Casino_Ambient_NPCs_EnableMarker|1 +XPDAC01Casino|XPDAC01Casino_AuditorCombatants_EnableMarker|1 +XPDAC01Casino|XPDAC01Casino_DoorLoad002|1 +XPDAC01Casino|XPDAC01Casino_HatchDoor|1 +XPDAC01Casino|XPDAC01Casino_OvergrownCombatants_EnableMarker|1 +XPDAC01Casino|XPD_AC02_ProximityTracker_SpawnMarker01_Ref|1 +XPDAC01Casino|XPD_AC02_ProximityTracker_SpawnMarker02_Ref|1 +XPDAC01Casino|XPD_AC02_ProximityTracker_SpawnMarker03_Ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker01_Ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker02_Ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker03_Ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker04_Ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker05_ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker06_Ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker07_Ref|1 +XPDAC01Casino|XPD_AC02_SolveLocksMarker08_Ref|1 +XPDAC01Casino|XPD_AC_CasinoFriendliesDisabler_Ref|1 +XPDAC01EntertainmentDistrict||6782 +XPDAC01EntertainmentDistrict|AC_MQ02_Stage_CasinoQuarterToBoardwalk_Marker|1 +XPDAC01EntertainmentDistrict|AC_MQ02_Stage_Evelyn_CasinoQuarter|1 +XPDAC01EntertainmentDistrict|AC_SQ05_CasinoQuarter_PersistentMarker_REF|1 +XPDAC01EntertainmentDistrict|XPDAC01CasinoQuarter_Ambient_Enemy_EnableMarker|1 +XPDAC01EntertainmentDistrict|XPDAC01Casino_DoorLoad001|1 +XPDAC01EntertainmentDistrict|XPD_AC01_MobAllyEnableMarker_Ref|1 +XPDAC01EntertainmentDistrict|XPD_AC02_PersistentMarker|1 +XPDAC01EntertainmentDistrict|XPD_AC02_PlayerOnlyTrigger|1 +XPDAC01EntertainmentDistrict|XPD_NightClub_RightDoor_Ext|1 +XPDAC01NightClub||2944 +XPDAC01NightClub|XPDAC01Casino_HatchDoor001|1 +XPDAC01NightClub|XPDAC01NightClub_Ambient_NPCs_EnableMarker|1 +XPDAC01NightClub|XPD_AC01_BillyBossFightFurniture_Ref|1 +XPDAC01NightClub|XPD_AC01_BossDespawnMarker_Ref|1 +XPDAC01NightClub|XPD_AC_PersistentMarker_Quentinos_Ref|1 +XPDAC01NightClub|XPD_NightClub_RightDoor_Int|1 +XPDAC01NightClub|XPD_SalStickyFingers_Stool|1 +XPDAC02Aquarium||16003 +XPDAC02Aquarium|Aquarium_EnemyCombatants_EnableMarker|1 +XPDAC02Aquarium|Aquarium_FriendlyNPCs_EnableMarker|1 +XPDAC02Aquarium|XPDAC02Aqua_SizeComparisonVolume|1 +XPDAC02Aquarium|XPDAC02_DefendNPCSpawnCenter00|1 +XPDAC02Aquarium|XPDAC02_DefendNPCSpawnCenter01|1 +XPDAC02Aquarium|XPDAC02_DefendNPCSpawnCenter03|1 +XPDAC02Aquarium|XPDAC02_DefendNPCSpawnCenter04|1 +XPDAC02Aquarium|XPDAC02_DefendNPCSpawnCenter05|1 +XPDAC02Aquarium|XPD_AC01_AquariumEntranceMarker|1 +XPDAC02Aquarium|XPD_AC01_Entrance_SpawnCenter|1 +XPDAC02Aquarium|XPD_AC01_Inner_SpawnCenter|1 +XPDAC02Aquarium|XPD_AC01_ObjMod_RepelEnemies_Activator|1 +XPDAC02Aquarium|XPD_AC01_ObjMod_RepelEnemies_Trigger|1 +XPDAC02Aquarium|XPD_AC01_SharksDen_SpawnCenter|1 +XPDAC02Aquarium|XPD_AC01_StageTrigger|1 +XPDAC02Aquarium|XPD_AC01_Theater_SpawnCenter|1 +XPDAC02Aquarium|XPD_AC02_AquariumEntranceTrigger|1 +XPDAC02Aquarium|XPD_AC02_AquariumExitMarker|1 +XPDAC02Aquarium|XPD_AC02_CarryAndThrow_Target_00|1 +XPDAC02Aquarium|XPD_AC02_CarryAndThrow_Target_01|1 +XPDAC02Aquarium|XPD_AC02_CarryAndThrow_Target_02|1 +XPDAC02Aquarium|XPD_AC02_CarryAndThrow_Target_03|1 +XPDAC02Aquarium|XPD_AC02_CharlotteRef|1 +XPDAC02Aquarium|XPD_AC02_Charlotte_ChaiseFurn|1 +XPDAC02Aquarium|XPD_AC02_CullHerd_ProxTrigger|1 +XPDAC02Aquarium|XPD_AC02_DefendNPC_ExitMarker|1 +XPDAC02Aquarium|XPD_AC02_Door_Finale|1 +XPDAC02Aquarium|XPD_AC02_NaughtyShowman_00|1 +XPDAC02Aquarium|XPD_AC02_NaughtyShowman_01|1 +XPDAC02Aquarium|XPD_AC02_NaughtyShowman_02|1 +XPDAC02Aquarium|XPD_AC02_NaughtyShowman_02_Pillory|1 +XPDAC02Aquarium|XPD_AC02_NaughtyShowman_03|1 +XPDAC02Aquarium|XPD_AC02_SteamMarker|1 +XPDAC02Aquarium|XPD_AC02_TatoBasket|1 +XPDAC02Aquarium|XPD_AC02_Theater_ProxTrigger|1 +XPDAC02Aquarium|XPD_AC02_VIPBoothDoor|1 +XPDAC02Aquarium|XPD_AC02_Veracio_WallLean_Aquarium|1 +XPDAC02Aquarium|XPD_AC02_WinnersStageMarker|1 +XPDAC02Boardwalk||10539 +XPDAC02Boardwalk|AC_MQ02_Stage_TicketClerkRef|1 +XPDAC02Boardwalk|AC_SQ03_BackRoomTrigger|1 +XPDAC02Boardwalk|AC_SQ03_BoardwalkToPier_Marker|1 +XPDAC02Boardwalk|AC_SQ03_ClientAlleyMarker|1 +XPDAC02Boardwalk|AC_SQ03_ClientRef|1 +XPDAC02Boardwalk|AC_SQ03_Custodial_SamAlleyMarker|1 +XPDAC02Boardwalk|AC_SQ03_SamBackRoomMarker|1 +XPDAC02Boardwalk|AC_SQ03_SamRef|1 +XPDAC02Boardwalk|AC_SQ03_SamShopMarker|1 +XPDAC02Boardwalk|AC_SQ03_VictimFurn|1 +XPDAC02Boardwalk|AC_SQ03_VictimRef|1 +XPDAC02Boardwalk|Boardwalk_EnemyCombatants_EnableMarker|1 +XPDAC02Boardwalk|Boardwalk_FriendlyNPCs_EnableMarker|1 +XPDAC02Boardwalk|Door_BoardwalkToCasinoQuarter|1 +XPDAC02Boardwalk|ObjMod_Assassination_ProxyTrigger003|1 +XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint00|1 +XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint01|1 +XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint02|1 +XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint03|1 +XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint04|1 +XPDAC02Boardwalk|XPD_AC01_VeracioRef_Boardwalk|1 +XPDAC02Boardwalk|XPD_AC02_BoardwalkEntrance_ProxTrigger|1 +XPDAC02Boardwalk|XPD_AC02_BoardwalkExitMarker|1 +XPDAC02Boardwalk|XPD_AC02_Door_BoardwalkToPier|1 +XPDAC02Boardwalk|XPD_AC02_JuchiRef_Boardwalk|1 +XPDAC02Boardwalk|XPD_AC02_JullianRef_Boardwalk|1 +XPDAC02Boardwalk|XPD_AC02_LennoxSmokeFurn|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsChair_00|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsChair_01|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsChair_02|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsChair_03|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_00|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_01|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_02|1 +XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_03|1 +XPDAC02Boardwalk|XPD_AC02_Veracio_WallLeanFurn|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker56|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker58|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker59|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker60|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker61|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker62|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker63|1 +XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker64|1 +XPDAC02Pier||7244 +XPDAC02Pier|AC_MQ02_BackstageTeleportMarker_00|1 +XPDAC02Pier|AC_MQ02_BackstageTeleportMarker_01|1 +XPDAC02Pier|AC_MQ02_BackstageTeleportMarker_02|1 +XPDAC02Pier|AC_MQ02_Stage_BackstageTrigger|1 +XPDAC02Pier|AC_MQ02_Stage_ClownDressingRoom_EnableMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ClownHatMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ClownOutfitMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ClownPatrolMarker|1 +XPDAC02Pier|AC_MQ02_Stage_DressingRoomDoor|1 +XPDAC02Pier|AC_MQ02_Stage_DressingRoomExitTrigger|1 +XPDAC02Pier|AC_MQ02_Stage_DressingRoomMarker|1 +XPDAC02Pier|AC_MQ02_Stage_DressingRoomTrigger|1 +XPDAC02Pier|AC_MQ02_Stage_EvelynBackstageMarker|1 +XPDAC02Pier|AC_MQ02_Stage_FleeVenue_SpawnCenter|1 +XPDAC02Pier|AC_MQ02_Stage_KnifeTargetMarker|1 +XPDAC02Pier|AC_MQ02_Stage_PerformanceClowns_EnableMarker|1 +XPDAC02Pier|AC_MQ02_Stage_StageMarker|1 +XPDAC02Pier|AC_MQ02_Stage_StageProps_EnableMarker|1 +XPDAC02Pier|AC_MQ02_Stage_StageTrigger|1 +XPDAC02Pier|AC_MQ02_Stage_ZaydeRef|1 +XPDAC02Pier|AC_MQ02_Stage_ZaydeWaitMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ZaydesVanity|1 +XPDAC02Pier|AC_SQ03_SamInstructionsMarker|1 +XPDAC02Pier|AC_SQ03_SamPierRef|1 +XPDAC02Pier|PierToBoardwalkDoor|1 +XPDAC02Pier|PierToBoardwalk_ExitMarker|1 +XPDAC02Pier|Pier_EnemyCombatants_EnableMarker|1 +XPDAC02Pier|Pier_FriendlyNPCs_EnableMarker|1 +XPDAC02Pier|XPD_AC01_ArcadeMarker|1 +XPDAC02Pier|XPD_AC01_EntirePier_ProximityTrigger|1 +XPDAC02Pier|XPD_AC01_PierArcade_ProximityTrigger|1 +XPDAC02Pier|XPD_AC01_PierEntranceMarker|1 +XPDAC02Pier|XPD_AC02_AquariumChuteMarker|1 +XPDAC02Pier|XPD_AC02_Door_PierHall_Center|1 +XPDAC02Pier|XPD_AC02_Door_PierHall_Left|1 +XPDAC02Pier|XPD_AC02_Door_PierHall_Right|1 +XPDAC02Pier|XPD_AC02_PierEntranceTrigger|1 +XPDAC02Pier|XPD_AC02_ShowroomTrigger|1 +XPDAC02Pier|XPD_AC02_SolveLocks_ActivateRef_00|1 +XPDAC02Pier|XPD_AC02_SolveLocks_ActivateRef_01|1 +XPDAC02Pier|XPD_AC02_SolveLocks_ActivateRef_02|1 +XPDAC02Pier|XPD_AC02_SolveLocks_ActivateRef_03|1 +XPDAC02Pier|XPD_AC02_SolveLocks_ActivateRef_04|1 +XPDAC02Pier|XPD_AC02_SolveLocks_ActivateRef_05|1 +XPDAC02Pier|XPD_AC02_SolveLocks_ActivateRef_06|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalMarker_00|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalMarker_01|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalMarker_02|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalMarker_03|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalMarker_04|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalMarker_05|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalMarker_06|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_00|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_01|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_02|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_03|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_04|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_05|1 +XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_06|1 +XPDAC02Pier|XPD_AC02_Stage_MicrophoneMarker|1 +XPDAC03CityHall||4104 +XPDAC03CityHall|XPDAC03CityHall_DoorLoad002|1 +XPDAC03CityHall|XPD_AC03_PersistentMarker_CityHall_Ref|1 +XPDAC03CommunityCenter||4626 +XPDAC03CommunityCenter|XPDAC03Community_DoorLoad002|1 +XPDAC03CommunityCenter|XPD_AC03_CurtainMoveMarker_Ref|1 +XPDAC03CommunityCenter|XPD_AC03_PersistentMarker_CommunityCenter_Ref|1 +XPDAC03CommunityCenter|XPD_AC03_RepelEnemies_SecureAreaAct_Ref|1 +XPDAC03CommunityCenter|XPD_AC03_TheaterCurtain_Ref|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker55|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker57|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker65|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker66|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker67|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker68|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker69|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker70|1 +XPDAC03CommunityCenter|XPD_Pitt02_Organ002|1 +XPDAC03FloodedCityCenter||20048 +XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_01|1 +XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_02|1 +XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_03|1 +XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_04|1 +XPDAC03FloodedCityCenter|XPDAC03CityHall_DoorLoad001|1 +XPDAC03FloodedCityCenter|XPDAC03Community_DoorLoad001|1 +XPDAC03FloodedCityCenter|XPD_AC03_DefendNPC_ProxTrigger_Ref|1 +XPDAC03FloodedCityCenter|XPD_AC03_DefendNPC_Ref|1 +XPDAC03FloodedCityCenter|XPD_AC03_IntroAuditorCombatantsSpawnCenter_Ref|1 +XPDAC03FloodedCityCenter|XPD_AC03_IntroOvergrown_SpawnMarkerRef|1 +XPDAC03FloodedCityCenter|XPD_AC03_PersistentMarker_FloodedCityCenter_Ref|1 XPDPitt01Foundry||16874 XPDPitt01Foundry|EXM1Pitt1_Shipping_Door_Interior0|1 XPDPitt01Foundry|Pitt01_Objmod_SolveLocks_PlacementPoint00|1 @@ -13752,7 +14518,7 @@ XPDPitt01Foundry|XPD_Pitt01_TrogFXTrigger01_Ref|1 XPDPitt01Foundry|XPD_Pitt01_TrogFXTrigger02_Ref|1 XPDPitt01Foundry|XPD_Pitt01_TrogFXTrigger03_Ref|1 XPDPitt01Foundry|XPD_Pitt02_Door|1 -XPDPitt01Industrial||19952 +XPDPitt01Industrial||20025 XPDPitt01Industrial|AmbEWS_Node00_ShantyTown_SCM|1 XPDPitt01Industrial|AmbEWS_Node00_ShantyTown_SCM001|1 XPDPitt01Industrial|AmbEWS_Node00_ShantyTown_Sandbox|1 @@ -13785,6 +14551,7 @@ XPDPitt01Industrial|AmbEWS_Node08_DepotTrog03_Sandbox|1 XPDPitt01Industrial|AmbEWS_Node08_DepotTrog03_Trigger|1 XPDPitt01Industrial|DefendNPC_Attackers_SCM|1 XPDPitt01Industrial|EXM1Pitt1_Shipping_Door_Exterior|1 +XPDPitt01Industrial|EXM1Pitt1_Shipping_Door_Exterior_Static|1 XPDPitt01Industrial|ObjMod_Assassination_ProxyTrigger|1 XPDPitt01Industrial|ObjMod_Assassination_Terr00_SCM00|1 XPDPitt01Industrial|ObjMod_Assassination_Terr00_SCM01|1 @@ -13806,10 +14573,17 @@ XPDPitt01Industrial|RespawnExit01Temp01|1 XPDPitt01Industrial|RespawnExit01Temp02|1 XPDPitt01Industrial|RespawnExit01Temp03|1 XPDPitt01Industrial|RespawnExit01Temp04|1 +XPDPitt01Industrial|RespawnExit01Temp05|1 +XPDPitt01Industrial|RespawnExit01Temp06|1 +XPDPitt01Industrial|RespawnExit01Temp07|1 +XPDPitt01Industrial|RespawnExit01Temp08|1 XPDPitt01Industrial|RespawnExit02Temp01|1 XPDPitt01Industrial|RespawnExit02Temp02|1 XPDPitt01Industrial|RespawnExit02Temp03|1 XPDPitt01Industrial|RespawnExit02Temp04|1 +XPDPitt01Industrial|RttP01_ObjMod_ObjectDestruction_ProxyTrigger|1 +XPDPitt01Industrial|RttP01_ObjMod_ProximityTracker_ProxyTrigger|1 +XPDPitt01Industrial|RttP01_ObjMod_SolveLocks_ProxyTrigger|1 XPDPitt01Industrial|SFL02_Track_DyerDoor01RefLOCKED001|1 XPDPitt01Industrial|XPD_FinaleCombat_FighterVolume|1 XPDPitt01Industrial|XPD_FinaleCombat_HoldVolume|1 @@ -13940,8 +14714,56 @@ XPDPitt01Industrial|XPD_Pitt01_UnionBeggar_Ref|1 XPDPitt01Industrial|XPD_Pitt01_UnionNaysayer_Chair_Ref|1 XPDPitt01Industrial|XPD_Pitt01_UnionNaysayer_Ref|1 XPDPitt01Industrial|XPD_Pitt01_Wicker_CowerMarker_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_AmmoBox_001_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_AmmoBox_002_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_AreaCenter_Set00|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_Fanatic002|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_Fanatic003|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_Fanatic004|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_Fanatic005|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_Fanatic006|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_FanaticTurret001|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_FanaticTurret002|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_FanaticTurret003|1 +XPDPitt01Industrial|XPD_RTTP01_ObjectDestruction_ManholeRef_01|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker001_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker002_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker003_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker01_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker02_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker03_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker1_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker2_Ref|1 +XPDPitt01Industrial|XPD_RTTP01_SolveLocks_Marker3_Ref|1 +XPDPitt01Industrial|XPD_RTTP_ObjectDestruction_Fanatic001|1 +XPDPitt01Industrial|XPD_RttP01_EnableMarker|1 +XPDPitt01Industrial|XPD_RttP01_Foundry_Door_Static|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_00_00|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_00_01|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_00_02|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_00_03|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_00_04|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_00_06|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_01_00|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_01_01|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_01_02|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_01_03|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_01_04|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_01_05|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_01_06|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_00|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_01|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_02|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_03|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_04|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_05|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_06|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_07|1 +XPDPitt01Industrial|XPD_RttP01_ProxActivator_02_08|1 +XPDPitt01Industrial|XPD_RttP01_ProxTracker_Transmitter|1 XPDPitt01Industrial|XPD_VertibirdPilot_01_LandingPad_Marker_Ref|1 XPDPitt01Industrial|XPD_VertibirdPilot_01_Vertibird_Marker_Ref002|1 +XPDPitt02ACCJ||15 XPDPitt02Sanctum||17936 XPDPitt02Sanctum|Pitt02_BossRoom_Marker|1 XPDPitt02Sanctum|Pitt02_CatacombsGate_Marker|1 @@ -14199,6 +15021,41 @@ XPDPitt02Trench|XPD_Pitt02_Survivor_TrainTunnel|1 XPDPitt02Trench|XPD_Pitt02_Survivor_TrainTunnel001|1 XPDPitt02Trench|XPD_Pitt02_Survivor_TrainTunnel002|1 XPDPitt02Trench|XPD_Pitt02_TrainTunnel_ProxTrigger|1 +XPDRttP01SteelTower||10061 +XPDRttP01SteelTower|RttP01_ObjMod_DefendNPC_ProxyTrigger003|1 +XPDRttP01SteelTower|RttP01_ObjMod_FreePrisoners_ProxyTrigger004|1 +XPDRttP01SteelTower|RttP01_ObjMod_RepelEnemies_ProxyTrigger|1 +XPDRttP01SteelTower|XPDRttP01_Door_Industrial_01|1 +XPDRttP01SteelTower|XPDRttP01_DungeonExit01_01|1 +XPDRttP01SteelTower|XPDRttP01_DungeonExit01_02|1 +XPDRttP01SteelTower|XPDRttP01_DungeonExit01_03|1 +XPDRttP01SteelTower|XPDRttP01_DungeonExit01_04|1 +XPDRttP01SteelTower|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker42|1 +XPDRttP01SteelTower|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker43|1 +XPDRttP01SteelTower|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker44|1 +XPDRttP01SteelTower|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker45|1 +XPDRttP01SteelTower|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker46|1 +XPDRttP01SteelTower|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker47|1 +XPDRttP01SteelTowerRoof||1996 +XPDRttP01SteelTowerRoof|TestElevDoorARef064|1 +XPDRttP01SteelTowerRoof|TestElevDoorTriggerARef058|1 +XPDRttP01SteelTowerRoof|XPDRttP01_RoofExit01_01|1 +XPDRttP01SteelTowerRoof|XPDRttP01_RoofExit01_02|1 +XPDRttP01SteelTowerRoof|XPDRttP01_RoofExit01_03|1 +XPDRttP01SteelTowerRoof|XPDRttP01_RoofExit01_04|1 +XPDRttP01SteelTowerUpperFloors||6229 +XPDRttP01SteelTowerUpperFloors|RttP01_ObjMod_Assassination_ProxyTrigger|1 +XPDRttP01SteelTowerUpperFloors|RttP01_ObjMod_CarryAndThrow_ProxyTrigger|1 +XPDRttP01SteelTowerUpperFloors|RttP01_ObjMod_Puzzle_ProxyTrigger|1 +XPDRttP01SteelTowerUpperFloors|TestElevDoorARef073|1 +XPDRttP01SteelTowerUpperFloors|TestElevDoorTriggerARef054|1 +XPDRttP01SteelTowerUpperFloors|TestElevDoorTriggerARef069|1 +XPDRttP01SteelTowerUpperFloors|XPDPitt01SteelTower_UpperFloorsMarker001|1 +XPDRttP01SteelTowerUpperFloors|XPDRttP01_SteelTowerUpperFloors_Turf_TVStation01|1 +XPDRttP01SteelTowerUpperFloors|XPDRttP01_UpperFloorsExit01_01|1 +XPDRttP01SteelTowerUpperFloors|XPDRttP01_UpperFloorsExit01_02|1 +XPDRttP01SteelTowerUpperFloors|XPDRttP01_UpperFloorsExit01_03|1 +XPDRttP01SteelTowerUpperFloors|XPDRttP01_UpperFloorsExit01_04|1 ==Total standard entities by spawnChance by Space== AMSHQ01|50|6 AMSHQ01|75|1 @@ -14206,23 +15063,23 @@ AMSHQ01|100|5474 AMSHQ02|100|1993 AVRMedicalCenter01|100|5936 AlleghenyAsylum01|100|15013 -Appalachia|50|42 -Appalachia|75|136 +Appalachia|50|43 +Appalachia|75|142 Appalachia|85|72 -Appalachia|100|3081352 +Appalachia|100|3084384 ArktosPharmaLab01|50|1 ArktosPharmaLab01|75|1 -ArktosPharmaLab01|100|17160 +ArktosPharmaLab01|100|17161 ArktosPharmaLabDungeon|50|1 ArktosPharmaLabDungeon|75|1 ArktosPharmaLabDungeon|100|14621 -BelchingBetty01|100|5220 +BelchingBetty01|100|5218 BigBendTunnel01|100|7551 BlackwaterMine01|100|6166 BlueRidgeOffice01|50|1 BlueRidgeOffice01|100|765 BurdetteManorBasement01|100|499 -BurningMine01|100|6137 +BurningMine01|100|6136 Burrows01|75|8 Burrows01|100|20165 CharGen01|100|7052 @@ -14245,7 +15102,7 @@ EasternRegionalPen01|100|11438 EmmettMountainDisposalSite01|50|4 EmmettMountainDisposalSite01|75|6 EmmettMountainDisposalSite01|100|4847 -EnclaveResearchFacility01|100|18740 +EnclaveResearchFacility01|100|18742 FortAtlas01|100|5184 FortAtlasDungeon01|100|12665 FoundationInt01|100|5372 @@ -14258,7 +15115,7 @@ FreeStatesBunker03|100|1043 FreeStatesBunker04|100|1254 FreeStatesBunker06|100|949 FreeStatesBunker07|100|1049 -GarrahanMiningHQ01|100|9201 +GarrahanMiningHQ01|100|9200 GarrahanMiningHQDungeon|100|7694 GauleyMine01|100|4177 GlassedCavern01|100|9043 @@ -14272,6 +15129,7 @@ HornwrightHQ01|100|5951 HornwrightSafeRoom01|50|1 HornwrightSafeRoom01|75|2 HornwrightSafeRoom01|100|1041 +IngramMansion01|100|936 KerwoodMine01|100|5667 LewisandSonsFarmingSupply01|100|461 LousMine01|75|3 @@ -14289,16 +15147,22 @@ MorgantownApartment01|100|1362 MorgantownHighSchool01|100|5953 MorgantownHighSchoolDungeon|100|5561 MountBlairWarehouseBasement01|100|319 -NPEVault7601|100|7090 +NPECultistCave|50|2 +NPECultistCave|75|2 +NPECultistCave|100|4241 +NPEVault7601|100|7064 +NVEShelter01|100|360 +NVEVault7601|100|7137 NukaColaQuantumPlant01|100|5477 OrwellOrchardsShelter01|100|2209 OverseersHome01|100|1250 PoseidonPlant01|100|15660 PoseidonPlant02|100|4189 RadioResearchCenter01|100|3472 -RaiderCave01|100|1016 +RaiderCave01|75|2 +RaiderCave01|100|1442 RaiderCave02|100|1874 -RaiderCave03|100|1028 +RaiderCave03|100|1681 RaiderRaidTrailerInt|100|106 RiversideManor01|100|7433 RobCoResearchCenter01|50|3 @@ -14311,6 +15175,7 @@ SettlerBugOutCave|100|372 SheltersCave01|100|534 SheltersCave02|100|608 SheltersClaimCenter01|100|976 +SheltersHighStakes|100|2666 SheltersMissileSilo|100|493 SheltersPittTrench01|100|1142 SheltersRootCellar|100|595 @@ -14336,7 +15201,7 @@ TheRustyPick01|100|2442 TheWayward01|100|1719 ThunderMtPowerPlant01|100|9415 TopOfTheWorld01|100|4652 -TunnelOfLoveMineshaft01|100|4419 +TunnelOfLoveMineshaft01|100|4422 UCB01|100|4569 UCB02|100|77 UncannyCaverns01|100|4228 @@ -14344,7 +15209,7 @@ UncannyCaverns02|100|3191 UncannyCavernsDungeon|100|7410 VTecAgCenter01|50|9 VTecAgCenter01|100|3127 -ValleyGalleria01|100|8633 +ValleyGalleria01|100|8635 VanLoweTaxidermy01|75|3 VanLoweTaxidermy01|100|1964 Vault51Dungeon|100|9604 @@ -14355,7 +15220,7 @@ Vault79Main|50|1 Vault79Main|100|18850 Vault94Dungeon|50|6 Vault94Dungeon|75|6 -Vault94Dungeon|100|17472 +Vault94Dungeon|100|17471 Vault94DungeonGECK|50|1 Vault94DungeonGECK|75|5 Vault94DungeonGECK|100|4598 @@ -14363,7 +15228,7 @@ Vault94Entrance|100|1320 Vault96Dungeon|75|4 Vault96Dungeon|100|21754 VaultTecU01|75|1 -VaultTecU01|100|10712 +VaultTecU01|100|10710 WVLumberCo01|50|1 WVLumberCo01|75|3 WVLumberCo01|100|1543 @@ -14381,19 +15246,34 @@ WestTek01|100|11786 WestTek02|75|1 WestTek02|100|5126 WhitespringBunker01|100|16333 -WhitespringMall01|100|6940 -WhitespringRefuge01|100|11498 +WhitespringMall01|100|6947 +WhitespringRefuge01|100|11685 +XPDAC01Casino|100|13709 +XPDAC01EntertainmentDistrict|100|6791 +XPDAC01NightClub|100|2951 +XPDAC02Aquarium|100|16041 +XPDAC02Boardwalk|75|1 +XPDAC02Boardwalk|100|10582 +XPDAC02Pier|75|2 +XPDAC02Pier|100|7302 +XPDAC03CityHall|100|4106 +XPDAC03CommunityCenter|100|4640 +XPDAC03FloodedCityCenter|100|20059 XPDPitt01Foundry|50|9 XPDPitt01Foundry|75|11 XPDPitt01Foundry|100|16918 XPDPitt01Industrial|50|4 XPDPitt01Industrial|75|3 -XPDPitt01Industrial|100|20134 +XPDPitt01Industrial|100|20262 +XPDPitt02ACCJ|100|15 XPDPitt02Sanctum|75|2 XPDPitt02Sanctum|100|18032 XPDPitt02Trench|50|4 XPDPitt02Trench|75|8 XPDPitt02Trench|100|21225 +XPDRttP01SteelTower|100|10075 +XPDRttP01SteelTowerRoof|100|2002 +XPDRttP01SteelTowerUpperFloors|100|6241 ==Total Scrap and Junk per Component per Space== AMSHQ01|Acid|1|1 AMSHQ01|Aluminum|7|4 @@ -14499,39 +15379,39 @@ AlleghenyAsylum01|Screw|30|25 AlleghenyAsylum01|Spring|32|30 AlleghenyAsylum01|Steel|254|168 AlleghenyAsylum01|Wood|94|71 -Appalachia|Acid|1358|876 -Appalachia|Adhesive|1156|490 -Appalachia|Aluminum|2130|1501 -Appalachia|Antiseptic|872|412 -Appalachia|Asbestos|1609|1196 -Appalachia|Ballistic Fiber|184|92 -Appalachia|Bone|3419|1305 -Appalachia|Ceramic|3801|3284 -Appalachia|Circuitry|461|365 -Appalachia|Cloth|5766|5132 -Appalachia|Concrete|2301|421 -Appalachia|Copper|1521|1439 -Appalachia|Cork|628|511 -Appalachia|Crystal|323|197 -Appalachia|Fertilizer|1064|374 -Appalachia|Fiber Optics|40|39 -Appalachia|Fiberglass|936|699 -Appalachia|Gear|1135|958 -Appalachia|Glass|8972|7417 -Appalachia|Gold|78|78 +Appalachia|Acid|1371|886 +Appalachia|Adhesive|1171|498 +Appalachia|Aluminum|2145|1512 +Appalachia|Antiseptic|882|418 +Appalachia|Asbestos|1624|1209 +Appalachia|Ballistic Fiber|188|94 +Appalachia|Bone|3432|1310 +Appalachia|Ceramic|3838|3310 +Appalachia|Circuitry|472|371 +Appalachia|Cloth|5804|5165 +Appalachia|Concrete|2315|423 +Appalachia|Copper|1525|1442 +Appalachia|Cork|631|513 +Appalachia|Crystal|328|200 +Appalachia|Fertilizer|1084|379 +Appalachia|Fiber Optics|41|40 +Appalachia|Fiberglass|937|700 +Appalachia|Gear|1152|972 +Appalachia|Glass|9062|7493 +Appalachia|Gold|80|80 Appalachia|Gunpowder|1|1 -Appalachia|Lead|5275|3051 -Appalachia|Leather|1915|862 -Appalachia|Nuclear Material|136|136 -Appalachia|Oil|3652|2446 -Appalachia|Plastic|5698|4048 -Appalachia|Rubber|1990|1203 -Appalachia|Screw|1175|1056 -Appalachia|Silver|262|221 -Appalachia|Spring|1283|1252 -Appalachia|Steel|15449|9217 +Appalachia|Lead|5306|3071 +Appalachia|Leather|1922|866 +Appalachia|Nuclear Material|139|139 +Appalachia|Oil|3689|2464 +Appalachia|Plastic|5760|4087 +Appalachia|Rubber|2000|1210 +Appalachia|Screw|1198|1070 +Appalachia|Silver|270|227 +Appalachia|Spring|1296|1265 +Appalachia|Steel|15634|9329 Appalachia|Ultracite|1|1 -Appalachia|Wood|4761|3324 +Appalachia|Wood|4832|3368 ArktosPharmaLab01|Acid|48|33 ArktosPharmaLab01|Adhesive|10|3 ArktosPharmaLab01|Aluminum|31|25 @@ -14597,15 +15477,14 @@ BelchingBetty01|Circuitry|1|1 BelchingBetty01|Cloth|10|6 BelchingBetty01|Copper|6|4 BelchingBetty01|Fiberglass|5|3 -BelchingBetty01|Gear|5|5 +BelchingBetty01|Gear|4|4 BelchingBetty01|Glass|9|9 -BelchingBetty01|Lead|2|1 BelchingBetty01|Nuclear Material|2|2 BelchingBetty01|Oil|6|5 BelchingBetty01|Plastic|4|3 BelchingBetty01|Screw|4|4 BelchingBetty01|Spring|6|6 -BelchingBetty01|Steel|25|16 +BelchingBetty01|Steel|21|13 BelchingBetty01|Wood|14|11 BigBendTunnel01|Acid|7|4 BigBendTunnel01|Aluminum|2|2 @@ -15594,6 +16473,19 @@ HornwrightSafeRoom01|Rubber|1|1 HornwrightSafeRoom01|Screw|1|1 HornwrightSafeRoom01|Steel|7|4 HornwrightSafeRoom01|Wood|1|1 +IngramMansion01|Acid|1|1 +IngramMansion01|Aluminum|2|1 +IngramMansion01|Antiseptic|2|1 +IngramMansion01|Ceramic|11|11 +IngramMansion01|Circuitry|1|1 +IngramMansion01|Cloth|5|4 +IngramMansion01|Copper|3|3 +IngramMansion01|Glass|17|15 +IngramMansion01|Plastic|2|2 +IngramMansion01|Screw|1|1 +IngramMansion01|Silver|1|1 +IngramMansion01|Steel|5|3 +IngramMansion01|Wood|3|2 KerwoodMine01|Acid|4|2 KerwoodMine01|Aluminum|10|5 KerwoodMine01|Copper|2|1 @@ -15890,6 +16782,20 @@ MountBlairWarehouseBasement01|Screw|1|1 MountBlairWarehouseBasement01|Spring|1|1 MountBlairWarehouseBasement01|Steel|13|9 MountBlairWarehouseBasement01|Wood|2|2 +NPECultistCave|Acid|2|1 +NPECultistCave|Adhesive|1|1 +NPECultistCave|Aluminum|2|1 +NPECultistCave|Bone|12|6 +NPECultistCave|Cloth|4|4 +NPECultistCave|Glass|2|2 +NPECultistCave|Lead|3|2 +NPECultistCave|Oil|1|1 +NPECultistCave|Plastic|2|2 +NPECultistCave|Rubber|1|1 +NPECultistCave|Screw|6|6 +NPECultistCave|Spring|4|4 +NPECultistCave|Steel|33|17 +NPECultistCave|Wood|6|5 NPEVault7601|Acid|34|26 NPEVault7601|Adhesive|78|24 NPEVault7601|Aluminum|66|42 @@ -15915,6 +16821,31 @@ NPEVault7601|Silver|54|36 NPEVault7601|Spring|72|30 NPEVault7601|Steel|205|109 NPEVault7601|Wood|154|89 +NVEVault7601|Acid|34|26 +NVEVault7601|Adhesive|78|24 +NVEVault7601|Aluminum|66|42 +NVEVault7601|Antiseptic|54|24 +NVEVault7601|Asbestos|6|6 +NVEVault7601|Ceramic|32|20 +NVEVault7601|Circuitry|54|18 +NVEVault7601|Cloth|210|111 +NVEVault7601|Copper|19|19 +NVEVault7601|Cork|30|18 +NVEVault7601|Crystal|36|12 +NVEVault7601|Fiberglass|43|37 +NVEVault7601|Gear|62|25 +NVEVault7601|Glass|299|162 +NVEVault7601|Lead|16|8 +NVEVault7601|Leather|108|54 +NVEVault7601|Nuclear Material|6|6 +NVEVault7601|Oil|66|24 +NVEVault7601|Plastic|128|77 +NVEVault7601|Rubber|12|6 +NVEVault7601|Screw|62|31 +NVEVault7601|Silver|54|36 +NVEVault7601|Spring|72|30 +NVEVault7601|Steel|205|109 +NVEVault7601|Wood|154|89 NukaColaQuantumPlant01|Adhesive|13|5 NukaColaQuantumPlant01|Aluminum|20|17 NukaColaQuantumPlant01|Asbestos|5|3 @@ -16063,14 +16994,16 @@ RadioResearchCenter01|Spring|16|16 RadioResearchCenter01|Steel|65|42 RadioResearchCenter01|Wood|41|29 RaiderCave01|Black Titanium|2|2 +RaiderCave01|Circuitry|4|2 RaiderCave01|Cloth|2|2 RaiderCave01|Gear|2|2 -RaiderCave01|Glass|6|5 -RaiderCave01|Lead|1|1 +RaiderCave01|Glass|4|4 +RaiderCave01|Lead|6|2 RaiderCave01|Leather|4|2 -RaiderCave01|Oil|3|2 -RaiderCave01|Steel|14|9 -RaiderCave01|Wood|1|1 +RaiderCave01|Oil|7|4 +RaiderCave01|Screw|2|2 +RaiderCave01|Steel|19|12 +RaiderCave01|Wood|5|3 RaiderCave02|Acid|7|4 RaiderCave02|Aluminum|10|6 RaiderCave02|Asbestos|3|2 @@ -16091,17 +17024,21 @@ RaiderCave02|Screw|1|1 RaiderCave02|Spring|2|2 RaiderCave02|Steel|18|10 RaiderCave02|Wood|6|4 -RaiderCave03|Asbestos|4|3 -RaiderCave03|Cloth|4|4 +RaiderCave03|Asbestos|5|4 +RaiderCave03|Ceramic|1|1 +RaiderCave03|Cloth|8|6 RaiderCave03|Copper|1|1 RaiderCave03|Gear|1|1 -RaiderCave03|Glass|23|22 -RaiderCave03|Leather|2|1 -RaiderCave03|Oil|3|2 -RaiderCave03|Plastic|8|5 -RaiderCave03|Spring|1|1 -RaiderCave03|Steel|9|5 -RaiderCave03|Wood|1|1 +RaiderCave03|Glass|27|24 +RaiderCave03|Lead|1|1 +RaiderCave03|Leather|4|2 +RaiderCave03|Oil|17|11 +RaiderCave03|Plastic|11|7 +RaiderCave03|Rubber|2|1 +RaiderCave03|Screw|1|1 +RaiderCave03|Spring|3|3 +RaiderCave03|Steel|33|17 +RaiderCave03|Wood|2|2 RaiderRaidTrailerInt|Adhesive|1|1 RaiderRaidTrailerInt|Aluminum|1|1 RaiderRaidTrailerInt|Asbestos|6|4 @@ -17192,27 +18129,27 @@ WhitespringMall01|Nuclear Material|1|1 WhitespringMall01|Oil|31|23 WhitespringMall01|Plastic|69|50 WhitespringMall01|Rubber|14|10 -WhitespringMall01|Screw|40|24 +WhitespringMall01|Screw|39|23 WhitespringMall01|Silver|32|24 WhitespringMall01|Spring|55|43 -WhitespringMall01|Steel|256|154 -WhitespringMall01|Wood|95|60 +WhitespringMall01|Steel|250|151 +WhitespringMall01|Wood|92|58 WhitespringRefuge01|Acid|1|1 WhitespringRefuge01|Aluminum|18|12 WhitespringRefuge01|Antiseptic|5|4 WhitespringRefuge01|Asbestos|10|7 WhitespringRefuge01|Bone|1|1 -WhitespringRefuge01|Ceramic|158|120 +WhitespringRefuge01|Ceramic|169|128 WhitespringRefuge01|Circuitry|10|6 -WhitespringRefuge01|Cloth|50|35 +WhitespringRefuge01|Cloth|54|37 WhitespringRefuge01|Concrete|3|1 WhitespringRefuge01|Copper|8|7 WhitespringRefuge01|Cork|2|1 WhitespringRefuge01|Crystal|3|3 WhitespringRefuge01|Fiber Optics|3|3 -WhitespringRefuge01|Fiberglass|13|9 +WhitespringRefuge01|Fiberglass|15|10 WhitespringRefuge01|Gear|6|6 -WhitespringRefuge01|Glass|64|46 +WhitespringRefuge01|Glass|72|54 WhitespringRefuge01|Gold|2|2 WhitespringRefuge01|Lead|12|10 WhitespringRefuge01|Leather|8|5 @@ -17224,7 +18161,172 @@ WhitespringRefuge01|Screw|8|8 WhitespringRefuge01|Silver|1|1 WhitespringRefuge01|Spring|12|12 WhitespringRefuge01|Steel|107|83 -WhitespringRefuge01|Wood|109|66 +WhitespringRefuge01|Wood|111|67 +XPDAC01Casino|Acid|17|14 +XPDAC01Casino|Adhesive|24|10 +XPDAC01Casino|Aluminum|25|18 +XPDAC01Casino|Antiseptic|18|9 +XPDAC01Casino|Asbestos|85|60 +XPDAC01Casino|Bone|7|3 +XPDAC01Casino|Ceramic|209|166 +XPDAC01Casino|Circuitry|16|16 +XPDAC01Casino|Cloth|182|137 +XPDAC01Casino|Copper|42|35 +XPDAC01Casino|Cork|5|4 +XPDAC01Casino|Crystal|10|4 +XPDAC01Casino|Fertilizer|12|3 +XPDAC01Casino|Fiberglass|53|36 +XPDAC01Casino|Gear|25|23 +XPDAC01Casino|Glass|238|214 +XPDAC01Casino|Gold|4|4 +XPDAC01Casino|Lead|89|33 +XPDAC01Casino|Leather|4|2 +XPDAC01Casino|Oil|52|35 +XPDAC01Casino|Plastic|127|83 +XPDAC01Casino|Rubber|29|22 +XPDAC01Casino|Screw|24|22 +XPDAC01Casino|Silver|60|60 +XPDAC01Casino|Spring|27|27 +XPDAC01Casino|Steel|322|226 +XPDAC01Casino|Wood|121|81 +XPDAC01EntertainmentDistrict|Aluminum|3|3 +XPDAC01EntertainmentDistrict|Asbestos|3|3 +XPDAC01EntertainmentDistrict|Ballistic Fiber|2|1 +XPDAC01EntertainmentDistrict|Bone|9|3 +XPDAC01EntertainmentDistrict|Ceramic|1|1 +XPDAC01EntertainmentDistrict|Circuitry|2|2 +XPDAC01EntertainmentDistrict|Cloth|27|22 +XPDAC01EntertainmentDistrict|Copper|2|2 +XPDAC01EntertainmentDistrict|Fertilizer|1|1 +XPDAC01EntertainmentDistrict|Fiberglass|2|2 +XPDAC01EntertainmentDistrict|Glass|21|16 +XPDAC01EntertainmentDistrict|Lead|5|5 +XPDAC01EntertainmentDistrict|Leather|3|1 +XPDAC01EntertainmentDistrict|Nuclear Material|2|2 +XPDAC01EntertainmentDistrict|Plastic|18|17 +XPDAC01EntertainmentDistrict|Rubber|2|1 +XPDAC01EntertainmentDistrict|Screw|2|2 +XPDAC01EntertainmentDistrict|Silver|3|2 +XPDAC01EntertainmentDistrict|Spring|2|2 +XPDAC01EntertainmentDistrict|Steel|27|11 +XPDAC01EntertainmentDistrict|Wood|3|2 +XPDAC01NightClub|Aluminum|4|3 +XPDAC01NightClub|Antiseptic|1|1 +XPDAC01NightClub|Asbestos|6|5 +XPDAC01NightClub|Ceramic|31|30 +XPDAC01NightClub|Circuitry|1|1 +XPDAC01NightClub|Cloth|23|19 +XPDAC01NightClub|Copper|7|7 +XPDAC01NightClub|Cork|1|1 +XPDAC01NightClub|Crystal|3|1 +XPDAC01NightClub|Fiberglass|2|1 +XPDAC01NightClub|Gear|2|1 +XPDAC01NightClub|Glass|181|142 +XPDAC01NightClub|Gold|4|4 +XPDAC01NightClub|Lead|1|1 +XPDAC01NightClub|Leather|2|1 +XPDAC01NightClub|Nuclear Material|1|1 +XPDAC01NightClub|Oil|7|4 +XPDAC01NightClub|Plastic|18|12 +XPDAC01NightClub|Rubber|8|5 +XPDAC01NightClub|Screw|6|6 +XPDAC01NightClub|Silver|6|3 +XPDAC01NightClub|Spring|7|5 +XPDAC01NightClub|Steel|100|79 +XPDAC01NightClub|Wood|30|15 +XPDAC02Aquarium|Acid|8|7 +XPDAC02Aquarium|Adhesive|3|3 +XPDAC02Aquarium|Aluminum|15|15 +XPDAC02Aquarium|Antiseptic|24|12 +XPDAC02Aquarium|Asbestos|38|36 +XPDAC02Aquarium|Ceramic|47|46 +XPDAC02Aquarium|Circuitry|8|8 +XPDAC02Aquarium|Cloth|57|53 +XPDAC02Aquarium|Copper|15|15 +XPDAC02Aquarium|Fiberglass|14|13 +XPDAC02Aquarium|Gear|10|8 +XPDAC02Aquarium|Glass|220|189 +XPDAC02Aquarium|Lead|24|15 +XPDAC02Aquarium|Leather|18|9 +XPDAC02Aquarium|Oil|20|14 +XPDAC02Aquarium|Plastic|185|40 +XPDAC02Aquarium|Rubber|65|39 +XPDAC02Aquarium|Screw|16|15 +XPDAC02Aquarium|Silver|95|95 +XPDAC02Aquarium|Spring|48|48 +XPDAC02Aquarium|Steel|225|173 +XPDAC02Aquarium|Wood|85|67 +XPDAC02Boardwalk|Acid|14|11 +XPDAC02Boardwalk|Aluminum|2|2 +XPDAC02Boardwalk|Antiseptic|10|5 +XPDAC02Boardwalk|Asbestos|20|15 +XPDAC02Boardwalk|Ballistic Fiber|6|3 +XPDAC02Boardwalk|Ceramic|68|63 +XPDAC02Boardwalk|Circuitry|3|3 +XPDAC02Boardwalk|Cloth|91|77 +XPDAC02Boardwalk|Concrete|3|1 +XPDAC02Boardwalk|Copper|3|3 +XPDAC02Boardwalk|Cork|2|1 +XPDAC02Boardwalk|Fertilizer|12|3 +XPDAC02Boardwalk|Fiberglass|4|3 +XPDAC02Boardwalk|Gear|6|6 +XPDAC02Boardwalk|Glass|56|53 +XPDAC02Boardwalk|Lead|34|26 +XPDAC02Boardwalk|Leather|46|17 +XPDAC02Boardwalk|Oil|3|3 +XPDAC02Boardwalk|Plastic|43|23 +XPDAC02Boardwalk|Rubber|19|10 +XPDAC02Boardwalk|Screw|14|14 +XPDAC02Boardwalk|Spring|17|17 +XPDAC02Boardwalk|Steel|80|56 +XPDAC02Boardwalk|Wood|34|24 +XPDAC02Pier|Acid|4|2 +XPDAC02Pier|Aluminum|6|4 +XPDAC02Pier|Asbestos|13|9 +XPDAC02Pier|Ceramic|35|32 +XPDAC02Pier|Circuitry|5|4 +XPDAC02Pier|Cloth|103|98 +XPDAC02Pier|Copper|2|2 +XPDAC02Pier|Cork|9|5 +XPDAC02Pier|Crystal|3|1 +XPDAC02Pier|Fiberglass|3|2 +XPDAC02Pier|Gear|10|9 +XPDAC02Pier|Glass|29|23 +XPDAC02Pier|Lead|13|10 +XPDAC02Pier|Leather|26|12 +XPDAC02Pier|Nuclear Material|2|2 +XPDAC02Pier|Oil|5|3 +XPDAC02Pier|Plastic|156|119 +XPDAC02Pier|Rubber|52|27 +XPDAC02Pier|Screw|8|8 +XPDAC02Pier|Silver|2|2 +XPDAC02Pier|Spring|34|33 +XPDAC02Pier|Steel|83|60 +XPDAC02Pier|Wood|39|24 +XPDAC03CityHall|Circuitry|4|4 +XPDAC03CityHall|Copper|4|4 +XPDAC03CityHall|Fiberglass|4|4 +XPDAC03CityHall|Gear|2|1 +XPDAC03CityHall|Screw|3|1 +XPDAC03CityHall|Spring|2|1 +XPDAC03CityHall|Steel|5|1 +XPDAC03CommunityCenter|Copper|2|2 +XPDAC03CommunityCenter|Lead|30|4 +XPDAC03CommunityCenter|Steel|5|3 +XPDAC03FloodedCityCenter|Aluminum|4|3 +XPDAC03FloodedCityCenter|Bone|2|1 +XPDAC03FloodedCityCenter|Ceramic|1|1 +XPDAC03FloodedCityCenter|Copper|3|3 +XPDAC03FloodedCityCenter|Crystal|1|1 +XPDAC03FloodedCityCenter|Fiber Optics|1|1 +XPDAC03FloodedCityCenter|Fiberglass|1|1 +XPDAC03FloodedCityCenter|Gear|1|1 +XPDAC03FloodedCityCenter|Glass|17|16 +XPDAC03FloodedCityCenter|Lead|1|1 +XPDAC03FloodedCityCenter|Oil|3|2 +XPDAC03FloodedCityCenter|Screw|1|1 +XPDAC03FloodedCityCenter|Steel|1|1 +XPDAC03FloodedCityCenter|Wood|3|2 XPDPitt01Foundry|Acid|79|43 XPDPitt01Foundry|Adhesive|70|28 XPDPitt01Foundry|Aluminum|63|45 @@ -17331,6 +18433,8 @@ XPDPitt02Trench|Screw|12|12 XPDPitt02Trench|Spring|12|12 XPDPitt02Trench|Steel|237|142 XPDPitt02Trench|Wood|55|49 +XPDRttP01SteelTower|Screw|1|1 +XPDRttP01SteelTower|Wood|2|1 ==Average (variable only) Spawn chance and Count per NPC per Space== AMSHQ01|Robot|100.0|2 AVRMedicalCenter01|Scorched|100.0|21 @@ -17341,27 +18445,27 @@ Appalachia|Bloodbug|41.98|70 Appalachia|Cave Cricket|8.19|159 Appalachia|Deathclaw|23.5|6 Appalachia|Fog Crawler|12.63|45 -Appalachia|Ghoul|49.37|1020 +Appalachia|Ghoul|49.47|1017 Appalachia|Gulper|17.44|108 Appalachia|Honey Beast|19.18|7 Appalachia|Insect|16.23|229 -Appalachia|Liberator|16.61|456 +Appalachia|Liberator|16.61|453 Appalachia|Mega Sloth|17.63|8 Appalachia|Mirelurk|31.09|167 Appalachia|Mole Miner|60.64|192 -Appalachia|Mole Rat|14.69|518 +Appalachia|Mole Rat|14.68|515 Appalachia|Rad Ant|25.0|14 Appalachia|Rad Rat|9.03|339 Appalachia|Rad Scorpion|15.8|100 Appalachia|Rad Toad|17.41|48 Appalachia|Radroach|25.0|2 -Appalachia|Robot|38.48|417 -Appalachia|Scorched|55.25|1108 +Appalachia|Robot|38.64|414 +Appalachia|Scorched|55.36|1105 Appalachia|Snallygaster|67.03|26 -Appalachia|Stingwing|57.14|6 +Appalachia|Stingwing|57.15|6 Appalachia|Super Mutant|45.7|794 Appalachia|Tick|64.29|7 -Appalachia|Vicious Dog|15.4|497 +Appalachia|Vicious Dog|15.39|494 Appalachia|Wolf|19.98|182 Appalachia|Yao Guai|10.55|129 ArktosPharmaLab01|Ghoul|100.0|3 @@ -17414,10 +18518,12 @@ WestTek01|Super Mutant|100.0|41 005A7C2E|FortAtlasDungeon01|Atlas Substructure|0|4363|-9226|-10127|18854|-19939|1487|700|0|1.2 005B1E4A|SheltersVaultLivingQuarters01|Vault Quarters Shelter|0|-4288|-2378|-6912|-1664|-5588|832|-900|-700|1.3 000042F4|SugarGroveMissileSilo01|Missile Silo Alpha|0|-8234|-30161|-15252|-1216|-37728|-22594|0|0|1.0 -005B59C8|RaiderCave03|Mirelurk Den|0|1056|-849|-2393|4506|-4644|2945|0|0|1.0 +005B59C8|RaiderCave03|Mirelurk Den|0|1056|-51|-1553|3665|-3603|3501|0|0|1.0 006975E4|SheltersSoundStage|Sound Stage Shelter|0|-1424|994|-2834|-15|-864|2852|0|0|1.0 +0069506E|XPDAC03CityHall|City Hall|0|773|4273|-3516|5062|-1153|9700|500|0|1.4 001294F4|WhitespringBunker01|Whitespring Bunker|0|-16858|-6933|-23104|-10613|-12653|-1213|0|0|1.0 -0001A69E|ValleyGalleria01|Valley Galleria|0|163|-1144|-5377|5703|-6768|4480|0|0|1.0 +0068CC70|XPDAC02Pier|Showman's Pier|0|1104|3776|-6064|8272|-1920|9472|0|200|1.3 +0001A69E|ValleyGalleria01|Valley Galleria|0|163|1128|-5377|5703|-6768|9024|0|0|1.0 0039E892|FreeStatesBunker06|Abandoned Bunker|0|165|1480|-1064|1394|272|2688|0|0|1.0 0043CE8E|MorgantownApartment01|Shadowbreeze Apartments|0|-387|-310|-1276|501|-1374|754|0|0|1.0 005A6C66|FoundationSupplyRoom01|Foundation Supply Room|0|-134|210|-768|499|-707|1127|0|500|1.0 @@ -17434,10 +18540,13 @@ WestTek01|Super Mutant|100.0|41 0041BC67|MorgantownAirportTerminal02|Morgantown Airport Terminal|0|85|39|-2543|2713|-2357|2435|0|0|1.0 005A5547|SheltersVaultServerRoom01|Server Room Shelter|0|4870|-1401|-1184|10924|-7408|4606|1700|1000|1.7 0060D363|SheltersCave01|Abandoned Mine Shelter|0|1004|778|-2488|4496|-2315|3872|0|0|1.0 +0069506F|XPDAC03CommunityCenter|Community Center|0|1626|2508|-9725|12978|-4381|9398|0|0|2.5 005A7AD1|BlueRidgeOffice01|Blue Ridge Office|0|-107|-101|-1732|1517|-1726|1524|200|0|2.2 +0068CC71|XPDAC02Boardwalk|The Boardwalk|0|-33441|-10305|-94530|27648|-35712|15102|-5000|200|4.7 0000F0FB|BigBendTunnel01|Big Bend Tunnels|0|1888|17175|-5275|9051|86|34264|0|0|1.0 00574627|RollinsLaborCamp01|Rollins Prison|0|245|473|-1024|1514|-973|1920|200|-1100|1.7 006378CF|XPDPitt02Sanctum|Sanctum|0|3368|103|-3137|9874|-5889|6096|0|0|1.0 +006A275B|IngramMansion01|Ingram Mansion|0|672|119|-632|1976|-1026|1264|0|1000|1.0 0002E506|EmmettMountainDisposalSite01|Emmett Mountain Disposal Site|0|1356|1004|-2934|5647|-4560|6568|0|0|1.0 0061961E|ArktosPharmaLabDungeon|Arktos Pharma Biome Lab|0|-5489|-2981|-15190|4211|-9756|3794|0|0|1.0 0062406E|XPDPitt01Foundry|The Foundry|0|1735|4360|-5058|8529|-2416|11136|0|0|1.0 @@ -17447,9 +18556,12 @@ WestTek01|Super Mutant|100.0|41 0054B502|CharlestonCapitolCourthouse01|Charleston Capitol Courthouse|0|2307|-2239|0|4614|-4479|0|-1300|-850|1.3 005C38D6|SheltersClaimCenter01|Shelters Claim Center|0|-4898|144|-6280|-3516|-375|663|0|0|1.0 0066FCB2|GarrahanMiningHQDungeon|Garrahan Mining HQ|0|538|311|-4042|5119|-12335|12958|0|-250|2.0 +00687BF0|XPDRttP01SteelTowerUpperFloors|Steel Tower Upper Floors|0|27055|7296|-3520|57631|-9631|24223|9400|-2500|5.0 000402E2|SamBlackwellsDeathclawCave|Cavern|0|-5632|2061|-15744|4480|-2014|6137|-2200|200|1.9 +0053E8DF|XPDAC01EntertainmentDistrict|Casino Quarter|0|-3011|2304|-29576|23554|-24260|28869|-200|-600|2.0 0053F947|LousMine01|Carleton Mine|0|-7512|17618|-17914|2890|9233|26003|0|0|1.0 -005AFB11|RaiderCave01|Deserted Mine|0|850|1905|-3398|5098|-2236|6047|0|0|1.0 +00678787|XPDPitt02ACCJ|Purgatory|0|-211|-181|-843|421|-1026|663|-700|2000|2.5 +005AFB11|RaiderCave01|Deserted Mine|0|1349|1898|-1493|4191|-1026|4823|0|0|1.0 00004C43|GlassedCavern01|Glassed Cavern|0|-2827|-324|-13587|7933|-11385|10736|0|0|1.0 0004FF09|FreeStatesBunker03|Ella Ames' Bunker|0|1134|1822|-241|2510|741|2903|0|0|1.0 003FEE25|HornwrightSafeRoom01|Hornwright Estate Safe Room|0|75|896|-1560|1710|-128|1920|0|0|1.0 @@ -17461,10 +18573,12 @@ WestTek01|Super Mutant|100.0|41 0039EFE3|BelchingBetty01|Belching Betty|0|-1294|12787|-6063|3474|-326|25901|0|0|1.0 00431DED|PoseidonPlant02|Poseidon Energy Plant Expansion|0|-2341|3011|-6614|1932|-4837|10859|-400|-2700|2.0 00675A19|MorgantownHighSchoolDungeon|Morgantown High School|0|1396|-2890|-787|3579|-6799|1019|0|0|1.0 +00695071|XPDAC01NightClub|Quentino's Night Club|0|-768|1389|-3456|1920|-600|3378|0|0|1.0 0000D343|WatogaCivicCenter01|Watoga Civic Center|0|3397|1264|-668|7462|-2926|5455|0|0|1.0 0062E263|SheltersCave02|Forbidden Digsite Shelter|0|2088|-656|-2488|6664|-4064|2752|0|0|1.0 00044FEC|GauleyMine01|Gauley Mine|0|1508|1723|-4792|7808|-3159|6605|0|0|1.0 0010FE68|TheRustyPick01|The Rusty Pick|0|1687|1773|-255|3630|-1457|5004|0|0|1.0 +00678788|XPDRttP01SteelTower|Steel Tower|0|6093|10184|-23|12209|-641|21010|-500|1200|1.7 0012D4C2|BlackwaterMine01|Blackwater Mine|0|1292|-1378|-8954|11538|-5813|3057|0|0|1.0 00175BC8|SamBlackwellBunker02|Sam Blackwell's Bunker|0|568|1441|-986|2122|-574|3456|0|0|1.0 004306B0|TopOfTheWorld01|Mezzanine Level|0|105|230|-4191|4402|-4060|4521|0|0|1.0 @@ -17477,6 +18591,7 @@ WestTek01|Super Mutant|100.0|41 00589E9E|MonongahMine01|Monongah Mine|0|-7225|10298|-14339|-112|112|20484|0|0|1.0 0000237C|RobCoResearchCenter01|RobCo Research Center|0|-2584|1383|-6704|1536|-1872|4639|0|0|1.0 005500E0|CharlestonCapitolBuilding02|Charleston Capitol Building|0|-117|-1037|-4650|4416|-4244|2169|0|0|1.0 +00739AF1|SheltersHighStakes|High Stakes Shelter|0|219|681|-4468|4907|-3324|4686|0|0|1.0 004738DF|TheNukashine01|The Nukashine|0|564|899|-103|1232|-2|1801|0|0|1.0 00115C47|CultistCave01|Lucky Hole Mine|0|-794|-2826|-6225|4636|-8727|3075|0|0|1.0 0011B7B9|RiversideManor01|Riverside Manor|0|2608|492|-712|5928|-2368|3352|0|0|1.0 @@ -17484,10 +18599,12 @@ WestTek01|Super Mutant|100.0|41 004429C9|MonongahMissileSilo01|Missile Silo Bravo|0|-7626|-18947|-15252|0|-37728|-167|300|-2450|2.2 0016B4B7|KerwoodMine01|Kerwood Mine|0|-763|1488|-7814|6287|-6772|9749|0|0|1.0 004060AF|Vault79GoldVaultOperations|Gold Vault Operations|0|-2064|-6915|-6297|2169|-10953|-2878|0|0|1.0 +0067C2B7|XPDRttP01SteelTowerRoof|Steel Tower Rooftop|0|1625|1024|-17496|20747|-4120|6168|2000|0|4.0 0001A559|AMSHQ01|AMS Headquarters|0|-62|-120|-2176|2052|-2177|1936|0|0|1.0 000491C9|SugarGrove01|Sugar Grove|0|1284|4656|-1368|3936|1472|7840|0|0|1.0 00413025|GraftonSteelUnderground01|Grafton Steel Underground|0|-68|-3795|-6808|6671|-16036|8446|0|0|1.0 00004E11|WendigoCave01|Wendigo Cave|0|8971|-2210|184|17759|-9858|5437|0|0|1.0 +006AFE91|NVEVault7601|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 005C2E07|LewisandSonsFarmingSupply01|Putnam Residence|0|-284|-157|-825|256|-1026|711|0|0|1.0 00477C6A|FraternityHouse01|Pi House|0|546|998|-86|1179|493|1504|0|0|1.0 0058D442|BurdetteManorBasement01|Burdette Manor Basement|0|392|744|-264|1048|-286|1775|0|0|1.0 @@ -17499,6 +18616,7 @@ WestTek01|Super Mutant|100.0|41 00478804|FraternityHouse02|Eta Psi House|0|472|1143|-8|952|503|1784|0|0|1.0 0062781C|WhitespringMall01|Whitespring Mall|0|-7336|8301|-12496|-2176|6428|10175|0|0|1.0 004041F2|TheWayward01|The Wayward|0|1858|-158|-621|4338|-2376|2059|1100|600|2.2 +006F47E0|NPECultistCave|Organ Cave|0|3147|-9654|-3562|9856|-20724|1415|0|1600|1.5 00004017|VaultTecU01|Vault-Tec University|0|-4774|730|-10325|776|-3862|5322|0|0|1.0 005C60DB|DaggersDen02|Dagger's Throne Room|0|792|-1423|-2100|3685|-2807|-39|0|0|1.0 005D6247|Vault94DungeonGECK|Vault 94 G.E.C.K. Wing|0|-2031|-7354|-5077|1014|-10721|-3987|0|0|1.0 @@ -17511,9 +18629,10 @@ WestTek01|Super Mutant|100.0|41 0038C0B3|MTR08LodeBaring01|Abandoned Mine Shaft Elaine|0|3733|1296|-1264|8730|-6484|9076|0|0|1.0 0040593B|RaiderRaidTrailerInt|Trailer Interior|0|-96|-11|-516|323|-257|234|0|0|1.0 004E10F3|MountBlairWarehouseBasement01|Warehouse Basement|0|97|-1344|-702|896|-2112|-576|0|0|1.0 +006AF443|NVEShelter01|VR Shelter|0|2565|-788|-5742|10873|-5152|3576|1000|-200|1.4 0051EF4D|CharGen05|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 00616199|XPDPitt01Industrial|The Pitt - Industrial|0|-4744|-1415|-20382|10894|-15918|13088|0|0|1.0 -006BEEC5|NPEVault7601|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 +006BEEC5|NPEVault7601|Vault 76|0|1715|1223|-3162|6593|-3152|5598|0|0|1.0 0011F9E7|Vault94Entrance|Vault 94 Entrance|0|5684|15752|2952|8417|14390|17114|0|0|1.0 0051EF57|CharGen02|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 0060F37B|WatogaHighSchoolDungeon|Watoga High School|0|-1571|2284|-5728|2585|-1296|5864|0|0|1.0 @@ -17532,6 +18651,7 @@ WestTek01|Super Mutant|100.0|41 001D7232|HornwrightHQ01|Hornwright Industrial HQ|0|742|404|-939|2424|-2455|3264|0|0|1.0 00401116|Vault79Main|Vault 79|0|-1440|-2646|-13064|10183|-13490|8197|0|0|1.0 0051EF4E|CharGen04|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 +006A4378|XPDAC01Casino|The Neapolitan Casino|0|-2672|1290|-6400|1056|-4075|6656|0|0|1.0 00004586|EasternRegionalPen01|Eastern Regional Penitentiary|0|2936|-92|-320|6192|-5440|5255|0|0|1.0 006B8756|SheltersToxicWasteland|Toxic Wasteland|0|4258|1394|-41855|50372|-30185|32974|0|0|1.0 003D3915|MonongahPowerPlant01|Monongah Power Plant|0|-1219|2479|-5920|3482|-705|5664|0|0|1.0 @@ -17553,10 +18673,12 @@ WestTek01|Super Mutant|100.0|41 0003BDBB|UncannyCaverns01|Uncanny Caverns|0|1980|4821|-2676|6636|-806|10448|0|0|1.0 0040C1A7|CraterWatchstation01|Crater Watchstation Worksite|0|-1243|-3555|-4122|1636|-8328|1218|-150|-2000|1.8 0051EF4F|CharGen03|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 +0068CC6F|XPDAC02Aquarium|Aquarium of the Atlantic|0|-2001|-2492|-10369|6366|-11894|6910|0|0|1.0 +0069306F|XPDAC03FloodedCityCenter|Flooded City Center|0|3693|-3150|-12777|20163|-15753|9452|600|0|1.2 006D8953|SheltersRootCellar|Root Cellar Dungeon|0|3217|-2261|682|5752|-3682|-841|0|0|1.0 0039E891|FreeStatesBunker07|Ransacked Bunker|0|1125|2081|-320|2570|667|3496|0|0|1.0 005CC20D|WatogaCivicCenterDungeon|Watoga Raider Arena|0|3469|339|-524|7462|-3351|4030|0|0|1.0 003F880F|FoundationInt01|Foundation Interior|0|3171|-6042|-3576|9919|-15956|3872|1400|1800|1.7 006240BB|WhitespringRefuge01|Whitespring Refuge|0|-8840|10960|-16336|-1344|5056|16864|0|0|1.0 ==Instance IDs Count Vs Distinct== -3953268|3953268 +4077546|4077546 diff --git a/FO76Edit/Output/Skipped_spaces.csv b/FO76Edit/Output/Skipped_spaces.csv index 5c0d67d..f248822 100644 --- a/FO76Edit/Output/Skipped_spaces.csv +++ b/FO76Edit/Output/Skipped_spaces.csv @@ -51,6 +51,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00173A2B,DebugFlight,Debug Flight World,1 001E0D39,TestMadWorld,TastMadWorld,1 0043D900,DebugRussellWorld,DebugRussellWorld,1 +006E5A1F,DebugJeffUWorldspace01,DebugJeffU_Worldspace01,1 00004CF4,zCUTUnusedVault12003COPY0000,Stellwagen Gorge,0 0000F80C,,,0 00018704,,,0 @@ -74,6 +75,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 005CAAA8,zCUTDebugSheltersVaultTestMat01,Quick Test Cell,0 0060A0B8,DebugJeffU01,Quick Test Cell,0 006781A8,DebugRyanJohnson,Quick Test Cell,0 +0069D430,DebugJeffU05,Aquarium,0 00002E22,zCUTVault65,Vault 65,0 00008CAA,,,0 00180A56,COPY0108,,0 @@ -182,6 +184,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00587BCC,zCUTTestTheWaywardExt,Quick Test Cell,0 00602FAC,PackInSheltersEntranceVaultServerRoomLargeStorageCell,,0 00651080,PackInATXWavvyWillardsWaterBedPackInStorageCell,,0 +006EF488,zzzSheltersPatch50,Quick Test Cell,0 00083FFE,PackInLvlStingwingAmbushWallPackInStorageCell,,0 000A5E92,PackInLvlRadStagDefaultPackInStorageCell,,0 000CFD46,COPY0285,,0 @@ -446,6 +449,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00608AC5,,,0 0063220D,PackInZetanTubePackInStorageCell,,0 0063540D,,,0 +006AC521,DebugHillValley,Hill Valley,0 006C6DBD,PackInSCORES14CollectronpackinAutoMinerStorageCell,,0 00004007,zCUT76DangerRoom,76 PVP Playground,0 000042C3,zCUTTestDrewIndScraps,Quick Test Cell,0 @@ -555,6 +559,8 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00586D3C,PackInDenizenPackInScavengerSurveyorStorageCell,,0 005D16FC,zCUTDebugCameronL,Quick Test Cell,0 00669704,PackInNWOTNukaCrateStallTemplateNoLootStorageCell,,0 +006E5A20,DebugJeffU06,Quick Test Cell,0 +0072F440,DebugRyanJohnson2,,0 0001A92A,WarehouseTestEncounterTypes,Encounter Types Test Area,0 00162A62,COPY0081,,0 0016BAEA,COPY0085,,0 @@ -622,6 +628,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 004F7808,,,0 0051AD44,PackInMSiloOperationsConsoleLeft05StorageCell,,0 0067D4C0,DebugBrentC02,Quick Test Cell,0 +00695070,zCUTTest01,,0 00004062,,,0 0003BDBE,PackInPACKToxicClutterSm01StorageCell,,0 000500CA,COPY0042,,0 @@ -647,6 +654,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 005DBDFA,PackInATXDisplayMannequinRackMaleStorageCell,,0 005FEB02,PackInWorkshopFloraPumpkin02packinStorageCell,,0 00608AC6,,,0 +006F5196,PackInF1SurvivalTentFlatbedTruckStorageCell,,0 0001A8F8,,,0 0003D984,PackInLvlBloodbugAmbushCeilingPackInStorageCell,,0 0004BAE8,,,0 @@ -692,7 +700,6 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 004DE24B,,,0 0050D9AB,zCUTTestLogan,Quick Test Cell,0 0051AD63,PackInMSiloOperationsConsoleSingleTall18StorageCell,,0 -0053E8DF,zCUTProtoExpo04,Quick Test Cell,0 005ADDBB,PackInATXDoorNukaColaMachineSecretStorageCell,,0 005B1D03,,,0 005B7D7F,PackInSCORES1PKINCAMPDeployableFutureTecStorageCell,,0 @@ -926,7 +933,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 0022E09C,,,0 00275FC8,,,0 003CC138,,,0 -00407FD0,zCUTProtoExpo07,Quick Test Cell,0 +00407FD0,DebugCBernardo02,Quick Test Cell,0 005FBF6C,PackInScorchedTubePackInStorageCell,,0 0064D8E4,,,0 000017F6,,,0 @@ -1019,6 +1026,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 005C895A,PackInSheltersEntranceVaultReceptionSmallStorageCell,,0 005E9466,PackInTurretBubbleWallPackInStorageCell,,0 00677892,PackInATXMedievalPortcullisPKINStorageCell,,0 +006EC426,,,0 00001698,PackInWorkshopPACKWrhsPrefab01StorageCell,,0 000028F4,,,0 0000E0F0,PackInFEVDecalTrap02StorageCell,,0 @@ -1196,6 +1204,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 0051AD3D,PackInMSiloOperationsConsoleCabMid02StorageCell,,0 00564B45,DebugDobert03,Quick Test Cell,0 005C8AE1,PackInATXAmmoConverterpackinStorageCell,,0 +00731725,PackInF1SurvivalTentGazeboPKINStorageCell,,0 00001243,76HoldingCellSQHorde,Quick Test Cell,0 00017DEF,76HoldingCellMD03,Quick Test Cell,0 0004722F,zCUTTestCharGen02,Vault 76,0 @@ -1264,6 +1273,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 00528A0F,,,0 005350E3,DebugCarlM,Quick Test Cell,0 005544E3,,,0 +007451B7,PackInF1S15SurvivalTentGazeboPKINCStorageCell,,0 00011D92,,,0 001228DA,PackInPACKMtnTopShrubsSmall02StorageCell,,0 0014056A,PackInTreeMapleForest01CrowMarkerPackinStorageCell,,0 @@ -1417,6 +1427,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 0051AD48,PackInMSiloOperationsConsoleLeft01StorageCell,,0 005A29F0,PackInF1SurvivalTentRaiderStorageCell,,0 0062173C,,,0 +006EC234,DebugRyanJohnsonPOI,,0 000072CA,,,0 0001B2B6,COPY0256,,0 0003D97E,PackInLvlMirelurkAmbushWaterPackInStorageCell,,0 @@ -1639,6 +1650,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 0048683D,PackInStorageCellDUPLICATE006,,0 0051AD49,PackInMSiloOperationsConsoleRight04StorageCell,,0 00590369,zCUTClarksburgPharmacy01,Clarksburg Pharmacy,0 +0069B669,DebugJeffU04,Aquarium,0 006CD0F1,DebugGreenScreen,DebugGreenScreen,0 000028F7,,,0 00021BCB,,,0 diff --git a/Mappalachia/Properties/AssemblyInfo.cs b/Mappalachia/Properties/AssemblyInfo.cs index f71a091..fd2c010 100644 --- a/Mappalachia/Properties/AssemblyInfo.cs +++ b/Mappalachia/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.7.2")] -[assembly: AssemblyFileVersion("1.7.7.2")] +[assembly: AssemblyVersion("1.7.7.3")] +[assembly: AssemblyFileVersion("1.7.7.3")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Preprocessor/MapMarkers.cs b/Preprocessor/MapMarkers.cs index ee6c080..243f3b0 100644 --- a/Preprocessor/MapMarkers.cs +++ b/Preprocessor/MapMarkers.cs @@ -7,7 +7,10 @@ internal static class MapMarkers { const string bloodEagleMarker = "BloodEagleMarker"; const string cultistMarker = "CultistMarker"; + const string raiderMarker = "SkullRingMarker"; const string workshopMarker = "PublicWorkshopMarker"; + const string bosMarker = "BoSMarker"; + const string fastTravelBadString = "Fast Travel Point: "; const string fissureSite = "Fissure Site"; static readonly Regex validMapMarkerName = new Regex("^(([A-Z].*Marker)|WhitespringResort|NukaColaQuantumPlant|TrainTrackMark)$"); @@ -43,6 +46,9 @@ internal static class MapMarkers { "Lucky Hole Mine", cultistMarker }, { "Moth-Home", cultistMarker }, { "Sacrament", cultistMarker }, + { "Organ Cave North", cultistMarker }, + { "Organ Cave South", cultistMarker }, + { "Organ Cave West", cultistMarker }, { "Abandoned Bog Town", workshopMarker }, { "Beckley Mine Exhibit", workshopMarker }, { "Berkeley Springs West", workshopMarker }, @@ -64,9 +70,13 @@ internal static class MapMarkers { "Thunder Mt. Power Plant Yard", workshopMarker }, { "Tyler County Dirt Track", workshopMarker }, { "Wade Airport", workshopMarker }, + { "Ohio River Adventures", raiderMarker }, + { "The Crater", raiderMarker }, + { "The Coop", raiderMarker }, + { "Forward Station Alpha", bosMarker }, + { "Forward Station Delta", bosMarker }, + { "Forward Station Tango", bosMarker }, { "Foundation", "HammerWingMarker" }, - { "Ohio River Adventures", "SkullRingMarker" }, - { "The Crater", "SkullRingMarker" }, { "The Rusty Pick", "LegendaryPurveyorMarker" }, { "Vault 51", "Vault51Marker" }, { "Vault 79", "Vault79Marker" }, diff --git a/Preprocessor/SpaceNudge.cs b/Preprocessor/SpaceNudge.cs index 0b7fa57..527cf7c 100644 --- a/Preprocessor/SpaceNudge.cs +++ b/Preprocessor/SpaceNudge.cs @@ -157,6 +157,84 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 1.6f; break; + case "XPDAC03CityHall": + nudgeX = 500; + nudgeY = 0; + nudgeScale = 1.4f; + break; + + case "XPDAC02Pier": + nudgeX = 0; + nudgeY = 200; + nudgeScale = 1.3f; + break; + + case "XPDAC03CommunityCenter": + nudgeX = 0; + nudgeY = 0; + nudgeScale = 2.5f; + break; + + case "XPDAC02Boardwalk": + nudgeX = -5000; + nudgeY = 200; + nudgeScale = 4.7f; + break; + + case "IngramMansion01": + nudgeX = 0; + nudgeY = 1000; + nudgeScale = 1f; + break; + + case "XPDRttP01SteelTowerUpperFloors": + nudgeX = 9400; + nudgeY = -2500; + nudgeScale = 5f; + break; + + case "XPDAC01EntertainmentDistrict": + nudgeX = -200; + nudgeY = -600; + nudgeScale = 2f; + break; + + case "XPDPitt02ACCJ": + nudgeX = -700; + nudgeY = 2000; + nudgeScale = 2.5f; + break; + + case "XPDRttP01SteelTower": + nudgeX = -500; + nudgeY = 1200; + nudgeScale = 1.7f; + break; + + case "XPDRttP01SteelTowerRoof": + nudgeX = 2000; + nudgeY = 0; + nudgeScale = 4f; + break; + + case "NPECultistCave": + nudgeX = 0; + nudgeY = 1600; + nudgeScale = 1.5f; + break; + + case "NVEShelter01": + nudgeX = 1000; + nudgeY = -200; + nudgeScale = 1.4f; + break; + + case "XPDAC03FloodedCityCenter": + nudgeX = 600; + nudgeY = 0; + nudgeScale = 1.2f; + break; + default: nudgeX = 0; nudgeY = 0; diff --git a/README.md b/README.md index 8eb6b07..00eac3e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Mappalachia is a Windows application for generating and exporting complex maps o [![Latest release](https://img.shields.io/github/downloads/AHeroicLlama/Mappalachia/total)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
![](https://img.shields.io/github/last-commit/AHeroicLlama/Mappalachia)
[![Latest release](https://img.shields.io/github/v/release/aheroicllama/mappalachia)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
-![](https://img.shields.io/badge/game%20version-1.7.7.6-green)
+![](https://img.shields.io/badge/game%20version-1.7.8.8-green)
[![Discord](https://img.shields.io/discord/1029499482028646400?label=Discord&logo=Discord)](https://discord.gg/Z2GMpm6rad)
[![License](https://img.shields.io/github/license/AHeroicLlama/Mappalachia)](LICENSE.md) From 3e7bccb48c534518116f5249306609033a7927c8 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Fri, 8 Dec 2023 22:35:42 +0000 Subject: [PATCH 10/16] Dev document updates, correct name of Sacramental Glade --- Database/summary.txt | 4 ++-- Developer_Guides/ImageAssetValidation.md | 2 +- Developer_Guides/Ingest.md | 2 ++ Preprocessor/MapMarkers.cs | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Database/summary.txt b/Database/summary.txt index 1542f72..c0419d1 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -3,7 +3,7 @@ mappalachia.db ==SQLite version== 3.44.2 2023-11-24 11:41:44 ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f (64-bit) ==Checksum== -7c2253774ea9fb1b6c5f4e44159f3865 +cb495b0d3b7f918f7a1fd784b902c9a1 ==File Size== 449691648 ==Tables== @@ -382,11 +382,11 @@ Appalachia|OverlookMarker|Scenic Overlook|-12691|-145411 Appalachia|PalaceWindingPathMarker|Palace of the Winding Path|57571|164802 Appalachia|PierMarker|Summersville Docks|-70893|-44187 Appalachia|PondLakeMarker|Big Maw|145503|38296 -Appalachia|PondLakeMarker|Cranberry Glade|192808|-120632 Appalachia|PondLakeMarker|Gnarled Shallows|198829|141223 Appalachia|PondLakeMarker|Gulper Lagoon|158150|111085 Appalachia|PondLakeMarker|Highland Marsh|172319|131548 Appalachia|PondLakeMarker|Lake Eloise|51553|-156468 +Appalachia|PondLakeMarker|Sacramental Glade|192808|-120632 Appalachia|PondLakeMarker|Solomon's Pond|38767|-64481 Appalachia|PondLakeMarker|Spruce Knob Channels|26548|-129199 Appalachia|PondLakeMarker|Spruce Knob Lake|35190|-121222 diff --git a/Developer_Guides/ImageAssetValidation.md b/Developer_Guides/ImageAssetValidation.md index b9856dd..5baa0d5 100644 --- a/Developer_Guides/ImageAssetValidation.md +++ b/Developer_Guides/ImageAssetValidation.md @@ -9,7 +9,7 @@ The tool doesn't produce any output but should be run prior to any Mappalachia r ## Asset Validation In the main `Mappalachia.sln`, build and run the `ImageAssetChecker` project.
-The tool will connect to the database so it know which cells, worldspaces, and map markers are required.
+The tool will connect to the database so it knows which cells, worldspaces, and map markers are required.
It will then cross reference to the contents of the `img` folder to verify that each space has an applicable background image file, that the image is of the correct dimensions, and that the file size looks correct. Then it will check for all map markers, also verifying that they exist and that they are of a normal file size.
Finally the tool will verify there are no extraneous image files present.
diff --git a/Developer_Guides/Ingest.md b/Developer_Guides/Ingest.md index 79a3368..86d6661 100644 --- a/Developer_Guides/Ingest.md +++ b/Developer_Guides/Ingest.md @@ -13,6 +13,8 @@ Using SQLite, a single batch file creates the empty database structure, then ins ## Game Version The game version string is baked into the database. If you have Fallout 76 installed in the default Steam location, you may enable automatic game version detection by downloading [`sigcheck.exe`](https://docs.microsoft.com/en-gb/sysinternals/downloads/sigcheck) from Sysinternals and placing it in the database folder - if so, the game version string will be automatically gathered from `Fallout76.exe`.
Otherwise, before running `build_database.bat`, ensure the correct game version string is stored in `gameVersion.csv`.
+
+Sometimes the version of the exe will differ from the version given in-game. The recommended rule is that the version in-game (bottom-left of settings menu) trumps the version of the exe. Where this is the case, you must call the batch script with the `override` argument. This prevents sigcheck from modifying `gameVersion.csv` and instead trusts the value you should have entered into the file previously. ## Building the database Before we can build the database, we need a copy of the sqlite tools windows binary, called sqlite3.exe. This is distributed at the [SQLite downloads page](https://www.sqlite.org/download.html). Under 'Precompiled Binaries for Windows' find the sqlite-tools zip.
diff --git a/Preprocessor/MapMarkers.cs b/Preprocessor/MapMarkers.cs index 243f3b0..bb9970b 100644 --- a/Preprocessor/MapMarkers.cs +++ b/Preprocessor/MapMarkers.cs @@ -89,6 +89,7 @@ internal static class MapMarkers { "Building Summersville Dam", "Summersville Dam" }, { "Burning Mine", "The Burning Mine" }, { "Cranberry Bog Region", "Quarry X3" }, + { "Cranberry Glade", "Sacramental Glade" }, { "Crater Outpost", "Crater Watchstation" }, { "Emmett Mt. Disposal Site", "Emmett Mountain Disposal Site" }, { "Garrahan Excavations Headquarters", "Garrahan Mining Headquarters" }, From 82f4924ce81fe5cca0346c8f320eaaedaf95c7c9 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Fri, 15 Dec 2023 20:39:04 +0000 Subject: [PATCH 11/16] 1.7.8.10 game hotfix DB update --- Database/gameVersion.csv | 2 +- Database/summary.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Database/gameVersion.csv b/Database/gameVersion.csv index d94091f..2dc24c0 100644 --- a/Database/gameVersion.csv +++ b/Database/gameVersion.csv @@ -1,2 +1,2 @@ version -1.7.8.8 +1.7.8.10 diff --git a/Database/summary.txt b/Database/summary.txt index c0419d1..2d27a89 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -3,7 +3,7 @@ mappalachia.db ==SQLite version== 3.44.2 2023-11-24 11:41:44 ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f (64-bit) ==Checksum== -cb495b0d3b7f918f7a1fd784b902c9a1 +f6583849eb16d1217c0293a9cf083234 ==File Size== 449691648 ==Tables== @@ -14,7 +14,7 @@ Lock_Levels Position_Data Space_Info Index_PositionData_CoverAll Index_ScrapSearch_CompMagSpace Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Game Version== -1.7.8.8 +1.7.8.10 ==Mean Average X/Y/Z Coord== -11542.1491666802|4354.97236499601|11401.7878800141 ==Min/Max X/Y/Z Coord== From f26e17bf1eee29fa6261545337ed8fc7d67c512a Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Mon, 29 Jan 2024 20:06:01 +0000 Subject: [PATCH 12/16] Update SQLite versions --- BackgroundRenderer/BackgroundRenderer.csproj | 2 +- Database/summary.txt | 4 ++-- ImageAssetChecker/ImageAssetChecker.csproj | 2 +- MapIconProcessor/MapIconProcessor.csproj | 2 +- Mappalachia/Mappalachia.csproj | 2 +- MappalachiaTests/MappalachiaTests.csproj | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BackgroundRenderer/BackgroundRenderer.csproj b/BackgroundRenderer/BackgroundRenderer.csproj index 265abc4..14df2f7 100644 --- a/BackgroundRenderer/BackgroundRenderer.csproj +++ b/BackgroundRenderer/BackgroundRenderer.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Database/summary.txt b/Database/summary.txt index 2d27a89..569a807 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -1,9 +1,9 @@ ==Database name== mappalachia.db ==SQLite version== -3.44.2 2023-11-24 11:41:44 ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f (64-bit) +3.45.0 2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d (64-bit) ==Checksum== -f6583849eb16d1217c0293a9cf083234 +19d1f74ba27a720361a68462642bad42 ==File Size== 449691648 ==Tables== diff --git a/ImageAssetChecker/ImageAssetChecker.csproj b/ImageAssetChecker/ImageAssetChecker.csproj index aca4475..d74c806 100644 --- a/ImageAssetChecker/ImageAssetChecker.csproj +++ b/ImageAssetChecker/ImageAssetChecker.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MapIconProcessor/MapIconProcessor.csproj b/MapIconProcessor/MapIconProcessor.csproj index d59e1fd..59a2a58 100644 --- a/MapIconProcessor/MapIconProcessor.csproj +++ b/MapIconProcessor/MapIconProcessor.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Mappalachia/Mappalachia.csproj b/Mappalachia/Mappalachia.csproj index 4034088..881f0f9 100644 --- a/Mappalachia/Mappalachia.csproj +++ b/Mappalachia/Mappalachia.csproj @@ -53,7 +53,7 @@ - 8.0.0 + 8.0.1 all diff --git a/MappalachiaTests/MappalachiaTests.csproj b/MappalachiaTests/MappalachiaTests.csproj index c769920..c37cefd 100644 --- a/MappalachiaTests/MappalachiaTests.csproj +++ b/MappalachiaTests/MappalachiaTests.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From e4178aca54aab0e1af514c6cb08151ec0e597015 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Tue, 30 Jan 2024 20:39:18 +0000 Subject: [PATCH 13/16] 1.7.7.4 - Game patch 1.7.9.7 --- Database/gameVersion.csv | 2 +- Database/summary.txt | 128 ++++++++++++------------- Mappalachia/Properties/AssemblyInfo.cs | 4 +- README.md | 2 +- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Database/gameVersion.csv b/Database/gameVersion.csv index 2dc24c0..e95498e 100644 --- a/Database/gameVersion.csv +++ b/Database/gameVersion.csv @@ -1,2 +1,2 @@ version -1.7.8.10 +1.7.9.7 diff --git a/Database/summary.txt b/Database/summary.txt index 569a807..7f110f3 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -3,9 +3,9 @@ mappalachia.db ==SQLite version== 3.45.0 2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d (64-bit) ==Checksum== -19d1f74ba27a720361a68462642bad42 +7ee0cf97365cf5541fd326cb3cd4dc0f ==File Size== -449691648 +449679360 ==Tables== Entity_Info Map_Markers Region Standard_Search Game_Version NPC_Search Scrap_Search @@ -14,9 +14,9 @@ Lock_Levels Position_Data Space_Info Index_PositionData_CoverAll Index_ScrapSearch_CompMagSpace Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Game Version== -1.7.8.10 +1.7.9.7 ==Mean Average X/Y/Z Coord== --11542.1491666802|4354.97236499601|11401.7878800141 +-11543.8823400728|4355.54119308985|11401.8958248722 ==Min/Max X/Y/Z Coord== -402000|407637|-407387|380538|-50907|136069 ==100 most common xyz coordinates + count== @@ -123,17 +123,17 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Z outliers== 74 ==Average X Bounds Width== -21.8197249031648 +21.8149244140989 ==Average Y Bounds Width== -16.3040532222077 +16.2985113354327 ==Average Z Bounds Width== -15.2882792738574 +15.2829144471585 ==Average Z Rotation== -4.11085858994601 +4.11035320835418 ==Average display name string length== -2.73819537590652 +2.73801350398982 ==Average editorID string length== -25.0667924614091 +25.0670198013049 ==Map Markers== Appalachia|AgriculturalCenterMarker|Vault-Tec Agricultural Research Center|-117195|19445 Appalachia|AirfieldMarker|Crashed Plane|147706|58411 @@ -747,8 +747,8 @@ AVRMedicalCenter01|Box|194 AlleghenyAsylum01||14278 AlleghenyAsylum01|Box|730 AlleghenyAsylum01|Sphere|5 -Appalachia||3016750 -Appalachia|Box|63636 +Appalachia||3016717 +Appalachia|Box|63637 Appalachia|Ellipsoid|3 Appalachia|Line|1802 Appalachia|Plane|105 @@ -989,8 +989,8 @@ SheltersCave02||574 SheltersCave02|Box|34 SheltersClaimCenter01||921 SheltersClaimCenter01|Box|55 -SheltersHighStakes||2533 -SheltersHighStakes|Box|133 +SheltersHighStakes||2536 +SheltersHighStakes|Box|81 SheltersMissileSilo||442 SheltersMissileSilo|Box|51 SheltersPittTrench01||1009 @@ -1134,17 +1134,17 @@ WhitespringMall01||6810 WhitespringMall01|Box|137 WhitespringRefuge01||11459 WhitespringRefuge01|Box|226 -XPDAC01Casino||13235 +XPDAC01Casino||13256 XPDAC01Casino|Box|473 XPDAC01Casino|Plane|1 -XPDAC01EntertainmentDistrict||6257 +XPDAC01EntertainmentDistrict||6254 XPDAC01EntertainmentDistrict|Box|534 XPDAC01NightClub||2738 XPDAC01NightClub|Box|213 XPDAC02Aquarium||15525 XPDAC02Aquarium|Box|516 -XPDAC02Boardwalk||9821 -XPDAC02Boardwalk|Box|760 +XPDAC02Boardwalk||9822 +XPDAC02Boardwalk|Box|761 XPDAC02Boardwalk|Sphere|2 XPDAC02Pier||7074 XPDAC02Pier|Box|230 @@ -1154,8 +1154,8 @@ XPDAC03CommunityCenter||4602 XPDAC03CommunityCenter|Box|38 XPDAC03FloodedCityCenter||19992 XPDAC03FloodedCityCenter|Box|67 -XPDPitt01Foundry||16376 -XPDPitt01Foundry|Box|555 +XPDPitt01Foundry||16368 +XPDPitt01Foundry|Box|558 XPDPitt01Foundry|Plane|6 XPDPitt01Foundry|Sphere|1 XPDPitt01Industrial||18823 @@ -1193,7 +1193,7 @@ AlleghenyAsylum01|Advanced (Level 1)|6 AlleghenyAsylum01|Expert (Level 2)|6 AlleghenyAsylum01|Master (Level 3)|1 AlleghenyAsylum01|Novice (Level 0)|3 -Appalachia||3083573 +Appalachia||3083541 Appalachia|Advanced (Level 1)|322 Appalachia|Barred|1 Appalachia|Chained|1 @@ -1485,7 +1485,7 @@ SheltersCave01||534 SheltersCave02||608 SheltersClaimCenter01||975 SheltersClaimCenter01|Requires Key|1 -SheltersHighStakes||2666 +SheltersHighStakes||2617 SheltersMissileSilo||493 SheltersPittTrench01||1142 SheltersRootCellar||595 @@ -1657,13 +1657,13 @@ WhitespringRefuge01||11656 WhitespringRefuge01|Advanced (Level 1)|2 WhitespringRefuge01|Inaccessible|21 WhitespringRefuge01|Novice (Level 0)|6 -XPDAC01Casino||13681 +XPDAC01Casino||13702 XPDAC01Casino|Advanced (Level 1)|5 XPDAC01Casino|Inaccessible|3 XPDAC01Casino|Master (Level 3)|5 XPDAC01Casino|Novice (Level 0)|14 XPDAC01Casino|Requires Terminal|1 -XPDAC01EntertainmentDistrict||6784 +XPDAC01EntertainmentDistrict||6781 XPDAC01EntertainmentDistrict|Advanced (Level 1)|4 XPDAC01EntertainmentDistrict|Expert (Level 2)|1 XPDAC01EntertainmentDistrict|Inaccessible|1 @@ -1675,7 +1675,7 @@ XPDAC01NightClub|Novice (Level 0)|1 XPDAC02Aquarium||16039 XPDAC02Aquarium|Expert (Level 2)|1 XPDAC02Aquarium|Novice (Level 0)|1 -XPDAC02Boardwalk||10572 +XPDAC02Boardwalk||10574 XPDAC02Boardwalk|Expert (Level 2)|1 XPDAC02Boardwalk|Inaccessible|1 XPDAC02Boardwalk|Master (Level 3)|1 @@ -1693,7 +1693,7 @@ XPDAC03FloodedCityCenter||20046 XPDAC03FloodedCityCenter|Advanced (Level 1)|5 XPDAC03FloodedCityCenter|Expert (Level 2)|1 XPDAC03FloodedCityCenter|Novice (Level 0)|7 -XPDPitt01Foundry||16906 +XPDPitt01Foundry||16901 XPDPitt01Foundry|Advanced (Level 1)|16 XPDPitt01Foundry|Expert (Level 2)|5 XPDPitt01Foundry|Master (Level 3)|3 @@ -1805,7 +1805,7 @@ Appalachia|ASPC|2377 Appalachia|BNDS|10373 Appalachia|BOOK|495 Appalachia|CNCY|257 -Appalachia|CONT|12518 +Appalachia|CONT|12515 Appalachia|DOOR|2526 Appalachia|FLOR|45207 Appalachia|FURN|15106 @@ -1813,16 +1813,16 @@ Appalachia|HAZD|995 Appalachia|IDLM|16918 Appalachia|KEYM|36 Appalachia|LIGH|8359 -Appalachia|LVLI|71746 -Appalachia|MISC|36053 -Appalachia|MSTT|23185 +Appalachia|LVLI|71744 +Appalachia|MISC|36047 +Appalachia|MSTT|23179 Appalachia|NOTE|178 Appalachia|NPC_|7407 Appalachia|PROJ|93 Appalachia|SCOL|353403 Appalachia|SECH|253 Appalachia|SOUN|5923 -Appalachia|STAT|2385531 +Appalachia|STAT|2385516 Appalachia|TACT|62 Appalachia|TERM|371 Appalachia|TXST|62869 @@ -3396,10 +3396,10 @@ SheltersClaimCenter01|SCOL|14 SheltersClaimCenter01|STAT|763 SheltersClaimCenter01|TERM|1 SheltersClaimCenter01|TXST|50 -SheltersHighStakes|ACTI|130 +SheltersHighStakes|ACTI|78 SheltersHighStakes|DOOR|3 -SheltersHighStakes|LIGH|93 -SheltersHighStakes|STAT|2440 +SheltersHighStakes|LIGH|91 +SheltersHighStakes|STAT|2445 SheltersMissileSilo|ACTI|9 SheltersMissileSilo|LIGH|15 SheltersMissileSilo|MSTT|9 @@ -4295,15 +4295,15 @@ WhitespringRefuge01|STAT|9527 WhitespringRefuge01|TERM|5 WhitespringRefuge01|TXST|41 WhitespringRefuge01|WEAP|4 -XPDAC01Casino|ACTI|262 +XPDAC01Casino|ACTI|272 XPDAC01Casino|ALCH|3 XPDAC01Casino|ARMO|1 XPDAC01Casino|ASPC|2 XPDAC01Casino|BNDS|47 XPDAC01Casino|BOOK|21 -XPDAC01Casino|CONT|225 +XPDAC01Casino|CONT|229 XPDAC01Casino|DOOR|75 -XPDAC01Casino|FURN|295 +XPDAC01Casino|FURN|291 XPDAC01Casino|HAZD|1 XPDAC01Casino|IDLM|140 XPDAC01Casino|KEYM|2 @@ -4314,7 +4314,7 @@ XPDAC01Casino|MSTT|285 XPDAC01Casino|NPC_|69 XPDAC01Casino|SCOL|377 XPDAC01Casino|SOUN|12 -XPDAC01Casino|STAT|9876 +XPDAC01Casino|STAT|9887 XPDAC01Casino|TERM|6 XPDAC01Casino|TXST|277 XPDAC01EntertainmentDistrict|ACTI|61 @@ -4331,7 +4331,7 @@ XPDAC01EntertainmentDistrict|NPC_|82 XPDAC01EntertainmentDistrict|SCOL|902 XPDAC01EntertainmentDistrict|SECH|2 XPDAC01EntertainmentDistrict|SOUN|7 -XPDAC01EntertainmentDistrict|STAT|4749 +XPDAC01EntertainmentDistrict|STAT|4746 XPDAC01EntertainmentDistrict|TXST|453 XPDAC01NightClub|ACTI|32 XPDAC01NightClub|ALCH|3 @@ -4385,7 +4385,7 @@ XPDAC02Boardwalk|NPC_|56 XPDAC02Boardwalk|SCOL|769 XPDAC02Boardwalk|SECH|16 XPDAC02Boardwalk|SOUN|25 -XPDAC02Boardwalk|STAT|7281 +XPDAC02Boardwalk|STAT|7283 XPDAC02Boardwalk|TERM|1 XPDAC02Boardwalk|TXST|546 XPDAC02Pier|ACTI|228 @@ -4454,7 +4454,7 @@ XPDAC03FloodedCityCenter|SCOL|717 XPDAC03FloodedCityCenter|STAT|18542 XPDAC03FloodedCityCenter|TERM|2 XPDAC03FloodedCityCenter|TXST|2 -XPDPitt01Foundry|ACTI|235 +XPDPitt01Foundry|ACTI|238 XPDPitt01Foundry|AMMO|18 XPDPitt01Foundry|ARMO|9 XPDPitt01Foundry|BNDS|5 @@ -4472,7 +4472,7 @@ XPDPitt01Foundry|NOTE|2 XPDPitt01Foundry|NPC_|81 XPDPitt01Foundry|SCOL|1911 XPDPitt01Foundry|SOUN|39 -XPDPitt01Foundry|STAT|11229 +XPDPitt01Foundry|STAT|11221 XPDPitt01Foundry|TERM|3 XPDPitt01Foundry|TXST|574 XPDPitt01Foundry|WEAP|6 @@ -4650,7 +4650,7 @@ AlleghenyAsylum01|TestElevDoorTriggerARef077|1 AlleghenyAsylum01|TestElevDoorTriggerARef078|1 AlleghenyAsylum01|TestElevDoorTriggerARef079|1 AlleghenyAsylum01|W05_JonahItoRef|1 -Appalachia||3079120 +Appalachia||3079088 Appalachia|76ExitEventQuest_CenterMaker|1 Appalachia|76ExitEventSpawnAreaRef001|1 Appalachia|76ExitEventSpawnAreaRef002|1 @@ -12436,7 +12436,7 @@ SettlerBugOutCave|W05_MQ_101P_B_AubrieDeadEnableMarkerRef|1 SheltersCave01||534 SheltersCave02||608 SheltersClaimCenter01||976 -SheltersHighStakes||2666 +SheltersHighStakes||2617 SheltersMissileSilo||493 SheltersPittTrench01||1142 SheltersRootCellar||595 @@ -14225,7 +14225,7 @@ WhitespringRefuge01|XPD_Hub_Responders_SkippyMarker_Junk|1 WhitespringRefuge01|XPD_Hub_Responders_SkippyMarker_MissionHub|1 WhitespringRefuge01|XPD_JeremiahRef|1 WhitespringRefuge01|XPD_WhitespringGreeterRef|1 -XPDAC01Casino||13675 +XPDAC01Casino||13696 XPDAC01Casino|AC_MQ02_Stage_CasinoExitMarker|1 XPDAC01Casino|AC_MQ02_Stage_OutsideLoungeTrigger|1 XPDAC01Casino|AC_MQ02_Stage_PokerGameTrigger|1 @@ -14260,7 +14260,7 @@ XPDAC01Casino|XPD_AC02_SolveLocksMarker06_Ref|1 XPDAC01Casino|XPD_AC02_SolveLocksMarker07_Ref|1 XPDAC01Casino|XPD_AC02_SolveLocksMarker08_Ref|1 XPDAC01Casino|XPD_AC_CasinoFriendliesDisabler_Ref|1 -XPDAC01EntertainmentDistrict||6782 +XPDAC01EntertainmentDistrict||6779 XPDAC01EntertainmentDistrict|AC_MQ02_Stage_CasinoQuarterToBoardwalk_Marker|1 XPDAC01EntertainmentDistrict|AC_MQ02_Stage_Evelyn_CasinoQuarter|1 XPDAC01EntertainmentDistrict|AC_SQ05_CasinoQuarter_PersistentMarker_REF|1 @@ -14317,7 +14317,7 @@ XPDAC02Aquarium|XPD_AC02_Theater_ProxTrigger|1 XPDAC02Aquarium|XPD_AC02_VIPBoothDoor|1 XPDAC02Aquarium|XPD_AC02_Veracio_WallLean_Aquarium|1 XPDAC02Aquarium|XPD_AC02_WinnersStageMarker|1 -XPDAC02Boardwalk||10539 +XPDAC02Boardwalk||10541 XPDAC02Boardwalk|AC_MQ02_Stage_TicketClerkRef|1 XPDAC02Boardwalk|AC_SQ03_BackRoomTrigger|1 XPDAC02Boardwalk|AC_SQ03_BoardwalkToPier_Marker|1 @@ -14453,7 +14453,7 @@ XPDAC03FloodedCityCenter|XPD_AC03_DefendNPC_Ref|1 XPDAC03FloodedCityCenter|XPD_AC03_IntroAuditorCombatantsSpawnCenter_Ref|1 XPDAC03FloodedCityCenter|XPD_AC03_IntroOvergrown_SpawnMarkerRef|1 XPDAC03FloodedCityCenter|XPD_AC03_PersistentMarker_FloodedCityCenter_Ref|1 -XPDPitt01Foundry||16874 +XPDPitt01Foundry||16869 XPDPitt01Foundry|EXM1Pitt1_Shipping_Door_Interior0|1 XPDPitt01Foundry|Pitt01_Objmod_SolveLocks_PlacementPoint00|1 XPDPitt01Foundry|Pitt01_Objmod_SolveLocks_PlacementPoint01|1 @@ -15066,7 +15066,7 @@ AlleghenyAsylum01|100|15013 Appalachia|50|43 Appalachia|75|142 Appalachia|85|72 -Appalachia|100|3084384 +Appalachia|100|3084352 ArktosPharmaLab01|50|1 ArktosPharmaLab01|75|1 ArktosPharmaLab01|100|17161 @@ -15175,7 +15175,7 @@ SettlerBugOutCave|100|372 SheltersCave01|100|534 SheltersCave02|100|608 SheltersClaimCenter01|100|976 -SheltersHighStakes|100|2666 +SheltersHighStakes|100|2617 SheltersMissileSilo|100|493 SheltersPittTrench01|100|1142 SheltersRootCellar|100|595 @@ -15248,12 +15248,12 @@ WestTek02|100|5126 WhitespringBunker01|100|16333 WhitespringMall01|100|6947 WhitespringRefuge01|100|11685 -XPDAC01Casino|100|13709 -XPDAC01EntertainmentDistrict|100|6791 +XPDAC01Casino|100|13730 +XPDAC01EntertainmentDistrict|100|6788 XPDAC01NightClub|100|2951 XPDAC02Aquarium|100|16041 XPDAC02Boardwalk|75|1 -XPDAC02Boardwalk|100|10582 +XPDAC02Boardwalk|100|10584 XPDAC02Pier|75|2 XPDAC02Pier|100|7302 XPDAC03CityHall|100|4106 @@ -15261,7 +15261,7 @@ XPDAC03CommunityCenter|100|4640 XPDAC03FloodedCityCenter|100|20059 XPDPitt01Foundry|50|9 XPDPitt01Foundry|75|11 -XPDPitt01Foundry|100|16918 +XPDPitt01Foundry|100|16913 XPDPitt01Industrial|50|4 XPDPitt01Industrial|75|3 XPDPitt01Industrial|100|20262 @@ -15381,14 +15381,14 @@ AlleghenyAsylum01|Steel|254|168 AlleghenyAsylum01|Wood|94|71 Appalachia|Acid|1371|886 Appalachia|Adhesive|1171|498 -Appalachia|Aluminum|2145|1512 +Appalachia|Aluminum|2144|1511 Appalachia|Antiseptic|882|418 -Appalachia|Asbestos|1624|1209 +Appalachia|Asbestos|1623|1208 Appalachia|Ballistic Fiber|188|94 Appalachia|Bone|3432|1310 Appalachia|Ceramic|3838|3310 Appalachia|Circuitry|472|371 -Appalachia|Cloth|5804|5165 +Appalachia|Cloth|5802|5163 Appalachia|Concrete|2315|423 Appalachia|Copper|1525|1442 Appalachia|Cork|631|513 @@ -15400,18 +15400,18 @@ Appalachia|Gear|1152|972 Appalachia|Glass|9062|7493 Appalachia|Gold|80|80 Appalachia|Gunpowder|1|1 -Appalachia|Lead|5306|3071 +Appalachia|Lead|5305|3070 Appalachia|Leather|1922|866 Appalachia|Nuclear Material|139|139 Appalachia|Oil|3689|2464 -Appalachia|Plastic|5760|4087 -Appalachia|Rubber|2000|1210 +Appalachia|Plastic|5759|4086 +Appalachia|Rubber|1998|1209 Appalachia|Screw|1198|1070 Appalachia|Silver|270|227 -Appalachia|Spring|1296|1265 -Appalachia|Steel|15634|9329 +Appalachia|Spring|1295|1264 +Appalachia|Steel|15630|9327 Appalachia|Ultracite|1|1 -Appalachia|Wood|4832|3368 +Appalachia|Wood|4831|3367 ArktosPharmaLab01|Acid|48|33 ArktosPharmaLab01|Adhesive|10|3 ArktosPharmaLab01|Aluminum|31|25 @@ -18681,4 +18681,4 @@ WestTek01|Super Mutant|100.0|41 003F880F|FoundationInt01|Foundation Interior|0|3171|-6042|-3576|9919|-15956|3872|1400|1800|1.7 006240BB|WhitespringRefuge01|Whitespring Refuge|0|-8840|10960|-16336|-1344|5056|16864|0|0|1.0 ==Instance IDs Count Vs Distinct== -4077546|4077546 +4077480|4077480 diff --git a/Mappalachia/Properties/AssemblyInfo.cs b/Mappalachia/Properties/AssemblyInfo.cs index fd2c010..d566cb3 100644 --- a/Mappalachia/Properties/AssemblyInfo.cs +++ b/Mappalachia/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.7.3")] -[assembly: AssemblyFileVersion("1.7.7.3")] +[assembly: AssemblyVersion("1.7.7.4")] +[assembly: AssemblyFileVersion("1.7.7.4")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/README.md b/README.md index 00eac3e..3ea0d3d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Mappalachia is a Windows application for generating and exporting complex maps o [![Latest release](https://img.shields.io/github/downloads/AHeroicLlama/Mappalachia/total)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
![](https://img.shields.io/github/last-commit/AHeroicLlama/Mappalachia)
[![Latest release](https://img.shields.io/github/v/release/aheroicllama/mappalachia)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
-![](https://img.shields.io/badge/game%20version-1.7.8.8-green)
+![](https://img.shields.io/badge/game%20version-1.7.9.7-green)
[![Discord](https://img.shields.io/discord/1029499482028646400?label=Discord&logo=Discord)](https://discord.gg/Z2GMpm6rad)
[![License](https://img.shields.io/github/license/AHeroicLlama/Mappalachia)](LICENSE.md) From 7876794832c23e5bc6686f74b4267c5a9a8468eb Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Wed, 27 Mar 2024 12:09:06 +0000 Subject: [PATCH 14/16] 1.7.7.5 - Game update 1.7.10.12 Updates database to Fallout 76 version 1.7.10.12 Adds support for new and renamed cells. Alphabetized the switch of cells in Preprocessor/SpaceNudge --- BackgroundRenderer/BackgroundRenderer.cs | 7 +- BackgroundRenderer/BackgroundRenderer.csproj | 2 +- Database/gameVersion.csv | 2 +- Database/summary.txt | 1806 +++++++++++------- FO76Edit/Output/Skipped_spaces.csv | 1 + ImageAssetChecker/ImageAssetChecker.csproj | 2 +- MapIconProcessor/MapIconProcessor.csproj | 2 +- Mappalachia/Mappalachia.csproj | 4 +- Mappalachia/Properties/AssemblyInfo.cs | 4 +- MappalachiaTests/MappalachiaTests.csproj | 8 +- Preprocessor/SpaceNudge.cs | 97 +- README.md | 2 +- 12 files changed, 1195 insertions(+), 742 deletions(-) diff --git a/BackgroundRenderer/BackgroundRenderer.cs b/BackgroundRenderer/BackgroundRenderer.cs index 15de69e..064d5c1 100644 --- a/BackgroundRenderer/BackgroundRenderer.cs +++ b/BackgroundRenderer/BackgroundRenderer.cs @@ -37,17 +37,18 @@ public partial class BackgroundRenderer { "FoundationSupplyRoom01", 200 }, { "FraternityHouse01", 850 }, { "FraternityHouse02", 850 }, - { "IngramMansion01", 500 }, + { "TheRoseRoom01", 500 }, { "LewisandSonsFarmingSupply01", 500 }, { "OverseersHome01", 675 }, { "PoseidonPlant02", 3000 }, - { "RaiderCave01", 300 }, - { "RaiderCave03", 300 }, + { "LittleRobsHideout01", 300 }, + { "MiresEye01", 300 }, { "RaiderRaidTrailerInt", 150 }, { "SheltersRootCellar", 300 }, { "SheltersSoundStage", 1000 }, { "SheltersToxicWasteland", 2000 }, { "SugarGrove02", 1000 }, + { "SurlysShack01", 250 }, { "TheCraterCore01", 100 }, { "TheWayward01", 400 }, { "TopOfTheWorld01", -1800 }, diff --git a/BackgroundRenderer/BackgroundRenderer.csproj b/BackgroundRenderer/BackgroundRenderer.csproj index 14df2f7..6f8f23c 100644 --- a/BackgroundRenderer/BackgroundRenderer.csproj +++ b/BackgroundRenderer/BackgroundRenderer.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Database/gameVersion.csv b/Database/gameVersion.csv index e95498e..14abdd5 100644 --- a/Database/gameVersion.csv +++ b/Database/gameVersion.csv @@ -1,2 +1,2 @@ version -1.7.9.7 +1.7.10.12 diff --git a/Database/summary.txt b/Database/summary.txt index 7f110f3..d0a213d 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -1,11 +1,11 @@ ==Database name== mappalachia.db ==SQLite version== -3.45.0 2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d (64-bit) +3.45.2 2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77 (64-bit) ==Checksum== -7ee0cf97365cf5541fd326cb3cd4dc0f +084049d39b4bfbacee762a3a9ac1363b ==File Size== -449679360 +455102464 ==Tables== Entity_Info Map_Markers Region Standard_Search Game_Version NPC_Search Scrap_Search @@ -14,9 +14,9 @@ Lock_Levels Position_Data Space_Info Index_PositionData_CoverAll Index_ScrapSearch_CompMagSpace Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Game Version== -1.7.9.7 +1.7.10.12 ==Mean Average X/Y/Z Coord== --11543.8823400728|4355.54119308985|11401.8958248722 +-11438.7424961503|4351.25900924584|11290.7856351356 ==Min/Max X/Y/Z Coord== -402000|407637|-407387|380538|-50907|136069 ==100 most common xyz coordinates + count== @@ -34,7 +34,7 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace 3642|-626|273|42 3816|1208|263|42 4115|2168|262|42 -0|0|0|41 +0|0|0|40 39101|14406|35188|40 624|-1848|-1112|38 3696|-6968|-1112|37 @@ -45,47 +45,46 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace -2850|4792|572|34 -128|1664|-608|34 0|256|0|34 -1536|0|0|34 -0|1024|0|33 -256|1536|0|33 +1536|0|0|33 -1216|2352|128|32 -0|768|0|32 +256|1536|0|32 960|2352|128|32 --256|1024|0|31 +0|768|0|31 -512|768|0|30 -512|1024|0|30 --256|768|0|29 -0|-256|0|29 +-256|1024|0|29 +0|1024|0|29 1024|1792|-608|29 -129108|-37082|6630|28 -79616|-138368|30208|28 +-256|768|0|28 1920|1664|512|28 2176|1664|512|28 2176|1920|512|28 -11852|-31565|3080|27 -8774|-28029|3591|27 --256|0|0|27 +0|-256|0|27 -79616|-138368|28096|26 +-256|0|0|26 512|1024|256|26 -0|1280|0|25 -512|1024|0|25 -512|1536|0|25 +1792|768|0|26 1280|1792|-608|25 -1536|-256|0|25 1648|-1848|-1112|25 -1792|768|0|25 4898|1543|-251|25 -6016|-32034|3328|24 -6016|-32034|4096|24 --512|256|0|24 -256|1024|0|24 +-2688|-5504|512|24 +0|1280|0|24 +512|1024|0|24 +512|1536|0|24 768|1536|0|24 1024|1536|0|24 1280|3840|512|24 +1536|-256|0|24 1920|-2944|0|24 1920|-2176|0|24 -256|-256|0|23 -256|0|0|23 +-512|256|0|23 +-512|640|0|23 512|-512|0|23 1024|768|0|23 1408|-128|256|23 @@ -95,22 +94,24 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace -12313|-9137|4261|22 -11535|1118|-276|22 -3708|-154012|33461|22 --768|0|0|22 --512|640|0|22 0|512|0|22 +256|1024|0|22 768|1792|256|22 896|896|256|22 1152|1536|0|22 1280|768|256|22 1664|1920|512|22 +1920|-2176|384|22 2560|-2944|0|22 33916|77986|21778|22 -12363|-8955|4261|21 -12215|-9011|4437|21 -10406|404|-459|21 +-768|0|0|21 -6|-11|-2289|21 0|1024|256|21 -256|1280|0|21 +256|-256|0|21 +256|0|0|21 256|4224|512|21 512|4224|512|21 1024|-256|0|21 @@ -119,21 +120,20 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace 1280|3200|512|21 1280|3328|512|21 1280|3584|512|21 -1280|4096|512|21 ==Z outliers== 74 ==Average X Bounds Width== -21.8149244140989 +22.3373151008547 ==Average Y Bounds Width== -16.2985113354327 +16.5683214043823 ==Average Z Bounds Width== -15.2829144471585 +15.880529489518 ==Average Z Rotation== -4.11035320835418 +4.16760068899983 ==Average display name string length== -2.73801350398982 +2.73372474917893 ==Average editorID string length== -25.0670198013049 +25.1229360687452 ==Map Markers== Appalachia|AgriculturalCenterMarker|Vault-Tec Agricultural Research Center|-117195|19445 Appalachia|AirfieldMarker|Crashed Plane|147706|58411 @@ -207,6 +207,7 @@ Appalachia|CabinMarker|Pioneer Scout Camp|3600|137867 Appalachia|CabinMarker|Pylon Ambush Site|-82630|-92095 Appalachia|CabinMarker|Seneca Rocks Visitor Center|55774|56635 Appalachia|CabinMarker|Sunday Brothers' Cabin|138232|1426 +Appalachia|CabinMarker|Surly's Shack|-81000|202063 Appalachia|CapitalBuildingMarker|Charleston Capitol Building|-91983|-57828 Appalachia|CastleMarker|Prickett's Fort|60920|193668 Appalachia|CaveMarker|Abandoned Waste Dump|185034|26724 @@ -215,6 +216,7 @@ Appalachia|CaveMarker|Gauley Mine|-58605|62688 Appalachia|CaveMarker|Gauley Mine Exit|-47691|71024 Appalachia|CaveMarker|Hopewell Cave|114047|114129 Appalachia|CaveMarker|Makeshift Vault|-83329|160208 +Appalachia|CaveMarker|Mire's Eye|194133|186953 Appalachia|CaveMarker|Mysterious Cave|143425|200808 Appalachia|CaveMarker|The Deep|-34473|-38131 Appalachia|CaveMarker|Uncanny Caverns|-41528|-89947 @@ -230,7 +232,6 @@ Appalachia|CowSpotsCreameryMarker|Cow Spots Creamery|-124481|-14415 Appalachia|CowSpotsCreameryMarker|Lady Janet's Soft Serve|-103994|152996 Appalachia|CultistMarker|Blakes Offering|199894|-36612 Appalachia|CultistMarker|Clancy Manor|-92174|182999 -Appalachia|CultistMarker|Ingram Mansion|26293|99600 Appalachia|CultistMarker|Johnson's Acre|74465|-179824 Appalachia|CultistMarker|Kanawha County Cemetery|-176698|-24065 Appalachia|CultistMarker|Lucky Hole Mine|88918|-138108 @@ -356,6 +357,7 @@ Appalachia|LowRiseMarker|Ranger District Office|149723|-90368 Appalachia|LowRiseMarker|The Whitespring Service Entrance|7427|-58385 Appalachia|MansionMarker|Hornwright Summer Villa|-47674|-54542 Appalachia|MansionMarker|Riverside Manor|-70715|-70220 +Appalachia|MansionMarker|The Rose Room|26293|99600 Appalachia|MansionMarker|Torrance House|-55628|-61977 Appalachia|MilitaryBaseMarker|Camp McClintock|-69224|-12781 Appalachia|MilitaryBaseMarker|Firebase Hancock|109835|-172982 @@ -534,7 +536,7 @@ Appalachia|WoodShackMarker|Southhampton Estate|169981|125109 Appalachia|WoodShackMarker|Toxic Larry's Meat 'n Go|115473|39450 Appalachia|WoodShackMarker|Treetops|162220|-26927 ==Total Unique entities== -43987 +44454 ==Regions== Space|Region|subRegions|maxVerts Appalachia|76Border|1|55 @@ -747,11 +749,11 @@ AVRMedicalCenter01|Box|194 AlleghenyAsylum01||14278 AlleghenyAsylum01|Box|730 AlleghenyAsylum01|Sphere|5 -Appalachia||3016717 -Appalachia|Box|63637 +Appalachia||3017080 +Appalachia|Box|63700 Appalachia|Ellipsoid|3 Appalachia|Line|1802 -Appalachia|Plane|105 +Appalachia|Plane|106 Appalachia|Sphere|2345 ArktosPharmaLab01||15650 ArktosPharmaLab01|Box|1483 @@ -766,7 +768,7 @@ ArktosPharmaLabDungeon|Sphere|4 BelchingBetty01||5088 BelchingBetty01|Box|124 BelchingBetty01|Line|6 -BigBendTunnel01||6829 +BigBendTunnel01||6828 BigBendTunnel01|Box|721 BigBendTunnel01|Sphere|1 BlackwaterMine01||5836 @@ -837,13 +839,13 @@ EmmettMountainDisposalSite01|Line|1 EmmettMountainDisposalSite01|Sphere|1 EnclaveResearchFacility01||17862 EnclaveResearchFacility01|Box|880 -FortAtlas01||4947 +FortAtlas01||4948 FortAtlas01|Box|237 FortAtlasDungeon01||12349 FortAtlasDungeon01|Box|308 FortAtlasDungeon01|Sphere|8 -FoundationInt01||4998 -FoundationInt01|Box|370 +FoundationInt01||5001 +FoundationInt01|Box|371 FoundationInt01|Line|4 FoundationSupplyRoom01||521 FoundationSupplyRoom01|Box|8 @@ -864,7 +866,7 @@ FreeStatesBunker06||910 FreeStatesBunker06|Box|38 FreeStatesBunker06|Line|1 FreeStatesBunker07||1003 -FreeStatesBunker07|Box|46 +FreeStatesBunker07|Box|47 GarrahanMiningHQ01||8860 GarrahanMiningHQ01|Box|330 GarrahanMiningHQ01|Line|3 @@ -875,7 +877,7 @@ GarrahanMiningHQDungeon|Line|2 GarrahanMiningHQDungeon|Sphere|1 GauleyMine01||4017 GauleyMine01|Box|160 -GlassedCavern01||8291 +GlassedCavern01||8292 GlassedCavern01|Box|742 GlassedCavern01|Line|4 GlassedCavern01|Sphere|6 @@ -896,13 +898,13 @@ HornwrightHQ01|Plane|3 HornwrightHQ01|Sphere|1 HornwrightSafeRoom01||1017 HornwrightSafeRoom01|Box|27 -IngramMansion01||934 -IngramMansion01|Box|2 KerwoodMine01||5287 KerwoodMine01|Box|373 KerwoodMine01|Line|7 LewisandSonsFarmingSupply01||458 LewisandSonsFarmingSupply01|Box|3 +LittleRobsHideout01||1363 +LittleRobsHideout01|Box|96 LousMine01||6719 LousMine01|Box|268 LousMine01|Line|5 @@ -914,6 +916,8 @@ MTR08LodeBaring02|Box|174 MTR08LodeBaring02|Line|1 MamaDolceProcessing01||2940 MamaDolceProcessing01|Box|134 +MiresEye01||1529 +MiresEye01|Box|152 MonongahMine01||6097 MonongahMine01|Box|825 MonongahMine01|Sphere|1 @@ -935,7 +939,7 @@ MorgantownHighSchoolDungeon|Box|159 MorgantownHighSchoolDungeon|Sphere|1 MountBlairWarehouseBasement01||312 MountBlairWarehouseBasement01|Box|7 -NPECultistCave||3989 +NPECultistCave||3987 NPECultistCave|Box|256 NPEVault7601||6921 NPEVault7601|Box|141 @@ -952,20 +956,16 @@ OrwellOrchardsShelter01|Box|52 OrwellOrchardsShelter01|Sphere|1 OverseersHome01||1208 OverseersHome01|Box|42 -PoseidonPlant01||15283 -PoseidonPlant01|Box|373 +PoseidonPlant01||15281 +PoseidonPlant01|Box|374 PoseidonPlant01|Line|4 PoseidonPlant02||3827 PoseidonPlant02|Box|360 PoseidonPlant02|Line|2 RadioResearchCenter01||3328 RadioResearchCenter01|Box|144 -RaiderCave01||1350 -RaiderCave01|Box|94 RaiderCave02||1733 RaiderCave02|Box|141 -RaiderCave03||1529 -RaiderCave03|Box|152 RaiderRaidTrailerInt||95 RaiderRaidTrailerInt|Box|11 RiversideManor01||7072 @@ -989,6 +989,8 @@ SheltersCave02||574 SheltersCave02|Box|34 SheltersClaimCenter01||921 SheltersClaimCenter01|Box|55 +SheltersFlatlands||1016 +SheltersFlatlands|Box|518 SheltersHighStakes||2536 SheltersHighStakes|Box|81 SheltersMissileSilo||442 @@ -1023,14 +1025,18 @@ SugarGrove02||270 SugarGrove02|Box|1 SugarGroveMissileSilo01||15061 SugarGroveMissileSilo01|Box|629 -TheCraterCore01||1233 +SurlysShack01||92 +SurlysShack01|Box|29 +TheCraterCore01||1236 TheCraterCore01|Box|47 TheCraterCore01|Plane|9 -TheNukashine01||1475 -TheNukashine01|Box|63 +TheNukashine01||1465 +TheNukashine01|Box|55 +TheRoseRoom01||1502 +TheRoseRoom01|Box|37 TheRustyPick01||2355 TheRustyPick01|Box|87 -TheWayward01||1660 +TheWayward01||1659 TheWayward01|Box|59 ThunderMtPowerPlant01||8918 ThunderMtPowerPlant01|Box|493 @@ -1040,7 +1046,7 @@ TopOfTheWorld01||4236 TopOfTheWorld01|Box|413 TopOfTheWorld01|Line|2 TopOfTheWorld01|Sphere|1 -TunnelOfLoveMineshaft01||4305 +TunnelOfLoveMineshaft01||4306 TunnelOfLoveMineshaft01|Box|116 TunnelOfLoveMineshaft01|Plane|1 UCB01||4434 @@ -1055,7 +1061,7 @@ UncannyCaverns01|Line|1 UncannyCaverns01|Sphere|2 UncannyCaverns02||2955 UncannyCaverns02|Box|236 -UncannyCavernsDungeon||6748 +UncannyCavernsDungeon||6749 UncannyCavernsDungeon|Box|658 UncannyCavernsDungeon|Line|1 UncannyCavernsDungeon|Sphere|3 @@ -1074,7 +1080,7 @@ Vault51Dungeon|Plane|4 Vault51Dungeon|Sphere|2 Vault63Entrance||312 Vault63Entrance|Box|38 -Vault79Entrance||1466 +Vault79Entrance||1465 Vault79Entrance|Box|80 Vault79GoldVaultOperations||4654 Vault79GoldVaultOperations|Box|44 @@ -1082,7 +1088,7 @@ Vault79Main||18141 Vault79Main|Box|705 Vault79Main|Line|5 Vault94Dungeon||16120 -Vault94Dungeon|Box|1349 +Vault94Dungeon|Box|1350 Vault94Dungeon|Line|10 Vault94Dungeon|Sphere|4 Vault94DungeonGECK||4321 @@ -1132,39 +1138,49 @@ WhitespringBunker01||15833 WhitespringBunker01|Box|500 WhitespringMall01||6810 WhitespringMall01|Box|137 -WhitespringRefuge01||11459 +WhitespringRefuge01||11462 WhitespringRefuge01|Box|226 -XPDAC01Casino||13256 -XPDAC01Casino|Box|473 +XPDAC01Casino||13336 +XPDAC01Casino|Box|474 XPDAC01Casino|Plane|1 -XPDAC01EntertainmentDistrict||6254 -XPDAC01EntertainmentDistrict|Box|534 -XPDAC01NightClub||2738 +XPDAC01EntertainmentDistrict||6275 +XPDAC01EntertainmentDistrict|Box|518 +XPDAC01NightClub||2783 XPDAC01NightClub|Box|213 -XPDAC02Aquarium||15525 -XPDAC02Aquarium|Box|516 -XPDAC02Boardwalk||9822 -XPDAC02Boardwalk|Box|761 +XPDAC02Aquarium||15613 +XPDAC02Aquarium|Box|514 +XPDAC02AquariumDungeon||15342 +XPDAC02AquariumDungeon|Box|489 +XPDAC02AquariumDungeon|Sphere|1 +XPDAC02Boardwalk||9989 +XPDAC02Boardwalk|Box|765 XPDAC02Boardwalk|Sphere|2 -XPDAC02Pier||7074 -XPDAC02Pier|Box|230 -XPDAC03CityHall||4102 -XPDAC03CityHall|Box|4 -XPDAC03CommunityCenter||4602 -XPDAC03CommunityCenter|Box|38 -XPDAC03FloodedCityCenter||19992 -XPDAC03FloodedCityCenter|Box|67 -XPDPitt01Foundry||16368 +XPDAC02Pier||7228 +XPDAC02Pier|Box|246 +XPDAC02Pier|Plane|2 +XPDAC03CityHall||5948 +XPDAC03CityHall|Box|47 +XPDAC03CityHall|Plane|7 +XPDAC03CommunityCenter||11127 +XPDAC03CommunityCenter|Box|526 +XPDAC03FloodedCityCenter||16129 +XPDAC03FloodedCityCenter|Box|950 +XPDAC03FloodedCityCenter|Plane|5 +XPDPitt01Foundry||16367 XPDPitt01Foundry|Box|558 XPDPitt01Foundry|Plane|6 XPDPitt01Foundry|Sphere|1 +XPDPitt01FoundryDungeon||14865 +XPDPitt01FoundryDungeon|Box|485 +XPDPitt01FoundryDungeon|Plane|6 +XPDPitt01FoundryDungeon|Sphere|1 XPDPitt01Industrial||18823 XPDPitt01Industrial|Box|1445 XPDPitt01Industrial|Sphere|1 XPDPitt02ACCJ||15 XPDPitt02Sanctum||17557 XPDPitt02Sanctum|Box|477 -XPDPitt02Trench||19687 +XPDPitt02Trench||19686 XPDPitt02Trench|Box|1550 XPDRttP01SteelTower||10029 XPDRttP01SteelTower|Box|46 @@ -1193,12 +1209,12 @@ AlleghenyAsylum01|Advanced (Level 1)|6 AlleghenyAsylum01|Expert (Level 2)|6 AlleghenyAsylum01|Master (Level 3)|1 AlleghenyAsylum01|Novice (Level 0)|3 -Appalachia||3083541 +Appalachia||3083969 Appalachia|Advanced (Level 1)|322 Appalachia|Barred|1 Appalachia|Chained|1 Appalachia|Expert (Level 2)|198 -Appalachia|Inaccessible|23 +Appalachia|Inaccessible|22 Appalachia|Master (Level 3)|86 Appalachia|Novice (Level 0)|337 Appalachia|Requires Key|90 @@ -1217,7 +1233,7 @@ BelchingBetty01||5213 BelchingBetty01|Advanced (Level 1)|1 BelchingBetty01|Requires Key|3 BelchingBetty01|Requires Terminal|1 -BigBendTunnel01||7538 +BigBendTunnel01||7537 BigBendTunnel01|Advanced (Level 1)|4 BigBendTunnel01|Chained|1 BigBendTunnel01|Expert (Level 2)|1 @@ -1299,7 +1315,7 @@ EnclaveResearchFacility01|Expert (Level 2)|2 EnclaveResearchFacility01|Inaccessible|4 EnclaveResearchFacility01|Master (Level 3)|1 EnclaveResearchFacility01|Novice (Level 0)|8 -FortAtlas01||5180 +FortAtlas01||5181 FortAtlas01|Master (Level 3)|1 FortAtlas01|Novice (Level 0)|2 FortAtlas01|Requires Terminal|1 @@ -1308,7 +1324,7 @@ FortAtlasDungeon01|Advanced (Level 1)|1 FortAtlasDungeon01|Expert (Level 2)|1 FortAtlasDungeon01|Novice (Level 0)|3 FortAtlasDungeon01|Requires Terminal|1 -FoundationInt01||5372 +FoundationInt01||5376 FoundationSupplyRoom01||529 FraternityHouse01||1215 FraternityHouse01|Advanced (Level 1)|1 @@ -1326,7 +1342,7 @@ FreeStatesBunker04|Advanced (Level 1)|1 FreeStatesBunker04|Expert (Level 2)|1 FreeStatesBunker06||948 FreeStatesBunker06|Expert (Level 2)|1 -FreeStatesBunker07||1048 +FreeStatesBunker07||1049 FreeStatesBunker07|Expert (Level 2)|1 GarrahanMiningHQ01||9187 GarrahanMiningHQ01|Advanced (Level 1)|1 @@ -1341,7 +1357,7 @@ GauleyMine01||4172 GauleyMine01|Advanced (Level 1)|2 GauleyMine01|Inaccessible|1 GauleyMine01|Novice (Level 0)|2 -GlassedCavern01||9034 +GlassedCavern01||9035 GlassedCavern01|Advanced (Level 1)|3 GlassedCavern01|Expert (Level 2)|2 GlassedCavern01|Master (Level 3)|1 @@ -1366,9 +1382,6 @@ HornwrightHQ01|Novice (Level 0)|1 HornwrightHQ01|Requires Key|3 HornwrightSafeRoom01||1043 HornwrightSafeRoom01|Requires Key|1 -IngramMansion01||933 -IngramMansion01|Advanced (Level 1)|1 -IngramMansion01|Inaccessible|2 KerwoodMine01||5656 KerwoodMine01|Advanced (Level 1)|1 KerwoodMine01|Expert (Level 2)|2 @@ -1377,6 +1390,8 @@ KerwoodMine01|Novice (Level 0)|1 KerwoodMine01|Requires Key|6 LewisandSonsFarmingSupply01||460 LewisandSonsFarmingSupply01|Novice (Level 0)|1 +LittleRobsHideout01||1458 +LittleRobsHideout01|Novice (Level 0)|1 LousMine01||6985 LousMine01|Advanced (Level 1)|1 LousMine01|Novice (Level 0)|3 @@ -1388,6 +1403,7 @@ MTR08LodeBaring02|Novice (Level 0)|1 MamaDolceProcessing01||3067 MamaDolceProcessing01|Advanced (Level 1)|5 MamaDolceProcessing01|Novice (Level 0)|2 +MiresEye01||1681 MonongahMine01||6921 MonongahMine01|Inaccessible|1 MonongahMine01|Novice (Level 0)|1 @@ -1416,7 +1432,7 @@ MorgantownHighSchoolDungeon||5558 MorgantownHighSchoolDungeon|Advanced (Level 1)|1 MorgantownHighSchoolDungeon|Expert (Level 2)|2 MountBlairWarehouseBasement01||319 -NPECultistCave||4239 +NPECultistCave||4237 NPECultistCave|Advanced (Level 1)|1 NPECultistCave|Novice (Level 0)|5 NPEVault7601||7062 @@ -1436,7 +1452,7 @@ OrwellOrchardsShelter01|Expert (Level 2)|1 OverseersHome01||1248 OverseersHome01|Advanced (Level 1)|1 OverseersHome01|Requires Key|1 -PoseidonPlant01||15632 +PoseidonPlant01||15631 PoseidonPlant01|Advanced (Level 1)|7 PoseidonPlant01|Expert (Level 2)|2 PoseidonPlant01|Master (Level 3)|4 @@ -1451,11 +1467,8 @@ RadioResearchCenter01|Advanced (Level 1)|3 RadioResearchCenter01|Expert (Level 2)|2 RadioResearchCenter01|Novice (Level 0)|2 RadioResearchCenter01|Requires Key|1 -RaiderCave01||1443 -RaiderCave01|Novice (Level 0)|1 RaiderCave02||1873 RaiderCave02|Expert (Level 2)|1 -RaiderCave03||1681 RaiderRaidTrailerInt||106 RiversideManor01||7420 RiversideManor01|Advanced (Level 1)|2 @@ -1485,6 +1498,7 @@ SheltersCave01||534 SheltersCave02||608 SheltersClaimCenter01||975 SheltersClaimCenter01|Requires Key|1 +SheltersFlatlands||1534 SheltersHighStakes||2617 SheltersMissileSilo||493 SheltersPittTrench01||1142 @@ -1518,12 +1532,16 @@ SugarGroveMissileSilo01|Expert (Level 2)|9 SugarGroveMissileSilo01|Master (Level 3)|9 SugarGroveMissileSilo01|Novice (Level 0)|3 SugarGroveMissileSilo01|Requires Terminal|1 -TheCraterCore01||1287 +SurlysShack01||121 +TheCraterCore01||1290 TheCraterCore01|Master (Level 3)|1 TheCraterCore01|Requires Key|1 -TheNukashine01||1538 +TheNukashine01||1520 +TheRoseRoom01||1536 +TheRoseRoom01|Advanced (Level 1)|1 +TheRoseRoom01|Requires Key|2 TheRustyPick01||2442 -TheWayward01||1717 +TheWayward01||1716 TheWayward01|Expert (Level 2)|1 TheWayward01|Requires Key|1 ThunderMtPowerPlant01||9410 @@ -1534,7 +1552,7 @@ TopOfTheWorld01||4645 TopOfTheWorld01|Advanced (Level 1)|2 TopOfTheWorld01|Expert (Level 2)|1 TopOfTheWorld01|Master (Level 3)|4 -TunnelOfLoveMineshaft01||4422 +TunnelOfLoveMineshaft01||4423 UCB01||4565 UCB01|Advanced (Level 1)|2 UCB01|Novice (Level 0)|1 @@ -1544,7 +1562,7 @@ UncannyCaverns01||4225 UncannyCaverns01|Advanced (Level 1)|1 UncannyCaverns01|Novice (Level 0)|2 UncannyCaverns02||3191 -UncannyCavernsDungeon||7404 +UncannyCavernsDungeon||7405 UncannyCavernsDungeon|Advanced (Level 1)|1 UncannyCavernsDungeon|Inaccessible|3 UncannyCavernsDungeon|Novice (Level 0)|2 @@ -1565,7 +1583,7 @@ Vault51Dungeon|Inaccessible|9 Vault51Dungeon|Master (Level 3)|1 Vault51Dungeon|Novice (Level 0)|1 Vault63Entrance||350 -Vault79Entrance||1545 +Vault79Entrance||1544 Vault79Entrance|Expert (Level 2)|1 Vault79GoldVaultOperations||4698 Vault79Main||18822 @@ -1576,7 +1594,7 @@ Vault79Main|Master (Level 3)|3 Vault79Main|Novice (Level 0)|2 Vault79Main|Requires Key|2 Vault79Main|Requires Terminal|2 -Vault94Dungeon||17458 +Vault94Dungeon||17459 Vault94Dungeon|Advanced (Level 1)|5 Vault94Dungeon|Expert (Level 2)|10 Vault94Dungeon|Inaccessible|2 @@ -1653,51 +1671,60 @@ WhitespringMall01|Advanced (Level 1)|1 WhitespringMall01|Expert (Level 2)|1 WhitespringMall01|Master (Level 3)|3 WhitespringMall01|Novice (Level 0)|8 -WhitespringRefuge01||11656 +WhitespringRefuge01||11659 WhitespringRefuge01|Advanced (Level 1)|2 WhitespringRefuge01|Inaccessible|21 WhitespringRefuge01|Novice (Level 0)|6 -XPDAC01Casino||13702 +XPDAC01Casino||13783 XPDAC01Casino|Advanced (Level 1)|5 XPDAC01Casino|Inaccessible|3 XPDAC01Casino|Master (Level 3)|5 XPDAC01Casino|Novice (Level 0)|14 XPDAC01Casino|Requires Terminal|1 -XPDAC01EntertainmentDistrict||6781 +XPDAC01EntertainmentDistrict||6787 XPDAC01EntertainmentDistrict|Advanced (Level 1)|4 XPDAC01EntertainmentDistrict|Expert (Level 2)|1 -XPDAC01EntertainmentDistrict|Inaccessible|1 XPDAC01EntertainmentDistrict|Novice (Level 0)|1 -XPDAC01NightClub||2946 +XPDAC01NightClub||2990 XPDAC01NightClub|Advanced (Level 1)|2 -XPDAC01NightClub|Expert (Level 2)|2 +XPDAC01NightClub|Expert (Level 2)|3 XPDAC01NightClub|Novice (Level 0)|1 -XPDAC02Aquarium||16039 +XPDAC02Aquarium||16125 XPDAC02Aquarium|Expert (Level 2)|1 XPDAC02Aquarium|Novice (Level 0)|1 -XPDAC02Boardwalk||10574 +XPDAC02AquariumDungeon||15830 +XPDAC02AquariumDungeon|Expert (Level 2)|1 +XPDAC02AquariumDungeon|Novice (Level 0)|1 +XPDAC02Boardwalk||10745 XPDAC02Boardwalk|Expert (Level 2)|1 -XPDAC02Boardwalk|Inaccessible|1 XPDAC02Boardwalk|Master (Level 3)|1 XPDAC02Boardwalk|Novice (Level 0)|8 -XPDAC02Pier||7303 +XPDAC02Boardwalk|Requires Key|1 +XPDAC02Pier||7475 XPDAC02Pier|Expert (Level 2)|1 -XPDAC03CityHall||4099 +XPDAC03CityHall||5988 XPDAC03CityHall|Advanced (Level 1)|2 XPDAC03CityHall|Expert (Level 2)|1 -XPDAC03CityHall|Novice (Level 0)|4 -XPDAC03CommunityCenter||4637 -XPDAC03CommunityCenter|Advanced (Level 1)|1 +XPDAC03CityHall|Novice (Level 0)|11 +XPDAC03CommunityCenter||11646 +XPDAC03CommunityCenter|Advanced (Level 1)|5 XPDAC03CommunityCenter|Novice (Level 0)|2 -XPDAC03FloodedCityCenter||20046 -XPDAC03FloodedCityCenter|Advanced (Level 1)|5 +XPDAC03FloodedCityCenter||17058 +XPDAC03FloodedCityCenter|Advanced (Level 1)|6 XPDAC03FloodedCityCenter|Expert (Level 2)|1 -XPDAC03FloodedCityCenter|Novice (Level 0)|7 -XPDPitt01Foundry||16901 +XPDAC03FloodedCityCenter|Inaccessible|1 +XPDAC03FloodedCityCenter|Master (Level 3)|3 +XPDAC03FloodedCityCenter|Novice (Level 0)|15 +XPDPitt01Foundry||16900 XPDPitt01Foundry|Advanced (Level 1)|16 XPDPitt01Foundry|Expert (Level 2)|5 XPDPitt01Foundry|Master (Level 3)|3 XPDPitt01Foundry|Novice (Level 0)|8 +XPDPitt01FoundryDungeon||15334 +XPDPitt01FoundryDungeon|Advanced (Level 1)|8 +XPDPitt01FoundryDungeon|Expert (Level 2)|5 +XPDPitt01FoundryDungeon|Master (Level 3)|3 +XPDPitt01FoundryDungeon|Novice (Level 0)|7 XPDPitt01Industrial||20237 XPDPitt01Industrial|Advanced (Level 1)|24 XPDPitt01Industrial|Expert (Level 2)|3 @@ -1710,7 +1737,7 @@ XPDPitt02Sanctum|Advanced (Level 1)|1 XPDPitt02Sanctum|Inaccessible|4 XPDPitt02Sanctum|Master (Level 3)|2 XPDPitt02Sanctum|Novice (Level 0)|4 -XPDPitt02Trench||21217 +XPDPitt02Trench||21216 XPDPitt02Trench|Advanced (Level 1)|4 XPDPitt02Trench|Expert (Level 2)|8 XPDPitt02Trench|Novice (Level 0)|8 @@ -1797,36 +1824,36 @@ AlleghenyAsylum01|SOUN|4 AlleghenyAsylum01|STAT|11109 AlleghenyAsylum01|TERM|7 AlleghenyAsylum01|TXST|475 -Appalachia|ACTI|21797 -Appalachia|ALCH|265 +Appalachia|ACTI|21821 +Appalachia|ALCH|267 Appalachia|AMMO|59 Appalachia|ARMO|104 Appalachia|ASPC|2377 -Appalachia|BNDS|10373 -Appalachia|BOOK|495 +Appalachia|BNDS|10374 +Appalachia|BOOK|494 Appalachia|CNCY|257 -Appalachia|CONT|12515 -Appalachia|DOOR|2526 -Appalachia|FLOR|45207 -Appalachia|FURN|15106 +Appalachia|CONT|12521 +Appalachia|DOOR|2527 +Appalachia|FLOR|45211 +Appalachia|FURN|15123 Appalachia|HAZD|995 -Appalachia|IDLM|16918 +Appalachia|IDLM|16931 Appalachia|KEYM|36 -Appalachia|LIGH|8359 -Appalachia|LVLI|71744 -Appalachia|MISC|36047 -Appalachia|MSTT|23179 +Appalachia|LIGH|8372 +Appalachia|LVLI|71756 +Appalachia|MISC|36059 +Appalachia|MSTT|23188 Appalachia|NOTE|178 -Appalachia|NPC_|7407 +Appalachia|NPC_|7417 Appalachia|PROJ|93 -Appalachia|SCOL|353403 +Appalachia|SCOL|353446 Appalachia|SECH|253 Appalachia|SOUN|5923 -Appalachia|STAT|2385516 +Appalachia|STAT|2385758 Appalachia|TACT|62 Appalachia|TERM|371 -Appalachia|TXST|62869 -Appalachia|WEAP|175 +Appalachia|TXST|62887 +Appalachia|WEAP|176 ArktosPharmaLab01|ACTI|355 ArktosPharmaLab01|ASPC|14 ArktosPharmaLab01|BNDS|116 @@ -1898,7 +1925,7 @@ BigBendTunnel01|MSTT|288 BigBendTunnel01|NPC_|75 BigBendTunnel01|SCOL|252 BigBendTunnel01|SOUN|1 -BigBendTunnel01|STAT|5345 +BigBendTunnel01|STAT|5344 BigBendTunnel01|TERM|1 BigBendTunnel01|TXST|537 BigBendTunnel01|WEAP|4 @@ -2358,7 +2385,7 @@ FortAtlas01|LVLI|26 FortAtlas01|MISC|387 FortAtlas01|MSTT|99 FortAtlas01|NOTE|3 -FortAtlas01|NPC_|44 +FortAtlas01|NPC_|45 FortAtlas01|SCOL|238 FortAtlas01|SOUN|1 FortAtlas01|STAT|3502 @@ -2387,7 +2414,7 @@ FortAtlasDungeon01|SOUN|14 FortAtlasDungeon01|STAT|9750 FortAtlasDungeon01|TERM|3 FortAtlasDungeon01|TXST|329 -FoundationInt01|ACTI|17 +FoundationInt01|ACTI|18 FoundationInt01|ASPC|13 FoundationInt01|BNDS|62 FoundationInt01|BOOK|2 @@ -2399,10 +2426,10 @@ FoundationInt01|LIGH|153 FoundationInt01|MISC|222 FoundationInt01|MSTT|102 FoundationInt01|NOTE|10 -FoundationInt01|NPC_|21 +FoundationInt01|NPC_|23 FoundationInt01|SCOL|199 FoundationInt01|SOUN|13 -FoundationInt01|STAT|4034 +FoundationInt01|STAT|4035 FoundationInt01|TERM|1 FoundationInt01|TXST|339 FoundationSupplyRoom01|ACTI|4 @@ -2556,7 +2583,7 @@ FreeStatesBunker07|MSTT|32 FreeStatesBunker07|NPC_|4 FreeStatesBunker07|SCOL|38 FreeStatesBunker07|SOUN|1 -FreeStatesBunker07|STAT|630 +FreeStatesBunker07|STAT|631 FreeStatesBunker07|TXST|43 GarrahanMiningHQ01|ACTI|85 GarrahanMiningHQ01|ARMO|1 @@ -2638,7 +2665,7 @@ GlassedCavern01|NOTE|5 GlassedCavern01|NPC_|119 GlassedCavern01|SCOL|428 GlassedCavern01|SOUN|41 -GlassedCavern01|STAT|6185 +GlassedCavern01|STAT|6186 GlassedCavern01|TERM|1 GlassedCavern01|TXST|690 GlassedCavern01|WEAP|1 @@ -2735,20 +2762,6 @@ HornwrightSafeRoom01|SCOL|37 HornwrightSafeRoom01|STAT|806 HornwrightSafeRoom01|TXST|20 HornwrightSafeRoom01|WEAP|1 -IngramMansion01|ACTI|11 -IngramMansion01|BOOK|6 -IngramMansion01|CONT|15 -IngramMansion01|DOOR|3 -IngramMansion01|FURN|33 -IngramMansion01|IDLM|4 -IngramMansion01|LIGH|28 -IngramMansion01|LVLI|18 -IngramMansion01|MISC|47 -IngramMansion01|MSTT|5 -IngramMansion01|NPC_|11 -IngramMansion01|SCOL|10 -IngramMansion01|STAT|744 -IngramMansion01|TERM|1 KerwoodMine01|ACTI|98 KerwoodMine01|ASPC|1 KerwoodMine01|BNDS|10 @@ -2781,6 +2794,23 @@ LewisandSonsFarmingSupply01|MSTT|17 LewisandSonsFarmingSupply01|NPC_|4 LewisandSonsFarmingSupply01|SCOL|1 LewisandSonsFarmingSupply01|STAT|264 +LittleRobsHideout01|ACTI|20 +LittleRobsHideout01|BNDS|13 +LittleRobsHideout01|BOOK|1 +LittleRobsHideout01|CONT|6 +LittleRobsHideout01|DOOR|8 +LittleRobsHideout01|FLOR|1 +LittleRobsHideout01|FURN|16 +LittleRobsHideout01|HAZD|1 +LittleRobsHideout01|IDLM|12 +LittleRobsHideout01|LIGH|24 +LittleRobsHideout01|LVLI|9 +LittleRobsHideout01|MISC|21 +LittleRobsHideout01|MSTT|35 +LittleRobsHideout01|NPC_|16 +LittleRobsHideout01|SCOL|64 +LittleRobsHideout01|STAT|1131 +LittleRobsHideout01|TXST|81 LousMine01|ACTI|282 LousMine01|ALCH|4 LousMine01|ARMO|2 @@ -2857,6 +2887,21 @@ MamaDolceProcessing01|SOUN|7 MamaDolceProcessing01|STAT|2229 MamaDolceProcessing01|TERM|5 MamaDolceProcessing01|TXST|77 +MiresEye01|ACTI|44 +MiresEye01|BNDS|9 +MiresEye01|BOOK|2 +MiresEye01|CONT|13 +MiresEye01|DOOR|5 +MiresEye01|FURN|13 +MiresEye01|IDLM|21 +MiresEye01|LIGH|51 +MiresEye01|LVLI|98 +MiresEye01|MISC|50 +MiresEye01|MSTT|81 +MiresEye01|NPC_|14 +MiresEye01|SCOL|32 +MiresEye01|STAT|1109 +MiresEye01|TXST|139 MonongahMine01|ACTI|134 MonongahMine01|BNDS|102 MonongahMine01|BOOK|4 @@ -3009,7 +3054,7 @@ NPECultistCave|BOOK|1 NPECultistCave|CONT|23 NPECultistCave|DOOR|4 NPECultistCave|FLOR|3 -NPECultistCave|FURN|20 +NPECultistCave|FURN|19 NPECultistCave|HAZD|2 NPECultistCave|IDLM|12 NPECultistCave|LIGH|211 @@ -3018,7 +3063,7 @@ NPECultistCave|MISC|33 NPECultistCave|MSTT|165 NPECultistCave|NPC_|23 NPECultistCave|SCOL|98 -NPECultistCave|STAT|3223 +NPECultistCave|STAT|3222 NPECultistCave|TXST|221 NPEVault7601|ACTI|178 NPEVault7601|ALCH|30 @@ -3147,7 +3192,7 @@ PoseidonPlant01|NOTE|1 PoseidonPlant01|NPC_|64 PoseidonPlant01|SCOL|394 PoseidonPlant01|SOUN|31 -PoseidonPlant01|STAT|12937 +PoseidonPlant01|STAT|12936 PoseidonPlant01|TERM|15 PoseidonPlant01|TXST|207 PoseidonPlant02|ACTI|35 @@ -3190,23 +3235,6 @@ RadioResearchCenter01|SOUN|2 RadioResearchCenter01|STAT|2512 RadioResearchCenter01|TERM|3 RadioResearchCenter01|TXST|86 -RaiderCave01|ACTI|13 -RaiderCave01|BNDS|13 -RaiderCave01|BOOK|2 -RaiderCave01|CONT|6 -RaiderCave01|DOOR|8 -RaiderCave01|FLOR|1 -RaiderCave01|FURN|16 -RaiderCave01|HAZD|1 -RaiderCave01|IDLM|12 -RaiderCave01|LIGH|24 -RaiderCave01|LVLI|9 -RaiderCave01|MISC|21 -RaiderCave01|MSTT|35 -RaiderCave01|NPC_|14 -RaiderCave01|SCOL|64 -RaiderCave01|STAT|1124 -RaiderCave01|TXST|81 RaiderCave02|ACTI|20 RaiderCave02|BNDS|46 RaiderCave02|BOOK|3 @@ -3223,21 +3251,6 @@ RaiderCave02|SCOL|98 RaiderCave02|STAT|1340 RaiderCave02|TERM|1 RaiderCave02|TXST|127 -RaiderCave03|ACTI|44 -RaiderCave03|BNDS|9 -RaiderCave03|BOOK|2 -RaiderCave03|CONT|13 -RaiderCave03|DOOR|5 -RaiderCave03|FURN|13 -RaiderCave03|IDLM|21 -RaiderCave03|LIGH|51 -RaiderCave03|LVLI|98 -RaiderCave03|MISC|50 -RaiderCave03|MSTT|81 -RaiderCave03|NPC_|14 -RaiderCave03|SCOL|32 -RaiderCave03|STAT|1109 -RaiderCave03|TXST|139 RaiderRaidTrailerInt|CONT|7 RaiderRaidTrailerInt|DOOR|1 RaiderRaidTrailerInt|FURN|2 @@ -3396,6 +3409,12 @@ SheltersClaimCenter01|SCOL|14 SheltersClaimCenter01|STAT|763 SheltersClaimCenter01|TERM|1 SheltersClaimCenter01|TXST|50 +SheltersFlatlands|ACTI|6 +SheltersFlatlands|ASPC|1 +SheltersFlatlands|LIGH|1 +SheltersFlatlands|SCOL|26 +SheltersFlatlands|STAT|993 +SheltersFlatlands|TXST|507 SheltersHighStakes|ACTI|78 SheltersHighStakes|DOOR|3 SheltersHighStakes|LIGH|91 @@ -3554,6 +3573,20 @@ SugarGroveMissileSilo01|STAT|10777 SugarGroveMissileSilo01|TERM|27 SugarGroveMissileSilo01|TXST|298 SugarGroveMissileSilo01|WEAP|1 +SurlysShack01|BNDS|2 +SurlysShack01|BOOK|1 +SurlysShack01|CONT|2 +SurlysShack01|DOOR|2 +SurlysShack01|FLOR|1 +SurlysShack01|FURN|1 +SurlysShack01|LIGH|7 +SurlysShack01|LVLI|7 +SurlysShack01|MISC|5 +SurlysShack01|MSTT|6 +SurlysShack01|NPC_|1 +SurlysShack01|SCOL|1 +SurlysShack01|STAT|56 +SurlysShack01|TXST|29 TheCraterCore01|ACTI|6 TheCraterCore01|ASPC|7 TheCraterCore01|CONT|34 @@ -3564,32 +3597,49 @@ TheCraterCore01|LIGH|123 TheCraterCore01|LVLI|7 TheCraterCore01|MISC|55 TheCraterCore01|MSTT|22 -TheCraterCore01|NPC_|15 +TheCraterCore01|NPC_|17 TheCraterCore01|SCOL|24 TheCraterCore01|SECH|1 TheCraterCore01|SOUN|9 -TheCraterCore01|STAT|941 +TheCraterCore01|STAT|942 TheCraterCore01|TERM|2 -TheNukashine01|ACTI|15 +TheNukashine01|ACTI|16 TheNukashine01|ASPC|3 TheNukashine01|BNDS|8 TheNukashine01|BOOK|2 TheNukashine01|CONT|8 TheNukashine01|DOOR|7 -TheNukashine01|FURN|23 +TheNukashine01|FURN|25 TheNukashine01|HAZD|1 TheNukashine01|IDLM|7 TheNukashine01|LIGH|42 TheNukashine01|LVLI|28 -TheNukashine01|MISC|273 +TheNukashine01|MISC|270 TheNukashine01|MSTT|45 TheNukashine01|NOTE|1 -TheNukashine01|NPC_|1 -TheNukashine01|SCOL|68 +TheNukashine01|NPC_|6 +TheNukashine01|SCOL|60 TheNukashine01|SOUN|8 -TheNukashine01|STAT|964 +TheNukashine01|STAT|958 TheNukashine01|TERM|2 -TheNukashine01|TXST|32 +TheNukashine01|TXST|23 +TheRoseRoom01|ACTI|20 +TheRoseRoom01|ALCH|2 +TheRoseRoom01|BNDS|6 +TheRoseRoom01|BOOK|6 +TheRoseRoom01|CONT|25 +TheRoseRoom01|DOOR|4 +TheRoseRoom01|FURN|60 +TheRoseRoom01|IDLM|7 +TheRoseRoom01|LIGH|71 +TheRoseRoom01|LVLI|22 +TheRoseRoom01|MISC|131 +TheRoseRoom01|MSTT|29 +TheRoseRoom01|NPC_|10 +TheRoseRoom01|SCOL|33 +TheRoseRoom01|STAT|1099 +TheRoseRoom01|TERM|1 +TheRoseRoom01|TXST|13 TheRustyPick01|ACTI|14 TheRustyPick01|ARMO|25 TheRustyPick01|ASPC|2 @@ -3627,7 +3677,7 @@ TheWayward01|SCOL|40 TheWayward01|SOUN|1 TheWayward01|STAT|941 TheWayward01|TACT|1 -TheWayward01|TXST|37 +TheWayward01|TXST|36 ThunderMtPowerPlant01|ACTI|185 ThunderMtPowerPlant01|ARMO|2 ThunderMtPowerPlant01|ASPC|25 @@ -3678,15 +3728,15 @@ TunnelOfLoveMineshaft01|FLOR|69 TunnelOfLoveMineshaft01|FURN|43 TunnelOfLoveMineshaft01|LIGH|163 TunnelOfLoveMineshaft01|LVLI|23 -TunnelOfLoveMineshaft01|MISC|64 +TunnelOfLoveMineshaft01|MISC|63 TunnelOfLoveMineshaft01|MSTT|32 TunnelOfLoveMineshaft01|NPC_|1 -TunnelOfLoveMineshaft01|SCOL|346 +TunnelOfLoveMineshaft01|SCOL|347 TunnelOfLoveMineshaft01|STAT|3480 TunnelOfLoveMineshaft01|TACT|1 TunnelOfLoveMineshaft01|TERM|1 TunnelOfLoveMineshaft01|TXST|62 -TunnelOfLoveMineshaft01|WEAP|6 +TunnelOfLoveMineshaft01|WEAP|7 UCB01|ACTI|31 UCB01|ASPC|7 UCB01|BNDS|8 @@ -3763,7 +3813,7 @@ UncannyCavernsDungeon|NOTE|1 UncannyCavernsDungeon|NPC_|12 UncannyCavernsDungeon|SCOL|268 UncannyCavernsDungeon|SOUN|11 -UncannyCavernsDungeon|STAT|5660 +UncannyCavernsDungeon|STAT|5661 UncannyCavernsDungeon|TACT|10 UncannyCavernsDungeon|TXST|643 VTecAgCenter01|ACTI|17 @@ -3868,7 +3918,7 @@ Vault79Entrance|LIGH|37 Vault79Entrance|MISC|30 Vault79Entrance|MSTT|45 Vault79Entrance|SCOL|128 -Vault79Entrance|STAT|1198 +Vault79Entrance|STAT|1197 Vault79Entrance|TERM|1 Vault79Entrance|TXST|71 Vault79Entrance|WEAP|1 @@ -3924,7 +3974,7 @@ Vault94Dungeon|MSTT|158 Vault94Dungeon|NPC_|42 Vault94Dungeon|SCOL|1135 Vault94Dungeon|SOUN|74 -Vault94Dungeon|STAT|12852 +Vault94Dungeon|STAT|12853 Vault94Dungeon|TERM|21 Vault94Dungeon|TXST|1168 Vault94Dungeon|WEAP|13 @@ -4275,7 +4325,7 @@ WhitespringMall01|STAT|4679 WhitespringMall01|TERM|13 WhitespringMall01|TXST|16 WhitespringMall01|WEAP|1 -WhitespringRefuge01|ACTI|102 +WhitespringRefuge01|ACTI|103 WhitespringRefuge01|ARMO|3 WhitespringRefuge01|ASPC|1 WhitespringRefuge01|BOOK|2 @@ -4289,171 +4339,195 @@ WhitespringRefuge01|LVLI|96 WhitespringRefuge01|MISC|385 WhitespringRefuge01|MSTT|133 WhitespringRefuge01|NOTE|5 -WhitespringRefuge01|NPC_|46 +WhitespringRefuge01|NPC_|47 WhitespringRefuge01|SCOL|172 -WhitespringRefuge01|STAT|9527 +WhitespringRefuge01|STAT|9528 WhitespringRefuge01|TERM|5 WhitespringRefuge01|TXST|41 WhitespringRefuge01|WEAP|4 -XPDAC01Casino|ACTI|272 +XPDAC01Casino|ACTI|273 XPDAC01Casino|ALCH|3 XPDAC01Casino|ARMO|1 XPDAC01Casino|ASPC|2 XPDAC01Casino|BNDS|47 -XPDAC01Casino|BOOK|21 +XPDAC01Casino|BOOK|26 XPDAC01Casino|CONT|229 XPDAC01Casino|DOOR|75 -XPDAC01Casino|FURN|291 +XPDAC01Casino|FURN|311 XPDAC01Casino|HAZD|1 -XPDAC01Casino|IDLM|140 +XPDAC01Casino|IDLM|141 XPDAC01Casino|KEYM|2 -XPDAC01Casino|LIGH|566 +XPDAC01Casino|LIGH|565 XPDAC01Casino|LVLI|220 -XPDAC01Casino|MISC|947 +XPDAC01Casino|MISC|948 XPDAC01Casino|MSTT|285 -XPDAC01Casino|NPC_|69 +XPDAC01Casino|NPC_|100 XPDAC01Casino|SCOL|377 -XPDAC01Casino|SOUN|12 -XPDAC01Casino|STAT|9887 +XPDAC01Casino|SOUN|13 +XPDAC01Casino|STAT|9907 XPDAC01Casino|TERM|6 -XPDAC01Casino|TXST|277 +XPDAC01Casino|TXST|279 XPDAC01EntertainmentDistrict|ACTI|61 XPDAC01EntertainmentDistrict|ASPC|1 XPDAC01EntertainmentDistrict|CONT|61 -XPDAC01EntertainmentDistrict|DOOR|8 -XPDAC01EntertainmentDistrict|FURN|121 +XPDAC01EntertainmentDistrict|DOOR|9 +XPDAC01EntertainmentDistrict|FURN|122 XPDAC01EntertainmentDistrict|IDLM|95 -XPDAC01EntertainmentDistrict|LIGH|49 +XPDAC01EntertainmentDistrict|LIGH|50 XPDAC01EntertainmentDistrict|LVLI|59 XPDAC01EntertainmentDistrict|MISC|64 -XPDAC01EntertainmentDistrict|MSTT|77 +XPDAC01EntertainmentDistrict|MSTT|81 XPDAC01EntertainmentDistrict|NPC_|82 XPDAC01EntertainmentDistrict|SCOL|902 XPDAC01EntertainmentDistrict|SECH|2 XPDAC01EntertainmentDistrict|SOUN|7 -XPDAC01EntertainmentDistrict|STAT|4746 -XPDAC01EntertainmentDistrict|TXST|453 +XPDAC01EntertainmentDistrict|STAT|4763 +XPDAC01EntertainmentDistrict|TXST|434 XPDAC01NightClub|ACTI|32 XPDAC01NightClub|ALCH|3 XPDAC01NightClub|BOOK|3 XPDAC01NightClub|CONT|30 XPDAC01NightClub|DOOR|16 -XPDAC01NightClub|FURN|125 +XPDAC01NightClub|FURN|128 XPDAC01NightClub|LIGH|142 XPDAC01NightClub|LVLI|33 XPDAC01NightClub|MISC|303 XPDAC01NightClub|MSTT|80 -XPDAC01NightClub|NPC_|30 +XPDAC01NightClub|NOTE|1 +XPDAC01NightClub|NPC_|62 XPDAC01NightClub|SCOL|65 XPDAC01NightClub|SOUN|15 -XPDAC01NightClub|STAT|1907 +XPDAC01NightClub|STAT|1915 +XPDAC01NightClub|TERM|1 XPDAC01NightClub|TXST|167 -XPDAC02Aquarium|ACTI|76 +XPDAC02Aquarium|ACTI|74 XPDAC02Aquarium|BNDS|3 XPDAC02Aquarium|BOOK|7 XPDAC02Aquarium|CONT|77 XPDAC02Aquarium|DOOR|53 XPDAC02Aquarium|FLOR|5 -XPDAC02Aquarium|FURN|118 +XPDAC02Aquarium|FURN|149 XPDAC02Aquarium|IDLM|73 XPDAC02Aquarium|LIGH|713 XPDAC02Aquarium|LVLI|122 XPDAC02Aquarium|MISC|671 XPDAC02Aquarium|MSTT|481 -XPDAC02Aquarium|NPC_|49 +XPDAC02Aquarium|NPC_|88 XPDAC02Aquarium|SCOL|960 XPDAC02Aquarium|SOUN|46 -XPDAC02Aquarium|STAT|12306 +XPDAC02Aquarium|STAT|12324 XPDAC02Aquarium|TERM|2 XPDAC02Aquarium|TXST|279 -XPDAC02Boardwalk|ACTI|736 +XPDAC02AquariumDungeon|ACTI|47 +XPDAC02AquariumDungeon|BNDS|3 +XPDAC02AquariumDungeon|CONT|77 +XPDAC02AquariumDungeon|DOOR|49 +XPDAC02AquariumDungeon|FLOR|5 +XPDAC02AquariumDungeon|FURN|83 +XPDAC02AquariumDungeon|IDLM|31 +XPDAC02AquariumDungeon|LIGH|725 +XPDAC02AquariumDungeon|LVLI|122 +XPDAC02AquariumDungeon|MISC|664 +XPDAC02AquariumDungeon|MSTT|482 +XPDAC02AquariumDungeon|SCOL|959 +XPDAC02AquariumDungeon|SOUN|45 +XPDAC02AquariumDungeon|STAT|12265 +XPDAC02AquariumDungeon|TXST|275 +XPDAC02Boardwalk|ACTI|739 XPDAC02Boardwalk|ARMO|1 XPDAC02Boardwalk|ASPC|1 XPDAC02Boardwalk|BNDS|8 XPDAC02Boardwalk|BOOK|11 XPDAC02Boardwalk|CONT|95 -XPDAC02Boardwalk|DOOR|19 +XPDAC02Boardwalk|DOOR|20 XPDAC02Boardwalk|FLOR|1 -XPDAC02Boardwalk|FURN|155 +XPDAC02Boardwalk|FURN|191 XPDAC02Boardwalk|HAZD|2 -XPDAC02Boardwalk|IDLM|110 -XPDAC02Boardwalk|LIGH|117 -XPDAC02Boardwalk|LVLI|207 -XPDAC02Boardwalk|MISC|303 -XPDAC02Boardwalk|MSTT|123 -XPDAC02Boardwalk|NPC_|56 -XPDAC02Boardwalk|SCOL|769 +XPDAC02Boardwalk|IDLM|124 +XPDAC02Boardwalk|LIGH|120 +XPDAC02Boardwalk|LVLI|226 +XPDAC02Boardwalk|MISC|311 +XPDAC02Boardwalk|MSTT|125 +XPDAC02Boardwalk|NPC_|106 +XPDAC02Boardwalk|SCOL|768 XPDAC02Boardwalk|SECH|16 XPDAC02Boardwalk|SOUN|25 -XPDAC02Boardwalk|STAT|7283 +XPDAC02Boardwalk|STAT|7319 XPDAC02Boardwalk|TERM|1 XPDAC02Boardwalk|TXST|546 -XPDAC02Pier|ACTI|228 +XPDAC02Pier|ACTI|248 XPDAC02Pier|BNDS|11 -XPDAC02Pier|BOOK|3 -XPDAC02Pier|CONT|64 +XPDAC02Pier|BOOK|6 +XPDAC02Pier|CONT|65 XPDAC02Pier|DOOR|46 -XPDAC02Pier|FURN|97 -XPDAC02Pier|IDLM|38 -XPDAC02Pier|LIGH|366 +XPDAC02Pier|FURN|141 +XPDAC02Pier|IDLM|40 +XPDAC02Pier|LIGH|367 XPDAC02Pier|LVLI|78 -XPDAC02Pier|MISC|344 -XPDAC02Pier|MSTT|176 -XPDAC02Pier|NPC_|37 -XPDAC02Pier|SCOL|302 +XPDAC02Pier|MISC|346 +XPDAC02Pier|MSTT|177 +XPDAC02Pier|NOTE|3 +XPDAC02Pier|NPC_|64 +XPDAC02Pier|SCOL|299 XPDAC02Pier|SOUN|4 -XPDAC02Pier|STAT|5396 +XPDAC02Pier|STAT|5450 XPDAC02Pier|TACT|1 -XPDAC02Pier|TXST|108 +XPDAC02Pier|TXST|125 XPDAC02Pier|WEAP|5 -XPDAC03CityHall|ACTI|8 -XPDAC03CityHall|BOOK|5 -XPDAC03CityHall|CONT|53 +XPDAC03CityHall|ACTI|13 +XPDAC03CityHall|BNDS|23 +XPDAC03CityHall|BOOK|6 +XPDAC03CityHall|CONT|99 XPDAC03CityHall|DOOR|8 -XPDAC03CityHall|FURN|55 +XPDAC03CityHall|FURN|54 XPDAC03CityHall|IDLM|2 -XPDAC03CityHall|LIGH|9 -XPDAC03CityHall|MISC|5 -XPDAC03CityHall|MSTT|8 -XPDAC03CityHall|NPC_|19 -XPDAC03CityHall|SCOL|138 +XPDAC03CityHall|LIGH|102 +XPDAC03CityHall|LVLI|14 +XPDAC03CityHall|MISC|198 +XPDAC03CityHall|MSTT|20 +XPDAC03CityHall|NPC_|34 +XPDAC03CityHall|SCOL|299 XPDAC03CityHall|SOUN|15 -XPDAC03CityHall|STAT|3777 -XPDAC03CityHall|TERM|3 +XPDAC03CityHall|STAT|5106 +XPDAC03CityHall|TERM|2 +XPDAC03CityHall|TXST|6 XPDAC03CityHall|WEAP|1 -XPDAC03CommunityCenter|ACTI|83 +XPDAC03CommunityCenter|ACTI|91 +XPDAC03CommunityCenter|BNDS|188 XPDAC03CommunityCenter|BOOK|5 -XPDAC03CommunityCenter|CONT|27 -XPDAC03CommunityCenter|DOOR|33 -XPDAC03CommunityCenter|FLOR|3 -XPDAC03CommunityCenter|FURN|105 -XPDAC03CommunityCenter|IDLM|79 -XPDAC03CommunityCenter|LIGH|3 -XPDAC03CommunityCenter|LVLI|4 -XPDAC03CommunityCenter|MISC|15 -XPDAC03CommunityCenter|MSTT|16 -XPDAC03CommunityCenter|NPC_|54 -XPDAC03CommunityCenter|SCOL|33 -XPDAC03CommunityCenter|STAT|4178 +XPDAC03CommunityCenter|CONT|135 +XPDAC03CommunityCenter|DOOR|36 +XPDAC03CommunityCenter|FURN|137 +XPDAC03CommunityCenter|IDLM|80 +XPDAC03CommunityCenter|LIGH|296 +XPDAC03CommunityCenter|LVLI|143 +XPDAC03CommunityCenter|MISC|153 +XPDAC03CommunityCenter|MSTT|138 +XPDAC03CommunityCenter|NOTE|1 +XPDAC03CommunityCenter|NPC_|58 +XPDAC03CommunityCenter|SCOL|496 +XPDAC03CommunityCenter|STAT|9345 XPDAC03CommunityCenter|TERM|2 -XPDAC03FloodedCityCenter|ACTI|241 -XPDAC03FloodedCityCenter|ARMO|2 +XPDAC03CommunityCenter|TXST|349 +XPDAC03FloodedCityCenter|ACTI|302 +XPDAC03FloodedCityCenter|ARMO|3 XPDAC03FloodedCityCenter|ASPC|1 -XPDAC03FloodedCityCenter|BNDS|4 -XPDAC03FloodedCityCenter|BOOK|3 -XPDAC03FloodedCityCenter|CONT|57 -XPDAC03FloodedCityCenter|DOOR|6 -XPDAC03FloodedCityCenter|FURN|131 -XPDAC03FloodedCityCenter|IDLM|118 -XPDAC03FloodedCityCenter|LIGH|20 -XPDAC03FloodedCityCenter|LVLI|15 -XPDAC03FloodedCityCenter|MISC|33 -XPDAC03FloodedCityCenter|MSTT|70 -XPDAC03FloodedCityCenter|NPC_|95 -XPDAC03FloodedCityCenter|SCOL|717 -XPDAC03FloodedCityCenter|STAT|18542 -XPDAC03FloodedCityCenter|TERM|2 -XPDAC03FloodedCityCenter|TXST|2 +XPDAC03FloodedCityCenter|BNDS|91 +XPDAC03FloodedCityCenter|BOOK|7 +XPDAC03FloodedCityCenter|CONT|110 +XPDAC03FloodedCityCenter|DOOR|11 +XPDAC03FloodedCityCenter|FURN|122 +XPDAC03FloodedCityCenter|IDLM|117 +XPDAC03FloodedCityCenter|KEYM|1 +XPDAC03FloodedCityCenter|LIGH|227 +XPDAC03FloodedCityCenter|LVLI|69 +XPDAC03FloodedCityCenter|MISC|361 +XPDAC03FloodedCityCenter|MSTT|181 +XPDAC03FloodedCityCenter|NPC_|99 +XPDAC03FloodedCityCenter|SCOL|2688 +XPDAC03FloodedCityCenter|STAT|11984 +XPDAC03FloodedCityCenter|TERM|3 +XPDAC03FloodedCityCenter|TXST|707 XPDPitt01Foundry|ACTI|238 XPDPitt01Foundry|AMMO|18 XPDPitt01Foundry|ARMO|9 @@ -4472,10 +4546,29 @@ XPDPitt01Foundry|NOTE|2 XPDPitt01Foundry|NPC_|81 XPDPitt01Foundry|SCOL|1911 XPDPitt01Foundry|SOUN|39 -XPDPitt01Foundry|STAT|11221 +XPDPitt01Foundry|STAT|11220 XPDPitt01Foundry|TERM|3 XPDPitt01Foundry|TXST|574 XPDPitt01Foundry|WEAP|6 +XPDPitt01FoundryDungeon|ACTI|98 +XPDPitt01FoundryDungeon|AMMO|18 +XPDPitt01FoundryDungeon|ARMO|6 +XPDPitt01FoundryDungeon|BNDS|4 +XPDPitt01FoundryDungeon|CONT|215 +XPDPitt01FoundryDungeon|DOOR|21 +XPDPitt01FoundryDungeon|FURN|72 +XPDPitt01FoundryDungeon|HAZD|6 +XPDPitt01FoundryDungeon|IDLM|36 +XPDPitt01FoundryDungeon|LIGH|287 +XPDPitt01FoundryDungeon|LVLI|332 +XPDPitt01FoundryDungeon|MISC|279 +XPDPitt01FoundryDungeon|MSTT|450 +XPDPitt01FoundryDungeon|NPC_|12 +XPDPitt01FoundryDungeon|SCOL|1912 +XPDPitt01FoundryDungeon|SOUN|39 +XPDPitt01FoundryDungeon|STAT|11144 +XPDPitt01FoundryDungeon|TXST|425 +XPDPitt01FoundryDungeon|WEAP|1 XPDPitt01Industrial|ACTI|220 XPDPitt01Industrial|AMMO|4 XPDPitt01Industrial|ASPC|2 @@ -4541,7 +4634,7 @@ XPDPitt02Trench|MISC|349 XPDPitt02Trench|MSTT|446 XPDPitt02Trench|NOTE|2 XPDPitt02Trench|NPC_|147 -XPDPitt02Trench|SCOL|2097 +XPDPitt02Trench|SCOL|2096 XPDPitt02Trench|SOUN|2 XPDPitt02Trench|STAT|15023 XPDPitt02Trench|TERM|6 @@ -4650,7 +4743,7 @@ AlleghenyAsylum01|TestElevDoorTriggerARef077|1 AlleghenyAsylum01|TestElevDoorTriggerARef078|1 AlleghenyAsylum01|TestElevDoorTriggerARef079|1 AlleghenyAsylum01|W05_JonahItoRef|1 -Appalachia||3079088 +Appalachia||3079513 Appalachia|76ExitEventQuest_CenterMaker|1 Appalachia|76ExitEventSpawnAreaRef001|1 Appalachia|76ExitEventSpawnAreaRef002|1 @@ -4661,6 +4754,7 @@ Appalachia|76ExitEventStartTrigger002|1 Appalachia|76Exit_CenterBoundary_EnterMarker|1 Appalachia|76Exit_RightBoundary_EnterMarker|1 Appalachia|76TrailerEnabler|1 +Appalachia|AC_SQ04_LessonBookDispenser|1 Appalachia|AMBUSH_SOUTHTREES_LODXMarker|1 Appalachia|AMBUSH_Shack1_LODXMarker|1 Appalachia|AMBUSH_Shack2_LODXMarker|1 @@ -8579,7 +8673,7 @@ Appalachia|RSVP00_REF_Container_Cooler_Scott|1 Appalachia|RSVP00_REF_Container_Garry|1 Appalachia|RSVP00_REF_Corpse_Colonel|1 Appalachia|RSVP00_REF_Corpse_Dassa|1 -Appalachia|RSVP00_REF_Corpse_ReverendWinters|1 +Appalachia|RSVP00_REF_Corpse_ReverendWinters_Copy01|1 Appalachia|RSVP00_REF_Corpse_Scott|1 Appalachia|RSVP00_REF_Corpse_SofieYates|1 Appalachia|RSVP00_REF_Corpse_WillieMae|1 @@ -8601,7 +8695,7 @@ Appalachia|RSVP00_REF_Trigger_DelbertBedroom|1 Appalachia|RSVP00_REF_Trigger_Flatwoods|1 Appalachia|RSVP00_REF_Trigger_Tavern|1 Appalachia|RSVP01_Book_Report_WaterJuly_REF|1 -Appalachia|RSVP01_KeshaCorpseRef|1 +Appalachia|RSVP01_KeshaCorpseRef_Copy01|1 Appalachia|RSVP01_REF_Activator_WaterSupply|1 Appalachia|RSVP01_REF_Book_Database_Intro|1 Appalachia|RSVP01_REF_Book_PatientChart_Buzz|1 @@ -9325,6 +9419,7 @@ Appalachia|Test_MTNZ05_StoppedMarker01|1 Appalachia|TheCraterMapMarker|1 Appalachia|TheCrosshair_LocationCenter|1 Appalachia|TheCrosshair_LocationEdge|1 +Appalachia|TheRoseRoomMapMarker|1 Appalachia|TheRustyPickMapMarker|1 Appalachia|TheRustyPick_LocationCenter|1 Appalachia|TheRustyPick_LocationEdge|1 @@ -10222,7 +10317,7 @@ BelchingBetty01|TMRightStairs|1 BelchingBetty01|TM_left1|1 BelchingBetty01|TM_leftbottomapproach|1 BelchingBetty01|zw_belchingbettylowerlevel|1 -BigBendTunnel01||7467 +BigBendTunnel01||7466 BigBendTunnel01|E05_CP1_BackBrahmin|1 BigBendTunnel01|E05_CP1_BackBrahmin001|1 BigBendTunnel01|E05_CP1_BackBrahmin002|1 @@ -10934,7 +11029,7 @@ EnclaveResearchFacility01|BS01_MQ07_Task05_Trigger|1 EnclaveResearchFacility01|BS01_MQ07_Task06_Trigger|1 EnclaveResearchFacility01|BS01_MQ07_Task07_Trigger|1 EnclaveResearchFacility01|BS01_MQ07_WelcomeBack_Trigger|1 -FortAtlas01||5065 +FortAtlas01||5066 FortAtlas01|Atlas_VernonDodgeFurniture01|1 FortAtlas01|Atlas_VernonDodgeFurniture02|1 FortAtlas01|Atlas_VernonDodgeFurniture03|1 @@ -11185,6 +11280,10 @@ FortAtlasDungeon01|WaterVolume03|1 FortAtlasDungeon01|WaterVolume04|1 FortAtlasDungeon01|WaterVolume06|1 FoundationInt01||5347 +FoundationInt01|AC_SQ04_FoundationExitMarker|1 +FoundationInt01|AC_SQ04_FoundationSceneTrigger|1 +FoundationInt01|AC_SQ04_JusticeRef_Foundation|1 +FoundationInt01|AC_SQ04_SettlerRef|1 FoundationInt01|AubrieSandboxMarker|1 FoundationInt01|FoundationSoldiersSandboxMarker|1 FoundationInt01|Foundation_Interior_DirectTravelPoint|1 @@ -11264,7 +11363,7 @@ FreeStatesBunker06|REF_COMP_Astronaut_Actor_Daguerre|1 FreeStatesBunker06|REF_COMP_Astronaut_Furniture_Wounded|1 FreeStatesBunker06|REF_COMP_Astronaut_Intro_EnableMarker|1 FreeStatesBunker06|REF_COMP_Astronaut_Terminal_Bunker|1 -FreeStatesBunker07||1040 +FreeStatesBunker07||1041 FreeStatesBunker07|FS_JeremiahPart01Ref001|1 FreeStatesBunker07|W05_MQS_203P_FieldsFurn1|1 FreeStatesBunker07|W05_MQS_203P_FieldsFurn2|1 @@ -11351,7 +11450,7 @@ GauleyMine01|W05_MQ_004P_Crane_Stage700ObjMarker|1 GauleyMine01|W05_MQ_004P_Crane_Stage775Trigger|1 GauleyMine01|W05_MQ_004P_SecondWaveEnableMarker|1 GauleyMine01|W05_PollyHeadSpawn_GauleyMine|1 -GlassedCavern01||9036 +GlassedCavern01||9037 GlassedCavern01|BoS03CaveMarker|1 GlassedCavern01|BoS03RubbleSpawnerREF|1 GlassedCavern01|BoS03TransponderREF05|1 @@ -11540,38 +11639,6 @@ HornwrightSafeRoom01|W05_MQS_201P_Saferoom|1 HornwrightSafeRoom01|W05_MQS_201P_Saferoom_REF|1 HornwrightSafeRoom01|W05_MQS_201P_Saferoom_Scene_REF|1 HornwrightSafeRoom01|W05_MotherlodeAlwaysOpen|1 -IngramMansion01||905 -IngramMansion01|AC_MQ01_AbbieCowerMarker|1 -IngramMansion01|AC_MQ01_DownstairsTrigger|1 -IngramMansion01|AC_MQ01_EvelynDownstairsMarker|1 -IngramMansion01|AC_MQ01_EvelynStormAwayMarker|1 -IngramMansion01|AC_MQ01_ExitMarker|1 -IngramMansion01|AC_MQ01_HitmanGoon|1 -IngramMansion01|AC_MQ01_HitmanGoonMarker|1 -IngramMansion01|AC_MQ01_HitmanLeaderMarker|1 -IngramMansion01|AC_MQ01_MusicianRef|1 -IngramMansion01|AC_MQ01_Opportunity_AbbieStoolRef|1 -IngramMansion01|AC_MQ01_Opportunity_EvelynToAbbieMarker|1 -IngramMansion01|AC_MQ01_Opportunity_FemaleScavengerMarker|1 -IngramMansion01|AC_MQ01_Opportunity_HitmanStool|1 -IngramMansion01|AC_MQ01_Opportunity_MaleScavengerMarker|1 -IngramMansion01|AC_MQ01_Opportunity_MedicFurn|1 -IngramMansion01|AC_MQ01_Opportunity_MusicianCouch|1 -IngramMansion01|AC_MQ01_Opportunity_PlayerCouch|1 -IngramMansion01|AC_MQ01_Opportunity_ShootMarker|1 -IngramMansion01|AC_MQ01_Opportunity_VinBarFurn|1 -IngramMansion01|AC_MQ01_ScavengerFemale|1 -IngramMansion01|AC_MQ01_ScavengerMale|1 -IngramMansion01|AC_MQ01_TubaRef|1 -IngramMansion01|AC_MQ01_VinBarMarker|1 -IngramMansion01|AC_MQ04_Sins_LabTableDecorEnableMarker_REF|1 -IngramMansion01|AC_MQ04_VinSmokeFurniture_Ref|1 -IngramMansion01|AC_MQ_AbbieRef|1 -IngramMansion01|AC_MQ_AntonioRef|1 -IngramMansion01|AC_MQ_EvelynRef|1 -IngramMansion01|AC_MQ_LabDoor_Ref|1 -IngramMansion01|AC_MQ_VinRef|1 -IngramMansion01|AC_MQ_VinToAbbieMarker|1 KerwoodMine01||5593 KerwoodMine01|BS01_BarredDoor|1 KerwoodMine01|BS01_Bread_Miners|1 @@ -11659,6 +11726,19 @@ LewisandSonsFarmingSupply01|BS01_MQ03_FieldTesting_Couch|1 LewisandSonsFarmingSupply01|BS01_MQ03_FieldTesting_MartyChair|1 LewisandSonsFarmingSupply01|BS01_MQ03_FieldTesting_OtherChair|1 LewisandSonsFarmingSupply01|BS01_MartyPutnam_EnableMarker|1 +LittleRobsHideout01||1447 +LittleRobsHideout01|AC_SQ01_HellsEagles_EnemySpawnTrigger_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_HideoutSpawnCenter_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_InstanceMarker_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_InterviewCameraMarker_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_Interview_TeleportMarker_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_JackFreedMarker_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_Jack_ExitMarker_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_Jack_ThroneMarker_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_LatrineDoor_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_LittleRob_ThroneMarker_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_RobsDoor01_Ref|1 +LittleRobsHideout01|AC_SQ01_HellsEagles_RobsDoor02_Ref|1 LousMine01||6959 LousMine01|CrusherTrapFallingDustRocksRoom|1 LousMine01|Door01_Explosion|1 @@ -11849,6 +11929,7 @@ MamaDolceProcessing01|EN07_Death_AreaObjREF|1 MamaDolceProcessing01|EN07_Death_StealthLabTerminalREF|1 MamaDolceProcessing01|MamaDolceProcessingLoadDoorInt|1 MamaDolceProcessing01|MamaDolceProcessing_LocationCenter|1 +MiresEye01||1681 MonongahMine01||6892 MonongahMine01|E06_Colossus_AmbushTrigger|1 MonongahMine01|E06_Colossus_DoorEnableMarker|1 @@ -12009,7 +12090,7 @@ MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_01_PackIn012|1 MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_02_PackIn012|1 MorgantownHighSchoolDungeon|DailyOps_Mode01_Respawn03_03_PackIn012|1 MountBlairWarehouseBasement01||319 -NPECultistCave||4233 +NPECultistCave||4231 NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref|1 NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref001|1 NPECultistCave|NPE_DQ01_CultistArtifactContainer_Ref002|1 @@ -12023,82 +12104,82 @@ NPECultistCave|NorthExitOrganCave|1 NPECultistCave|SouthExitOrganCave|1 NPECultistCave|WestExitOrganCave|1 NPEVault7601||6958 -NPEVault7601|76CharGenPerkBoardTriggerRef005_Copy01_Copy01|1 -NPEVault7601|76ExitTriggerREF02_Copy01_Copy01|1 -NPEVault7601|76TrailerCoupleEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerOverseerEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerPartyEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerRoomPipboyEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerStandeeEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerTrainingEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerVaultDoorExitEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerVaultExitEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerVaultExitHugEnabler001_Copy01_Copy01|1 -NPEVault7601|76TrailerWorkersEnabler001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroCouple_Actor_Barney001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroCouple_Actor_Carol001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Alice001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Barney001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Biscuit001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Carol001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Cody001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Kathy001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Louise001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Margret001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Markie001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Phyllis001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Ron001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Sandy001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Violet001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroParty_Actor_Will001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactorLight04_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactorLight05_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactorLight06_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Foreman001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker05_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker07_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker08_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker09_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroReactor_Actor_Worker10_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroStandee_Actor_Sandy001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroStandee_Actor_Violet001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Alice001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Biscuit001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Cody001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Louise001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Margret001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Markie001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Overseer03_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Overseer04_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Phyllis001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Ron001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Sandy001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Violet001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroTraining_Actor_Will001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Alice001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Barney001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Carol001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Cody001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Louise001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Margret001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Markie001_Copy01_Copy01|1 -NPEVault7601|76Trailer_IntroVaultExit_Actor_Ron001_Copy01_Copy01|1 -NPEVault7601|CAMPTriggerMarker002_Copy01_Copy01|1 -NPEVault7601|CharGenEndMarker002_Copy01_Copy01|1 -NPEVault7601|CharGenTrailerRef005_Copy01_Copy01|1 +NPEVault7601|76CharGenPerkBoardTriggerRef005_Copy01_Copy01_Copy01|1 +NPEVault7601|76ExitTriggerREF02_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerCoupleEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerOverseerEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerPartyEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerRoomPipboyEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerStandeeEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerTrainingEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerVaultDoorExitEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerVaultExitEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerVaultExitHugEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76TrailerWorkersEnabler001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroCouple_Actor_Barney001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroCouple_Actor_Carol001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Alice001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Barney001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Biscuit001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Carol001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Cody001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Kathy001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Louise001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Margret001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Markie001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Phyllis001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Ron001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Sandy001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Violet001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroParty_Actor_Will001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactorLight04_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactorLight05_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactorLight06_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Foreman001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker05_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker07_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker08_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker09_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroReactor_Actor_Worker10_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroStandee_Actor_Sandy001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroStandee_Actor_Violet001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Alice001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Biscuit001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Cody001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Louise001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Margret001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Markie001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Overseer03_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Overseer04_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Phyllis001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Ron001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Sandy001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Violet001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroTraining_Actor_Will001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Alice001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Barney001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Carol001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Cody001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Louise001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Margret001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Markie001_Copy01_Copy01_Copy01|1 +NPEVault7601|76Trailer_IntroVaultExit_Actor_Ron001_Copy01_Copy01_Copy01|1 +NPEVault7601|CAMPTriggerMarker002_Copy01_Copy01_Copy01|1 +NPEVault7601|CharGenEndMarker002_Copy01_Copy01_Copy01|1 +NPEVault7601|CharGenTrailerRef005_Copy01_Copy01_Copy01|1 NPEVault7601|Chargen_BreadcrumbQT01_Ref|1 NPEVault7601|Chargen_BreadcrumbQT02_Ref|1 NPEVault7601|Chargen_BreadcrumbQT03_Ref|1 @@ -12106,23 +12187,23 @@ NPEVault7601|Chargen_BreadcrumbQT04_Ref|1 NPEVault7601|Chargen_BreadcrumbQT05_Ref|1 NPEVault7601|Chargen_BreadcrumbQT06_Ref|1 NPEVault7601|Chargen_BreadcrumbQT07_Ref|1 -NPEVault7601|Face01Light002_Copy01_Copy01|1 -NPEVault7601|Face02Light002_Copy01_Copy01|1 -NPEVault7601|Face03Light002_Copy01_Copy01|1 -NPEVault7601|Face04Light002_Copy01_Copy01|1 -NPEVault7601|Face05Light002_Copy01_Copy01|1 -NPEVault7601|Face06Light002_Copy01_Copy01|1 -NPEVault7601|Intro_Party_TrailerEnabler005_Copy01_Copy01|1 +NPEVault7601|Face01Light002_Copy01_Copy01_Copy01|1 +NPEVault7601|Face02Light002_Copy01_Copy01_Copy01|1 +NPEVault7601|Face03Light002_Copy01_Copy01_Copy01|1 +NPEVault7601|Face04Light002_Copy01_Copy01_Copy01|1 +NPEVault7601|Face05Light002_Copy01_Copy01_Copy01|1 +NPEVault7601|Face06Light002_Copy01_Copy01_Copy01|1 +NPEVault7601|Intro_Party_TrailerEnabler005_Copy01_Copy01_Copy01|1 NPEVault7601|NPE_LoadoutObjects_EnableMarker_Ref|1 NPEVault7601|NPE_MQ01_Enjoy_VR76ExitMarker_Ref|1 NPEVault7601|NPE_SaveFailsafe_Trigger_Ref|1 -NPEVault7601|NameOverrideTestMarker001_Copy01_Copy01|1 -NPEVault7601|PipeRoomExtFilter002_Copy01_Copy01|1 -NPEVault7601|PipeRoomIntFilter002_Copy01_Copy01|1 -NPEVault7601|PipeRoomNoFilter002_Copy01_Copy01|1 -NPEVault7601|RS01A_Contact_DoorQTMarker02_Copy01_Copy01|1 -NPEVault7601|TestChargenDinerScene001_Copy01_Copy01|1 -NPEVault7601|TrailerEnabler005_Copy01_Copy01|1 +NPEVault7601|NameOverrideTestMarker001_Copy01_Copy01_Copy01|1 +NPEVault7601|PipeRoomExtFilter002_Copy01_Copy01_Copy01|1 +NPEVault7601|PipeRoomIntFilter002_Copy01_Copy01_Copy01|1 +NPEVault7601|PipeRoomNoFilter002_Copy01_Copy01_Copy01|1 +NPEVault7601|RS01A_Contact_DoorQTMarker02_Copy01_Copy01_Copy01|1 +NPEVault7601|TestChargenDinerScene001_Copy01_Copy01_Copy01|1 +NPEVault7601|TrailerEnabler005_Copy01_Copy01_Copy01|1 NPEVault7601|XMarkerHeading_CharGen06Start01|1 NPEVault7601|XMarkerHeading_CharGen06Start02|1 NPEVault7601|XMarkerHeading_CharGen06Start03|1 @@ -12131,96 +12212,96 @@ NPEVault7601|XMarkerHeading_CharGen06Start05|1 NPEVault7601|XMarkerHeading_CharGen06Start06|1 NVEShelter01||360 NVEVault7601||7041 -NVEVault7601|76CharGenPerkBoardTriggerRef005_Copy01|1 -NVEVault7601|76ExitTriggerREF02_Copy01|1 -NVEVault7601|76TrailerCoupleEnabler001_Copy01|1 -NVEVault7601|76TrailerOverseerEnabler001_Copy01|1 -NVEVault7601|76TrailerPartyEnabler001_Copy01|1 -NVEVault7601|76TrailerRoomPipboyEnabler001_Copy01|1 -NVEVault7601|76TrailerStandeeEnabler001_Copy01|1 -NVEVault7601|76TrailerTrainingEnabler001_Copy01|1 -NVEVault7601|76TrailerVaultDoorExitEnabler001_Copy01|1 -NVEVault7601|76TrailerVaultExitEnabler001_Copy01|1 -NVEVault7601|76TrailerVaultExitHugEnabler001_Copy01|1 -NVEVault7601|76TrailerWorkersEnabler001_Copy01|1 -NVEVault7601|76Trailer_IntroCouple_Actor_Barney001_Copy01|1 -NVEVault7601|76Trailer_IntroCouple_Actor_Carol001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Alice001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Barney001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Biscuit001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Carol001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Cody001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Kathy001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Louise001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Margret001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Markie001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Phyllis001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Ron001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Sandy001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Violet001_Copy01|1 -NVEVault7601|76Trailer_IntroParty_Actor_Will001_Copy01|1 -NVEVault7601|76Trailer_IntroReactorLight04_Copy01|1 -NVEVault7601|76Trailer_IntroReactorLight05_Copy01|1 -NVEVault7601|76Trailer_IntroReactorLight06_Copy01|1 -NVEVault7601|76Trailer_IntroReactor_Actor_Foreman001_Copy01|1 -NVEVault7601|76Trailer_IntroReactor_Actor_Worker05_Copy01|1 -NVEVault7601|76Trailer_IntroReactor_Actor_Worker07_Copy01|1 -NVEVault7601|76Trailer_IntroReactor_Actor_Worker08_Copy01|1 -NVEVault7601|76Trailer_IntroReactor_Actor_Worker09_Copy01|1 -NVEVault7601|76Trailer_IntroReactor_Actor_Worker10_Copy01|1 -NVEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001_Copy01|1 -NVEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001_Copy01|1 -NVEVault7601|76Trailer_IntroStandee_Actor_Sandy001_Copy01|1 -NVEVault7601|76Trailer_IntroStandee_Actor_Violet001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Alice001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Biscuit001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Cody001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Louise001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Margret001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Markie001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Overseer03_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Overseer04_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Phyllis001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Ron001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Sandy001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Violet001_Copy01|1 -NVEVault7601|76Trailer_IntroTraining_Actor_Will001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Alice001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Barney001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Carol001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Cody001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Louise001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Margret001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Markie001_Copy01|1 -NVEVault7601|76Trailer_IntroVaultExit_Actor_Ron001_Copy01|1 -NVEVault7601|CAMPTriggerMarker002_Copy01|1 -NVEVault7601|CharGenEndMarker002_Copy01|1 -NVEVault7601|CharGenTrailerRef005_Copy01|1 -NVEVault7601|Face01Light002_Copy01|1 -NVEVault7601|Face02Light002_Copy01|1 -NVEVault7601|Face03Light002_Copy01|1 -NVEVault7601|Face04Light002_Copy01|1 -NVEVault7601|Face05Light002_Copy01|1 -NVEVault7601|Face06Light002_Copy01|1 -NVEVault7601|Intro_Party_TrailerEnabler005_Copy01|1 -NVEVault7601|NameOverrideTestMarker001_Copy01|1 -NVEVault7601|PipeRoomExtFilter002_Copy01|1 -NVEVault7601|PipeRoomIntFilter002_Copy01|1 -NVEVault7601|PipeRoomNoFilter002_Copy01|1 -NVEVault7601|RS01A_Contact_DoorQTMarker02_Copy01|1 -NVEVault7601|TestChargenDinerScene001_Copy01|1 -NVEVault7601|TrailerEnabler005_Copy01|1 +NVEVault7601|76CharGenPerkBoardTriggerRef005_Copy01_Copy01|1 +NVEVault7601|76ExitTriggerREF02_Copy01_Copy01|1 +NVEVault7601|76TrailerCoupleEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerOverseerEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerPartyEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerRoomPipboyEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerStandeeEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerTrainingEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerVaultDoorExitEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerVaultExitEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerVaultExitHugEnabler001_Copy01_Copy01|1 +NVEVault7601|76TrailerWorkersEnabler001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroCouple_Actor_Barney001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroCouple_Actor_Carol001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Alice001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Barney001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Biscuit001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Carol001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Cody001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Kathy001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Louise001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Margret001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Markie001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Phyllis001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Ron001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Sandy001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Violet001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroParty_Actor_Will001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactorLight04_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactorLight05_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactorLight06_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Foreman001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker05_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker07_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker08_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker09_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroReactor_Actor_Worker10_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroRoomPipboy_Actor_Barney001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroRoomPipboy_Actor_Carol001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroStandee_Actor_Sandy001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroStandee_Actor_Violet001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Alice001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Biscuit001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Cody001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Louise001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Margret001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Markie001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Overseer03_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Overseer04_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Phyllis001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Ron001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Sandy001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Violet001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroTraining_Actor_Will001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Alice001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Barney001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Carol001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Cody001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Kathy001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Louise001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Margret001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Markie001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultDoorExit_Actor_Sandy001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Alice001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Barney001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Biscuit001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Carol001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Cody001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Kathy001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Louise001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Margret001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Markie001_Copy01_Copy01|1 +NVEVault7601|76Trailer_IntroVaultExit_Actor_Ron001_Copy01_Copy01|1 +NVEVault7601|CAMPTriggerMarker002_Copy01_Copy01|1 +NVEVault7601|CharGenEndMarker002_Copy01_Copy01|1 +NVEVault7601|CharGenTrailerRef005_Copy01_Copy01|1 +NVEVault7601|Face01Light002_Copy01_Copy01|1 +NVEVault7601|Face02Light002_Copy01_Copy01|1 +NVEVault7601|Face03Light002_Copy01_Copy01|1 +NVEVault7601|Face04Light002_Copy01_Copy01|1 +NVEVault7601|Face05Light002_Copy01_Copy01|1 +NVEVault7601|Face06Light002_Copy01_Copy01|1 +NVEVault7601|Intro_Party_TrailerEnabler005_Copy01_Copy01|1 +NVEVault7601|NameOverrideTestMarker001_Copy01_Copy01|1 +NVEVault7601|PipeRoomExtFilter002_Copy01_Copy01|1 +NVEVault7601|PipeRoomIntFilter002_Copy01_Copy01|1 +NVEVault7601|PipeRoomNoFilter002_Copy01_Copy01|1 +NVEVault7601|RS01A_Contact_DoorQTMarker02_Copy01_Copy01|1 +NVEVault7601|TestChargenDinerScene001_Copy01_Copy01|1 +NVEVault7601|TrailerEnabler005_Copy01_Copy01|1 NVEVault7601|XMarkerHeading_CharGen01Start07|1 NVEVault7601|XMarkerHeading_CharGen01Start08|1 NVEVault7601|XMarkerHeading_CharGen01Start09|1 @@ -12264,7 +12345,7 @@ OverseersHome01|W05_MQ_101P_OverseerEnableMarkerRef|1 OverseersHome01|W05_MQ_101P_SetStage110Trigger|1 OverseersHome01|W05_MQ_101P_SetStage150Trigger|1 OverseersHome01|W05_Overseer_InstancedRef|1 -PoseidonPlant01||15640 +PoseidonPlant01||15639 PoseidonPlant01|AudioEnableMarker_Poseidon_GeneratorRoom|1 PoseidonPlant01|AudioEnableMarker_Poseidon_ReactorRoom|1 PoseidonPlant01|LC006_PoseidonPlantLoadExpansion|1 @@ -12296,7 +12377,6 @@ PoseidonPlant02|WL020_Post204P_UnlockedDoor02|1 RadioResearchCenter01||3470 RadioResearchCenter01|EN03_RadioResearchDebugMarker|1 RadioResearchCenter01|MTNM02RadioResearchMarker|1 -RaiderCave01||1444 RaiderCave02||1857 RaiderCave02|BS01_MQ05_Raiders_EnableMarker_BoSProtectrons|1 RaiderCave02|BS01_MQ05_Raiders_EnableMarker_Raiders|1 @@ -12315,7 +12395,6 @@ RaiderCave02|BS01_MQ06A_Raiders_PierceRef|1 RaiderCave02|BS01_MQ06A_Raiders_ShinCaveMarker001|1 RaiderCave02|BS01_MQ06A_Raiders_ShinCaveMarker002|1 RaiderCave02|BS01_MQ06A_Raiders_ShinRef|1 -RaiderCave03||1681 RaiderRaidTrailerInt||99 RaiderRaidTrailerInt|W05_MQ_101P_A_AldridgeAliveEnableRef|1 RaiderRaidTrailerInt|W05_MQ_101P_A_AldridgeAliveRef|1 @@ -12436,6 +12515,7 @@ SettlerBugOutCave|W05_MQ_101P_B_AubrieDeadEnableMarkerRef|1 SheltersCave01||534 SheltersCave02||608 SheltersClaimCenter01||976 +SheltersFlatlands||1534 SheltersHighStakes||2617 SheltersMissileSilo||493 SheltersPittTrench01||1142 @@ -12621,7 +12701,10 @@ SugarGroveMissileSilo01|xSCMSilo_Ops|1 SugarGroveMissileSilo01|xSCMSilo_Reactor|1 SugarGroveMissileSilo01|xSCMSilo_Residential|1 SugarGroveMissileSilo01|xSCMSilo_Storage|1 -TheCraterCore01||1258 +SurlysShack01||120 +SurlysShack01|AC_SQ01_HellsEagles_NoteContainer_Ref|1 +TheCraterCore01||1260 +TheCraterCore01|AC_SQ01_HellsEagles_Oscar_ExitMarker_Ref|1 TheCraterCore01|BrahminSkullCraterRef|1 TheCraterCore01|Crater_Gail_Room_Marker|1 TheCraterCore01|Crater_Interior_DirectTravelPoint|1 @@ -12653,12 +12736,64 @@ TheCraterCore01|W05_Sandbox_AllRef|1 TheCraterCore01|W05_Sandbox_BottomRef|1 TheCraterCore01|W05_Sandbox_TopRef|1 TheCraterCore01|XPD_ARG_XMarker|1 -TheNukashine01||1533 +TheNukashine01||1506 +TheNukashine01|AC_SQ04_BrotherhoodHoldUpMarker|1 +TheNukashine01|AC_SQ04_DownstairsTrigger|1 +TheNukashine01|AC_SQ04_HoldUpMarker|1 +TheNukashine01|AC_SQ04_InstrumentFurnRef|1 +TheNukashine01|AC_SQ04_JusticeHoldUpFurn|1 +TheNukashine01|AC_SQ04_JusticeRef_Nukashine|1 +TheNukashine01|AC_SQ04_JusticeWrapUpMarker|1 +TheNukashine01|AC_SQ04_NukashineExitMarker|1 +TheNukashine01|AC_SQ04_ReneRef|1 TheNukashine01|P01A_Nukashine_BivRef|1 TheNukashine01|P01A_Nukashine_PastSecretDoorTrigger|1 TheNukashine01|P01A_Nukashine_SpeakeasyTrigger|1 TheNukashine01|UD004_NukashineLoadDoorInt|1 TheNukashine01|XMarker_D01A_Wasted_BrewingObj|1 +TheRoseRoom01||1497 +TheRoseRoom01|AC_MQ01_DownstairsTrigger|1 +TheRoseRoom01|AC_MQ01_EvelynDownstairsMarker|1 +TheRoseRoom01|AC_MQ01_EvelynStormAwayMarker|1 +TheRoseRoom01|AC_MQ01_ExitMarker|1 +TheRoseRoom01|AC_MQ01_HitmanGoon|1 +TheRoseRoom01|AC_MQ01_HitmanLeaderMarker|1 +TheRoseRoom01|AC_MQ01_MusicianRef|1 +TheRoseRoom01|AC_MQ01_Opportunity_AbbieCowerFurn|1 +TheRoseRoom01|AC_MQ01_Opportunity_AbbieStoolRef|1 +TheRoseRoom01|AC_MQ01_Opportunity_AbbieStoolRef001|1 +TheRoseRoom01|AC_MQ01_Opportunity_EvelynFanSelfFurn|1 +TheRoseRoom01|AC_MQ01_Opportunity_EvelynToAbbieMarker|1 +TheRoseRoom01|AC_MQ01_Opportunity_FemaleScavengerMarker|1 +TheRoseRoom01|AC_MQ01_Opportunity_HitmanGoonDrinkingFurn|1 +TheRoseRoom01|AC_MQ01_Opportunity_HitmanStool|1 +TheRoseRoom01|AC_MQ01_Opportunity_MaleScavengerMarker|1 +TheRoseRoom01|AC_MQ01_Opportunity_MedicFurn|1 +TheRoseRoom01|AC_MQ01_Opportunity_MusicianCouch|1 +TheRoseRoom01|AC_MQ01_Opportunity_PlayerCouch|1 +TheRoseRoom01|AC_MQ01_Opportunity_ShootMarker|1 +TheRoseRoom01|AC_MQ01_Opportunity_VinBarFurn|1 +TheRoseRoom01|AC_MQ01_ScavengerFemale|1 +TheRoseRoom01|AC_MQ01_ScavengerMale|1 +TheRoseRoom01|AC_MQ01_TubaRef|1 +TheRoseRoom01|AC_MQ01_VinAfterFightMarker|1 +TheRoseRoom01|AC_MQ03_HonorBound_Abbie_Marker_Ref|1 +TheRoseRoom01|AC_MQ03_HonorBound_RussoHouseMarker_Ref|1 +TheRoseRoom01|AC_MQ04_Sins_AbbieFinaleMarker|1 +TheRoseRoom01|AC_MQ04_Sins_AntonioFinaleMarker|1 +TheRoseRoom01|AC_MQ04_Sins_EvelynFinaleMarker|1 +TheRoseRoom01|AC_MQ04_Sins_FinaleSceneTrigger|1 +TheRoseRoom01|AC_MQ04_Sins_LabTableDecorEnableMarker_REF|1 +TheRoseRoom01|AC_MQ04_Sins_VinFinaleMarker|1 +TheRoseRoom01|AC_MQ04_VinSmokeFurniture_Ref|1 +TheRoseRoom01|AC_MQ_AbbieRef|1 +TheRoseRoom01|AC_MQ_AntonioRef|1 +TheRoseRoom01|AC_MQ_EvelynRef|1 +TheRoseRoom01|AC_MQ_LabDoor_Ref|1 +TheRoseRoom01|AC_MQ_VinRef|1 +TheRoseRoom01|AC_MQ_VinToAbbieMarker|1 +TheRoseRoom01|TheRoseRoom01_Interior_DirectTravelPoint|1 +TheRoseRoom01|TheRoseRoom_Interior_DirectTravelPoint|1 TheRustyPick01||2428 TheRustyPick01|LC149_MoleMiner_Idle_01|1 TheRustyPick01|LC149_MoleMiner_Idle_02|1 @@ -12674,7 +12809,7 @@ TheRustyPick01|LGV01_LegendaryVendorChestRef|1 TheRustyPick01|LGV01_LegendaryVendor_Marker|1 TheRustyPick01|LGV01_LegendaryVendor_MarkerStart|1 TheRustyPick01|TheRustyPick_Interior_DirectTravelPoint|1 -TheWayward01||1644 +TheWayward01||1643 TheWayward01|Camera_WaywardBar_XMarkerRefPoint|1 TheWayward01|REF_COMP_Spawn_Available_Companions|1 TheWayward01|W05_003P_RadioBroadcastMarkerREF|1 @@ -12807,7 +12942,7 @@ TopOfTheWorld01|W05_MQ_101P_A_supermutant_trigger_backcorridor_07|1 TopOfTheWorld01|W05_MQ_101P_A_supermutant_trigger_backcorridor_08|1 TopOfTheWorld01|W05_MQ_101P_MegRef|1 TopOfTheWorld01|W05_MQ_101P_RaiderBRef|1 -TunnelOfLoveMineshaft01||4383 +TunnelOfLoveMineshaft01||4384 TunnelOfLoveMineshaft01|E09C_ArenaSpawn01|1 TunnelOfLoveMineshaft01|E09C_ArenaSpawn02|1 TunnelOfLoveMineshaft01|E09C_BrokenTracks_ObjectiveMarker_Radius3250|1 @@ -12917,7 +13052,7 @@ UncannyCaverns02|BS02_MQ01_Penance_ShinExplosionFurn|1 UncannyCaverns02|BS02_MQ01_Penance_ShinIntRef|1 UncannyCaverns02|BS02_MQ01_Penance_ShinMineSceneMarker|1 UncannyCaverns02|BS02_MQ01_Penance_SpawnCenterInt|1 -UncannyCavernsDungeon||7383 +UncannyCavernsDungeon||7384 UncannyCavernsDungeon|DailyOps_Mode01_Activator00_PackIn010|1 UncannyCavernsDungeon|DailyOps_Mode01_Activator01_PackIn010|1 UncannyCavernsDungeon|DailyOps_Mode01_Activator02_PackIn010|1 @@ -13048,7 +13183,7 @@ Vault63Entrance|v63_State2_Enable|1 Vault63Entrance|v63_State3_Disable|1 Vault63Entrance|v63_State3_Enable|1 Vault63Entrance|v63_StateGeneric_Enable|1 -Vault79Entrance||1545 +Vault79Entrance||1544 Vault79Entrance|W05_V97ExtTerminalREF|1 Vault79GoldVaultOperations||4678 Vault79GoldVaultOperations|ColePos1_Marker|1 @@ -13279,7 +13414,7 @@ Vault79Main|WendigoAmbush|1 Vault79Main|WendigoEatMarker|1 Vault79Main|testmarkerbry|1 Vault79Main|v79vent|1 -Vault94Dungeon||17439 +Vault94Dungeon||17440 Vault94Dungeon|BS013_Vault94Dungeon_Out|1 Vault94Dungeon|DailyOps_Global_Vault94_Blocker01|1 Vault94Dungeon|DailyOps_Global_Vault94_Blocker02|1 @@ -14003,7 +14138,7 @@ WhitespringMall01|TestElevDoorTriggerARef130|1 WhitespringMall01|TestElevDoorTriggerARef134|1 WhitespringMall01|TestElevDoorTriggerARef136|1 WhitespringMall01|WhitespringMall_Interior_DirectTravelPoint|1 -WhitespringRefuge01||11464 +WhitespringRefuge01||11466 WhitespringRefuge01|AC_MQ01_Opportunity_Poster_00|1 WhitespringRefuge01|AC_MQ01_Opportunity_Poster_01|1 WhitespringRefuge01|AC_MQ01_Opportunity_Poster_02|1 @@ -14012,6 +14147,7 @@ WhitespringRefuge01|AC_MQ01_Opportunity_Poster_05|1 WhitespringRefuge01|AC_MQ02_Stage_EvelynBarFurn|1 WhitespringRefuge01|AC_MQ02_Stage_EvelynIntroMarker|1 WhitespringRefuge01|AC_MQ02_Stage_EvelynSuperstitionMarker|1 +WhitespringRefuge01|AC_MQ02_Stage_IntroDebugMarker|1 WhitespringRefuge01|AC_MQ02_Stage_IntroSceneTrigger|1 WhitespringRefuge01|AC_MQ02_Stage_OrlandoIntroMarker|1 WhitespringRefuge01|AC_MQ02_Stage_SuperstitiousRefugeeRef|1 @@ -14225,14 +14361,16 @@ WhitespringRefuge01|XPD_Hub_Responders_SkippyMarker_Junk|1 WhitespringRefuge01|XPD_Hub_Responders_SkippyMarker_MissionHub|1 WhitespringRefuge01|XPD_JeremiahRef|1 WhitespringRefuge01|XPD_WhitespringGreeterRef|1 -XPDAC01Casino||13696 +XPDAC01Casino||13775 XPDAC01Casino|AC_MQ02_Stage_CasinoExitMarker|1 XPDAC01Casino|AC_MQ02_Stage_OutsideLoungeTrigger|1 XPDAC01Casino|AC_MQ02_Stage_PokerGameTrigger|1 -XPDAC01Casino|AC_MQ02_Stage_ShadyMobstersChair|1 +XPDAC01Casino|AC_MQ02_Stage_ShadyMobsterChair|1 XPDAC01Casino|AC_MQ02_Stage_StanRef|1 +XPDAC01Casino|AC_MQ02_Stage_StanleySoriano_EnableMarker|1 XPDAC01Casino|AC_MQ02_Stage_StansChair|1 XPDAC01Casino|AC_SQ05_Casino_PersistentMarker_REF|1 +XPDAC01Casino|EXP14_HighRollersLounge_DoormanMarker|1 XPDAC01Casino|EXP14_HighRollersLounge_MainDoor_Ref|1 XPDAC01Casino|TestElevDoorARef105|1 XPDAC01Casino|TestElevDoorARef106|1 @@ -14260,17 +14398,24 @@ XPDAC01Casino|XPD_AC02_SolveLocksMarker06_Ref|1 XPDAC01Casino|XPD_AC02_SolveLocksMarker07_Ref|1 XPDAC01Casino|XPD_AC02_SolveLocksMarker08_Ref|1 XPDAC01Casino|XPD_AC_CasinoFriendliesDisabler_Ref|1 -XPDAC01EntertainmentDistrict||6779 +XPDAC01EntertainmentDistrict||6782 XPDAC01EntertainmentDistrict|AC_MQ02_Stage_CasinoQuarterToBoardwalk_Marker|1 XPDAC01EntertainmentDistrict|AC_MQ02_Stage_Evelyn_CasinoQuarter|1 XPDAC01EntertainmentDistrict|AC_SQ05_CasinoQuarter_PersistentMarker_REF|1 -XPDAC01EntertainmentDistrict|XPDAC01CasinoQuarter_Ambient_Enemy_EnableMarker|1 XPDAC01EntertainmentDistrict|XPDAC01Casino_DoorLoad001|1 +XPDAC01EntertainmentDistrict|XPDAC01_ManholetoBoardwalk|1 +XPDAC01EntertainmentDistrict|XPDAC01_ManholetoFloodedCity|1 +XPDAC01EntertainmentDistrict|XPD_AC01_Manhole_LoadDoor_Enabler|1 XPDAC01EntertainmentDistrict|XPD_AC01_MobAllyEnableMarker_Ref|1 XPDAC01EntertainmentDistrict|XPD_AC02_PersistentMarker|1 XPDAC01EntertainmentDistrict|XPD_AC02_PlayerOnlyTrigger|1 XPDAC01EntertainmentDistrict|XPD_NightClub_RightDoor_Ext|1 -XPDAC01NightClub||2944 +XPDAC01NightClub||2984 +XPDAC01NightClub|AC_SQ05_Regent_FabioBackUp_00|1 +XPDAC01NightClub|AC_SQ05_Regent_FabioBackUp_01|1 +XPDAC01NightClub|AC_SQ05_Regent_FabioBackUp_02|1 +XPDAC01NightClub|AC_SQ05_Regent_FabioBackUp_03|1 +XPDAC01NightClub|AC_SQ05_Regent_FabioBackUp_04|1 XPDAC01NightClub|XPDAC01Casino_HatchDoor001|1 XPDAC01NightClub|XPDAC01NightClub_Ambient_NPCs_EnableMarker|1 XPDAC01NightClub|XPD_AC01_BillyBossFightFurniture_Ref|1 @@ -14278,7 +14423,7 @@ XPDAC01NightClub|XPD_AC01_BossDespawnMarker_Ref|1 XPDAC01NightClub|XPD_AC_PersistentMarker_Quentinos_Ref|1 XPDAC01NightClub|XPD_NightClub_RightDoor_Int|1 XPDAC01NightClub|XPD_SalStickyFingers_Stool|1 -XPDAC02Aquarium||16003 +XPDAC02Aquarium||16089 XPDAC02Aquarium|Aquarium_EnemyCombatants_EnableMarker|1 XPDAC02Aquarium|Aquarium_FriendlyNPCs_EnableMarker|1 XPDAC02Aquarium|XPDAC02Aqua_SizeComparisonVolume|1 @@ -14315,15 +14460,42 @@ XPDAC02Aquarium|XPD_AC02_SteamMarker|1 XPDAC02Aquarium|XPD_AC02_TatoBasket|1 XPDAC02Aquarium|XPD_AC02_Theater_ProxTrigger|1 XPDAC02Aquarium|XPD_AC02_VIPBoothDoor|1 -XPDAC02Aquarium|XPD_AC02_Veracio_WallLean_Aquarium|1 +XPDAC02Aquarium|XPD_AC02_VeracioFurn_Aquarium|1 XPDAC02Aquarium|XPD_AC02_WinnersStageMarker|1 -XPDAC02Boardwalk||10541 +XPDAC02AquariumDungeon||15810 +XPDAC02AquariumDungeon|DailyOps_Mode01_Activator00_PackIn016|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Activator01_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Activator02_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Activator03_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_EWSModule00_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_EWSModule01_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_EWSModule02_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_EWSModule03_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_EWSModule04_PackIn015|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn00_01_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn00_02_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn00_03_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn01_01_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn01_02_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn01_03_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn02_01_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn02_02_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn02_03_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn03_01_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn03_02_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_Mode01_Respawn03_03_PackIn017|1 +XPDAC02AquariumDungeon|DailyOps_ReturnDoor_PackIn004|1 +XPDAC02Boardwalk||10701 +XPDAC02Boardwalk|AC_MQ02_Stage_TicketClerkMarker|1 XPDAC02Boardwalk|AC_MQ02_Stage_TicketClerkRef|1 XPDAC02Boardwalk|AC_SQ03_BackRoomTrigger|1 XPDAC02Boardwalk|AC_SQ03_BoardwalkToPier_Marker|1 XPDAC02Boardwalk|AC_SQ03_ClientAlleyMarker|1 XPDAC02Boardwalk|AC_SQ03_ClientRef|1 +XPDAC02Boardwalk|AC_SQ03_Custodial_AlleyTrigger|1 +XPDAC02Boardwalk|AC_SQ03_Custodial_BackRoomDoor|1 XPDAC02Boardwalk|AC_SQ03_Custodial_SamAlleyMarker|1 +XPDAC02Boardwalk|AC_SQ03_OutsideBackRoomTrigger|1 XPDAC02Boardwalk|AC_SQ03_SamBackRoomMarker|1 XPDAC02Boardwalk|AC_SQ03_SamRef|1 XPDAC02Boardwalk|AC_SQ03_SamShopMarker|1 @@ -14331,8 +14503,9 @@ XPDAC02Boardwalk|AC_SQ03_VictimFurn|1 XPDAC02Boardwalk|AC_SQ03_VictimRef|1 XPDAC02Boardwalk|Boardwalk_EnemyCombatants_EnableMarker|1 XPDAC02Boardwalk|Boardwalk_FriendlyNPCs_EnableMarker|1 -XPDAC02Boardwalk|Door_BoardwalkToCasinoQuarter|1 XPDAC02Boardwalk|ObjMod_Assassination_ProxyTrigger003|1 +XPDAC02Boardwalk|XPDAC02_ManholetoCasinoQuarter|1 +XPDAC02Boardwalk|XPDAC02_ManholetoFloodedCity|1 XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint00|1 XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint01|1 XPDAC02Boardwalk|XPD_AC01_ObjMod_Race_Checkpoint02|1 @@ -14342,9 +14515,14 @@ XPDAC02Boardwalk|XPD_AC01_VeracioRef_Boardwalk|1 XPDAC02Boardwalk|XPD_AC02_BoardwalkEntrance_ProxTrigger|1 XPDAC02Boardwalk|XPD_AC02_BoardwalkExitMarker|1 XPDAC02Boardwalk|XPD_AC02_Door_BoardwalkToPier|1 +XPDAC02Boardwalk|XPD_AC02_FireworksTrigger_00|1 +XPDAC02Boardwalk|XPD_AC02_FireworksTrigger_01|1 +XPDAC02Boardwalk|XPD_AC02_FireworksTrigger_02|1 +XPDAC02Boardwalk|XPD_AC02_Fireworks_EnableMarker|1 XPDAC02Boardwalk|XPD_AC02_JuchiRef_Boardwalk|1 XPDAC02Boardwalk|XPD_AC02_JullianRef_Boardwalk|1 XPDAC02Boardwalk|XPD_AC02_LennoxSmokeFurn|1 +XPDAC02Boardwalk|XPD_AC02_Manhole_LoadDoor_Enabler|1 XPDAC02Boardwalk|XPD_AC02_RefreshmentsChair_00|1 XPDAC02Boardwalk|XPD_AC02_RefreshmentsChair_01|1 XPDAC02Boardwalk|XPD_AC02_RefreshmentsChair_02|1 @@ -14353,7 +14531,8 @@ XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_00|1 XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_01|1 XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_02|1 XPDAC02Boardwalk|XPD_AC02_RefreshmentsMarker_03|1 -XPDAC02Boardwalk|XPD_AC02_Veracio_WallLeanFurn|1 +XPDAC02Boardwalk|XPD_AC02_TwinsExitMarker|1 +XPDAC02Boardwalk|XPD_AC02_VeracioFurn|1 XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker56|1 XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker58|1 XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker59|1 @@ -14362,29 +14541,44 @@ XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker61|1 XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker62|1 XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker63|1 XPDAC02Boardwalk|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker64|1 -XPDAC02Pier||7244 +XPDAC02Pier||7401 XPDAC02Pier|AC_MQ02_BackstageTeleportMarker_00|1 XPDAC02Pier|AC_MQ02_BackstageTeleportMarker_01|1 XPDAC02Pier|AC_MQ02_BackstageTeleportMarker_02|1 +XPDAC02Pier|AC_MQ02_KnifeActivator|1 +XPDAC02Pier|AC_MQ02_StageFrontMarker|1 XPDAC02Pier|AC_MQ02_Stage_BackstageTrigger|1 XPDAC02Pier|AC_MQ02_Stage_ClownDressingRoom_EnableMarker|1 -XPDAC02Pier|AC_MQ02_Stage_ClownHatMarker|1 -XPDAC02Pier|AC_MQ02_Stage_ClownOutfitMarker|1 -XPDAC02Pier|AC_MQ02_Stage_ClownPatrolMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ClownHatDispenser|1 +XPDAC02Pier|AC_MQ02_Stage_ClownOutfitDispenser|1 +XPDAC02Pier|AC_MQ02_Stage_ClownPatrolMarker001|1 +XPDAC02Pier|AC_MQ02_Stage_ClownPatrolMarker002|1 XPDAC02Pier|AC_MQ02_Stage_DressingRoomDoor|1 XPDAC02Pier|AC_MQ02_Stage_DressingRoomExitTrigger|1 XPDAC02Pier|AC_MQ02_Stage_DressingRoomMarker|1 XPDAC02Pier|AC_MQ02_Stage_DressingRoomTrigger|1 +XPDAC02Pier|AC_MQ02_Stage_EvelynBackstageFurn|1 XPDAC02Pier|AC_MQ02_Stage_EvelynBackstageMarker|1 XPDAC02Pier|AC_MQ02_Stage_FleeVenue_SpawnCenter|1 +XPDAC02Pier|AC_MQ02_Stage_HulaHoopsTrigger|1 +XPDAC02Pier|AC_MQ02_Stage_KnifePromptBlocker|1 XPDAC02Pier|AC_MQ02_Stage_KnifeTargetMarker|1 +XPDAC02Pier|AC_MQ02_Stage_KnifeThrowingFurn|1 XPDAC02Pier|AC_MQ02_Stage_PerformanceClowns_EnableMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ShowProps_EnableMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ShowmanSnitchMarker|1 +XPDAC02Pier|AC_MQ02_Stage_StageFrontProps_EnableMarker|1 XPDAC02Pier|AC_MQ02_Stage_StageMarker|1 XPDAC02Pier|AC_MQ02_Stage_StageProps_EnableMarker|1 XPDAC02Pier|AC_MQ02_Stage_StageTrigger|1 +XPDAC02Pier|AC_MQ02_Stage_StarClownMarker|1 +XPDAC02Pier|AC_MQ02_Stage_ThrowKnifeFromMarker|1 +XPDAC02Pier|AC_MQ02_Stage_VanityRoomDoor|1 XPDAC02Pier|AC_MQ02_Stage_ZaydeRef|1 XPDAC02Pier|AC_MQ02_Stage_ZaydeWaitMarker|1 XPDAC02Pier|AC_MQ02_Stage_ZaydesVanity|1 +XPDAC02Pier|AC_SQ03_Custodial_EnableMarker|1 +XPDAC02Pier|AC_SQ03_Custodial_Sam_Sandbox|1 XPDAC02Pier|AC_SQ03_SamInstructionsMarker|1 XPDAC02Pier|AC_SQ03_SamPierRef|1 XPDAC02Pier|PierToBoardwalkDoor|1 @@ -14423,37 +14617,142 @@ XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_04|1 XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_05|1 XPDAC02Pier|XPD_AC02_SolveLocks_TerminalWall_06|1 XPDAC02Pier|XPD_AC02_Stage_MicrophoneMarker|1 -XPDAC03CityHall||4104 +XPDAC03CityHall||6000 XPDAC03CityHall|XPDAC03CityHall_DoorLoad002|1 XPDAC03CityHall|XPD_AC03_PersistentMarker_CityHall_Ref|1 -XPDAC03CommunityCenter||4626 +XPDAC03CommunityCenter||11604 XPDAC03CommunityCenter|XPDAC03Community_DoorLoad002|1 XPDAC03CommunityCenter|XPD_AC03_CurtainMoveMarker_Ref|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_DungeonExitMarker|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_PrisonerMarker_00|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_PrisonerMarker_01|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_PrisonerMarker_02|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_PrisonerMarker_03|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_PrisonerMarker_04|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_PrisonerMarker_05|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_PrisonerMarker_07|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_SCM_00|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_SCM_01|1 +XPDAC03CommunityCenter|XPD_AC03_ObjMod_FreePrisoners_SCM_02|1 XPDAC03CommunityCenter|XPD_AC03_PersistentMarker_CommunityCenter_Ref|1 XPDAC03CommunityCenter|XPD_AC03_RepelEnemies_SecureAreaAct_Ref|1 -XPDAC03CommunityCenter|XPD_AC03_TheaterCurtain_Ref|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker55|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker57|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker65|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker66|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker67|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker68|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker69|1 -XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker70|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set00_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set00_01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set00_02|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set01_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set01_01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set01_03|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set02_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set02_01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set02_02|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set03_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set03_01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set03_02|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocksTurret_Set03_05|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_EnableMarker_Set00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_EnableMarker_Set01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_EnableMarker_Set02|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_EnableMarker_Set03|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set00_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set00_02|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set00_03|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set01_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set01_01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set01_02|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set01_03|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set02_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set02_01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set02_02|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set02_03|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set03_00|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set03_01|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set03_03|1 +XPDAC03CommunityCenter|XPD_AC03_SolveLocks_PlacementMarker_Set03_04|1 +XPDAC03CommunityCenter|XPD_Pitt01_ObjMod_FreePrisoners_PrisonerMarker06|1 XPDAC03CommunityCenter|XPD_Pitt02_Organ002|1 -XPDAC03FloodedCityCenter||20048 +XPDAC03FloodedCityCenter||17003 +XPDAC03FloodedCityCenter|AC_MQ03_DEBUGWarehouseMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_DownedMuni_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_DownedMuni_Ref001|1 +XPDAC03FloodedCityCenter|AC_MQ03_DownedMuni_Ref002|1 +XPDAC03FloodedCityCenter|AC_MQ03_DownedMuni_Ref003|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_ChemLabDoor_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_ChemLabEntranceMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_ChemLabEntrance_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_ChemLabExit_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_ChemLabQTMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_ChemLabSpawnCenter_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_DEBUGChemLabMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Gene_Marker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_LostMuni_SpawnCenter_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_MobBeliever_VanishMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_MobDenier_VanishMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_MuniVanishMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_OvergrownAmbush_SpawnCenter_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerCamera_Ambush_Marker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerCamera_ChemLabMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerCamera_WarehouseMob_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerCamera_WarehouseVinSloane_Marker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerScene_Ambush_Marker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerScene_ChemLabMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerScene_WarehouseMob_Marker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_PlayerScene_WarehouseVinSloane_Marker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_SloaneWarehouseMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Sloane_ChemLabMarker_Ref001|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Sloane_ExitForeverMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Sloane_TravelToChemLab_VanishMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Sloane_VanishMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Valve01_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Valve02_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Valve03_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Valve04_Ref_Copy01|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_VinChemLabIntTeleportMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_VinWarehouseMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Vin_AmbushMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Vin_ChemLabMarker_Ref001|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Vin_GenesRoomMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Vin_TravelToChemLab_VanishMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Vin_VanishMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_WarehouseBackDoor_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_WarehouseDoorTrigger_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_WarehouseFrontDoor_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_WarehouseKey_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_WarehouseNote_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_WarehouseQT_XMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_WaterExplosionMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Waterfall_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_HonorBound_Waterfall_Ref001|1 +XPDAC03FloodedCityCenter|AC_MQ03_PlayerTeleportMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_Sloane_AmbushMarker_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ03_VinRusso_Ref|1 +XPDAC03FloodedCityCenter|AC_MQ04_AntonioBossFightMarker|1 +XPDAC03FloodedCityCenter|AC_MQ04_ChurchAmbientCombatEnableMarker|1 +XPDAC03FloodedCityCenter|AC_MQ04_Sins_AbbieChemLabMarker|1 +XPDAC03FloodedCityCenter|AC_MQ04_Sins_AntonioChemLabMarker|1 +XPDAC03FloodedCityCenter|AC_MQ04_Sins_ChemLabPlayerMarker|1 +XPDAC03FloodedCityCenter|JD|1 +XPDAC03FloodedCityCenter|JD_Ambush_Trigger|1 XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_01|1 XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_02|1 XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_03|1 XPDAC03FloodedCityCenter|XPDAC02_DungeonExit01_04|1 XPDAC03FloodedCityCenter|XPDAC03CityHall_DoorLoad001|1 XPDAC03FloodedCityCenter|XPDAC03Community_DoorLoad001|1 +XPDAC03FloodedCityCenter|XPDAC03_Church|1 +XPDAC03FloodedCityCenter|XPDAC03_Door01|1 +XPDAC03FloodedCityCenter|XPDAC03_Door02|1 +XPDAC03FloodedCityCenter|XPDAC03_Door03|1 +XPDAC03FloodedCityCenter|XPDAC03_Door04|1 +XPDAC03FloodedCityCenter|XPDAC03_Door05|1 +XPDAC03FloodedCityCenter|XPDAC03_ManholetoBoardwalk|1 +XPDAC03FloodedCityCenter|XPDAC03_ManholetoCasinoQuarter|1 XPDAC03FloodedCityCenter|XPD_AC03_DefendNPC_ProxTrigger_Ref|1 XPDAC03FloodedCityCenter|XPD_AC03_DefendNPC_Ref|1 XPDAC03FloodedCityCenter|XPD_AC03_IntroAuditorCombatantsSpawnCenter_Ref|1 XPDAC03FloodedCityCenter|XPD_AC03_IntroOvergrown_SpawnMarkerRef|1 +XPDAC03FloodedCityCenter|XPD_AC03_Manhole_LoadDoor_Enabler|1 XPDAC03FloodedCityCenter|XPD_AC03_PersistentMarker_FloodedCityCenter_Ref|1 -XPDPitt01Foundry||16869 +XPDPitt01Foundry||16868 XPDPitt01Foundry|EXM1Pitt1_Shipping_Door_Interior0|1 XPDPitt01Foundry|Pitt01_Objmod_SolveLocks_PlacementPoint00|1 XPDPitt01Foundry|Pitt01_Objmod_SolveLocks_PlacementPoint01|1 @@ -14518,6 +14817,29 @@ XPDPitt01Foundry|XPD_Pitt01_TrogFXTrigger01_Ref|1 XPDPitt01Foundry|XPD_Pitt01_TrogFXTrigger02_Ref|1 XPDPitt01Foundry|XPD_Pitt01_TrogFXTrigger03_Ref|1 XPDPitt01Foundry|XPD_Pitt02_Door|1 +XPDPitt01FoundryDungeon||15335 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Activator00_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Activator01_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Activator02_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Activator03_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_AmbientEWSTrigger_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_EWSModule00_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_EWSModule01_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_EWSModule02_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_EWSModule03_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_EWSModule04_PackIn014|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn00_01_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn00_02_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn00_03_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn01_01_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn01_02_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn01_03_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn02_01_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn02_02_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn02_03_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn03_01_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn03_02_PackIn015|1 +XPDPitt01FoundryDungeon|DailyOps_Mode01_Respawn03_03_PackIn015|1 XPDPitt01Industrial||20025 XPDPitt01Industrial|AmbEWS_Node00_ShantyTown_SCM|1 XPDPitt01Industrial|AmbEWS_Node00_ShantyTown_SCM001|1 @@ -14863,7 +15185,7 @@ XPDPitt02Sanctum|XPD_Pitt02_TrogNest_01_Collapsed|1 XPDPitt02Sanctum|XPD_Pitt02_TrogNest_01_FallingRocks|1 XPDPitt02Sanctum|XPD_Pitt02_TrogNest_02_Boarded|1 XPDPitt02Sanctum|XPD_Pitt02_TrogNest_02_FallingRocks|1 -XPDPitt02Trench||21080 +XPDPitt02Trench||21079 XPDPitt02Trench|AmbEWS_DummyRef|1 XPDPitt02Trench|AmbEWS_Node00_JaxonsNooseTrog00_SCM|1 XPDPitt02Trench|AmbEWS_Node00_JaxonsNooseTrog00_Sandbox|1 @@ -15066,7 +15388,7 @@ AlleghenyAsylum01|100|15013 Appalachia|50|43 Appalachia|75|142 Appalachia|85|72 -Appalachia|100|3084352 +Appalachia|100|3084779 ArktosPharmaLab01|50|1 ArktosPharmaLab01|75|1 ArktosPharmaLab01|100|17161 @@ -15074,7 +15396,7 @@ ArktosPharmaLabDungeon|50|1 ArktosPharmaLabDungeon|75|1 ArktosPharmaLabDungeon|100|14621 BelchingBetty01|100|5218 -BigBendTunnel01|100|7551 +BigBendTunnel01|100|7550 BlackwaterMine01|100|6166 BlueRidgeOffice01|50|1 BlueRidgeOffice01|100|765 @@ -15103,9 +15425,9 @@ EmmettMountainDisposalSite01|50|4 EmmettMountainDisposalSite01|75|6 EmmettMountainDisposalSite01|100|4847 EnclaveResearchFacility01|100|18742 -FortAtlas01|100|5184 +FortAtlas01|100|5185 FortAtlasDungeon01|100|12665 -FoundationInt01|100|5372 +FoundationInt01|100|5376 FoundationSupplyRoom01|100|529 FraternityHouse01|100|1216 FraternityHouse02|100|925 @@ -15114,11 +15436,11 @@ FreeStatesBunker02|100|981 FreeStatesBunker03|100|1043 FreeStatesBunker04|100|1254 FreeStatesBunker06|100|949 -FreeStatesBunker07|100|1049 +FreeStatesBunker07|100|1050 GarrahanMiningHQ01|100|9200 GarrahanMiningHQDungeon|100|7694 GauleyMine01|100|4177 -GlassedCavern01|100|9043 +GlassedCavern01|100|9044 GraftonPawnShop01|100|1478 GraftonSteelUnderground01|50|2 GraftonSteelUnderground01|75|19 @@ -15129,14 +15451,16 @@ HornwrightHQ01|100|5951 HornwrightSafeRoom01|50|1 HornwrightSafeRoom01|75|2 HornwrightSafeRoom01|100|1041 -IngramMansion01|100|936 KerwoodMine01|100|5667 LewisandSonsFarmingSupply01|100|461 +LittleRobsHideout01|75|2 +LittleRobsHideout01|100|1457 LousMine01|75|3 LousMine01|100|6989 MTR08LodeBaring01|100|3408 MTR08LodeBaring02|100|3284 MamaDolceProcessing01|100|3074 +MiresEye01|100|1681 MonongahMine01|100|6923 MonongahMissileSilo01|75|4 MonongahMissileSilo01|100|15686 @@ -15149,20 +15473,17 @@ MorgantownHighSchoolDungeon|100|5561 MountBlairWarehouseBasement01|100|319 NPECultistCave|50|2 NPECultistCave|75|2 -NPECultistCave|100|4241 +NPECultistCave|100|4239 NPEVault7601|100|7064 NVEShelter01|100|360 NVEVault7601|100|7137 NukaColaQuantumPlant01|100|5477 OrwellOrchardsShelter01|100|2209 OverseersHome01|100|1250 -PoseidonPlant01|100|15660 +PoseidonPlant01|100|15659 PoseidonPlant02|100|4189 RadioResearchCenter01|100|3472 -RaiderCave01|75|2 -RaiderCave01|100|1442 RaiderCave02|100|1874 -RaiderCave03|100|1681 RaiderRaidTrailerInt|100|106 RiversideManor01|100|7433 RobCoResearchCenter01|50|3 @@ -15175,6 +15496,7 @@ SettlerBugOutCave|100|372 SheltersCave01|100|534 SheltersCave02|100|608 SheltersClaimCenter01|100|976 +SheltersFlatlands|100|1534 SheltersHighStakes|100|2617 SheltersMissileSilo|100|493 SheltersPittTrench01|100|1142 @@ -15195,18 +15517,20 @@ SugarGrove01|100|8279 SugarGrove02|100|271 SugarGroveMissileSilo01|75|4 SugarGroveMissileSilo01|100|15686 -TheCraterCore01|100|1289 -TheNukashine01|100|1538 +SurlysShack01|100|121 +TheCraterCore01|100|1292 +TheNukashine01|100|1520 +TheRoseRoom01|100|1539 TheRustyPick01|100|2442 -TheWayward01|100|1719 +TheWayward01|100|1718 ThunderMtPowerPlant01|100|9415 TopOfTheWorld01|100|4652 -TunnelOfLoveMineshaft01|100|4422 +TunnelOfLoveMineshaft01|100|4423 UCB01|100|4569 UCB02|100|77 UncannyCaverns01|100|4228 UncannyCaverns02|100|3191 -UncannyCavernsDungeon|100|7410 +UncannyCavernsDungeon|100|7411 VTecAgCenter01|50|9 VTecAgCenter01|100|3127 ValleyGalleria01|100|8635 @@ -15214,13 +15538,13 @@ VanLoweTaxidermy01|75|3 VanLoweTaxidermy01|100|1964 Vault51Dungeon|100|9604 Vault63Entrance|100|350 -Vault79Entrance|100|1546 +Vault79Entrance|100|1545 Vault79GoldVaultOperations|100|4698 Vault79Main|50|1 Vault79Main|100|18850 Vault94Dungeon|50|6 Vault94Dungeon|75|6 -Vault94Dungeon|100|17471 +Vault94Dungeon|100|17472 Vault94DungeonGECK|50|1 Vault94DungeonGECK|75|5 Vault94DungeonGECK|100|4598 @@ -15247,21 +15571,27 @@ WestTek02|75|1 WestTek02|100|5126 WhitespringBunker01|100|16333 WhitespringMall01|100|6947 -WhitespringRefuge01|100|11685 -XPDAC01Casino|100|13730 -XPDAC01EntertainmentDistrict|100|6788 -XPDAC01NightClub|100|2951 -XPDAC02Aquarium|100|16041 +WhitespringRefuge01|100|11688 +XPDAC01Casino|100|13811 +XPDAC01EntertainmentDistrict|100|6793 +XPDAC01NightClub|100|2996 +XPDAC02Aquarium|100|16127 +XPDAC02AquariumDungeon|100|15832 XPDAC02Boardwalk|75|1 -XPDAC02Boardwalk|100|10584 +XPDAC02Boardwalk|100|10755 XPDAC02Pier|75|2 -XPDAC02Pier|100|7302 -XPDAC03CityHall|100|4106 -XPDAC03CommunityCenter|100|4640 -XPDAC03FloodedCityCenter|100|20059 +XPDAC02Pier|100|7474 +XPDAC03CityHall|100|6002 +XPDAC03CommunityCenter|50|1 +XPDAC03CommunityCenter|75|3 +XPDAC03CommunityCenter|100|11649 +XPDAC03FloodedCityCenter|100|17084 XPDPitt01Foundry|50|9 XPDPitt01Foundry|75|11 -XPDPitt01Foundry|100|16913 +XPDPitt01Foundry|100|16912 +XPDPitt01FoundryDungeon|50|9 +XPDPitt01FoundryDungeon|75|11 +XPDPitt01FoundryDungeon|100|15337 XPDPitt01Industrial|50|4 XPDPitt01Industrial|75|3 XPDPitt01Industrial|100|20262 @@ -15270,7 +15600,7 @@ XPDPitt02Sanctum|75|2 XPDPitt02Sanctum|100|18032 XPDPitt02Trench|50|4 XPDPitt02Trench|75|8 -XPDPitt02Trench|100|21225 +XPDPitt02Trench|100|21224 XPDRttP01SteelTower|100|10075 XPDRttP01SteelTowerRoof|100|2002 XPDRttP01SteelTowerUpperFloors|100|6241 @@ -15386,10 +15716,10 @@ Appalachia|Antiseptic|882|418 Appalachia|Asbestos|1623|1208 Appalachia|Ballistic Fiber|188|94 Appalachia|Bone|3432|1310 -Appalachia|Ceramic|3838|3310 +Appalachia|Ceramic|3839|3311 Appalachia|Circuitry|472|371 Appalachia|Cloth|5802|5163 -Appalachia|Concrete|2315|423 +Appalachia|Concrete|2318|424 Appalachia|Copper|1525|1442 Appalachia|Cork|631|513 Appalachia|Crystal|328|200 @@ -15397,19 +15727,19 @@ Appalachia|Fertilizer|1084|379 Appalachia|Fiber Optics|41|40 Appalachia|Fiberglass|937|700 Appalachia|Gear|1152|972 -Appalachia|Glass|9062|7493 +Appalachia|Glass|9064|7495 Appalachia|Gold|80|80 Appalachia|Gunpowder|1|1 -Appalachia|Lead|5305|3070 +Appalachia|Lead|5306|3071 Appalachia|Leather|1922|866 Appalachia|Nuclear Material|139|139 -Appalachia|Oil|3689|2464 -Appalachia|Plastic|5759|4086 +Appalachia|Oil|3692|2467 +Appalachia|Plastic|5762|4088 Appalachia|Rubber|1998|1209 Appalachia|Screw|1198|1070 Appalachia|Silver|270|227 -Appalachia|Spring|1295|1264 -Appalachia|Steel|15630|9327 +Appalachia|Spring|1296|1265 +Appalachia|Steel|15640|9334 Appalachia|Ultracite|1|1 Appalachia|Wood|4831|3367 ArktosPharmaLab01|Acid|48|33 @@ -16473,19 +16803,6 @@ HornwrightSafeRoom01|Rubber|1|1 HornwrightSafeRoom01|Screw|1|1 HornwrightSafeRoom01|Steel|7|4 HornwrightSafeRoom01|Wood|1|1 -IngramMansion01|Acid|1|1 -IngramMansion01|Aluminum|2|1 -IngramMansion01|Antiseptic|2|1 -IngramMansion01|Ceramic|11|11 -IngramMansion01|Circuitry|1|1 -IngramMansion01|Cloth|5|4 -IngramMansion01|Copper|3|3 -IngramMansion01|Glass|17|15 -IngramMansion01|Plastic|2|2 -IngramMansion01|Screw|1|1 -IngramMansion01|Silver|1|1 -IngramMansion01|Steel|5|3 -IngramMansion01|Wood|3|2 KerwoodMine01|Acid|4|2 KerwoodMine01|Aluminum|10|5 KerwoodMine01|Copper|2|1 @@ -16519,6 +16836,17 @@ LewisandSonsFarmingSupply01|Rubber|1|1 LewisandSonsFarmingSupply01|Screw|1|1 LewisandSonsFarmingSupply01|Steel|51|38 LewisandSonsFarmingSupply01|Wood|23|14 +LittleRobsHideout01|Black Titanium|2|2 +LittleRobsHideout01|Circuitry|4|2 +LittleRobsHideout01|Cloth|2|2 +LittleRobsHideout01|Gear|2|2 +LittleRobsHideout01|Glass|4|4 +LittleRobsHideout01|Lead|6|2 +LittleRobsHideout01|Leather|4|2 +LittleRobsHideout01|Oil|7|4 +LittleRobsHideout01|Screw|2|2 +LittleRobsHideout01|Steel|19|12 +LittleRobsHideout01|Wood|5|3 LousMine01|Acid|3|2 LousMine01|Adhesive|5|2 LousMine01|Antiseptic|2|1 @@ -16588,6 +16916,21 @@ MamaDolceProcessing01|Screw|1|1 MamaDolceProcessing01|Spring|5|5 MamaDolceProcessing01|Steel|22|14 MamaDolceProcessing01|Wood|6|6 +MiresEye01|Asbestos|5|4 +MiresEye01|Ceramic|1|1 +MiresEye01|Cloth|8|6 +MiresEye01|Copper|1|1 +MiresEye01|Gear|1|1 +MiresEye01|Glass|27|24 +MiresEye01|Lead|1|1 +MiresEye01|Leather|4|2 +MiresEye01|Oil|17|11 +MiresEye01|Plastic|11|7 +MiresEye01|Rubber|2|1 +MiresEye01|Screw|1|1 +MiresEye01|Spring|3|3 +MiresEye01|Steel|33|17 +MiresEye01|Wood|2|2 MonongahMine01|Acid|3|2 MonongahMine01|Adhesive|5|2 MonongahMine01|Aluminum|3|2 @@ -16993,17 +17336,6 @@ RadioResearchCenter01|Silver|2|1 RadioResearchCenter01|Spring|16|16 RadioResearchCenter01|Steel|65|42 RadioResearchCenter01|Wood|41|29 -RaiderCave01|Black Titanium|2|2 -RaiderCave01|Circuitry|4|2 -RaiderCave01|Cloth|2|2 -RaiderCave01|Gear|2|2 -RaiderCave01|Glass|4|4 -RaiderCave01|Lead|6|2 -RaiderCave01|Leather|4|2 -RaiderCave01|Oil|7|4 -RaiderCave01|Screw|2|2 -RaiderCave01|Steel|19|12 -RaiderCave01|Wood|5|3 RaiderCave02|Acid|7|4 RaiderCave02|Aluminum|10|6 RaiderCave02|Asbestos|3|2 @@ -17024,21 +17356,6 @@ RaiderCave02|Screw|1|1 RaiderCave02|Spring|2|2 RaiderCave02|Steel|18|10 RaiderCave02|Wood|6|4 -RaiderCave03|Asbestos|5|4 -RaiderCave03|Ceramic|1|1 -RaiderCave03|Cloth|8|6 -RaiderCave03|Copper|1|1 -RaiderCave03|Gear|1|1 -RaiderCave03|Glass|27|24 -RaiderCave03|Lead|1|1 -RaiderCave03|Leather|4|2 -RaiderCave03|Oil|17|11 -RaiderCave03|Plastic|11|7 -RaiderCave03|Rubber|2|1 -RaiderCave03|Screw|1|1 -RaiderCave03|Spring|3|3 -RaiderCave03|Steel|33|17 -RaiderCave03|Wood|2|2 RaiderRaidTrailerInt|Adhesive|1|1 RaiderRaidTrailerInt|Aluminum|1|1 RaiderRaidTrailerInt|Asbestos|6|4 @@ -17304,6 +17621,10 @@ SugarGroveMissileSilo01|Silver|8|8 SugarGroveMissileSilo01|Spring|25|25 SugarGroveMissileSilo01|Steel|292|194 SugarGroveMissileSilo01|Wood|107|75 +SurlysShack01|Adhesive|1|1 +SurlysShack01|Cloth|1|1 +SurlysShack01|Glass|4|3 +SurlysShack01|Steel|1|1 TheCraterCore01|Acid|2|1 TheCraterCore01|Asbestos|6|4 TheCraterCore01|Bone|44|19 @@ -17328,7 +17649,7 @@ TheNukashine01|Cork|3|2 TheNukashine01|Crystal|3|1 TheNukashine01|Fiberglass|10|8 TheNukashine01|Gear|1|1 -TheNukashine01|Glass|98|75 +TheNukashine01|Glass|95|73 TheNukashine01|Lead|26|15 TheNukashine01|Nuclear Material|1|1 TheNukashine01|Oil|26|16 @@ -17337,8 +17658,28 @@ TheNukashine01|Rubber|19|13 TheNukashine01|Screw|10|9 TheNukashine01|Silver|2|2 TheNukashine01|Spring|8|8 -TheNukashine01|Steel|96|61 +TheNukashine01|Steel|95|60 TheNukashine01|Wood|31|20 +TheRoseRoom01|Aluminum|4|3 +TheRoseRoom01|Asbestos|9|6 +TheRoseRoom01|Ceramic|25|20 +TheRoseRoom01|Circuitry|1|1 +TheRoseRoom01|Cloth|30|25 +TheRoseRoom01|Copper|2|2 +TheRoseRoom01|Cork|3|2 +TheRoseRoom01|Crystal|3|1 +TheRoseRoom01|Fiberglass|5|3 +TheRoseRoom01|Gear|2|2 +TheRoseRoom01|Glass|49|40 +TheRoseRoom01|Lead|2|2 +TheRoseRoom01|Oil|1|1 +TheRoseRoom01|Plastic|24|15 +TheRoseRoom01|Rubber|4|3 +TheRoseRoom01|Screw|6|5 +TheRoseRoom01|Silver|3|3 +TheRoseRoom01|Spring|2|2 +TheRoseRoom01|Steel|27|17 +TheRoseRoom01|Wood|14|8 TheRustyPick01|Acid|4|2 TheRustyPick01|Adhesive|4|1 TheRustyPick01|Aluminum|2|1 @@ -18168,7 +18509,7 @@ XPDAC01Casino|Aluminum|25|18 XPDAC01Casino|Antiseptic|18|9 XPDAC01Casino|Asbestos|85|60 XPDAC01Casino|Bone|7|3 -XPDAC01Casino|Ceramic|209|166 +XPDAC01Casino|Ceramic|210|167 XPDAC01Casino|Circuitry|16|16 XPDAC01Casino|Cloth|182|137 XPDAC01Casino|Copper|42|35 @@ -18249,15 +18590,37 @@ XPDAC02Aquarium|Glass|220|189 XPDAC02Aquarium|Lead|24|15 XPDAC02Aquarium|Leather|18|9 XPDAC02Aquarium|Oil|20|14 -XPDAC02Aquarium|Plastic|185|40 +XPDAC02Aquarium|Plastic|59|40 XPDAC02Aquarium|Rubber|65|39 XPDAC02Aquarium|Screw|16|15 XPDAC02Aquarium|Silver|95|95 XPDAC02Aquarium|Spring|48|48 XPDAC02Aquarium|Steel|225|173 XPDAC02Aquarium|Wood|85|67 +XPDAC02AquariumDungeon|Acid|8|7 +XPDAC02AquariumDungeon|Adhesive|3|3 +XPDAC02AquariumDungeon|Aluminum|15|15 +XPDAC02AquariumDungeon|Antiseptic|24|12 +XPDAC02AquariumDungeon|Asbestos|38|36 +XPDAC02AquariumDungeon|Ceramic|47|46 +XPDAC02AquariumDungeon|Circuitry|8|8 +XPDAC02AquariumDungeon|Cloth|57|53 +XPDAC02AquariumDungeon|Copper|15|15 +XPDAC02AquariumDungeon|Fiberglass|14|13 +XPDAC02AquariumDungeon|Gear|10|8 +XPDAC02AquariumDungeon|Glass|220|189 +XPDAC02AquariumDungeon|Lead|24|15 +XPDAC02AquariumDungeon|Leather|18|9 +XPDAC02AquariumDungeon|Oil|20|14 +XPDAC02AquariumDungeon|Plastic|45|33 +XPDAC02AquariumDungeon|Rubber|65|39 +XPDAC02AquariumDungeon|Screw|16|15 +XPDAC02AquariumDungeon|Silver|95|95 +XPDAC02AquariumDungeon|Spring|48|48 +XPDAC02AquariumDungeon|Steel|225|173 +XPDAC02AquariumDungeon|Wood|85|67 XPDAC02Boardwalk|Acid|14|11 -XPDAC02Boardwalk|Aluminum|2|2 +XPDAC02Boardwalk|Aluminum|4|4 XPDAC02Boardwalk|Antiseptic|10|5 XPDAC02Boardwalk|Asbestos|20|15 XPDAC02Boardwalk|Ballistic Fiber|6|3 @@ -18270,20 +18633,20 @@ XPDAC02Boardwalk|Cork|2|1 XPDAC02Boardwalk|Fertilizer|12|3 XPDAC02Boardwalk|Fiberglass|4|3 XPDAC02Boardwalk|Gear|6|6 -XPDAC02Boardwalk|Glass|56|53 +XPDAC02Boardwalk|Glass|61|58 XPDAC02Boardwalk|Lead|34|26 XPDAC02Boardwalk|Leather|46|17 XPDAC02Boardwalk|Oil|3|3 XPDAC02Boardwalk|Plastic|43|23 -XPDAC02Boardwalk|Rubber|19|10 +XPDAC02Boardwalk|Rubber|21|12 XPDAC02Boardwalk|Screw|14|14 XPDAC02Boardwalk|Spring|17|17 -XPDAC02Boardwalk|Steel|80|56 +XPDAC02Boardwalk|Steel|81|57 XPDAC02Boardwalk|Wood|34|24 XPDAC02Pier|Acid|4|2 XPDAC02Pier|Aluminum|6|4 XPDAC02Pier|Asbestos|13|9 -XPDAC02Pier|Ceramic|35|32 +XPDAC02Pier|Ceramic|34|31 XPDAC02Pier|Circuitry|5|4 XPDAC02Pier|Cloth|103|98 XPDAC02Pier|Copper|2|2 @@ -18301,32 +18664,80 @@ XPDAC02Pier|Rubber|52|27 XPDAC02Pier|Screw|8|8 XPDAC02Pier|Silver|2|2 XPDAC02Pier|Spring|34|33 -XPDAC02Pier|Steel|83|60 +XPDAC02Pier|Steel|86|63 XPDAC02Pier|Wood|39|24 -XPDAC03CityHall|Circuitry|4|4 -XPDAC03CityHall|Copper|4|4 -XPDAC03CityHall|Fiberglass|4|4 -XPDAC03CityHall|Gear|2|1 -XPDAC03CityHall|Screw|3|1 -XPDAC03CityHall|Spring|2|1 -XPDAC03CityHall|Steel|5|1 -XPDAC03CommunityCenter|Copper|2|2 -XPDAC03CommunityCenter|Lead|30|4 -XPDAC03CommunityCenter|Steel|5|3 -XPDAC03FloodedCityCenter|Aluminum|4|3 -XPDAC03FloodedCityCenter|Bone|2|1 -XPDAC03FloodedCityCenter|Ceramic|1|1 -XPDAC03FloodedCityCenter|Copper|3|3 -XPDAC03FloodedCityCenter|Crystal|1|1 +XPDAC03CityHall|Acid|24|9 +XPDAC03CityHall|Adhesive|18|7 +XPDAC03CityHall|Aluminum|14|11 +XPDAC03CityHall|Antiseptic|2|1 +XPDAC03CityHall|Asbestos|6|4 +XPDAC03CityHall|Ballistic Fiber|2|1 +XPDAC03CityHall|Ceramic|21|21 +XPDAC03CityHall|Circuitry|9|5 +XPDAC03CityHall|Cloth|30|30 +XPDAC03CityHall|Copper|21|16 +XPDAC03CityHall|Cork|2|1 +XPDAC03CityHall|Crystal|2|2 +XPDAC03CityHall|Fiber Optics|2|2 +XPDAC03CityHall|Fiberglass|5|5 +XPDAC03CityHall|Gear|18|13 +XPDAC03CityHall|Glass|56|39 +XPDAC03CityHall|Lead|6|5 +XPDAC03CityHall|Leather|2|1 +XPDAC03CityHall|Nuclear Material|3|3 +XPDAC03CityHall|Oil|10|8 +XPDAC03CityHall|Plastic|25|19 +XPDAC03CityHall|Rubber|10|8 +XPDAC03CityHall|Screw|12|10 +XPDAC03CityHall|Spring|11|10 +XPDAC03CityHall|Steel|102|66 +XPDAC03CityHall|Wood|30|22 +XPDAC03CommunityCenter|Adhesive|4|4 +XPDAC03CommunityCenter|Aluminum|3|2 +XPDAC03CommunityCenter|Asbestos|6|4 +XPDAC03CommunityCenter|Ballistic Fiber|2|1 +XPDAC03CommunityCenter|Ceramic|24|24 +XPDAC03CommunityCenter|Circuitry|4|4 +XPDAC03CommunityCenter|Cloth|23|18 +XPDAC03CommunityCenter|Copper|6|6 +XPDAC03CommunityCenter|Fiberglass|3|3 +XPDAC03CommunityCenter|Glass|38|33 +XPDAC03CommunityCenter|Lead|18|16 +XPDAC03CommunityCenter|Leather|12|6 +XPDAC03CommunityCenter|Oil|1|1 +XPDAC03CommunityCenter|Plastic|20|12 +XPDAC03CommunityCenter|Rubber|9|6 +XPDAC03CommunityCenter|Screw|5|5 +XPDAC03CommunityCenter|Silver|12|12 +XPDAC03CommunityCenter|Spring|2|2 +XPDAC03CommunityCenter|Steel|48|33 +XPDAC03CommunityCenter|Wood|31|21 +XPDAC03FloodedCityCenter|Acid|3|2 +XPDAC03FloodedCityCenter|Adhesive|15|11 +XPDAC03FloodedCityCenter|Aluminum|25|17 +XPDAC03FloodedCityCenter|Antiseptic|5|2 +XPDAC03FloodedCityCenter|Asbestos|16|10 +XPDAC03FloodedCityCenter|Bone|8|4 +XPDAC03FloodedCityCenter|Ceramic|7|7 +XPDAC03FloodedCityCenter|Circuitry|7|7 +XPDAC03FloodedCityCenter|Cloth|61|59 +XPDAC03FloodedCityCenter|Copper|34|33 +XPDAC03FloodedCityCenter|Cork|17|16 +XPDAC03FloodedCityCenter|Crystal|3|3 XPDAC03FloodedCityCenter|Fiber Optics|1|1 -XPDAC03FloodedCityCenter|Fiberglass|1|1 -XPDAC03FloodedCityCenter|Gear|1|1 -XPDAC03FloodedCityCenter|Glass|17|16 -XPDAC03FloodedCityCenter|Lead|1|1 -XPDAC03FloodedCityCenter|Oil|3|2 -XPDAC03FloodedCityCenter|Screw|1|1 -XPDAC03FloodedCityCenter|Steel|1|1 -XPDAC03FloodedCityCenter|Wood|3|2 +XPDAC03FloodedCityCenter|Fiberglass|12|10 +XPDAC03FloodedCityCenter|Gear|15|14 +XPDAC03FloodedCityCenter|Glass|105|89 +XPDAC03FloodedCityCenter|Lead|28|27 +XPDAC03FloodedCityCenter|Leather|4|2 +XPDAC03FloodedCityCenter|Oil|16|10 +XPDAC03FloodedCityCenter|Plastic|37|29 +XPDAC03FloodedCityCenter|Rubber|12|9 +XPDAC03FloodedCityCenter|Screw|10|10 +XPDAC03FloodedCityCenter|Silver|3|2 +XPDAC03FloodedCityCenter|Spring|14|14 +XPDAC03FloodedCityCenter|Steel|171|123 +XPDAC03FloodedCityCenter|Wood|29|22 XPDPitt01Foundry|Acid|79|43 XPDPitt01Foundry|Adhesive|70|28 XPDPitt01Foundry|Aluminum|63|45 @@ -18356,6 +18767,31 @@ XPDPitt01Foundry|Silver|2|2 XPDPitt01Foundry|Spring|30|30 XPDPitt01Foundry|Steel|566|349 XPDPitt01Foundry|Wood|147|113 +XPDPitt01FoundryDungeon|Acid|28|14 +XPDPitt01FoundryDungeon|Adhesive|33|13 +XPDPitt01FoundryDungeon|Aluminum|14|11 +XPDPitt01FoundryDungeon|Antiseptic|28|13 +XPDPitt01FoundryDungeon|Asbestos|16|10 +XPDPitt01FoundryDungeon|Bone|3|1 +XPDPitt01FoundryDungeon|Ceramic|15|14 +XPDPitt01FoundryDungeon|Circuitry|9|8 +XPDPitt01FoundryDungeon|Cloth|34|32 +XPDPitt01FoundryDungeon|Copper|17|16 +XPDPitt01FoundryDungeon|Crystal|1|1 +XPDPitt01FoundryDungeon|Fiber Optics|1|1 +XPDPitt01FoundryDungeon|Fiberglass|15|12 +XPDPitt01FoundryDungeon|Gear|18|18 +XPDPitt01FoundryDungeon|Glass|24|21 +XPDPitt01FoundryDungeon|Lead|64|26 +XPDPitt01FoundryDungeon|Nuclear Material|4|4 +XPDPitt01FoundryDungeon|Oil|47|34 +XPDPitt01FoundryDungeon|Plastic|35|24 +XPDPitt01FoundryDungeon|Rubber|9|5 +XPDPitt01FoundryDungeon|Screw|20|20 +XPDPitt01FoundryDungeon|Silver|1|1 +XPDPitt01FoundryDungeon|Spring|11|11 +XPDPitt01FoundryDungeon|Steel|250|150 +XPDPitt01FoundryDungeon|Wood|49|44 XPDPitt01Industrial|Acid|44|26 XPDPitt01Industrial|Adhesive|22|12 XPDPitt01Industrial|Aluminum|13|13 @@ -18518,9 +18954,9 @@ WestTek01|Super Mutant|100.0|41 005A7C2E|FortAtlasDungeon01|Atlas Substructure|0|4363|-9226|-10127|18854|-19939|1487|700|0|1.2 005B1E4A|SheltersVaultLivingQuarters01|Vault Quarters Shelter|0|-4288|-2378|-6912|-1664|-5588|832|-900|-700|1.3 000042F4|SugarGroveMissileSilo01|Missile Silo Alpha|0|-8234|-30161|-15252|-1216|-37728|-22594|0|0|1.0 -005B59C8|RaiderCave03|Mirelurk Den|0|1056|-51|-1553|3665|-3603|3501|0|0|1.0 +005B59C8|MiresEye01|Mire's Eye|0|1056|-51|-1553|3665|-3603|3501|0|0|1.0 006975E4|SheltersSoundStage|Sound Stage Shelter|0|-1424|994|-2834|-15|-864|2852|0|0|1.0 -0069506E|XPDAC03CityHall|City Hall|0|773|4273|-3516|5062|-1153|9700|500|0|1.4 +0069506E|XPDAC03CityHall|City Hall|0|-14|3447|-2396|2368|-1026|7920|500|0|1.4 001294F4|WhitespringBunker01|Whitespring Bunker|0|-16858|-6933|-23104|-10613|-12653|-1213|0|0|1.0 0068CC70|XPDAC02Pier|Showman's Pier|0|1104|3776|-6064|8272|-1920|9472|0|200|1.3 0001A69E|ValleyGalleria01|Valley Galleria|0|163|1128|-5377|5703|-6768|9024|0|0|1.0 @@ -18540,13 +18976,13 @@ WestTek01|Super Mutant|100.0|41 0041BC67|MorgantownAirportTerminal02|Morgantown Airport Terminal|0|85|39|-2543|2713|-2357|2435|0|0|1.0 005A5547|SheltersVaultServerRoom01|Server Room Shelter|0|4870|-1401|-1184|10924|-7408|4606|1700|1000|1.7 0060D363|SheltersCave01|Abandoned Mine Shelter|0|1004|778|-2488|4496|-2315|3872|0|0|1.0 -0069506F|XPDAC03CommunityCenter|Community Center|0|1626|2508|-9725|12978|-4381|9398|0|0|2.5 +0069506F|XPDAC03CommunityCenter|Community Center|0|5525|1284|-1928|12978|-3576|6144|0|0|2.5 005A7AD1|BlueRidgeOffice01|Blue Ridge Office|0|-107|-101|-1732|1517|-1726|1524|200|0|2.2 -0068CC71|XPDAC02Boardwalk|The Boardwalk|0|-33441|-10305|-94530|27648|-35712|15102|-5000|200|4.7 +0068CC71|XPDAC02Boardwalk|The Boardwalk|0|5166|-10305|-17316|27648|-35712|15102|-5000|200|4.7 0000F0FB|BigBendTunnel01|Big Bend Tunnels|0|1888|17175|-5275|9051|86|34264|0|0|1.0 00574627|RollinsLaborCamp01|Rollins Prison|0|245|473|-1024|1514|-973|1920|200|-1100|1.7 006378CF|XPDPitt02Sanctum|Sanctum|0|3368|103|-3137|9874|-5889|6096|0|0|1.0 -006A275B|IngramMansion01|Ingram Mansion|0|672|119|-632|1976|-1026|1264|0|1000|1.0 +006A275B|TheRoseRoom01|The Rose Room|0|792|119|-392|1976|-1026|1264|0|1000|1.0 0002E506|EmmettMountainDisposalSite01|Emmett Mountain Disposal Site|0|1356|1004|-2934|5647|-4560|6568|0|0|1.0 0061961E|ArktosPharmaLabDungeon|Arktos Pharma Biome Lab|0|-5489|-2981|-15190|4211|-9756|3794|0|0|1.0 0062406E|XPDPitt01Foundry|The Foundry|0|1735|4360|-5058|8529|-2416|11136|0|0|1.0 @@ -18561,7 +18997,7 @@ WestTek01|Super Mutant|100.0|41 0053E8DF|XPDAC01EntertainmentDistrict|Casino Quarter|0|-3011|2304|-29576|23554|-24260|28869|-200|-600|2.0 0053F947|LousMine01|Carleton Mine|0|-7512|17618|-17914|2890|9233|26003|0|0|1.0 00678787|XPDPitt02ACCJ|Purgatory|0|-211|-181|-843|421|-1026|663|-700|2000|2.5 -005AFB11|RaiderCave01|Deserted Mine|0|1349|1898|-1493|4191|-1026|4823|0|0|1.0 +005AFB11|LittleRobsHideout01|Little Rob's Hideout|0|1349|1898|-1493|4191|-1026|4823|0|0|1.0 00004C43|GlassedCavern01|Glassed Cavern|0|-2827|-324|-13587|7933|-11385|10736|0|0|1.0 0004FF09|FreeStatesBunker03|Ella Ames' Bunker|0|1134|1822|-241|2510|741|2903|0|0|1.0 003FEE25|HornwrightSafeRoom01|Hornwright Estate Safe Room|0|75|896|-1560|1710|-128|1920|0|0|1.0 @@ -18593,6 +19029,7 @@ WestTek01|Super Mutant|100.0|41 005500E0|CharlestonCapitolBuilding02|Charleston Capitol Building|0|-117|-1037|-4650|4416|-4244|2169|0|0|1.0 00739AF1|SheltersHighStakes|High Stakes Shelter|0|219|681|-4468|4907|-3324|4686|0|0|1.0 004738DF|TheNukashine01|The Nukashine|0|564|899|-103|1232|-2|1801|0|0|1.0 +0073FD07|XPDAC02AquariumDungeon|Aquarium of the Atlantic|0|-2253|-2492|-10369|5863|-11894|6910|0|0|1.0 00115C47|CultistCave01|Lucky Hole Mine|0|-794|-2826|-6225|4636|-8727|3075|0|0|1.0 0011B7B9|RiversideManor01|Riverside Manor|0|2608|492|-712|5928|-2368|3352|0|0|1.0 00406B95|WatogaUnderground01|Watoga Underground|0|1972|5124|-15626|19570|-5141|15390|350|0|1.6 @@ -18606,12 +19043,14 @@ WestTek01|Super Mutant|100.0|41 00004E11|WendigoCave01|Wendigo Cave|0|8971|-2210|184|17759|-9858|5437|0|0|1.0 006AFE91|NVEVault7601|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 005C2E07|LewisandSonsFarmingSupply01|Putnam Residence|0|-284|-157|-825|256|-1026|711|0|0|1.0 +00745347|SurlysShack01|Surly's Shack|0|315|-134|-345|976|-1026|757|1500|600|2.0 00477C6A|FraternityHouse01|Pi House|0|546|998|-86|1179|493|1504|0|0|1.0 0058D442|BurdetteManorBasement01|Burdette Manor Basement|0|392|744|-264|1048|-286|1775|0|0|1.0 00473A0C|VanLoweTaxidermy01|Van Lowe Taxidermy|0|1624|87|640|2608|-736|911|0|0|1.0 005F119A|WestTek02|FEV Production Facility|0|8320|2592|3840|12800|-1344|6528|0|0|1.0 005C28B8|OrwellOrchardsShelter01|Orwell Bomb Shelter|0|1740|814|-904|4384|-1344|2972|0|0|1.0 004429CA|SpruceKnobMissileSilo01|Missile Silo Charlie|0|-8234|-30161|-15252|-1216|-37728|-22594|0|0|1.0 +0074DC96|SheltersFlatlands|Flatlands|0|-10368|25271|-216060|195323|-172548|223090|-1400|-2300|10.0 006143D4|UncannyCavernsDungeon|Uncanny Caverns|0|3148|4581|-2676|8972|-1214|10376|0|0|1.0 00478804|FraternityHouse02|Eta Psi House|0|472|1143|-8|952|503|1784|0|0|1.0 0062781C|WhitespringMall01|Whitespring Mall|0|-7336|8301|-12496|-2176|6428|10175|0|0|1.0 @@ -18651,7 +19090,7 @@ WestTek01|Super Mutant|100.0|41 001D7232|HornwrightHQ01|Hornwright Industrial HQ|0|742|404|-939|2424|-2455|3264|0|0|1.0 00401116|Vault79Main|Vault 79|0|-1440|-2646|-13064|10183|-13490|8197|0|0|1.0 0051EF4E|CharGen04|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 -006A4378|XPDAC01Casino|The Neapolitan Casino|0|-2672|1290|-6400|1056|-4075|6656|0|0|1.0 +006A4378|XPDAC01Casino|The Neapolitan Casino|0|-2261|1290|-6400|1878|-4075|6656|0|0|1.0 00004586|EasternRegionalPen01|Eastern Regional Penitentiary|0|2936|-92|-320|6192|-5440|5255|0|0|1.0 006B8756|SheltersToxicWasteland|Toxic Wasteland|0|4258|1394|-41855|50372|-30185|32974|0|0|1.0 003D3915|MonongahPowerPlant01|Monongah Power Plant|0|-1219|2479|-5920|3482|-705|5664|0|0|1.0 @@ -18674,11 +19113,12 @@ WestTek01|Super Mutant|100.0|41 0040C1A7|CraterWatchstation01|Crater Watchstation Worksite|0|-1243|-3555|-4122|1636|-8328|1218|-150|-2000|1.8 0051EF4F|CharGen03|Vault 76|0|1715|1176|-3162|6593|-3152|5504|0|0|1.0 0068CC6F|XPDAC02Aquarium|Aquarium of the Atlantic|0|-2001|-2492|-10369|6366|-11894|6910|0|0|1.0 -0069306F|XPDAC03FloodedCityCenter|Flooded City Center|0|3693|-3150|-12777|20163|-15753|9452|600|0|1.2 +0069306F|XPDAC03FloodedCityCenter|Flooded City Center|0|3693|-3488|-12777|20163|-16429|9452|600|0|1.2 006D8953|SheltersRootCellar|Root Cellar Dungeon|0|3217|-2261|682|5752|-3682|-841|0|0|1.0 0039E891|FreeStatesBunker07|Ransacked Bunker|0|1125|2081|-320|2570|667|3496|0|0|1.0 005CC20D|WatogaCivicCenterDungeon|Watoga Raider Arena|0|3469|339|-524|7462|-3351|4030|0|0|1.0 003F880F|FoundationInt01|Foundation Interior|0|3171|-6042|-3576|9919|-15956|3872|1400|1800|1.7 006240BB|WhitespringRefuge01|Whitespring Refuge|0|-8840|10960|-16336|-1344|5056|16864|0|0|1.0 +00735883|XPDPitt01FoundryDungeon|The Foundry|0|1735|4360|-5058|8529|-2416|11136|0|0|1.0 ==Instance IDs Count Vs Distinct== -4077480|4077480 +4117853|4117853 diff --git a/FO76Edit/Output/Skipped_spaces.csv b/FO76Edit/Output/Skipped_spaces.csv index f248822..0a56fcd 100644 --- a/FO76Edit/Output/Skipped_spaces.csv +++ b/FO76Edit/Output/Skipped_spaces.csv @@ -2046,6 +2046,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace 0051AD41,PackInMSiloOperationsConsoleCabCluster02StorageCell,,0 00621735,PackInCaveCricketTubePackInStorageCell,,0 0062BC0D,WarehouseExpeditionsBeautifulCorner,Pitt Exterior Beautiful Corner,0 +00749DC9,WarehouseCrowds,The Neapolitan Casino,0 000028EF,,,0 0000405F,,,0 0001804B,,,0 diff --git a/ImageAssetChecker/ImageAssetChecker.csproj b/ImageAssetChecker/ImageAssetChecker.csproj index d74c806..97ee00f 100644 --- a/ImageAssetChecker/ImageAssetChecker.csproj +++ b/ImageAssetChecker/ImageAssetChecker.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MapIconProcessor/MapIconProcessor.csproj b/MapIconProcessor/MapIconProcessor.csproj index 59a2a58..e88406f 100644 --- a/MapIconProcessor/MapIconProcessor.csproj +++ b/MapIconProcessor/MapIconProcessor.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Mappalachia/Mappalachia.csproj b/Mappalachia/Mappalachia.csproj index 881f0f9..5e9f9e7 100644 --- a/Mappalachia/Mappalachia.csproj +++ b/Mappalachia/Mappalachia.csproj @@ -53,13 +53,13 @@ - 8.0.1 + 8.0.3 all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Mappalachia/Properties/AssemblyInfo.cs b/Mappalachia/Properties/AssemblyInfo.cs index d566cb3..1086e7c 100644 --- a/Mappalachia/Properties/AssemblyInfo.cs +++ b/Mappalachia/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.7.4")] -[assembly: AssemblyFileVersion("1.7.7.4")] +[assembly: AssemblyVersion("1.7.7.5")] +[assembly: AssemblyFileVersion("1.7.7.5")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/MappalachiaTests/MappalachiaTests.csproj b/MappalachiaTests/MappalachiaTests.csproj index c37cefd..ab1f666 100644 --- a/MappalachiaTests/MappalachiaTests.csproj +++ b/MappalachiaTests/MappalachiaTests.csproj @@ -11,10 +11,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Preprocessor/SpaceNudge.cs b/Preprocessor/SpaceNudge.cs index 527cf7c..eedee75 100644 --- a/Preprocessor/SpaceNudge.cs +++ b/Preprocessor/SpaceNudge.cs @@ -79,6 +79,18 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 2.2f; break; + case "NPECultistCave": + nudgeX = 0; + nudgeY = 1600; + nudgeScale = 1.5f; + break; + + case "NVEShelter01": + nudgeX = 1000; + nudgeY = -200; + nudgeScale = 1.4f; + break; + case "PoseidonPlant01": nudgeX = 400; nudgeY = 700; @@ -103,6 +115,12 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 1.9f; break; + case "SheltersFlatlands": + nudgeX = -1400; + nudgeY = -2300; + nudgeScale = 10f; + break; + case "SheltersVaultLivingQuarters01": nudgeX = -900; nudgeY = -700; @@ -121,12 +139,24 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 2.2f; break; + case "SurlysShack01": + nudgeX = 1500; + nudgeY = 600; + nudgeScale = 2; + break; + case "TheCraterCore01": nudgeX = 3650; nudgeY = 0; nudgeScale = 2.6f; break; + case "TheRoseRoom01": + nudgeX = 0; + nudgeY = 1000; + nudgeScale = 1f; + break; + case "TheWayward01": nudgeX = 1100; nudgeY = 600; @@ -157,22 +187,10 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 1.6f; break; - case "XPDAC03CityHall": - nudgeX = 500; - nudgeY = 0; - nudgeScale = 1.4f; - break; - - case "XPDAC02Pier": - nudgeX = 0; - nudgeY = 200; - nudgeScale = 1.3f; - break; - - case "XPDAC03CommunityCenter": - nudgeX = 0; - nudgeY = 0; - nudgeScale = 2.5f; + case "XPDAC01EntertainmentDistrict": + nudgeX = -200; + nudgeY = -600; + nudgeScale = 2f; break; case "XPDAC02Boardwalk": @@ -181,24 +199,29 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 4.7f; break; - case "IngramMansion01": + case "XPDAC02Pier": nudgeX = 0; - nudgeY = 1000; - nudgeScale = 1f; + nudgeY = 200; + nudgeScale = 1.3f; break; - case "XPDRttP01SteelTowerUpperFloors": - nudgeX = 9400; - nudgeY = -2500; - nudgeScale = 5f; + case "XPDAC03CityHall": + nudgeX = 500; + nudgeY = 0; + nudgeScale = 1.4f; break; - case "XPDAC01EntertainmentDistrict": - nudgeX = -200; - nudgeY = -600; - nudgeScale = 2f; + case "XPDAC03CommunityCenter": + nudgeX = 0; + nudgeY = 0; + nudgeScale = 2.5f; break; + case "XPDAC03FloodedCityCenter": + nudgeX = 600; + nudgeY = 0; + nudgeScale = 1.2f; + break; case "XPDPitt02ACCJ": nudgeX = -700; nudgeY = 2000; @@ -217,22 +240,10 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 4f; break; - case "NPECultistCave": - nudgeX = 0; - nudgeY = 1600; - nudgeScale = 1.5f; - break; - - case "NVEShelter01": - nudgeX = 1000; - nudgeY = -200; - nudgeScale = 1.4f; - break; - - case "XPDAC03FloodedCityCenter": - nudgeX = 600; - nudgeY = 0; - nudgeScale = 1.2f; + case "XPDRttP01SteelTowerUpperFloors": + nudgeX = 9400; + nudgeY = -2500; + nudgeScale = 5f; break; default: diff --git a/README.md b/README.md index 3ea0d3d..3a83326 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Mappalachia is a Windows application for generating and exporting complex maps o [![Latest release](https://img.shields.io/github/downloads/AHeroicLlama/Mappalachia/total)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
![](https://img.shields.io/github/last-commit/AHeroicLlama/Mappalachia)
[![Latest release](https://img.shields.io/github/v/release/aheroicllama/mappalachia)](https://github.com/AHeroicLlama/Mappalachia/releases/latest)
-![](https://img.shields.io/badge/game%20version-1.7.9.7-green)
+![](https://img.shields.io/badge/game%20version-1.7.10.12-green)
[![Discord](https://img.shields.io/discord/1029499482028646400?label=Discord&logo=Discord)](https://discord.gg/Z2GMpm6rad)
[![License](https://img.shields.io/github/license/AHeroicLlama/Mappalachia)](LICENSE.md) From 8201de1777b9f66cd6e1ca3343d8cd4ed4bbf2a2 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Thu, 18 Apr 2024 00:08:01 +0100 Subject: [PATCH 15/16] Add support for missing worldspace backgrounds Adds and supports worldspace (and watermask) backgrounds for DIMAs memories, Goodneighbor, and NukaWorld Market. Corrects some incorrect wording, and updates nuget packages. Rebuilds database. --- BackgroundRenderer/BackgroundRenderer.csproj | 2 +- CommonwealthCartography/Class/IOManager.cs | 7 ------- CommonwealthCartography/CommonwealthCartography.csproj | 2 +- CommonwealthCartography/Form/FormMaster.Designer.cs | 10 +++++----- CommonwealthCartography/Form/FormMaster.resx | 2 +- .../CommonwealthCartographyTests.csproj | 4 ++-- Database/summary.txt | 4 ++-- Developer_Guides/Ingest.md | 2 +- ImageAssetChecker/ImageAssetChecker.cs | 4 +++- ImageAssetChecker/ImageAssetChecker.csproj | 2 +- MapIconProcessor/MapIconProcessor.csproj | 2 +- Preprocessor/SpaceNudge.cs | 6 ++++++ 12 files changed, 24 insertions(+), 23 deletions(-) diff --git a/BackgroundRenderer/BackgroundRenderer.csproj b/BackgroundRenderer/BackgroundRenderer.csproj index 6f8f23c..4612eb3 100644 --- a/BackgroundRenderer/BackgroundRenderer.csproj +++ b/BackgroundRenderer/BackgroundRenderer.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CommonwealthCartography/Class/IOManager.cs b/CommonwealthCartography/Class/IOManager.cs index 88711dd..9ad3910 100644 --- a/CommonwealthCartography/Class/IOManager.cs +++ b/CommonwealthCartography/Class/IOManager.cs @@ -249,13 +249,6 @@ public static void Cleanup() public static Image GetImageForSpace(Space space) { string editorID = space.editorID; - - // Temp hack while fo76utils is unable to render worldspaces without terrain - if (editorID == "Goodneighbor" || editorID == "DLC03VRWorldspace" || editorID == "NukaWorldMarket") - { - return EmptyMapBackground(); - } - string filePath = imgFolder + (space.IsWorldspace() ? string.Empty : "\\cell\\"); string fileName = editorID + MapFileExtension; diff --git a/CommonwealthCartography/CommonwealthCartography.csproj b/CommonwealthCartography/CommonwealthCartography.csproj index 1f26d9f..c88da94 100644 --- a/CommonwealthCartography/CommonwealthCartography.csproj +++ b/CommonwealthCartography/CommonwealthCartography.csproj @@ -53,7 +53,7 @@ - 8.0.3 + 8.0.4 all diff --git a/CommonwealthCartography/Form/FormMaster.Designer.cs b/CommonwealthCartography/Form/FormMaster.Designer.cs index d33432f..91ac4e0 100644 --- a/CommonwealthCartography/Form/FormMaster.Designer.cs +++ b/CommonwealthCartography/Form/FormMaster.Designer.cs @@ -639,7 +639,7 @@ private void InitializeComponent() // viaKoFiToolStripMenuItem // viaKoFiToolStripMenuItem.Name = "viaKoFiToolStripMenuItem"; - viaKoFiToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + viaKoFiToolStripMenuItem.Size = new System.Drawing.Size(180, 22); viaKoFiToolStripMenuItem.Text = "Via Ko-Fi"; viaKoFiToolStripMenuItem.ToolTipText = "Support the project via Ko-Fi."; viaKoFiToolStripMenuItem.Click += Donate_ViaKoFi; @@ -647,7 +647,7 @@ private void InitializeComponent() // donatePatreonMenuItem // donatePatreonMenuItem.Name = "donatePatreonMenuItem"; - donatePatreonMenuItem.Size = new System.Drawing.Size(134, 22); + donatePatreonMenuItem.Size = new System.Drawing.Size(180, 22); donatePatreonMenuItem.Text = "Via Patreon"; donatePatreonMenuItem.ToolTipText = "Support the project via Patreon."; donatePatreonMenuItem.Click += Donate_ViaPatreon; @@ -655,9 +655,9 @@ private void InitializeComponent() // donatePayPalMenuItem // donatePayPalMenuItem.Name = "donatePayPalMenuItem"; - donatePayPalMenuItem.Size = new System.Drawing.Size(134, 22); + donatePayPalMenuItem.Size = new System.Drawing.Size(180, 22); donatePayPalMenuItem.Text = "Via PayPal"; - donatePayPalMenuItem.ToolTipText = "Support the project via Patreon."; + donatePayPalMenuItem.ToolTipText = "Support the project via PayPal."; donatePayPalMenuItem.Click += Donate_ViaPayPal; // // joinDiscordMenuItem @@ -1299,7 +1299,7 @@ private void InitializeComponent() // pictureBoxMapPreview // pictureBoxMapPreview.Anchor = System.Windows.Forms.AnchorStyles.None; - pictureBoxMapPreview.Location = new System.Drawing.Point(-14, 0); + pictureBoxMapPreview.Location = new System.Drawing.Point(-15, 0); pictureBoxMapPreview.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); pictureBoxMapPreview.Name = "pictureBoxMapPreview"; pictureBoxMapPreview.Size = new System.Drawing.Size(820, 820); diff --git a/CommonwealthCartography/Form/FormMaster.resx b/CommonwealthCartography/Form/FormMaster.resx index 17fc401..9355ac0 100644 --- a/CommonwealthCartography/Form/FormMaster.resx +++ b/CommonwealthCartography/Form/FormMaster.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/CommonwealthCartographyTests/CommonwealthCartographyTests.csproj b/CommonwealthCartographyTests/CommonwealthCartographyTests.csproj index 47976a4..b28438c 100644 --- a/CommonwealthCartographyTests/CommonwealthCartographyTests.csproj +++ b/CommonwealthCartographyTests/CommonwealthCartographyTests.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Database/summary.txt b/Database/summary.txt index bd9d92a..4d693a4 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -3,7 +3,7 @@ commonwealth_cartography.db ==SQLite version== 3.45.2 2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77 (64-bit) ==Checksum== -6ca6d4065d21efe0d92c13c7f7cb8d85 +d81c1310fb4ee967ea7b6c74b14ed1da ==File Size== 211533824 ==Tables== @@ -24778,7 +24778,7 @@ TheCastle01|Mirelurk|100.0|1 0005226E|Vault81Secret|Secret Vault 81|0|5506|-7026|2097|8916|-12228|-1824|0|-700|1.3|0 000532B6|NationalGuardTrainingYard01|National Guard Recruitment Office|0|2177|2358|1375|2980|1116|3601|0|0|1.0|0 00053834|PoseidonReservoir01|Poseidon Reservoir|0|2525|2797|-1525|6576|827|4767|-2400|0|2.0|0 -00054BD5|Goodneighbor|Goodneighbor|1|15161|-10355|2560|27763|-20320|-390|0|0|1.0|0 +00054BD5|Goodneighbor|Goodneighbor|1|15161|-10355|2560|27763|-20320|-390|-2600|200|2.3|0 000560EE|CambridgePolymerLabs01|Cambridge Polymer Labs|0|2152|4077|1|4304|0|8154|0|600|1.5|0 00056BEE|MaldenDrainage01|Malden Drainage|0|296|2428|-3440|4032|1328|3529|0|0|1.0|0 00057127|CorvegaAssemblyPlant01|Corvega Assembly Plant|0|196|1088|-4343|4736|-3445|5622|200|-500|1.4|0 diff --git a/Developer_Guides/Ingest.md b/Developer_Guides/Ingest.md index cb4ee9d..5799245 100644 --- a/Developer_Guides/Ingest.md +++ b/Developer_Guides/Ingest.md @@ -14,7 +14,7 @@ Using SQLite, a single batch file creates the empty database structure, then ins The game version string is baked into the database. If you have Fallout 4 installed in the default Steam location, you may enable automatic game version detection by downloading [`sigcheck.exe`](https://docs.microsoft.com/en-gb/sysinternals/downloads/sigcheck) from Sysinternals and placing it in the database folder - if so, the game version string will be automatically gathered from `Fallout4.exe`.
Otherwise, before running `build_database.bat`, ensure the correct game version string is stored in `gameVersion.csv`.

-Sometimes the version of the exe will differ from the version given in-game. The recommended rule is that the version in-game (bottom-left of settings menu) trumps the version of the exe. Where this is the case, you must call the batch script with the `override` argument. This prevents sigcheck from modifying `gameVersion.csv` and instead trusts the value you should have entered into the file previously. +Sometimes the version of the exe will differ from the version given in-game. The recommended rule is that the version in-game (bottom-right of settings menu) trumps the version of the exe. Where this is the case, you must call the batch script with the `override` argument. This prevents sigcheck from modifying `gameVersion.csv` and instead trusts the value you should have entered into the file previously. ## Building the database Before we can build the database, we need a copy of the sqlite tools windows binary, called sqlite3.exe. This is distributed at the [SQLite downloads page](https://www.sqlite.org/download.html). Under 'Precompiled Binaries for Windows' find the sqlite-tools zip.
diff --git a/ImageAssetChecker/ImageAssetChecker.cs b/ImageAssetChecker/ImageAssetChecker.cs index 98d1825..c5e53ba 100644 --- a/ImageAssetChecker/ImageAssetChecker.cs +++ b/ImageAssetChecker/ImageAssetChecker.cs @@ -5,6 +5,7 @@ namespace ImageAssetChecker internal class ImageAssetChecker { const int minMapSizeKB = 100; + const int minMapSizeKBWaterMask = 20; const int maxMapSizeKBCell = 10000; const int maxMapSizeKBWorldspace = 50000; const int maxMarkerSizeKB = 50; @@ -171,8 +172,9 @@ static void ValidateImageFile(string expectedFile, bool isWorldSpace) long sizeInBytes = new FileInfo(expectedFile).Length; long sizeInKB = sizeInBytes / 1024; int maxFileSizeKB = isWorldSpace ? maxMapSizeKBWorldspace : maxMapSizeKBCell; + int minFileSizeKb = expectedFile.EndsWith("_waterMask.png") ? minMapSizeKBWaterMask : minMapSizeKB; - if (sizeInKB > minMapSizeKB && sizeInKB < maxFileSizeKB) + if (sizeInKB > minFileSizeKb && sizeInKB < maxFileSizeKB) { Console.WriteLine($"File size OK ({sizeInKB}KB)"); } diff --git a/ImageAssetChecker/ImageAssetChecker.csproj b/ImageAssetChecker/ImageAssetChecker.csproj index 97ee00f..fcdf5cb 100644 --- a/ImageAssetChecker/ImageAssetChecker.csproj +++ b/ImageAssetChecker/ImageAssetChecker.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MapIconProcessor/MapIconProcessor.csproj b/MapIconProcessor/MapIconProcessor.csproj index e88406f..d80e402 100644 --- a/MapIconProcessor/MapIconProcessor.csproj +++ b/MapIconProcessor/MapIconProcessor.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Preprocessor/SpaceNudge.cs b/Preprocessor/SpaceNudge.cs index b96e89e..8bcaa73 100644 --- a/Preprocessor/SpaceNudge.cs +++ b/Preprocessor/SpaceNudge.cs @@ -397,6 +397,12 @@ public static CSVFile AddNudgeToSpaces(CSVFile spaceInfoFile) nudgeScale = 1.1f; break; + case "Goodneighbor": + nudgeX = -2600; + nudgeY = 200; + nudgeScale = 2.3f; + break; + case "GoodneighborHotelRexford": nudgeX = 800; nudgeY = 800; From 4bed43074e549bf01f661496dbba5f53199aebd6 Mon Sep 17 00:00:00 2001 From: AHeroicLlama Date: Thu, 25 Apr 2024 21:54:10 +0100 Subject: [PATCH 16/16] 1.0.1.0 - Update to Fallout 4 'Next Gen Update' Updates the database to game version 1.10.980.0.1 --- .../Properties/AssemblyInfo.cs | 4 +- Database/gameVersion.csv | 2 +- Database/summary.txt | 54 ++++++++++--------- FO4Edit/Output/Skipped_spaces_0.csv | 1 + 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/CommonwealthCartography/Properties/AssemblyInfo.cs b/CommonwealthCartography/Properties/AssemblyInfo.cs index 9c02dd9..ed5e733 100644 --- a/CommonwealthCartography/Properties/AssemblyInfo.cs +++ b/CommonwealthCartography/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Database/gameVersion.csv b/Database/gameVersion.csv index c5f0659..b397b69 100644 --- a/Database/gameVersion.csv +++ b/Database/gameVersion.csv @@ -1,2 +1,2 @@ version -1.10.163.0 +1.10.980.0.1 diff --git a/Database/summary.txt b/Database/summary.txt index 4d693a4..c784f80 100644 --- a/Database/summary.txt +++ b/Database/summary.txt @@ -1,11 +1,11 @@ ==Database name== commonwealth_cartography.db ==SQLite version== -3.45.2 2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77 (64-bit) +3.45.3 2024-04-15 13:34:05 8653b758870e6ef0c98d46b3ace27849054af85da891eb121e9aaa537f1e8355 (64-bit) ==Checksum== -d81c1310fb4ee967ea7b6c74b14ed1da +db93a7de4ded1632ef635929e061d179 ==File Size== -211533824 +211542016 ==Tables== Entity_Info Map_Markers Region Standard_Search Game_Version NPC_Search Scrap_Search @@ -14,9 +14,9 @@ Lock_Levels Position_Data Space_Info Index_PositionData_CoverAll Index_ScrapSearch_CompMagSpace Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Game Version== -1.10.163.0 +1.10.980.0.1 ==Mean Average X/Y/Z Coord== --3.79508283211987|178.841153624905|1353.98640511663 +-3.43547987240239|179.449286305496|1353.99028835402 ==Min/Max X/Y/Z Coord== -213381|316690|-235522|169181|-141089|27662 ==100 most common xyz coordinates + count== @@ -123,17 +123,17 @@ Index_PositionData_SpaceXYZ Index_StandardSearch_RefSpace ==Z outliers== 49 ==Average X Bounds Width== -11.9332997489111 +11.9336403950919 ==Average Y Bounds Width== -9.21865047352901 +9.2190217554712 ==Average Z Bounds Width== -7.53328488553498 +7.5335862744642 ==Average Z Rotation== -2.02934779278865 +2.02944241570882 ==Average display name string length== -2.75597674658594 +2.92347114260164 ==Average editorID string length== -22.3343194248564 +22.3350416179404 ==Map Markers== Commonwealth|AirfieldMarker|Boston Airport|48074|-3332 Commonwealth|AirfieldMarker|Skylanes Flight 1665|-64854|-125006 @@ -551,7 +551,7 @@ NukaWorld|TownRuinsMarker|Nuka-Town USA|596|-21444 NukaWorldAmphitheater|PackMarker|Bradberton Amphitheater|-2883|-18843 NukaWorldMarket|TownRuinsMarker|Nuka-Town Market|478|-18702 ==Total Unique entities== -29065 +29068 ==Regions== Space|Region|subRegions|maxVerts Commonwealth||1|5 @@ -732,8 +732,8 @@ CombatZone01||2409 CombatZone01|Box|77 CombatZone01|Line|2 CombatZone01|Plane|7 -Commonwealth||707759 -Commonwealth|Box|6542 +Commonwealth||707770 +Commonwealth|Box|6543 Commonwealth|Line|21 Commonwealth|Plane|18 Commonwealth|Sphere|140 @@ -774,7 +774,7 @@ DBTechHighSchool02|Plane|23 DLC01FortHagenSatelliteArray01||7587 DLC01FortHagenSatelliteArray01|Box|234 DLC01FortHagenSatelliteArray01|Line|1 -DLC01Lair01||28002 +DLC01Lair01||27997 DLC01Lair01|Box|444 DLC01Lair01|Line|22 DLC01Lair01|Sphere|1 @@ -1652,7 +1652,7 @@ CombatZone01|Advanced|1 CombatZone01|Expert|1 CombatZone01|Inaccessible|1 CombatZone01|Novice 1|2 -Commonwealth||714072 +Commonwealth||714084 Commonwealth|Advanced|116 Commonwealth|Expert|80 Commonwealth|Inaccessible|14 @@ -1695,7 +1695,7 @@ DLC01FortHagenSatelliteArray01||7819 DLC01FortHagenSatelliteArray01|Advanced|4 DLC01FortHagenSatelliteArray01|Expert|3 DLC01FortHagenSatelliteArray01|Novice 1|1 -DLC01Lair01||28430 +DLC01Lair01||28425 DLC01Lair01|Advanced|19 DLC01Lair01|Expert|1 DLC01Lair01|Inaccessible|1 @@ -3182,7 +3182,7 @@ Commonwealth|ASPC|749 Commonwealth|BNDS|5013 Commonwealth|BOOK|106 Commonwealth|CONT|5352 -Commonwealth|DOOR|1309 +Commonwealth|DOOR|1312 Commonwealth|FLOR|3537 Commonwealth|FURN|6789 Commonwealth|HAZD|862 @@ -3194,9 +3194,9 @@ Commonwealth|MSTT|14914 Commonwealth|NOTE|31 Commonwealth|NPC_|3723 Commonwealth|PROJ|282 -Commonwealth|SCOL|34155 +Commonwealth|SCOL|34157 Commonwealth|SOUN|879 -Commonwealth|STAT|590073 +Commonwealth|STAT|590080 Commonwealth|TACT|11 Commonwealth|TERM|142 Commonwealth|TXST|13369 @@ -3409,7 +3409,7 @@ DLC01Lair01|FURN|114 DLC01Lair01|HAZD|10 DLC01Lair01|IDLM|107 DLC01Lair01|KEYM|2 -DLC01Lair01|LIGH|1082 +DLC01Lair01|LIGH|1077 DLC01Lair01|MISC|570 DLC01Lair01|MSTT|851 DLC01Lair01|NOTE|4 @@ -8493,7 +8493,7 @@ CombatZone01|TheCombatZone01ToExtMain001|1 CombatZone01|TommyCowerMarker|1 CombatZone01|TommyRef|1 CombatZone01|TommyRunMarker02|1 -Commonwealth||711152 +Commonwealth||711162 Commonwealth|35CourtMapMarker|1 Commonwealth|ADV017_DogTravelOutOfCommonwealthMarkerRef|1 Commonwealth|AO_Comment_AbandonedRecently_1024_003|1 @@ -11519,6 +11519,8 @@ Commonwealth|V111ExtCompanionFailsafeDoorDUPLICATE000|1 Commonwealth|V111FailsafeWarpMarker|1 Commonwealth|V81_01TychoRunAwayMarker|1 Commonwealth|VFTFarBeaconMarker|1 +Commonwealth|VLTTOSEntranceBlocker|1 +Commonwealth|VLTTOSNavCut|1 Commonwealth|VSBloodbug|1 Commonwealth|Vault111AlwaysEnableControlsTriggerREF|1 Commonwealth|Vault111ElevatorDescendAgainTrigger|1 @@ -12032,7 +12034,7 @@ DLC01FortHagenSatelliteArray01|LightDLC01AssaultronHeadTrap03|1 DLC01FortHagenSatelliteArray01|LightDLC01AssaultronHeadTrap04|1 DLC01FortHagenSatelliteArray01|LightDLC01AssaultronHeadTrap05|1 DLC01FortHagenSatelliteArray01|LightDLC01AssaultronHeadTrap06|1 -DLC01Lair01||28218 +DLC01Lair01||28213 DLC01Lair01|AO_Comment_Dusty_512_012|1 DLC01Lair01|AO_Comment_HighTech_512_008|1 DLC01Lair01|DLC01CC_LitConsolePanels|1 @@ -18951,7 +18953,7 @@ CharlestownHouse01|100|324 CharlestownLaundry|100|255 CollegeSquare01|100|2713 CombatZone01|100|2495 -Commonwealth|100|714509 +Commonwealth|100|714521 ConcordCivicAccess01|100|1995 ConcordFactory|100|598 ConcordMuseum01|100|3414 @@ -18963,7 +18965,7 @@ CustomHouseTower01|100|174 DBTechHighSchool01|100|7496 DBTechHighSchool02|100|2418 DLC01FortHagenSatelliteArray01|100|7827 -DLC01Lair01|100|28469 +DLC01Lair01|100|28464 DLC03Acadia|100|3531 DLC03AlderseaDaySpa01|100|1461 DLC03BeaverCreekLanes01|100|2976 @@ -24997,4 +24999,4 @@ TheCastle01|Mirelurk|100.0|1 01053C58|NukaWorldMarket|Nuka-Town Market|1|981|-18351|-2549|4511|-21672|-15030|0|0|1.0|7 01054271|DLC03POIBasementArmory|Basement Armory|0|3038|2670|2396|3680|1968|3372|0|0|1.0|4 ==Instance IDs Count Vs Distinct== -1762722|1762060 +1762729|1762067 diff --git a/FO4Edit/Output/Skipped_spaces_0.csv b/FO4Edit/Output/Skipped_spaces_0.csv index 81d0a7c..08b9eb3 100644 --- a/FO4Edit/Output/Skipped_spaces_0.csv +++ b/FO4Edit/Output/Skipped_spaces_0.csv @@ -339,6 +339,7 @@ spaceFormID,spaceEditorID,spaceDisplayName,isWorldspace,esmNumber 00199063,,,0,0 002105C3,,,0,0 0024A197,ccTOSFO4001,Noir Penthouse,0,0 +0024A3EF,ccEEJFO4VLTInterior02,Quick Test Cell,0,0 0002F295,REHoldingCell,Quick Test Cell,0,0 00072E2D,PackInCeilingLight02StorageCell,,0,0 00089399,PackInFloorLampPackInStorageCell,,0,0