0.85sd23

semi_innate update
subtledoctor · Sep 24, 2023 · 3694f74 · 3694f74
1 parent 94789b1
commit 3694f74
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/faiths_and_powers/Faiths_and_Powers.tp2 b/faiths_and_powers/Faiths_and_Powers.tp2
@@ -2,7 +2,7 @@ BACKUP ~weidu_external/backup/faiths_and_powers~
 AUTHOR ~SubtleD and Grammarsalad~
 
 
-VERSION ~0.85sd22~
+VERSION ~0.85sd23~
 
 
 //README ~faiths_and_powers/readme-pnp.html~
@@ -560,7 +560,7 @@ BEGIN @30 // install spont option
 DESIGNATED 30
 LABEL ~D5_FNP_SPONTANEOUS_CASTING_OPTION~
 REQUIRE_PREDICATE (FILE_EXISTS_IN_GAME ~d5__spheres.d5~) @8
-REQUIRE_PREDICATE !(FILE_EXISTS_IN_GAME ~d5__5E_casting_divine.d5~) @8
+REQUIRE_PREDICATE !(FILE_EXISTS_IN_GAME ~d5__5E_casting_clerics.d5~) @8
 
 
 COPY ~faiths_and_powers/lib/markers/d5_marker.d5~ ~override/d5__fnp_spont_option.d5~

diff --git a/faiths_and_powers/lib/kits_multi_druids_shamans.tpa b/faiths_and_powers/lib/kits_multi_druids_shamans.tpa
@@ -310,7 +310,7 @@ LAF ADD_KIT_EX
 //                 R R O A N E X L S R O X S N A E E U A R I C A O O O R N E H P O A A A A A A A A 1 1 1 1 1 1 1 1 1 1 2
 //                 D D W R T D E E W D R E W A K R R B R D N E F W W W T G D I O N 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
     clasweap    = ~1 1 1 1 1 0 0 1~
-    weapprof    = ~0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 2 2 0 0 0 2 0 2 2 2 2 2 0 2 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0~
+    weapprof    = ~0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 2 2 0 0 0 2 0 0 0 2 2 2 0 2 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0~
 //                 ST DX CO IN WI CH
     abclasrq    = ~9  0  0  0  12 12~
     abclsmod    = ~0  0  0  0  0  0~

diff --git a/faiths_and_powers/lib/semi_spontaneous.tpa b/faiths_and_powers/lib/semi_spontaneous.tpa
@@ -1,5 +1,5 @@
 
-// v10.13 - tiny xxfat change to semi_innate; helper functions included
+// v10.14 - another semi_innate fix
 
 /*
 
@@ -5271,8 +5271,8 @@ END		//	end define function
 
 DEFINE_ACTION_FUNCTION semi_innate_casting INT_VAR semi_innate_stat = 109 semi_innate_shift = 20 STR_VAR semi_innate_prefix = ~~ semi_innate_array = ~~ points_table = ~x~ table_spl = ~~ BEGIN
 
-APPEND ~splprot.2da~ ~D5_INNATE_PTS%TAB%%semi_innate_stat%%TAB%-1%TAB%7~ UNLESS ~D5_INNATE_PTS~
-APPEND ~splprot.2da~ ~D5_INNATE=PTS%TAB%%semi_innate_stat%%TAB%-1%TAB%8~ UNLESS ~D5_INNATE=PTS~
+APPEND ~splprot.2da~ ~D5_INNATE_%semi_innate_stat%%TAB%%semi_innate_stat%%TAB%-1%TAB%7~ UNLESS ~D5_INNATE_%semi_innate_stat%~
+APPEND ~splprot.2da~ ~D5_INNATE=%semi_innate_stat%%TAB%%semi_innate_stat%%TAB%-1%TAB%8~ UNLESS ~D5_INNATE=%semi_innate_stat%~
 APPEND ~splprot.2da~ ~D5_FATIGUE_0%TAB%30%TAB%0%TAB%1~ UNLESS ~D5_FATIGUE_0~
 APPEND ~splprot.2da~ ~D5_FATIGUE_1%TAB%30%TAB%1%TAB%4~ UNLESS ~D5_FATIGUE_1~
 
@@ -5281,10 +5281,10 @@ COPY_EXISTING ~splprot.2da~ ~override~
   READ_2DA_ENTRIES_NOW rows cols
   FOR (row = 1; row < rows; ++row) BEGIN
 	READ_2DA_ENTRY_FORMER rows row 0 ~stat~
-	PATCH_IF (~%stat%~ STRING_EQUAL_CASE ~D5_INNATE_PTS~) BEGIN
+	PATCH_IF (~%stat%~ STRING_EQUAL_CASE ~D5_INNATE_%semi_innate_stat%~) BEGIN
 	  SET fake_innate_slots = %row%
 	END
-	PATCH_IF (~%stat%~ STRING_EQUAL_CASE ~D5_INNATE=PTS~) BEGIN
+	PATCH_IF (~%stat%~ STRING_EQUAL_CASE ~D5_INNATE=%semi_innate_stat%~) BEGIN
 	  SET fake_innate_equal = %row%
 	END
 	PATCH_IF (~%stat%~ STRING_EQUAL_CASE ~D5_FATIGUE_0~) BEGIN