0.9.13

better spontaneous
subtledoctor · Aug 16, 2021 · e356a63 · e356a63
1 parent 3eabae2
commit e356a63
Show file tree

Hide file tree

Showing 16 changed files with 4,703 additions and 4,535 deletions.
diff --git a/TomeAndBlood/README.txt b/TomeAndBlood/README.txt
@@ -1,6 +1,6 @@
 # TomeAndBlood
 
-Tome And Blood: More Options for Wizards and Sorcerers v0.9.6
+Tome And Blood: More Options for Wizards and Sorcerers v0.9.13
 
 ## Overview
 
@@ -121,13 +121,13 @@ COMPONENT 48: Armored Casting for Bards
 
 Bards can cast spells in leather armor.
 
-COMPONENTS 51, 52, 53, 54, 55: Innate Metamagic
+COMPONENTS 51-55: Innate Metamagic
 
 The first four of these components make spell sequencers and contingencies into innate abilities (Chain Contingency becomes an HLA) so they don't cost spell slots; but "filling" them with spells still uses the spell slots associated with those spells.  These four components differ according to how you get metamagic (automatically as you level up, or learned from scrolls) and whether or not sorcerers can use metamagic spells.
 
 The 5th version leaves sequencers and contingencies as spells you must memorize, but when you cast them, you "fill" them with any spell you *know,* without expending any memorization slots. 
 
-COMPONENTS 61, 62, 63: Cantrips
+COMPONENTS 61-63: Cantrips
 
 Component 61 allows mages and sorcerers to use one cantrip as an innate ability with unlimited uses.
 
@@ -172,7 +172,7 @@ The Arcanist's preparation slots are governed by MXSPLWIZ.2da; any changes you m
 
 *DO NOT* install this component if you are going to use the broader 5E Spellcasting mod.
 
-COMPONENT 80: Mana Sorcerer
+COMPONENT 85: Mana Sorcerer
 
 This component gives sorcerers (only unkitted sorcerers, for now) an innate ability to use mana points to cast spells instead of spell-level-based casting slots.  Your known spells will be the same (you must choose them manually from an item ability) but you will have a pool of mana points instead of spell slots.  Casting a spell costs as many points as its spell level; you will start with ~2 mana points and can progress to as many as 120, at level 25.  While more flexible, this is generally less firepower than a normal sorcerer has if you tally up their spell slots; so the Mana Sorcerer has a Restorative Meditation innate ability that can be used between fights, which will restore one half of the points you recently spent, rounded down.
 

diff --git a/TomeAndBlood/TomeAndBlood.tp2 b/TomeAndBlood/TomeAndBlood.tp2
@@ -1,6 +1,6 @@
 BACKUP ~TomeAndBlood/backup~
 AUTHOR ~aquadrizzt~
-VERSION ~0.9.12~ 
+VERSION ~0.9.13~ 
 
 ALWAYS
 
@@ -250,6 +250,7 @@ LAF revised_specialists END
 BEGIN @45
 DESIGNATED 45
 REQUIRE_PREDICATE (GAME_IS ~bgee bg2ee iwdee eet~) @2 
+DEPRECATED @4
 //GROUP @7
 
 COPY_EXISTING ~sw1h01.itm~ ~override/qdtnb_crafting.qd~ //detection for this component 
@@ -556,7 +557,7 @@ LAF mana_sorcerer END
 BEGIN @93
 DESIGNATED 93
 REQUIRE_PREDICATE (FILE_EXISTS_IN_GAME ~enginest.2da~) @3
-REQUIRE_PREDICATE (MOD_IS_INSTALLED ~tomeandblood.tp2~ ~80~) OR (MOD_IS_INSTALLED ~tomeandblood.tp2~ ~82~) @1
+REQUIRE_PREDICATE (MOD_IS_INSTALLED ~tomeandblood.tp2~ ~80~) OR (MOD_IS_INSTALLED ~tomeandblood.tp2~ ~82~) @4
 //GROUP @7
 
 COPY_EXISTING ~sw1h01.itm~ ~override/qdtnb_slotitm.qd~ //detection for this component 

diff --git a/TomeAndBlood/comp/setup_arcanist.tpa b/TomeAndBlood/comp/setup_arcanist.tpa
@@ -100,6 +100,18 @@ END
 //
 OUTER_SET arcanist_code = (0x4000 + %D5_ARCANIST%)
 
+APPEND ~splprot.2da~ ~D5_KIT_IS%TAB%152%TAB%-1%TAB%1~ UNLESS ~D5_KIT_IS~
+COPY_EXISTING ~splprot.2da~ ~override~
+	COUNT_2DA_COLS cols
+	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_KIT_IS~ BEGIN
+	    SET kit_is_row = %row%
+	  END
+	END
+BUT_ONLY
+
 //KIT ABILITIES______________________________________________________________________
 
 COPY ~tomeandblood/data/arcanist/d5acnst.2da~ ~override~
@@ -121,10 +133,11 @@ COPY ~tomeandblood/data/arcanist/d5cstarc.2da~ ~override~
   LPF arcane_casting_slots STR_VAR table_spl = ~d5zltac~ END
 BUT_ONLY
 
+COPY_EXISTING ~d5zprpd.spl~ ~override~
+  LPF ADD_SPELL_EFFECT INT_VAR opcode = 326 target = 1 parameter1 = %arcanist_code% parameter2 = %kit_is_row% timing = 1 STR_VAR resource = ~d5zltacz~ END
+
 APPEND ~d5acnst.2da~ ~SPELL_INIT  AP_D5ZZ000  ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****       ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        **** 
-LESSPREP    AP_D5Z0SLT  ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        **** 
-NO_ASPLS    AP_D5Z0SPL  ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        **** 
-CST_SLTS    AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC  AP_D5ZLTAC ~ UNLESS ~AP_D5ZZ000~
+NO_ASPLS    AP_D5Z0SPL  ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        ****        **** ~
 
 ACTION_IF (MOD_IS_INSTALLED ~tomeandblood.tp2~ ~62~) BEGIN	//	L1 cantrips
   COPY_EXISTING ~d5zltac.spl~ ~override~
@@ -142,26 +155,6 @@ ACTION_IF (MOD_IS_INSTALLED ~tomeandblood.tp2~ ~62~) BEGIN	//	L1 cantrips
   IF_EXISTS BUT_ONLY
 END
 
-//splprot kit check___________________________________________________________________
-//
-APPEND ~splprot.2da~ ~D5_KIT_IS%TAB%152%TAB%-1%TAB%1~ UNLESS ~D5_KIT_IS~
-COPY_EXISTING ~splprot.2da~ ~override~
-	COUNT_2DA_COLS cols
-	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_KIT_IS~ BEGIN
-	    SET kit_is_row = %row%
-	  END
-	END
-BUT_ONLY
-
-//patch spell refresh_________________________________________________________________
-//
-COPY_EXISTING ~d5zprpd.spl~ ~override~
-  LPF ADD_SPELL_EFFECT INT_VAR opcode = 326 target = 1 parameter1 = %arcanist_code% parameter2 = %kit_is_row% timing = 1 STR_VAR resource = ~d5zltac~ END
-IF_EXISTS BUT_ONLY
-
 
 //KIT DESCRIPTION PATCHES_____________________________________________________________
 //