3.1.3 - Fixed issues reported by micbaldur (http://www.shsforums.net/…

…topic/47635-notes-oddities-and-possible-bugs-in-my-bwp-game-spoilers/page-50#entry589066)

FishingForTrouble/README.md

@@ -26,3 +26,4 @@ Gerri is working on a German translation.
 7. Added check for EE game type to lib/patches.tpa to avoid patching ACTION.IDS (some signatures changed in EE)
 8. Incorporated patch from K4thos to fix EET journal chapter numbering
 9. Removed an invalid reference (http://www.shsforums.net/topic/58178-missing-spell-in-script/)
+10. Fixed issues reported by micbaldur (http://www.shsforums.net/topic/47635-notes-oddities-and-possible-bugs-in-my-bwp-game-spoilers/page-50#entry589066)

FishingForTrouble/dialog/ysailoth.d

@@ -114,10 +114,8 @@ IF ~Global("ys_TalkedToAiloth","GLOBAL",0)
 		Global("ys_FoundWizard","GLOBAL",1)~ THEN BEGIN BLK15
 	SAY @1651
 	IF~InParty("Jaheira")~THEN
-		DO ~SetGlobal("ys_TalkedToGarGel","GLOBAL",1)~
 		EXTERN JAHEIRAJ CHBLK3
  	IF~!InParty("Jaheira")~THEN
-		DO ~SetGlobal("ys_TalkedToGarGel","GLOBAL",1)~
 	 	REPLY @1652 GOTO BLK16
 END
 

FishingForTrouble/dialog/ysakil.d

@@ -210,7 +210,7 @@ END
 //---------------------------------------------------------
 IF ~Global("ysTalkedToRimon","GLOBAL",2)~ THEN BEGIN 20
 	SAY @4868
-	IF~Class(Player1,MAGE_ALL)~THEN REPLY @4869 GOTO 21
+	IF~~THEN REPLY @4869 GOTO 21 // was restricted to Class(Player1,MAGE_ALL), but CHARNAME is resourceful, so this reply should be available even if not a mage
 	IF~!Class(Player1,MAGE_ALL)~THEN REPLY @4870 GOTO 21
 END
 

FishingForTrouble/dialog/yscado.d

@@ -110,7 +110,8 @@ IF ~Global("ysTalkedToCado","GLOBAL",0)~ THEN BEGIN 25
   SAY @1067
   IF ~~ THEN
 	  JOURNAL @63
-    DO~SetGlobal("ysTalkedToCado","GLOBAL",1)~
+    DO~SetGlobal("ysTalkedToCado","GLOBAL",1)
+       SetGlobal("ysCerendorThief","GLOBAL",1)~
   EXIT
 END
 

FishingForTrouble/dialog/yschearl.d

@@ -94,7 +94,7 @@ IF ~Global("ys_TalkedToWultheof","GLOBAL",1)
 	Global("ys_GarrisonFight","GLOBAL",3)~ THEN BEGIN BLK100
 	SAY @2226
 	IF~~THEN
-		DO ~GivePartyGold(1500)
+		DO ~GiveGoldForce(1500)
 		SetGlobal("ys_TalkedToWultheof","GLOBAL",2)
 		SetGlobal("ys_WultheofReward","GLOBAL",1)~
 		EXIT

FishingForTrouble/dialog/yslevon.d

@@ -3,7 +3,7 @@ BEGIN yslevon
 //---------------------------------------------------------
 // Kill Akil accepted
 //---------------------------------------------------------
-IF ~Global("ysTalkedToLeron","GLOBAL",1)~ THEN BEGIN 50
+IF ~Global("ysTalkedToLeron","GLOBAL",1) !Global("ysTalkedToAkil","GLOBAL",2)~ THEN BEGIN 50
 	SAY @4950
 	IF~Global("ysAkilIsDead","GLOBAL",1)~THEN REPLY @4951 GOTO 51
 	IF~Global("ysAkilIsDead","GLOBAL",1)~THEN REPLY @4952 GOTO 51
@@ -28,8 +28,8 @@ END
 IF ~Global("ysTalkedToAkil","GLOBAL",2)~ THEN BEGIN 0
 	SAY @4955
 	IF~~THEN
-	DO~SetGlobal("ys_AkilNoLevon","GLOBAL",1)~ 
-	REPLY@4956EXTERN YSAKIL LEVON1
+      DO~SetGlobal("ys_AkilNoLevon","GLOBAL",1)~ 
+	  REPLY @4956 EXTERN YSAKIL LEVON1
 END
 
 //---------------------------------------------------------
@@ -47,13 +47,13 @@ END
 //---------------------------------------------------------
 IF ~Global("ysTalkedToAkil","GLOBAL",2)~ THEN BEGIN 3
 	SAY @4960
-	IF~~THEN REPLY @4961GOTO 4
+	IF~~THEN REPLY @4961 GOTO 4
 END
 
 //---------------------------------------------------------
 IF ~Global("ysTalkedToAkil","GLOBAL",2)~ THEN BEGIN 4
 	SAY @4962
-	IF~Global("ysTalkedToLeron","GLOBAL",1)~THEN REPLY@4963GOTO 5
+	IF~Global("ysTalkedToLeron","GLOBAL",1)~THEN REPLY @4963 GOTO 5
 	IF~~THEN REPLY @4964 GOTO 5
 END
 
@@ -67,10 +67,10 @@ END
 //---------------------------------------------------------
 IF ~Global("ysTalkedToAkil","GLOBAL",2)~ THEN BEGIN 6
 	SAY @4968
-	IF~CheckStatLT(Myself,11,CHR)~THEN REPLY @4969 GOTO 7
-	IF~CheckStatGT(Myself,10,CHR)
-     CheckStatLT(Myself,14,CHR)~THEN REPLY @4969 GOTO 8
-	IF~CheckStatGT(Myself,13,CHR)~THEN REPLY @4969 GOTO 9
+	IF~CheckStatLT(LastTalkedToBy(Myself),11,CHR)~THEN REPLY @4969 GOTO 7
+	IF~CheckStatGT(LastTalkedToBy(Myself),10,CHR)
+       CheckStatLT(LastTalkedToBy(Myself),14,CHR)~THEN REPLY @4969 GOTO 8
+	IF~CheckStatGT(LastTalkedToBy(Myself),13,CHR)~THEN REPLY @4969 GOTO 9
 END
 
 //---------------------------------------------------------

FishingForTrouble/readme.html

@@ -294,7 +294,7 @@ <h1>
         <p class="about">
           <a href="http://www.spellholdstudios.net/ie/fft">Mod Website</a> &#8226;
           <a href="http://www.shsforums.net/forum/550-fishing-for-trouble/">Mod Forum</a> &#8226;
-          <a href="https://github.com/BiGWorldProject/FishingForTrouble/archive/master.zip">Download</a> &#8226; Version 3.1.2
+          <a href="https://github.com/BiGWorldProject/FishingForTrouble/archive/master.zip">Download</a> &#8226; Version 3.1.3
         </p>
         <hr />
         <p class="menu">
@@ -895,7 +895,24 @@ <h6>
           <ul>
             <li>Incorporated patch from K4thos to fix EET journal chapter numbering
             </li>
-			<li>Removed an invalid reference (http://www.shsforums.net/topic/58178-missing-spell-in-script/)
+            <li>Removed an invalid reference (http://www.shsforums.net/topic/58178-missing-spell-in-script/)
+            </li>
+          </ul>
+          <h6>
+            Version 3.1.3: 6 November 2016
+          </h6>
+          <ul>
+            <li>Fixed following issues reported by micbaldur (http://www.shsforums.net/topic/47635-notes-oddities-and-possible-bugs-in-my-bwp-game-spoilers/?p=589066)
+            </li>
+            <li>Earl Wultheof will give a gold reward as his dialogue claims
+            </li>
+            <li>The Food Thief quest now advances and can be completed after talking with Cado
+            </li>
+            <li>Talking with Ailoth no longer makes Garalial act as if you already talked to him
+            </li>
+            <li>Fixed Levon's dialogue when Akil is in the same room (possible quest outcome)
+            </li>
+            <li>Fixed charisma checks in Levon's dialogue (speaker's charisma affects outcome)
             </li>
           </ul>
           <address>

FishingForTrouble/setup-fishingfortrouble.tp2

@@ -1,6 +1,6 @@
 BACKUP ~fishingfortrouble/backup~
 AUTHOR ~www.shsforums.net/forum/550-fishing-for-trouble/~
-VERSION ~3.1.2~
+VERSION ~3.1.3~
 //MODDER setup_tra NONE
 //launch the ReadMe file immediately
 README ~fishingfortrouble/readme.html~