diff --git a/BiG World Fixpack/TyrisFlare/FinalSolarChoice.d.patch b/BiG World Fixpack/TyrisFlare/FinalSolarChoice.d.patch new file mode 100644 index 0000000..9a5ff18 --- /dev/null +++ b/BiG World Fixpack/TyrisFlare/FinalSolarChoice.d.patch @@ -0,0 +1,125 @@ +--- TyrisFlare\Dialogue\FinalSolarChoice.d Tue Jan 20 19:23:00 2015 ++++ C:\BWP Patchstudio\patched files\TyrisFlare\Dialogue\FinalSolarChoice.d Sun Jul 19 09:57:31 2015 +@@ -192,39 +192,57 @@ + // Romantic consequences of ascension + + EXTEND_TOP FINSOL01 29 30 31 #1 //FinalSolarConsequences#1.1 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + OR(2) + Global("G#TF.DestinyAscendGood","LOCALS",2) + Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.4 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + Global("G#TF.DestinyMortal","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.5 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + !Global("G#TF.DestinyMortal","LOCALS",2) + !Global("G#TF.DestinyAscendGood","LOCALS",2) + !Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.6 + END + + EXTEND_TOP IMOEN25J 18 #1 //FinalSolarConsequences#1.2 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + OR(2) + Global("G#TF.DestinyAscendGood","LOCALS",2) + Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.4 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + Global("G#TF.DestinyMortal","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.5 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + !Global("G#TF.DestinyMortal","LOCALS",2) + !Global("G#TF.DestinyAscendGood","LOCALS",2) + !Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.6 + END + + EXTEND_TOP SAREV25J 4 6 #1 //FinalSolarConsequences#1.3 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + OR(2) + Global("G#TF.DestinyAscendGood","LOCALS",2) + Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.4 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + Global("G#TF.DestinyMortal","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.5 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + !Global("G#TF.DestinyMortal","LOCALS",2) + !Global("G#TF.DestinyAscendGood","LOCALS",2) + !Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#1.6 +@@ -299,7 +317,9 @@ + // Romantic consequences of remaining mortal + + EXTEND_TOP FINSOL01 32 #1 //FinalSolarConsequences#2.1 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + OR(2) + Global("G#TF.DestinyAscendGood","LOCALS",2) + Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#2.4 +@@ -312,26 +332,38 @@ + END + + EXTEND_TOP IMOEN25J 20 #1 //FinalSolarConsequences#2.2 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + OR(2) + Global("G#TF.DestinyAscendGood","LOCALS",2) + Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#2.4 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + Global("G#TF.DestinyMortal","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#2.5 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + !Global("G#TF.DestinyMortal","LOCALS",2) + !Global("G#TF.DestinyAscendGood","LOCALS",2) + !Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#2.6 + END + + EXTEND_TOP SAREV25J 5 7 #1 //FinalSolarConsequences#2.3 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + OR(2) + Global("G#TF.DestinyAscendGood","LOCALS",2) + Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#2.4 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + Global("G#TF.DestinyMortal","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#2.5 +- IF ~Global("G#TF.TyrisRomanceActive","GLOBAL",2) ++ IF ~InParty("G#Tyris") ++ !StateCheck("G#Tyris",CD_STATE_NOTVALID) ++ Global("G#TF.TyrisRomanceActive","GLOBAL",2) + !Global("G#TF.DestinyMortal","LOCALS",2) + !Global("G#TF.DestinyAscendGood","LOCALS",2) + !Global("G#TF.DestinyAscendEvil","LOCALS",2)~ EXTERN G#TRS25J FinalSolarConsequences#2.6 diff --git a/BiG World Fixpack/TyrisFlare/Setup-TyrisFlare.tp2.patch b/BiG World Fixpack/TyrisFlare/Setup-TyrisFlare.tp2.patch new file mode 100644 index 0000000..a219713 --- /dev/null +++ b/BiG World Fixpack/TyrisFlare/Setup-TyrisFlare.tp2.patch @@ -0,0 +1,11 @@ +--- TyrisFlare\Setup-TyrisFlare.tp2 Thu Feb 19 17:34:15 2015 ++++ C:\BWP Patchstudio\patched files\TyrisFlare\Setup-TyrisFlare.tp2 Sun Jul 19 09:58:55 2015 +@@ -1,7 +1,7 @@ + BACKUP ~TyrisFlare/Backup~ + AUTHOR ~grim@gibberlings3.net~ + NO_IF_EVAL_BUG +-VERSION ~v7~ ++VERSION ~v7 BWP Fix~ + ASK_EVERY_COMPONENT + + ALWAYS diff --git a/BiG World Fixpack/_BWP fixes.txt b/BiG World Fixpack/_BWP fixes.txt index d00a571..f6451d3 100644 --- a/BiG World Fixpack/_BWP fixes.txt +++ b/BiG World Fixpack/_BWP fixes.txt @@ -2110,11 +2110,10 @@ Pour en apprendre plus sur les corrections employ ---------------------------------------------------------------------------------------- -:: Tyris Flare NPC v3 +:: TyrisFlare - Tyris Flare NPC v7 -:: Interjection fix - Interjections.d -:: http://forums.gibberlings3.net/index.php?s=&showtopic=18726&view=findpost&p=160877 -:: http://forums.gibberlings3.net/index.php?s=&showtopic=18726&view=findpost&p=160892 +:: Roxanne's ToB Finale Solar Romance interjection fix +:: http://gibberlings3.net/forums/index.php?showtopic=23923&p=236927 ----------------------------------------------------------------------------------------