User:Nearox/SRLE Explorers Conflict Resolution: Difference between revisions
No edit summary |
m (Text replacement - "subrecord" to "sub-record") |
||
| (15 intermediate revisions by 2 users not shown) | |||
| Line 5: | Line 5: | ||
''Last Update:'' {{ #time: G:i:s j F Y "(UTC)" | {{REVISIONTIMESTAMP}} }} | ''Last Update:'' {{ #time: G:i:s j F Y "(UTC)" | {{REVISIONTIMESTAMP}} }} | ||
</center> | </center> | ||
{{TOC | {{TOC}}<br> | ||
- Add Cutting Room Floor.esp as master <br> | |||
- Add 3DNPC.esp as a master <br> | |||
=== Conflicts and Fixes === | === Conflicts and Fixes === | ||
| Line 15: | Line 17: | ||
===== Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> ===== | ===== Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> ===== | ||
'''Conflict Resolution:''' Use record from ''ELE_Legendary_Fs_Wt_Lite.esp''. <br> | '''Conflict Resolution:''' Use record from ''ELE_Legendary_Fs_Wt_Lite.esp''. <br> | ||
'''Problem Resolved:''' Needs to put into the Explorer's Edition Conflict Resolution ESP in order to facilitate the succesful merging of | '''Problem Resolved:''' Needs to put into the Explorer's Edition Conflict Resolution ESP in order to facilitate the succesful merging of sub-record 00064110. | ||
===== Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> \ Persistent \ 00064110 ===== | ===== Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> \ Persistent \ 00064110 ===== | ||
| Line 23: | Line 25: | ||
===== Block 1 \ Sub-Block 3 \ 0001677F <WindhelmNewGnisisCornerclub> \ Temporary \ 000D26CA ===== | ===== Block 1 \ Sub-Block 3 \ 0001677F <WindhelmNewGnisisCornerclub> \ Temporary \ 000D26CA ===== | ||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | ||
'''Problem Resolved:''' | '''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX''. | ||
===== Block 1 \ Sub-Block 6 \ 000681DD <BoulderfallCave01> \ Temporary \ 000D3C70 ===== | ===== Block 1 \ Sub-Block 6 \ 000681DD <BoulderfallCave01> \ Temporary \ 000D3C70 ===== | ||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | ||
'''Problem Resolved:''' | '''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX'' | ||
===== Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C94C3 ===== | ===== Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C94C3 ===== | ||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | ||
'''Problem Resolved:''' | '''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX'' | ||
===== Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C951B ===== | ===== Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C951B ===== | ||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | '''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | ||
'''Problem Resolved:''' | '''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX'' | ||
===== Block 2 \ Sub-Block 6 \ 000165AA <WhiterunHalloftheDead> \ Persistent \ 0005CC80 <AAWhiterunFenceServiceMarker> ===== | |||
'''Conflict Resolution:''' Use record from ''Inconsequential NPCs.esp''.<br> | |||
'''Problem Resolved:''' Preserve Record Flag changes from ''Inconsequential NPCs'' | |||
===== Block 2 \ Sub-Block 7 \ 0001522C <PurewaterRun01> \ Persistent \ 000C9AA9 ===== | ===== Block 2 \ Sub-Block 7 \ 0001522C <PurewaterRun01> \ Persistent \ 000C9AA9 ===== | ||
'''Conflict Resolution:''' Use record from ''Skyrim Immersive Creatures.esp'' then move the Record flags from ''3DNPC.esp''.<br> | '''Conflict Resolution:''' Use record from ''Skyrim Immersive Creatures.esp'' then move the Record flags from ''3DNPC.esp''.<br> | ||
'''Problem Resolved:''' Changes from ''Skyrim Immersive Creatures'' and ''Interesting NPCs'' needed to be merged. | '''Problem Resolved:''' Changes from ''Skyrim Immersive Creatures'' and ''Interesting NPCs'' needed to be merged. | ||
===== Block 5 \ Sub-Block 7 \ 000165B7 <WhiterunDrunkenHuntsman> ===== | |||
'''Conflict Resolution:''' Use record from ''SR Conflict Resolution.esp''.<br> | |||
'''Problem Resolved:''' Keep the patching of SR Conflict Resolution intact. This is needed to preserve a future error that arises out of the patching of a sub-record. Verify all the data is consistent with Explorer´s Edition Conflict Resolution.esp. | |||
===== Block 5 \ Sub-Block 7 \ 000165B7 <WhiterunDrunkenHuntsman> \ Persistent \ 000E1BA9 <HirelingJenassaREF> ===== | ===== Block 5 \ Sub-Block 7 \ 000165B7 <WhiterunDrunkenHuntsman> \ Persistent \ 000E1BA9 <HirelingJenassaREF> ===== | ||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the Linked References from ''Cutting Room Floor.esp''.<br> | '''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the Linked References from ''Cutting Room Floor.esp''.<br> | ||
'''Problem Resolved:''' Changes from ''Cutting Room Floor'' and ''Interesting NPCs'' needed to be merged. | '''Problem Resolved:''' Changes from ''Cutting Room Floor'' and ''Interesting NPCs'' needed to be merged. | ||
===== Block 6 \ Sub-Block 0 \ 0001605E <WhiterunBanneredMare> \ Persistent \ 00092A30 ===== | |||
'''Conflict Resolution:''' Use record from ''Immersive Citizens - AI Overhaul.esp'' then move the Record Flags from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Changes from ''Immersive Citizens'' and ''Interesting NPCs'' needed to be merged. | |||
===== Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Persistent \ 000C1D02 ===== | |||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp'' then move the Record Flags from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Changes of''Enhanced Lights and FX'' and ''Interesting NPCs'' needed to be merged. | |||
===== Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 00053EDE ===== | |||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp'' then move the XESP - Enable Parents records from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Changes of''Enhanced Lights and FX'' and ''Interesting NPCs'' needed to be merged. | |||
===== Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 000C1D03 ===== | |||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp'' then move the XESP - Enable Parents records from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Changes of''Enhanced Lights and FX'' and ''Interesting NPCs'' needed to be merged. | |||
===== Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 000C1D04 ===== | |||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp'' then move the XESP - Enable Parents records from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Changes of''Enhanced Lights and FX'' and ''Interesting NPCs'' needed to be merged. | |||
===== Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 000C1D05 ===== | |||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp'' then move the XESP - Enable Parents records from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Changes of''Enhanced Lights and FX'' and ''Interesting NPCs'' needed to be merged. | |||
===== Block 7 \ Sub-Block 3 \ 00016785 <WindhelmTempleofTalos> \ Persistent \ 000D1877 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Preserve Record Flags of ''Interesting NPCs''. | |||
===== Block 8 \ Sub-Block 2 \ 00015200 <TrevasWatch01> \ Persistent \ 0001571E ===== | |||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp'' then move the Record Flags from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Changes of''Enhanced Lights and FX'' and ''Interesting NPCs'' needed to be merged.' | |||
===== Block 8 \ Sub-Block 8 \ 00013810 <WinterholdCollegeArcanaeum> \ Temporary \ 00077D85 ===== | |||
'''Conflict Resolution:''' Use record from ''EnhancedLightsandFX.esp''.<br> | |||
'''Problem Resolved:''' Preserve lighting changes of''Enhanced Lights and FX'' | |||
==== Non-Player Character (Actor) ==== | |||
===== 00047CAD <Luaffyn> ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the VMAD - Virtual Machine Adapter records from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' NPC flag changes from ''Unofficial Skyrim Patch'' needed to be carried over. Not strictly necessary but for sake of good modding practice. | |||
===== 5002BB70 <Jade3DNPC> ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC Follower Perks Addon.esp'' then move the OBND - Object Bounds and the DOFT - Default Outfit records from ''Clothing & Clutter_3DNPC_Patch.esp''.<br> | |||
'''Problem Resolved:''' Perks and combat changes ''Interesting NPCs Follower Perks Addon'' needed to be carried forward. | |||
==== Quest ==== | |||
===== 00021382 <RelationshipMarriageFIN> ===== | |||
'''Conflict Resolution:''' | |||
'''Problem Resolved:''' NOT SURE if this needs patching of the Quest VMAD scripts from Hearthfires? 3DNPC supposedly is compatible with heartfires already as there's a seperate patch from author, but doesn't address this. | |||
==== Worldspace ==== | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 0001BB22 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the XLKR - Linked Reference records from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Changes from ''Unofficial Skyrim Patch'' needed to be forwarded. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 0006B50B ===== | |||
'''Conflict Resolution:''' <br> | |||
'''Problem Resolved:''' NOT SURE ABOUT THIS ONE. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 0007F411 ===== | |||
'''Conflict Resolution:''' Use record from ''Immersive Citizens - AI Overhaul.esp'' then move the Record Flags from ''3DNPC.esp''.<br>. | |||
'''Problem Resolved:''' Persistent Flag changes from ''Interesting NPCs'' merged with the Cell identification of ''Immersive Citizens''. NOT SURE ABOUT THIS ONE. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000844A3 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the XLKR - Linked Reference from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000844A4 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the XLKR - Linked Reference from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000A35A5 ===== | |||
'''Conflict Resolution:''' Use record from ''RBB-SR Merge.esp'' then right-click on Record Flags > Edit > check the box next to Persistent.<br> | |||
'''Problem Resolved:''' Merged persistent record flag of ''Interesting NPCs'' with location changes of ''Realistic Boat Bobbing''. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000A38EC ===== | |||
'''Conflict Resolution:''' Use record from ''RBB-SR Merge.esp'' then right-click on Record Flags > Edit > check the box next to Persistent.<br> | |||
'''Problem Resolved:''' Merged persistent record flag of ''Interesting NPCs'' with location changes of ''Realistic Boat Bobbing'' | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000AADD3 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move Data Position/Rotation block from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000B6252 ===== | |||
'''Conflict Resolution:''' Use record from ''Helgen Reborn.esp''.<br> | |||
'''Problem Resolved:''' XESP reference marker from ''Helgen Reborn'' had to be preserved. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000B6255 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the XESP data from ''Helgen Reborn.esp''.<br> | |||
'''Problem Resolved:''' XESP reference marker from ''Helgen Reborn'' had to be preserved as well as the persistent flag from ''3DNPC.esp''. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000E0BED ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move Data Position/Rotation block from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000F03FA ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' Preserve treasure chest type from ''Interesting NPCs'' instead of ''Skyrim Coin Replacer Redux'' in order to prevent potential quest disruption. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000FD8C9 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move Data Position/Rotation block from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 001015B8 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move Data Position/Rotation block from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block -2, 0 \ Sub-Block -5, 1 \ 00006FC3 <POIReach02> \ Temporary \ 00058EF7 ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block -1, -1 \ Sub-Block -3, -3 \ 00009C06 \ Temporary \ 00086131 ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -4, 0 \ 000099BE \ Temporary \ 00073349 ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -4, 0 \ 000099BE \ Temporary \ 00073389 ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -4, 0 \ 000099BE \ Temporary \ 0007338B ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -2, 2 \ 0000939C <MorthalExterior03> \ Temporary \ 001033C4 ===== | |||
'''Conflict Resolution:''' Use record from ''Skyrim Immersive Creatures.esp'' then right-click on Record Flags > Edit > check the box next to Initially Disabled.<br> | |||
'''Problem Resolved:''' Record flags from ''Skyrim Immersive Creatures'' and ''Interesting NPCs'' needed to be merged. | |||
===== 0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -2, 2 \ 0000939C <MorthalExterior03> \ Temporary \ 001033C7 ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 0, -3 \ 00009C57 \ Temporary \ 000EC188 ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp'' then right-click on Record Flags > Edit > check the box next to Starts Dead.<br> | |||
'''Problem Resolved:''' Changes from ''Unofficial Skyrim Patch'' and ''Interesting NPCs'' needed to be merged. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 2, -2 \ 0000977C ===== | |||
'''Conflict Resolution:''' Use record from ''RealisticWaterTwo.esp''.<br> | |||
'''Problem Resolved:''' Preserve XCWT water record from ''Realistic Water Two''. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 2, -1 \ 000095CA ===== | |||
'''Conflict Resolution:''' Use record from ''RealisticWaterTwo.esp''.<br> | |||
'''Problem Resolved:''' Preserve XCWT water record from ''Realistic Water Two''. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -2 \ 0000979A ===== | |||
'''Conflict Resolution:''' Use record from ''RealisticWaterTwo.esp''.<br> | |||
'''Problem Resolved:''' Preserve XCWT water record from ''Realistic Water Two''. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 0008804C ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the Ownership XOWN records from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Ragdoll data from ''Interesting NPCs'' and ownership data from ''Unofficial Skyrim Patch'' (probably) needed to be merged. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 0008809E ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the Ownership XOWN records from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Ragdoll data from ''Interesting NPCs'' and ownership data from ''Unofficial Skyrim Patch'' (probably) needed to be merged. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 000880E5 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the Ownership XOWN records from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Ragdoll data from ''Interesting NPCs'' and ownership data from ''Unofficial Skyrim Patch'' (probably) needed to be merged. | |||
===== 0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 000880E6 ===== | |||
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the Ownership XOWN records from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Ragdoll data from ''Interesting NPCs'' and ownership data from ''Unofficial Skyrim Patch'' (probably) needed to be merged. | |||
===== 0000003C <Tamriel> \ Block 0, 0 \ Sub-Block 0, 0 \ 0000917E \ Temporary \ 000DC423 ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp''.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 4, -3 \ 0000BCB8 ===== | |||
'''Conflict Resolution:''' Use record from ''RealisticWaterTwo.esp''.<br> | |||
'''Problem Resolved:''' Preserve XCWT water record from ''Realistic Water Two''. | |||
===== 0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 4, -3 \ 0000BCD8 ===== | |||
'''Conflict Resolution:''' Use record from ''RealisticWaterTwo.esp''.<br> | |||
'''Problem Resolved:''' Preserve XCWT water record from ''Realistic Water Two''. | |||
===== 0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 5, -3 \ 0000BCAF <RiftenCityNorthGateExterior> ===== | |||
'''Conflict Resolution:''' Use record from ''RealisticWaterTwo.esp''.<br> | |||
'''Problem Resolved:''' Preserve XCWT water record from ''Realistic Water Two'' | |||
===== 0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 5, -4 \ 0000BDC8 \ Temporary \ 0010E5FC ===== | |||
'''Conflict Resolution:''' Use record from ''Unofficial Skyrim Patch.esp'' then right-click on Record Flags > Edit > check the box next to Initially Disabled.<br> | |||
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''. | |||
===== 0000003C <Tamriel> \ Block 1, 0 \ Sub-Block 4, 2 \ 0000B32C <POINorthernCoast06a> \ Temporary \ 000C25D9 ===== | |||
'''Conflict Resolution:''' Use record from ''ELFX-Exteriors.esp'' .<br> | |||
'''Problem Resolved:''' Preserve lighting improvements of ''Enhanced Lights and FX''. | |||
===== 0001A26F <WhiterunWorld> \ 0001A270 \ Persistent \ 00048177 ===== | |||
'''Conflict Resolution:''' Use record from ''Immersive Citizens - AI Overhaul Merged.esp'' then move the Record Flags data from ''3DNPC.esp''.<br> | |||
'''Problem Resolved:''' NOT SURE | |||
===== Template ===== | |||
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | |||
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | |||
===== Template ===== | |||
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | |||
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | |||
===== Template ===== | ===== Template ===== | ||
| Line 64: | Line 280: | ||
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | '''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br> | ||
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | '''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged. | ||
== Sort Masters == | |||
Open Explorers Edition Conflict Resolution.esp with TES5Edit. After TES5Edit finishes loading, right-click the esp and select sort masters. Close TES5Edit and uncheck backup plugins. | |||
== LOOT Rule == | |||
Explorers Edition Conflict Resolution.esp AFTER SR Conflict Resolution.esp | |||
{{#css:User:Neovalen/Skyrim_Revisited.css}} | {{#css:User:Neovalen/Skyrim_Revisited.css}} | ||
Latest revision as of 21:08, January 3, 2022
SRLE - Explorer's Edition
Conflict Resolution Subguide
Last Update: 21:08:10 3 January 2022 (UTC)
- Add Cutting Room Floor.esp as master
- Add 3DNPC.esp as a master
Conflicts and Fixes
Armor
Cell
Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn>
Conflict Resolution: Use record from ELE_Legendary_Fs_Wt_Lite.esp.
Problem Resolved: Needs to put into the Explorer's Edition Conflict Resolution ESP in order to facilitate the succesful merging of sub-record 00064110.
Block 0 \ Sub-Block 9 \ 000133C6 <RiverwoodSleepingGiantInn> \ Persistent \ 00064110
Conflict Resolution: Use record from Immersive Citizens - AI Overhaul Merged.esp then move the Record flags from 3DNPC.esp.
Problem Resolved: Changes from Interesting NPCs and Immersive Citizens needed to be merged.
Block 1 \ Sub-Block 3 \ 0001677F <WindhelmNewGnisisCornerclub> \ Temporary \ 000D26CA
Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX.
Block 1 \ Sub-Block 6 \ 000681DD <BoulderfallCave01> \ Temporary \ 000D3C70
Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX
Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C94C3
Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX
Block 2 \ Sub-Block 3 \ 00016780 <WindhelmBelynHlaalusHouse> \ Temporary \ 000C951B
Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX
Block 2 \ Sub-Block 6 \ 000165AA <WhiterunHalloftheDead> \ Persistent \ 0005CC80 <AAWhiterunFenceServiceMarker>
Conflict Resolution: Use record from Inconsequential NPCs.esp.
Problem Resolved: Preserve Record Flag changes from Inconsequential NPCs
Block 2 \ Sub-Block 7 \ 0001522C <PurewaterRun01> \ Persistent \ 000C9AA9
Conflict Resolution: Use record from Skyrim Immersive Creatures.esp then move the Record flags from 3DNPC.esp.
Problem Resolved: Changes from Skyrim Immersive Creatures and Interesting NPCs needed to be merged.
Block 5 \ Sub-Block 7 \ 000165B7 <WhiterunDrunkenHuntsman>
Conflict Resolution: Use record from SR Conflict Resolution.esp.
Problem Resolved: Keep the patching of SR Conflict Resolution intact. This is needed to preserve a future error that arises out of the patching of a sub-record. Verify all the data is consistent with Explorer´s Edition Conflict Resolution.esp.
Block 5 \ Sub-Block 7 \ 000165B7 <WhiterunDrunkenHuntsman> \ Persistent \ 000E1BA9 <HirelingJenassaREF>
Conflict Resolution: Use record from 3DNPC.esp then move the Linked References from Cutting Room Floor.esp.
Problem Resolved: Changes from Cutting Room Floor and Interesting NPCs needed to be merged.
Block 6 \ Sub-Block 0 \ 0001605E <WhiterunBanneredMare> \ Persistent \ 00092A30
Conflict Resolution: Use record from Immersive Citizens - AI Overhaul.esp then move the Record Flags from 3DNPC.esp.
Problem Resolved: Changes from Immersive Citizens and Interesting NPCs needed to be merged.
Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Persistent \ 000C1D02
Conflict Resolution: Use record from EnhancedLightsandFX.esp then move the Record Flags from 3DNPC.esp.
Problem Resolved: Changes ofEnhanced Lights and FX and Interesting NPCs needed to be merged.
Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 00053EDE
Conflict Resolution: Use record from EnhancedLightsandFX.esp then move the XESP - Enable Parents records from 3DNPC.esp.
Problem Resolved: Changes ofEnhanced Lights and FX and Interesting NPCs needed to be merged.
Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 000C1D03
Conflict Resolution: Use record from EnhancedLightsandFX.esp then move the XESP - Enable Parents records from 3DNPC.esp.
Problem Resolved: Changes ofEnhanced Lights and FX and Interesting NPCs needed to be merged.
Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 000C1D04
Conflict Resolution: Use record from EnhancedLightsandFX.esp then move the XESP - Enable Parents records from 3DNPC.esp.
Problem Resolved: Changes ofEnhanced Lights and FX and Interesting NPCs needed to be merged.
Block 6 \ Sub-Block 9 \ 000152A8 <CragwallowSlope01> \ Temporary \ 000C1D05
Conflict Resolution: Use record from EnhancedLightsandFX.esp then move the XESP - Enable Parents records from 3DNPC.esp.
Problem Resolved: Changes ofEnhanced Lights and FX and Interesting NPCs needed to be merged.
Block 7 \ Sub-Block 3 \ 00016785 <WindhelmTempleofTalos> \ Persistent \ 000D1877
Conflict Resolution: Use record from 3DNPC.esp.
Problem Resolved: Preserve Record Flags of Interesting NPCs.
Block 8 \ Sub-Block 2 \ 00015200 <TrevasWatch01> \ Persistent \ 0001571E
Conflict Resolution: Use record from EnhancedLightsandFX.esp then move the Record Flags from 3DNPC.esp.
Problem Resolved: Changes ofEnhanced Lights and FX and Interesting NPCs needed to be merged.'
Block 8 \ Sub-Block 8 \ 00013810 <WinterholdCollegeArcanaeum> \ Temporary \ 00077D85
Conflict Resolution: Use record from EnhancedLightsandFX.esp.
Problem Resolved: Preserve lighting changes ofEnhanced Lights and FX
Non-Player Character (Actor)
00047CAD <Luaffyn>
Conflict Resolution: Use record from 3DNPC.esp then move the VMAD - Virtual Machine Adapter records from Unofficial Skyrim Patch.esp.
Problem Resolved: NPC flag changes from Unofficial Skyrim Patch needed to be carried over. Not strictly necessary but for sake of good modding practice.
5002BB70 <Jade3DNPC>
Conflict Resolution: Use record from 3DNPC Follower Perks Addon.esp then move the OBND - Object Bounds and the DOFT - Default Outfit records from Clothing & Clutter_3DNPC_Patch.esp.
Problem Resolved: Perks and combat changes Interesting NPCs Follower Perks Addon needed to be carried forward.
Quest
00021382 <RelationshipMarriageFIN>
Conflict Resolution: Problem Resolved: NOT SURE if this needs patching of the Quest VMAD scripts from Hearthfires? 3DNPC supposedly is compatible with heartfires already as there's a seperate patch from author, but doesn't address this.
Worldspace
0000003C <Tamriel> \ 00000D74 \ Persistent \ 0001BB22
Conflict Resolution: Use record from 3DNPC.esp then move the XLKR - Linked Reference records from Unofficial Skyrim Patch.esp.
Problem Resolved: Changes from Unofficial Skyrim Patch needed to be forwarded.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 0006B50B
Conflict Resolution:
Problem Resolved: NOT SURE ABOUT THIS ONE.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 0007F411
Conflict Resolution: Use record from Immersive Citizens - AI Overhaul.esp then move the Record Flags from 3DNPC.esp.
.
Problem Resolved: Persistent Flag changes from Interesting NPCs merged with the Cell identification of Immersive Citizens. NOT SURE ABOUT THIS ONE.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000844A3
Conflict Resolution: Use record from 3DNPC.esp then move the XLKR - Linked Reference from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000844A4
Conflict Resolution: Use record from 3DNPC.esp then move the XLKR - Linked Reference from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000A35A5
Conflict Resolution: Use record from RBB-SR Merge.esp then right-click on Record Flags > Edit > check the box next to Persistent.
Problem Resolved: Merged persistent record flag of Interesting NPCs with location changes of Realistic Boat Bobbing.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000A38EC
Conflict Resolution: Use record from RBB-SR Merge.esp then right-click on Record Flags > Edit > check the box next to Persistent.
Problem Resolved: Merged persistent record flag of Interesting NPCs with location changes of Realistic Boat Bobbing
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000AADD3
Conflict Resolution: Use record from 3DNPC.esp then move Data Position/Rotation block from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000B6252
Conflict Resolution: Use record from Helgen Reborn.esp.
Problem Resolved: XESP reference marker from Helgen Reborn had to be preserved.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000B6255
Conflict Resolution: Use record from 3DNPC.esp then move the XESP data from Helgen Reborn.esp.
Problem Resolved: XESP reference marker from Helgen Reborn had to be preserved as well as the persistent flag from 3DNPC.esp.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000E0BED
Conflict Resolution: Use record from 3DNPC.esp then move Data Position/Rotation block from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000F03FA
Conflict Resolution: Use record from 3DNPC.esp.
Problem Resolved: Preserve treasure chest type from Interesting NPCs instead of Skyrim Coin Replacer Redux in order to prevent potential quest disruption.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 000FD8C9
Conflict Resolution: Use record from 3DNPC.esp then move Data Position/Rotation block from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ 00000D74 \ Persistent \ 001015B8
Conflict Resolution: Use record from 3DNPC.esp then move Data Position/Rotation block from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block -2, 0 \ Sub-Block -5, 1 \ 00006FC3 <POIReach02> \ Temporary \ 00058EF7
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block -1, -1 \ Sub-Block -3, -3 \ 00009C06 \ Temporary \ 00086131
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -4, 0 \ 000099BE \ Temporary \ 00073349
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -4, 0 \ 000099BE \ Temporary \ 00073389
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -4, 0 \ 000099BE \ Temporary \ 0007338B
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -2, 2 \ 0000939C <MorthalExterior03> \ Temporary \ 001033C4
Conflict Resolution: Use record from Skyrim Immersive Creatures.esp then right-click on Record Flags > Edit > check the box next to Initially Disabled.
Problem Resolved: Record flags from Skyrim Immersive Creatures and Interesting NPCs needed to be merged.
0000003C <Tamriel> \ Block -1, 0 \ Sub-Block -2, 2 \ 0000939C <MorthalExterior03> \ Temporary \ 001033C7
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 0, -3 \ 00009C57 \ Temporary \ 000EC188
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp then right-click on Record Flags > Edit > check the box next to Starts Dead.
Problem Resolved: Changes from Unofficial Skyrim Patch and Interesting NPCs needed to be merged.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 2, -2 \ 0000977C
Conflict Resolution: Use record from RealisticWaterTwo.esp.
Problem Resolved: Preserve XCWT water record from Realistic Water Two.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 2, -1 \ 000095CA
Conflict Resolution: Use record from RealisticWaterTwo.esp.
Problem Resolved: Preserve XCWT water record from Realistic Water Two.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -2 \ 0000979A
Conflict Resolution: Use record from RealisticWaterTwo.esp.
Problem Resolved: Preserve XCWT water record from Realistic Water Two.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 0008804C
Conflict Resolution: Use record from 3DNPC.esp then move the Ownership XOWN records from Unofficial Skyrim Patch.esp.
Problem Resolved: Ragdoll data from Interesting NPCs and ownership data from Unofficial Skyrim Patch (probably) needed to be merged.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 0008809E
Conflict Resolution: Use record from 3DNPC.esp then move the Ownership XOWN records from Unofficial Skyrim Patch.esp.
Problem Resolved: Ragdoll data from Interesting NPCs and ownership data from Unofficial Skyrim Patch (probably) needed to be merged.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 000880E5
Conflict Resolution: Use record from 3DNPC.esp then move the Ownership XOWN records from Unofficial Skyrim Patch.esp.
Problem Resolved: Ragdoll data from Interesting NPCs and ownership data from Unofficial Skyrim Patch (probably) needed to be merged.
0000003C <Tamriel> \ Block 0, -1 \ Sub-Block 3, -1 \ 000095E6 <MixwaterMillExterior> \ Temporary \ 000880E6
Conflict Resolution: Use record from 3DNPC.esp then move the Ownership XOWN records from Unofficial Skyrim Patch.esp.
Problem Resolved: Ragdoll data from Interesting NPCs and ownership data from Unofficial Skyrim Patch (probably) needed to be merged.
0000003C <Tamriel> \ Block 0, 0 \ Sub-Block 0, 0 \ 0000917E \ Temporary \ 000DC423
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 4, -3 \ 0000BCB8
Conflict Resolution: Use record from RealisticWaterTwo.esp.
Problem Resolved: Preserve XCWT water record from Realistic Water Two.
0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 4, -3 \ 0000BCD8
Conflict Resolution: Use record from RealisticWaterTwo.esp.
Problem Resolved: Preserve XCWT water record from Realistic Water Two.
0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 5, -3 \ 0000BCAF <RiftenCityNorthGateExterior>
Conflict Resolution: Use record from RealisticWaterTwo.esp.
Problem Resolved: Preserve XCWT water record from Realistic Water Two
0000003C <Tamriel> \ Block 1, -1 \ Sub-Block 5, -4 \ 0000BDC8 \ Temporary \ 0010E5FC
Conflict Resolution: Use record from Unofficial Skyrim Patch.esp then right-click on Record Flags > Edit > check the box next to Initially Disabled.
Problem Resolved: Carry forward changes from Unofficial Skyrim Patch.
0000003C <Tamriel> \ Block 1, 0 \ Sub-Block 4, 2 \ 0000B32C <POINorthernCoast06a> \ Temporary \ 000C25D9
Conflict Resolution: Use record from ELFX-Exteriors.esp .
Problem Resolved: Preserve lighting improvements of Enhanced Lights and FX.
0001A26F <WhiterunWorld> \ 0001A270 \ Persistent \ 00048177
Conflict Resolution: Use record from Immersive Citizens - AI Overhaul Merged.esp then move the Record Flags data from 3DNPC.esp.
Problem Resolved: NOT SURE
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Template
Conflict Resolution: Use record from xxx.esp then move the xxx from xxx.esp.
Problem Resolved: Changes from xxx and xxx needed to be merged.
Sort Masters
Open Explorers Edition Conflict Resolution.esp with TES5Edit. After TES5Edit finishes loading, right-click the esp and select sort masters. Close TES5Edit and uncheck backup plugins.
LOOT Rule
Explorers Edition Conflict Resolution.esp AFTER SR Conflict Resolution.esp
{{#css:User:Neovalen/Skyrim_Revisited.css}}
