v2 Bug fixes

It's bad to make one commit for several issues, but I'm in a hurry.

Fixed bug where Weapon Knowledge Provides Lore Bonuses would not install
on non-EE games

Fixed bug where Defeating Monsters Provides Lore Bonuses was not iterating
correctly when looping through monster types

Fixed bug where earning a point of lore would prevent sleep

Added a few more continuations in scripts to hopefully prevent conflicts
with actual combat actions

Fixed bug where Defeating Monsters Provides Lore Bonuses was not picking up
on the correct breakpoints for lore bonuses

cdlore/baf/book_bottom.baf

@@ -6,4 +6,5 @@ THEN
     IncrementGlobal("cd_lore_books","GLOBAL",-%books_to_read%)
     IncrementGlobal("cd_lore_books_total_bonuses","GLOBAL",1)
     ApplySpellRES("cdlore1",Player1)
+    RestParty()
 END    

cdlore/baf/martial.baf

@@ -1,6 +1,7 @@
 IF
   Global("cd_lore_weapon_%prof%","GLOBAL",0)
-  ProficiencyGT(Player1,%prof%,0)
+  CheckStatGT(Player1,0,%prof%)
+//  ProficiencyGT(Player1,%prof%,0)
 THEN
   RESPONSE #100
     SetGlobal("cd_lore_weapon_%prof%","GLOBAL",1)

cdlore/baf/martial_bottom.baf

@@ -6,34 +6,36 @@ THEN
     SetGlobal("cd_lore_prof_total","GLOBAL",100)
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@2002)
+    RestParty()
 END 
 
 IF
   Global("cd_lore_grandmastery","GLOBAL",0)
   OR(20)
-    Proficiency(Player1,89,5)  // PROFICIENCYBASTARDSWORD
-    Proficiency(Player1,90,5)  // PROFICIENCYLONGSWORD
-    Proficiency(Player1,91,5)  // PROFICIENCYSHORTSWORD
-    Proficiency(Player1,92,5)  // PROFICIENCYAXE
-    Proficiency(Player1,93,5)  // PROFICIENCYTWOHANDEDSWORD
-    Proficiency(Player1,94,5)  // PROFICIENCYKATANA
-    Proficiency(Player1,95,5)  // PROFICIENCYSCIMITARWAKISASHININJATO
-    Proficiency(Player1,96,5)  // PROFICIENCYDAGGER
-    Proficiency(Player1,97,5)  // PROFICIENCYWARHAMMER
-    Proficiency(Player1,98,5)  // PROFICIENCYSPEAR
-    Proficiency(Player1,99,5)  // PROFICIENCYHALBERD
-    Proficiency(Player1,100,5) // PROFICIENCYFLAILMORNINGSTAR
-    Proficiency(Player1,101,5) // PROFICIENCYMACE
-    Proficiency(Player1,102,5) // PROFICIENCYQUARTERSTAFF
-    Proficiency(Player1,103,5) // PROFICIENCYCROSSBOW
-    Proficiency(Player1,104,5) // PROFICIENCYLONGBOW
-    Proficiency(Player1,105,5) // PROFICIENCYSHORTBOW
-    Proficiency(Player1,106,5) // PROFICIENCYDART
-    Proficiency(Player1,107,5) // PROFICIENCYSLING
-    Proficiency(Player1,115,5) // proficiencyclub on EE, EXTRAPROFICIENCY1 on oBG2
+    CheckStat(Player1,5,89)  // PROFICIENCYBASTARDSWORD
+    CheckStat(Player1,5,90)  // PROFICIENCYLONGSWORD
+    CheckStat(Player1,5,91)  // PROFICIENCYSHORTSWORD
+    CheckStat(Player1,5,92)  // PROFICIENCYAXE
+    CheckStat(Player1,5,93)  // PROFICIENCYTWOHANDEDSWORD
+    CheckStat(Player1,5,94)  // PROFICIENCYKATANA
+    CheckStat(Player1,5,95)  // PROFICIENCYSCIMITARWAKISASHININJATO
+    CheckStat(Player1,5,96)  // PROFICIENCYDAGGER
+    CheckStat(Player1,5,97)  // PROFICIENCYWARHAMMER
+    CheckStat(Player1,5,98)  // PROFICIENCYSPEAR
+    CheckStat(Player1,5,99)  // PROFICIENCYHALBERD
+    CheckStat(Player1,5,100) // PROFICIENCYFLAILMORNINGSTAR
+    CheckStat(Player1,5,101) // PROFICIENCYMACE
+    CheckStat(Player1,5,102) // PROFICIENCYQUARTERSTAFF
+    CheckStat(Player1,5,103) // PROFICIENCYCROSSBOW
+    CheckStat(Player1,5,104) // PROFICIENCYLONGBOW
+    CheckStat(Player1,5,105) // PROFICIENCYSHORTBOW
+    CheckStat(Player1,5,106) // PROFICIENCYDART
+    CheckStat(Player1,5,107) // PROFICIENCYSLING
+    CheckStat(Player1,5,115) // proficiencyclub on EE, EXTRAPROFICIENCY1 on oBG2
 THEN
   RESPONSE #100
     SetGlobal("cd_lore_grandmastery","GLOBAL",1)
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@2001)
+    RestParty()
 END    

cdlore/baf/monster.baf

@@ -6,4 +6,5 @@ THEN
   RESPONSE #100
     SetGlobal("cd_lore_monster_%index%","GLOBAL",1)
     IncrementGlobal("cd_lore_monster_total","GLOBAL",1)
+    Continue()
 END 

cdlore/baf/monster_bottom.baf

@@ -23,6 +23,7 @@ THEN
     SetGlobal("cd_lore_monster_bonus","GLOBAL",1) 
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@4001)
+    RestParty()
 END    
 
 IF 
@@ -33,6 +34,7 @@ THEN
     SetGlobal("cd_lore_monster_bonus","GLOBAL",2) 
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@4002)
+    RestParty()
 END    
 
 IF 
@@ -43,5 +45,6 @@ THEN
     SetGlobal("cd_lore_monster_bonus","GLOBAL",3) 
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@4003)
+    RestParty()
 END    
 

cdlore/baf/party.baf

@@ -40,6 +40,7 @@ THEN
     SetGlobal("cd_lore_class_bonus","GLOBAL",1) 
     ApplySpellRES("cdlore1",Player1)
     DisplayString(Myself,@3004)
+    RestParty()
 END    
 
 IF 
@@ -50,6 +51,7 @@ THEN
     SetGlobal("cd_lore_class_bonus","GLOBAL",2) 
     ApplySpellRES("cdlore1",Player1)
     DisplayString(Myself,@3005)
+    RestParty()
 END    
 
 IF 
@@ -60,6 +62,7 @@ THEN
     SetGlobal("cd_lore_class_bonus","GLOBAL",3) 
     ApplySpellRES("cdlore1",Player1)
     DisplayString(Myself,@3006)
+    RestParty()
 END    
 
 IF 
@@ -70,6 +73,7 @@ THEN
     SetGlobal("cd_lore_race_bonus","GLOBAL",1) 
     ApplySpellRES("cdlore1",Player1)
     DisplayString(Myself,@3001)
+    RestParty()
 END    
 
 IF 
@@ -80,6 +84,7 @@ THEN
     SetGlobal("cd_lore_race_bonus","GLOBAL",2) 
     ApplySpellRES("cdlore1",Player1)
     DisplayString(Myself,@3002)
+    RestParty()
 END    
 
 IF 
@@ -90,6 +95,7 @@ THEN
     SetGlobal("cd_lore_race_bonus","GLOBAL",3) 
     ApplySpellRES("cdlore1",Player1)
     DisplayString(Myself,@3003)
+    RestParty()
 END    
 
 

cdlore/baf/race_bottom.baf

@@ -23,6 +23,7 @@ THEN
     SetGlobal("cd_lore_race_bonus","GLOBAL",1) 
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@3001)
+    RestParty()
 END    
 
 IF 
@@ -33,6 +34,7 @@ THEN
     SetGlobal("cd_lore_race_bonus","GLOBAL",2) 
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@3002)
+    RestParty()
 END    
 
 IF 
@@ -43,5 +45,6 @@ THEN
     SetGlobal("cd_lore_race_bonus","GLOBAL",3) 
     ApplySpellRES("cdlore1",Myself)
     DisplayString(Myself,@3003)
+    RestParty()
 END    
 

cdlore/cdlore.tp2

@@ -1,7 +1,7 @@
 BACKUP ~cdlore/backup~ // location to store files for uninstall purposes
 SUPPORT ~https://www.gibberlings3.net/forums/forum/28-miscellaneous-released-mods/~
 
-VERSION ~v1~
+VERSION ~v2~
 
 README ~cdlore/languages/%LANGUAGE%/readme-cdlore.html~ ~cdlore/readme-cdlore.html~
 
@@ -131,7 +131,7 @@ BEGIN @4000 DESIGNATED 40 // weapon profs provide lore
 
 ACTION_IF !VARIABLE_IS_SET actions_per_rest THEN BEGIN INCLUDE ~cdlore/lib/common.tpa~ END
 
-OUTER_FOR (index = 100 ; prof < 200 ; ++prof) BEGIN
+OUTER_FOR (index = 100 ; index < 200 ; ++index) BEGIN
 
   EXTEND_BOTTOM ~dplayer3.bcs~ ~cdlore/baf/monster.baf~ EVALUATE_BUFFER
 

cdlore/customize.tpa

@@ -42,6 +42,6 @@ OUTER_SET class_bonus_3 = 45 // number of rests until you get the final bonus
 ///// monster component settings                       \\\\\
 /////                                                  \\\\\
 
-OUTER_SET race_bonus_1 = 10 // number of monster races that need to be killed to get the first bonus
-OUTER_SET race_bonus_2 = 30 // number of monster races that need to be killed to get the second bonus
-OUTER_SET race_bonus_3 = 70 // number of monster races that need to be killed to get the final bonus
+OUTER_SET monster_bonus_1 = 10 // number of monster races that need to be killed to get the first bonus
+OUTER_SET monster_bonus_2 = 30 // number of monster races that need to be killed to get the second bonus
+OUTER_SET monster_bonus_3 = 70 // number of monster races that need to be killed to get the final bonus

cdlore/lib/common.tpa

@@ -23,9 +23,9 @@ OUTER_SET other_classes =  4 // number of classes (NOT counting PC) that must be
 OUTER_SET class_bonus_1 =  5 // number of rests until you get the first bonus
 OUTER_SET class_bonus_2 = 15 // number of rests until you get the second bonus
 OUTER_SET class_bonus_3 = 45 // number of rests until you get the final bonus
-OUTER_SET race_bonus_1 = 10 // number of monster races that need to be killed to get the first bonus
-OUTER_SET race_bonus_2 = 30 // number of monster races that need to be killed to get the second bonus
-OUTER_SET race_bonus_3 = 70 // number of monster races that need to be killed to get the final bonus
+OUTER_SET monster_bonus_1 = 10 // number of monster races that need to be killed to get the first bonus
+OUTER_SET monster_bonus_2 = 30 // number of monster races that need to be killed to get the second bonus
+OUTER_SET monster_bonus_3 = 70 // number of monster races that need to be killed to get the final bonus
 
 INCLUDE ~cdlore/customize.tpa~
 

cdlore/readme-cdlore.html

@@ -31,7 +31,7 @@ <h1>Lore From Learning</h1>
       <p><strong><a href="http://www.gibberlings3.net/">A Gibberlings Three Mod</a><br />
         Authors: </strong><a href="https://www.gibberlings3.net/profile/8-camdawg/">CamDawg</a><br />
       <strong>On the Web: </strong><a href="https://www.gibberlings3.net/mods/tweaks/lore">Project Page</a> and <a href="https://www.gibberlings3.net/forums/forum/28-miscellaneous-released-mods/">Forum</a></p>
-      <p><strong>Version 1<!-- - <a href="http://www.gibberlings3.net/forums/index.php?app=downloads&amp;showcat=36">Check
+      <p><strong>Version 2<!-- - <a href="http://www.gibberlings3.net/forums/index.php?app=downloads&amp;showcat=36">Check
         for the most recent version</a>--></strong><br />
         <strong> Languages:</strong> English<br />
         <strong>Platforms: </strong>Windows, Mac <acronym title="Operating System 10">OS X</acronym>, and Linux<br />
@@ -157,6 +157,15 @@ <h2>Version History</h2>
     <div class="ribbon_triangle_h2-l"></div>
     <div class="ribbon_triangle_h2-r"></div>
     <div class="section">
+      <p><strong>Version  2 - May 27, 2021</strong></p>
+      <ul>
+
+        <li>Fixed bug where <strong>Weapon Knowledge Provides Lore Bonuses </strong>would not install on non-EE games</li>
+        <li>Fixed bug where <strong>Defeating Monsters Provides Lore Bonuses</strong> was not iterating correctly when looping through monster types</li>
+        <li>Fixed bug where earning a point of lore would prevent sleep</li>
+        <li>Added a few more continuations in scripts to hopefully prevent conflicts with actual combat actions</li>
+        <li>Fixed bug where <strong>Defeating Monsters Provides Lore Bonuses</strong> was not picking up on the correct breakpoints for lore bonuses</li>
+      </ul>
       <p><strong>Version  1 - May 27, 2021</strong></p>
       <ul>
 

package_mod.bat

@@ -6,7 +6,7 @@ call "%~dp0..\ModPackaging\utilities\ie_games.bat"
 
 REM /* MODIFY: set the values of the 3 variables below to reflect the current mod version */
 set "mod_name=Lore From Learning"
-set mod_version=v1
+set mod_version=v2
 set mod_folder=cdlore
 
 REM /* MODIFY: list here which IE games the mod is compatible with, from this list of possibilities: */