6.4

tighter proficiency integration
UnearthedArcana · Oct 26, 2023 · c2896eb · c2896eb
1 parent 98fabd9
commit c2896eb
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 50 deletions.
diff --git a/README.MD b/README.MD
@@ -9,7 +9,7 @@
 <body>
 <h1>NPCs Enhanced... um, for Everyone! (a.k.a. NPC_EE)</h1>
 <div class="section">
-  <p><strong> Version 6.3 </strong><br />
+  <p><strong> Version 6.4 </strong><br />
   <strong> Languages:</strong> English</p>
   <p><strong>Author: <a href="http://forums.gibberlings3.net/index.php?showuser=6306">The Subtle Doctor</a></strong></p>
   <p><strong><a href="https://github.com/UnearthedArcana/NPC_EE">Home page</a></strong></p>

diff --git a/npc_ee/data/d5_ckit.baf b/npc_ee/data/d5_ckit.baf
@@ -1342,6 +1342,16 @@ THEN
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5NSPLW",Myself))
 	SetGlobal("D5REMWSPLS","GLOBAL",1)
 END
+IF
+	Global("D5REMWSPLS","GLOBAL",0)
+	Global("D5CHACLS","GLOBAL",2)
+	Global("D5STTTLK","GLOBAL",1)
+	Class(LastSummonerOf(Myself),SORCERER)
+THEN
+	RESPONSE #100
+	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5NSPLW",Myself))
+	SetGlobal("D5REMWSPLS","GLOBAL",1)
+END
 
 IF
 	Global("D5CHAKIT","GLOBAL",0)
@@ -1352,7 +1362,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_fighter_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -1403,7 +1413,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_ranger_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -1485,7 +1495,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_paladin_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -1566,7 +1576,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_cleric_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -1615,7 +1625,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_druid_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -1675,7 +1685,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_shaman_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -1735,7 +1745,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_thief_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CSM8T",Myself))
 	Continue()
 END
@@ -1784,7 +1794,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_bard_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CSM8T",Myself))
 	Continue()
 END
@@ -1857,7 +1867,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_monk_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -1927,7 +1937,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),1_mage_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -2018,7 +2028,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_fighter_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -2078,7 +2088,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_fighter_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -2149,7 +2159,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_mage_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -2209,7 +2219,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_fighter_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CSM8T",Myself))
 	Continue()
 END
@@ -2269,7 +2279,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_ranger_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -2352,7 +2362,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_cleric_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CSM8T",Myself))
 	Continue()
 END
@@ -2413,7 +2423,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_mage_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -2473,7 +2483,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),2_mage_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CSM8T",Myself))
 	Continue()
 END
@@ -2534,7 +2544,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),3_mage_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CSM8T",Myself))
 	Continue()
 END
@@ -2606,7 +2616,7 @@ IF
 	CheckStatGT(LastSummonerOf(Myself),3_mage_xp,XP)
 THEN
 	RESPONSE #100
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF1",Myself))
+	SetGlobal("D5LV1PRF","GLOBAL",1)
 	Continue()
 END
 IF
@@ -2683,6 +2693,7 @@ END
 
 IF
 	Global("D5CHAPRF","GLOBAL",1)
+	Global("D5LV1PRF","GLOBAL",0)
 THEN
 	RESPONSE #100
 	SetNumTimesTalkedTo(0)
@@ -2728,12 +2739,67 @@ THEN
 	SetGlobal("D5REMCSPLS","GLOBAL",0)
 	SetGlobal("D5REMDSPLS","GLOBAL",0)
 	SetGlobal("D5CHAPRF","GLOBAL",0)
+	SetGlobal("D5LV1PRF","GLOBAL",0)
 	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5NPRF",Myself))
 	DestroySelf()               // reset all variables, then destroy self
 END
 
 IF
 	Global("D5CHAPRF","GLOBAL",0)
+	Global("D5LV1PRF","GLOBAL",1)
+THEN
+	RESPONSE #100
+	SetNumTimesTalkedTo(0)
+	SetGlobal("D5KITTLK","GLOBAL",0)
+	SetGlobal("D5ISDUAL","GLOBAL",0)
+	SetGlobal("D5CLSTLK","GLOBAL",0)
+	SetGlobal("D5CHACLS","GLOBAL",0)
+	SetGlobal("D5STRSET","GLOBAL",0)
+	SetGlobal("D5DEXSET","GLOBAL",0)
+	SetGlobal("D5CONSET","GLOBAL",0)
+	SetGlobal("D5INTSET","GLOBAL",0)
+	SetGlobal("D5WISSET","GLOBAL",0)
+	SetGlobal("D5CHRSET","GLOBAL",0)
+	SetGlobal("D5STRVALUE","GLOBAL",0)
+	SetGlobal("D5DEXVALUE","GLOBAL",0)
+	SetGlobal("D5CONVALUE","GLOBAL",0)
+	SetGlobal("D5INTVALUE","GLOBAL",0)
+	SetGlobal("D5WISVALUE","GLOBAL",0)
+	SetGlobal("D5CHRVALUE","GLOBAL",0)
+	SetGlobal("D5STTTLK","GLOBAL",0)
+	SetGlobal("D5PRFTLK","GLOBAL",0)
+	SetGlobal("D5CHAKIT","GLOBAL",0)
+	SetGlobal("D5FIKIT","GLOBAL",0)
+	SetGlobal("D5PAKIT","GLOBAL",0)
+	SetGlobal("D5RAKIT","GLOBAL",0)
+	SetGlobal("D5THKIT","GLOBAL",0)
+	SetGlobal("D5BAKIT","GLOBAL",0)
+	SetGlobal("D5CLKIT","GLOBAL",0)
+	SetGlobal("D5DRKIT","GLOBAL",0)
+	SetGlobal("D5SHKIT","GLOBAL",0)
+	SetGlobal("D5MOKIT","GLOBAL",0)
+	SetGlobal("D5MAKIT","GLOBAL",0)
+	SetGlobal("D5SOKIT","GLOBAL",0)
+	SetGlobal("D5FCKIT","GLOBAL",0)
+	SetGlobal("D5FDKIT","GLOBAL",0)
+	SetGlobal("D5FMKIT","GLOBAL",0)
+	SetGlobal("D5FTKIT","GLOBAL",0)
+	SetGlobal("D5CRKIT","GLOBAL",0)
+	SetGlobal("D5CTKIT","GLOBAL",0)
+	SetGlobal("D5CMKIT","GLOBAL",0)
+	SetGlobal("D5MTKIT","GLOBAL",0)
+	SetGlobal("D5REMWSPLS","GLOBAL",0)
+	SetGlobal("D5REMCSPLS","GLOBAL",0)
+	SetGlobal("D5REMDSPLS","GLOBAL",0)
+	SetGlobal("D5CHAPRF","GLOBAL",0)
+	SetGlobal("D5LV1PRF","GLOBAL",0)
+	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5CPRF",Myself))
+	DestroySelf()               // reset all variables, then destroy self
+END
+
+IF
+	Global("D5CHAPRF","GLOBAL",0)
+	Global("D5LV1PRF","GLOBAL",0)
 THEN
 	RESPONSE #100
 	SetNumTimesTalkedTo(0)

diff --git a/npc_ee/language/english/setup.tra b/npc_ee/language/english/setup.tra
@@ -17,8 +17,8 @@
 @2001  = ~This will take a few moments, please be patient...~
 @2002  = ~This tome does not work with dual-class characters~
 @2003  = ~Change proficiencies~
-@2004  = ~Change class/kit/ability scores and level up from 0~
-@2005  = ~Change kit (and ability scores and proficiencies)~
+@2004  = ~Change class, kit, ability scores, and level up from 0~
+@2005  = ~Change kit, ability scores, and proficiencies~
 @2006  = ~Change ability scores~
 @2007  = ~Memorize spells~
 @2008  = ~Learn spells~