diff --git a/cdlore/baf/book_bottom.baf b/cdlore/baf/book_bottom.baf
index 429bacf..9a32d05 100644
--- a/cdlore/baf/book_bottom.baf
+++ b/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
\ No newline at end of file
diff --git a/cdlore/baf/martial.baf b/cdlore/baf/martial.baf
index cb1cd64..6907ef6 100644
--- a/cdlore/baf/martial.baf
+++ b/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)
diff --git a/cdlore/baf/martial_bottom.baf b/cdlore/baf/martial_bottom.baf
index 0b70db3..3f05ce5 100644
--- a/cdlore/baf/martial_bottom.baf
+++ b/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
\ No newline at end of file
diff --git a/cdlore/baf/monster.baf b/cdlore/baf/monster.baf
index cd88ed7..d00278e 100644
--- a/cdlore/baf/monster.baf
+++ b/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
\ No newline at end of file
diff --git a/cdlore/baf/monster_bottom.baf b/cdlore/baf/monster_bottom.baf
index 7b78f1a..ad913e9 100644
--- a/cdlore/baf/monster_bottom.baf
+++ b/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
\ No newline at end of file
diff --git a/cdlore/baf/party.baf b/cdlore/baf/party.baf
index c0749ec..788a8ee 100644
--- a/cdlore/baf/party.baf
+++ b/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
\ No newline at end of file
diff --git a/cdlore/baf/race_bottom.baf b/cdlore/baf/race_bottom.baf
index d44dddb..4078b4e 100644
--- a/cdlore/baf/race_bottom.baf
+++ b/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
\ No newline at end of file
diff --git a/cdlore/cdlore.tp2 b/cdlore/cdlore.tp2
index 2b753b5..c7d8df1 100644
--- a/cdlore/cdlore.tp2
+++ b/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
diff --git a/cdlore/customize.tpa b/cdlore/customize.tpa
index 99c3ced..d0476c2 100644
--- a/cdlore/customize.tpa
+++ b/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
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/cdlore/lib/common.tpa b/cdlore/lib/common.tpa
index 33c8a25..1687b87 100644
--- a/cdlore/lib/common.tpa
+++ b/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~
diff --git a/cdlore/readme-cdlore.html b/cdlore/readme-cdlore.html
index 7320f48..a62d235 100644
--- a/cdlore/readme-cdlore.html
+++ b/cdlore/readme-cdlore.html
@@ -31,7 +31,7 @@ Lore From Learning
A Gibberlings Three Mod
Authors: CamDawg
On the Web: Project Page and Forum
- Version 1
Languages: English
Platforms: Windows, Mac OS X, and Linux
@@ -157,6 +157,15 @@
Version History
+
Version 2 - May 27, 2021
+
+
+ - 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
+
Version 1 - May 27, 2021
diff --git a/package_mod.bat b/package_mod.bat
index 084409f..9e4679a 100644
--- a/package_mod.bat
+++ b/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: */