User:Nearox/SRLE Explorers Conflict Resolution: Difference between revisions

From Step Mods | Change The Game
No edit summary
No edit summary
Line 106: Line 106:


===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 0006B50B =====
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 0006B50B =====
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the Data - Position/Rotation records from ''ELFX - Exteriors.esp''.<br>
'''Conflict Resolution:''' <br>
'''Problem Resolved:''' Lighting changes from ''Enhaned Lights and FX'' needed to be (partially) merged with the Persistent flag changes from '' Interesting NPCs''. NOT SURE ABOUT THIS ONE.
'''Problem Resolved:''' NOT SURE ABOUT THIS ONE.


===== Template =====
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 0007F411 =====
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br>
'''Conflict Resolution:''' Use record from ''Immersive Citizens - AI Overhaul.esp'' then move the Record Flags from ''3DNPC.esp''.<br>.
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged.
'''Problem Resolved:''' Persistent Flag changes from ''Interesting NPCs'' merged with the Cell identification of ''Immersive Citizens''. NOT SURE ABOUT THIS ONE.


===== Template =====
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000844A3 =====
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br>
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the XLKR - Linked Reference from ''Unofficial Skyrim Patch.esp''.<br>
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged.
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''.


===== Template =====
===== 0000003C <Tamriel> \ 00000D74 \ Persistent \ 000844A4 =====
'''Conflict Resolution:''' Use record from ''xxx.esp'' then move the xxx from ''xxx.esp''.<br>
'''Conflict Resolution:''' Use record from ''3DNPC.esp'' then move the XLKR - Linked Reference from ''Unofficial Skyrim Patch.esp''.<br>
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged.
'''Problem Resolved:''' Carry forward changes from ''Unofficial Skyrim Patch''


===== Template =====
===== Template =====
Line 125: Line 125:
'''Problem Resolved:''' Changes from ''xxx'' and ''xxx'' needed to be merged.
'''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 =====

Revision as of 20:38, October 4, 2015

SRLE - Explorer's Edition
Conflict Resolution Subguide
Last Update: 20:38:01 4 October 2015 (UTC)

Template:TOC right

- 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 subrecord 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 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> \ 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 BringOutYourDead.esp.
Problem Resolved: Essential NPC flag changes from Bring Out Your Dead 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

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.

{{#css:User:Neovalen/Skyrim_Revisited.css}}