0.79.29

updated semi-spont AGAIN
subtledoctor · Aug 25, 2021 · e1d0609 · e1d0609
1 parent ee0af38
commit e1d0609
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 54 deletions.
diff --git a/FnP_Multiclass/FnP_Multiclass.tp2 b/FnP_Multiclass/FnP_Multiclass.tp2
@@ -2,7 +2,7 @@ BACKUP ~faiths_and_powers/backup~
 AUTHOR ~SubtleD and Grammarsalad~
 
 
-VERSION ~0.79.28~
+VERSION ~0.79.29~
 
 
 ALWAYS

diff --git a/FnP_Multiclass/lib/semi_spontaneous.tpa b/FnP_Multiclass/lib/semi_spontaneous.tpa
@@ -1,5 +1,5 @@
 
-// v7.3 - cleric/mage fnp fix
+// v7.4 - checks spellstates before marker file exclusion
 
 
 DEFINE_PATCH_FUNCTION ~TRA2STR~ // given tra reference, returns string
@@ -81,18 +81,6 @@ END
 DEFINE_ACTION_FUNCTION semi_spontaneous_casting INT_VAR include_arcane = 0 include_divine = 0 BEGIN
 
 
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_spont.d5~) BEGIN
-
-
-//disable quickspell buttons__________________________________________________________
-//
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5znoqk.spl~) BEGIN
- COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5znoqk.spl~
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
-END
-
 //semi spont spellstates______________________________________________________________
 //
 ACTION_IF (FILE_CONTAINS_EVALUATED (~splstate.ids~ ~D5_SEMI_ARCANE~)) BEGIN
@@ -208,6 +196,19 @@ COPY_EXISTING ~splprot.2da~ ~override~
 BUT_ONLY
 
 
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_spont.d5~) BEGIN
+
+
+//disable quickspell buttons__________________________________________________________
+//
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5znoqk.spl~) BEGIN
+ COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5znoqk.spl~
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
+END
+
+
 //remove spell slots pending sleep_____________________________________________________
 //
 ACTION_IF !(FILE_EXISTS_IN_GAME ~d5z17wz.spl~) BEGIN
@@ -2784,19 +2785,6 @@ DEFINE_ACTION_FUNCTION semi_sorcerer_casting STR_VAR sorc_suffix = ~w~ BEGIN
 // suffix must match the one in the menu function
 
 
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_sorc_casting.d5~) BEGIN
-
-//disable quickspells and scroll learning____________________________________________
-//
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5xnoqk.spl~) BEGIN
- COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5xnoqk.spl~
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 101 target = 1 parameter2 = 147 timing = 9 END
-END
-
-
 //add spell slot stat checks to SPLPROT______________________________________________
 //
 APPEND ~splprot.2da~ ~D5_WIZ_1_7%TAB%108%TAB%-1%TAB%7~ UNLESS ~D5_WIZ_1_7~
@@ -2852,6 +2840,20 @@ ACTION_IF !(VARIABLE_IS_SET %semi_sorc_state%) BEGIN
 END
 
 
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_sorc_casting.d5~) BEGIN
+
+
+//disable quickspells and scroll learning____________________________________________
+//
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5xnoqk.spl~) BEGIN
+ COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5xnoqk.spl~
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 101 target = 1 parameter2 = 147 timing = 9 END
+END
+
+
 //remove all mage spell slots_________________________________________________________
 //
 ACTION_IF !(FILE_EXISTS_IN_GAME ~d5x0slt.spl~) BEGIN

diff --git a/faiths_and_powers/Faiths_and_Powers.tp2 b/faiths_and_powers/Faiths_and_Powers.tp2
@@ -2,7 +2,7 @@ BACKUP ~faiths_and_powers/backup~
 AUTHOR ~SubtleD and Grammarsalad~
 
 
-VERSION ~0.79.28~
+VERSION ~0.79.29~
 
 
 //README ~faiths_and_powers/readme-pnp.html~

diff --git a/faiths_and_powers/lib/semi_spontaneous.tpa b/faiths_and_powers/lib/semi_spontaneous.tpa
@@ -1,5 +1,5 @@
 
-// v7.3 - cleric/mage fnp fix
+// v7.4 - checks spellstates before marker file exclusion
 
 
 DEFINE_PATCH_FUNCTION ~TRA2STR~ // given tra reference, returns string
@@ -81,18 +81,6 @@ END
 DEFINE_ACTION_FUNCTION semi_spontaneous_casting INT_VAR include_arcane = 0 include_divine = 0 BEGIN
 
 
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_spont.d5~) BEGIN
-
-
-//disable quickspell buttons__________________________________________________________
-//
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5znoqk.spl~) BEGIN
- COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5znoqk.spl~
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
-END
-
 //semi spont spellstates______________________________________________________________
 //
 ACTION_IF (FILE_CONTAINS_EVALUATED (~splstate.ids~ ~D5_SEMI_ARCANE~)) BEGIN
@@ -208,6 +196,19 @@ COPY_EXISTING ~splprot.2da~ ~override~
 BUT_ONLY
 
 
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_spont.d5~) BEGIN
+
+
+//disable quickspell buttons__________________________________________________________
+//
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5znoqk.spl~) BEGIN
+ COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5znoqk.spl~
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
+END
+
+
 //remove spell slots pending sleep_____________________________________________________
 //
 ACTION_IF !(FILE_EXISTS_IN_GAME ~d5z17wz.spl~) BEGIN
@@ -2784,19 +2785,6 @@ DEFINE_ACTION_FUNCTION semi_sorcerer_casting STR_VAR sorc_suffix = ~w~ BEGIN
 // suffix must match the one in the menu function
 
 
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_sorc_casting.d5~) BEGIN
-
-//disable quickspells and scroll learning____________________________________________
-//
-ACTION_IF !(FILE_EXISTS_IN_GAME ~d5xnoqk.spl~) BEGIN
- COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5xnoqk.spl~
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 101 target = 1 parameter2 = 147 timing = 9 END
-END
-
-
 //add spell slot stat checks to SPLPROT______________________________________________
 //
 APPEND ~splprot.2da~ ~D5_WIZ_1_7%TAB%108%TAB%-1%TAB%7~ UNLESS ~D5_WIZ_1_7~
@@ -2852,6 +2840,20 @@ ACTION_IF !(VARIABLE_IS_SET %semi_sorc_state%) BEGIN
 END
 
 
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5__semi_sorc_casting.d5~) BEGIN
+
+
+//disable quickspells and scroll learning____________________________________________
+//
+ACTION_IF !(FILE_EXISTS_IN_GAME ~d5xnoqk.spl~) BEGIN
+ COPY ~%MOD_FOLDER%/lib/semi_spont/d5_base.spl~ ~override/d5xnoqk.spl~
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 3 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 4 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 144 target = 1 parameter2 = 5 timing = 9 END
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 101 target = 1 parameter2 = 147 timing = 9 END
+END
+
+
 //remove all mage spell slots_________________________________________________________
 //
 ACTION_IF !(FILE_EXISTS_IN_GAME ~d5x0slt.spl~) BEGIN
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ BACKUP ~faiths_and_powers/backup~ @@
     AUTHOR ~SubtleD and Grammarsalad~
-    VERSION ~0.79.28~
+    VERSION ~0.79.29~
     ALWAYS
@@ Expand Down @@