6.2

prof fixes
UnearthedArcana · Oct 23, 2023 · 0ee8c54 · 0ee8c54
1 parent fa62a52
commit 0ee8c54
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 23 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.0 </strong><br />
+  <p><strong> Version 6.2 </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
@@ -2728,7 +2728,7 @@ THEN
 	SetGlobal("D5REMCSPLS","GLOBAL",0)
 	SetGlobal("D5REMDSPLS","GLOBAL",0)
 	SetGlobal("D5CHAPRF","GLOBAL",0)
-	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5NPRFA",Myself))
+	ActionOverride(LastSummonerOf(Myself),ApplySpellRES("D5NPRF",Myself))
 	DestroySelf()               // reset all variables, then destroy self
 END
 

diff --git a/npc_ee/language/english/setup.tra b/npc_ee/language/english/setup.tra
@@ -103,6 +103,8 @@ Change Ability Scores?~
 @2090  = ~Initial weapon proficiency~
 @2091  = ~Advance weapon proficiency~
 @2092  = ~Choose a different weapon~
+@2093  = ~Restore Level 1 Weapon Proficiencies~
+@2094  = ~Select All Weapon Proficiencies~
 //
 @2100  = ~Advance to Proficiency (+)~
 @2101  = ~Advance to Proficiency (+) with Bastard Swords~

diff --git a/npc_ee/lib/npc_changes.tpa b/npc_ee/lib/npc_changes.tpa
@@ -332,11 +332,11 @@ BEGIN ~D5KITTLK~
 
 IF ~Global("D5KITTLK","GLOBAL",1)~ THEN BEGIN d5kittlk
  SAY @9
- IF ~Global("D5ISDUAL","GLOBAL",0)~ THEN REPLY @2004 DO ~ApplySpellRES("D5_NUKT",myself)~ EXIT 
+ IF ~Global("D5ISDUAL","GLOBAL",0)~ THEN REPLY @2004 DO ~SetGlobal("D5PRFTLK","GLOBAL",1)~ DO ~ApplySpellRES("D5_NUKT",myself)~ EXIT 
  IF ~~ THEN REPLY @2005 DO ~SetGlobal("D5CLSTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAKIT","GLOBAL",0)~ EXIT 
  IF ~~ THEN REPLY @2006 DO ~SetGlobal("D5CLSTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAKIT","GLOBAL",1)~ EXIT 
- IF ~~ THEN REPLY @2003 DO ~SetGlobal("D5CLSTLK","GLOBAL",1)~ DO ~SetGlobal("D5STTTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAKIT","GLOBAL",1)~ DO ~SetGlobal("D5PRFTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAPRF","GLOBAL",1)~ EXIT 
- IF ~~ THEN REPLY @2014 DO ~SetGlobal("D5CLSTLK","GLOBAL",1)~ DO ~SetGlobal("D5STTTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAKIT","GLOBAL",1)~ EXIT 
+ IF ~~ THEN REPLY @2003 DO ~SetGlobal("D5CLSTLK","GLOBAL",1)~ DO ~SetGlobal("D5STTTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAKIT","GLOBAL",1)~ EXIT 
+ IF ~~ THEN REPLY @2014 DO ~SetGlobal("D5CLSTLK","GLOBAL",1)~ DO ~SetGlobal("D5STTTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAKIT","GLOBAL",1)~ DO ~SetGlobal("D5PRFTLK","GLOBAL",1)~ DO ~SetGlobal("D5CHAPRF","GLOBAL",0)~ EXIT 
 END
 >>>>>>>> 
 COPY ~d5/d5kittlk.d~ ~weidu_external/npc_ee/compile/d5kittlk.d~
@@ -729,15 +729,20 @@ END
 //
 INCLUDE ~%MOD_FOLDER%/lib/dialprof.tpa~
 
-/*
-OUTER_SPRINT prof_script_name ~d5cprf~
-OUTER_SET script_level_one = 1
-OUTER_SET script_higher_levels = 0
-OUTER_SPRINT class_dlgs ~all~
-*/
-
 LAF PROF_DIALOGUE INT_VAR script_level_one = 1 script_higher_levels = 0 ignore_max = 0 STR_VAR prof_script_name = ~d5cprf~ class_dlgs = ~all~ END
 
+COPY_EXISTING ~d5cprf.spl~ ~override~
+  	SAY NAME1 @2093
+	SAY UNIDENTIFIED_DESC @2093
+
+CREATE SPL ~d5cprf1~	
+  SAY NAME1 @2093
+  SAY UNIDENTIFIED_DESC @2093
+  WRITE_SHORT 0x1c 4
+  WRITE_LONG 0x34 1
+  LPF QD_ADD_EMPTY_SPELL_HEADER INT_VAR type = 1 location = 4 target = 5 required_level = 1 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 171 target = 1 timing = 1 STR_VAR resource = ~d5cprf~ END
+
 ACTION_IF (FILE_EXISTS_IN_GAME ~d5cs000.spl~) BEGIN
   COPY_EXISTING ~d5cprf.spl~ ~override~
     LPF ADD_SPELL_EFFECT INT_VAR opcode = 146 target = 1 parameter2 = 1 timing = 4 duration = 5 STR_VAR resource = ~d5cs000~ END
@@ -747,18 +752,23 @@ END
 
 //distinct prof-only dlg_____________________________________________________________
 //
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5nprfa.spl~) BEGIN
-
-/*
- OUTER_SPRINT prof_script_name ~d5nprfa~
- OUTER_SET script_level_one = 1
- OUTER_SET script_higher_levels = 1
- OUTER_SPRINT class_dlgs ~all~
-*/
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5nprf.spl~) BEGIN
 
  LAF PROF_DIALOGUE INT_VAR script_level_one = 1 script_higher_levels = 1 ignore_max = 0 STR_VAR prof_script_name = ~d5nprf~ class_dlgs = ~all~ END
 
- COPY_EXISTING ~d5nprfa.spl~ ~override~
+ COPY_EXISTING ~d5nprf.spl~ ~override~
+    SAY NAME1 @2094
+    SAY UNIDENTIFIED_DESC @2094
+
+ CREATE SPL ~d5nprf1~	
+    SAY NAME1 @2094
+    SAY UNIDENTIFIED_DESC @2094
+    WRITE_SHORT 0x1c 4
+    WRITE_LONG 0x34 1
+    LPF QD_ADD_EMPTY_SPELL_HEADER INT_VAR type = 1 location = 4 target = 5 required_level = 1 END
+    LPF ADD_SPELL_EFFECT INT_VAR opcode = 171 target = 1 timing = 1 STR_VAR resource = ~d5nprf~ END
+
+ COPY_EXISTING ~d5nprf.spl~ ~override~
 //    LPF ADD_SPELL_EFFECT INT_VAR insert_point = 0 opcode = 326 target = 1 parameter1 = 12 parameter2 = 105 timing = 1 STR_VAR resource = ~d52P114~ END
 //    LPF ADD_SPELL_EFFECT INT_VAR insert_point = 0 opcode = 326 target = 1 parameter1 = 18 parameter2 = 105 timing = 1 STR_VAR resource = ~d52P114~ END
     LPF ADD_SPELL_EFFECT INT_VAR insert_point = 0 opcode = 321 target = 1 timing = 1 STR_VAR resource = ~d5profz~ END

diff --git a/npc_ee/npc_ee.tp2 b/npc_ee/npc_ee.tp2
@@ -1,7 +1,7 @@
 BACKUP ~weidu_external/backup/npc_ee~
 AUTHOR ~SubtleD~
 
-VERSION ~6.1.1~
+VERSION ~6.2~
 //README ~npc_ee/readme-NPC_EE.html~
 
 ALWAYS

diff --git a/npc_ee/readme-NPC_EE.html b/npc_ee/readme-NPC_EE.html
@@ -9,7 +9,7 @@
 <body>
 <h1>NPCs Enhanced... um, for Everyone! (a.k.a. NPC_EE)</h1>
 <div class="section">
-  <p><strong> Version 6.0 </strong><br />
+  <p><strong> Version 6.2 </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>