Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
0.8.54
Browse files Browse the repository at this point in the history 
improvements
  • Loading branch information
@subtledoctor
subtledoctor committed Aug 14, 2020
1 parent e816a71 commit 3ddeb6b
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 87 deletions.
5 changes: 3 additions & 2 deletions TomeAndBlood/TomeAndBlood.tp2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BACKUP ~TomeAndBlood/backup~
AUTHOR ~aquadrizzt@gmail.com~
VERSION ~0.8.53~
VERSION ~0.8.54~

ALWAYS

Expand Down Expand Up @@ -104,7 +104,8 @@ BEGIN @16
DESIGNATED 16
GROUP @5

COPY_EXISTING ~sw1h01.itm~ ~override/qdtnb_identify.qd~ //detection for this component
//COPY_EXISTING ~sw1h01.itm~ ~override/qdtnb_identify.qd~ //detection for this component
// now done inside the function

INCLUDE ~TomeAndBlood/comp/setup_spell_tweaks.tpa~

Expand Down
30 changes: 29 additions & 1 deletion TomeAndBlood/comp/setup_cantrips.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,23 @@ COPY_EXISTING ~spwi114.spl~ ~override~
//adding cantrips to appropriate mages
ACTION_PHP_EACH tnb_kit_list AS kitinfo => kitclab BEGIN
ACTION_IF (FILE_EXISTS_IN_GAME ~%kitclab%.2da~) BEGIN
APPEND ~%kitclab%.2da~ ~CANTRIPS GA_%kitinfo_2%~
APPEND ~%kitclab%.2da~ ~CANTRIPS GA_%kitinfo_2% **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ~
END
END

COPY_EXISTING ~kitlist.2da~ ~override~
COUNT_2DA_ROWS 9 rows
FOR (row = 2 ; row < rows ; ++row ) BEGIN
READ_2DA_ENTRY row 5 9 modclab
READ_2DA_ENTRY row 8 9 modclass
PATCH_IF (modclass = 1) OR (modclass = 19) BEGIN
INNER_ACTION BEGIN
APPEND ~%modclab%.2da~ ~CANTRIPS GA_D5_CANT1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ~ UNLESS ~CANTRIPS~
END
END
END
BUT_ONLY

//updating descriptions
OUTER_SET strref = (0 - 1)

Expand Down Expand Up @@ -751,6 +764,8 @@ ACTION_IF !(FILE_EXISTS_IN_GAME ~qdtnb_identify.qd~) BEGIN
END
BUT_ONLY

COPY_EXISTING ~sw1h01.itm~ ~override/qdtnb_identify.qd~ //detection for this component

END

//Infravision/True Strike: move to 2nd level if SR installed
Expand Down Expand Up @@ -1320,5 +1335,18 @@ ACTION_PHP_EACH tnb_kit_list AS kitinfo => kitclab BEGIN
END
END

COPY_EXISTING ~kitlist.2da~ ~override~
COUNT_2DA_ROWS 9 rows
FOR (row = 2 ; row < rows ; ++row ) BEGIN
READ_2DA_ENTRY row 5 9 modclab
READ_2DA_ENTRY row 8 9 modclass
PATCH_IF (modclass = 1) OR (modclass = 19) BEGIN
INNER_ACTION BEGIN
APPEND ~%modclab%.2da~ ~CANTRIPS AP_D5CANTW1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ~ UNLESS ~CANTRIPS~
END
END
END
BUT_ONLY

END // end define function
//____________________________________________________________________________________
15 changes: 15 additions & 0 deletions TomeAndBlood/comp/setup_familiars.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ INCLUDE ~TomeAndBlood/data/core/tnb_kit_list.tpa~
//Add Find Familiar innate to mages

COPY ~tomeandblood/lib/d5_base.spl~ ~override/d5fminn.spl~
WRITE_ASCII 0x3a ~spwi123c~
LPF ALTER_SPELL_HEADER STR_VAR icon = ~spwi123b~ END
LPF ADD_SPELL_EFFECT INT_VAR opcode = 171 target = 1 timing = 1 STR_VAR resource = ~spcl342~ END

ACTION_PHP_EACH tnb_kit_list AS kitinfo => kitclab BEGIN
Expand All @@ -17,6 +19,19 @@ ACTION_PHP_EACH tnb_kit_list AS kitinfo => kitclab BEGIN
END
END

COPY_EXISTING ~kitlist.2da~ ~override~
COUNT_2DA_ROWS 9 rows
FOR (row = 2 ; row < rows ; ++row) BEGIN
READ_2DA_ENTRY row 5 9 modclab
READ_2DA_ENTRY row 8 9 modclass
PATCH_IF (modclass = 1) OR (modclass = 19) BEGIN
INNER_ACTION BEGIN
APPEND ~%modclab%.2da~ ~FAMILIAR AP_D5FMINN **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ~ UNLESS ~FAMILIAR~
END
END
END
BUT_ONLY

//Remove Find Familiar from Spell Selection menu
APPEND ~HIDESPL.2da~ ~SPWI123 1 0~

Expand Down
4 changes: 2 additions & 2 deletions TomeAndBlood/comp/setup_multiclass_sorcerers.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ COPY_EXISTING_REGEXP GLOB ~^.+\.spl$~ ~override~
END
LPF DELETE_EFFECT END
PATCH_IF (%abil_target% = 4) BEGIN
LPF ADD_SPELL_EFFECT INT_VAR opcode = 148 target = 1 power = %spell_level% parameter1 = 0 parameter2 = 1 timing = 1 STR_VAR resource = EVAL ~%real_spell%~ END
LPF ADD_SPELL_EFFECT INT_VAR opcode = 148 target = 1 power = 0 parameter1 = 0 parameter2 = 1 timing = 1 STR_VAR resource = EVAL ~%real_spell%~ END
PATCH_IF (%abil_range% < 35) BEGIN
PATCH_IF (%abil_range% > 4) BEGIN
LPF ALTER_SPELL_HEADER INT_VAR range = (%abil_range% - 3) END
Expand All @@ -751,7 +751,7 @@ COPY_EXISTING_REGEXP GLOB ~^.+\.spl$~ ~override~
END
END
ELSE BEGIN
LPF ADD_SPELL_EFFECT INT_VAR opcode = 146 target = 2 power = %spell_level% parameter2 = 1 timing = 9 STR_VAR resource = EVAL ~%real_spell%~ END
LPF ADD_SPELL_EFFECT INT_VAR opcode = 146 target = 2 power = 0 parameter2 = 1 timing = 9 STR_VAR resource = EVAL ~%real_spell%~ END
END
PATCH_IF !(MOD_IS_INSTALLED ~tomeandblood.tp2~ ~62~) BEGIN
LPF ADD_SPELL_EFFECT INT_VAR opcode = 146 target = 1 parameter2 = 1 timing = 1 STR_VAR resource = EVAL ~d5src-%spell_level%~ END
Expand Down
4 changes: 2 additions & 2 deletions TomeAndBlood/comp/setup_specialists.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ ACTION_PHP_EACH wizard_spells AS ind => wizard_spell BEGIN
READ_BYTE (%eff_offset% + (%num_globals% * 0x30) + 0x02) eff_target
LPF DELETE_EFFECT END
PATCH_IF (%abil_target% = 4) BEGIN
LPF ADD_SPELL_EFFECT INT_VAR opcode = 148 target = 1 power = %spell_level% parameter1 = 0 parameter2 = 1 timing = 1 STR_VAR resource = EVAL ~%wizard_spell%~ END
LPF ADD_SPELL_EFFECT INT_VAR opcode = 148 target = 1 power = 0 parameter1 = 0 parameter2 = 1 timing = 1 STR_VAR resource = EVAL ~%wizard_spell%~ END
PATCH_IF (%abil_range% < 35) BEGIN
PATCH_IF (%abil_range% > 4) BEGIN
LPF ALTER_SPELL_HEADER INT_VAR range = (%abil_range% - 3) END
Expand All @@ -146,7 +146,7 @@ ACTION_PHP_EACH wizard_spells AS ind => wizard_spell BEGIN
END
END
PATCH_IF NOT (%abil_target% = 4) BEGIN
LPF ADD_SPELL_EFFECT INT_VAR opcode = 146 target = 2 power = %spell_level% parameter1 = 0 parameter2 = 1 timing = 1 STR_VAR resource = EVAL ~%wizard_spell%~ END
LPF ADD_SPELL_EFFECT INT_VAR opcode = 146 target = 2 power = 0 parameter1 = 0 parameter2 = 1 timing = 1 STR_VAR resource = EVAL ~%wizard_spell%~ END
END
END
INNER_ACTION BEGIN
Expand Down
6 changes: 6 additions & 0 deletions TomeAndBlood/comp/setup_spell_tweaks.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,8 @@ END // end define function

DEFINE_ACTION_FUNCTION new_identify BEGIN

ACTION_IF !(FILE_EXISTS_IN_GAME ~qdtnb_identify.qd~) BEGIN

INCLUDE ~TomeAndBlood/lib/b3identify.tph~
LAF B3_IDENTIFY_INSTALL END

Expand Down Expand Up @@ -1216,6 +1218,10 @@ COPY_EXISTING_REGEXP GLOB ~^.+\.cre$~ ~override~
END
BUT_ONLY

COPY_EXISTING ~sw1h01.itm~ ~override/qdtnb_identify.qd~ //detection for this component

END // end not found qdtnb_identify.qd

END // end define function
//____________________________________________________________________________________

80 changes: 40 additions & 40 deletions TomeAndBlood/data/level_one_cantrips/mxspldd.2da
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,43 +11,43 @@
8 3 4 3 1 0 0 0 0 0
9 3 4 4 2 0 0 0 0 0
10 3 4 4 3 1 0 0 0 0
11 3 4 4 4 2 0 0 0 0
12 3 4 4 4 3 1 0 0 0
13 3 4 4 4 4 2 0 0 0
14 3 4 4 4 4 3 1 0 0
15 3 4 4 4 4 4 2 0 0
16 3 4 4 4 4 4 3 1 0
17 3 4 4 4 4 4 4 2 0
18 3 4 4 4 4 4 4 3 1
19 3 4 4 4 4 4 4 4 2
20 3 4 4 4 4 4 4 4 4
21 3 4 4 4 4 4 4 4 4
22 3 4 4 4 4 4 4 4 4
23 3 4 4 4 4 4 4 4 4
24 3 4 4 4 4 4 4 4 4
25 3 4 4 4 4 4 4 4 4
26 3 4 4 4 4 4 4 4 4
27 3 4 4 4 4 4 4 4 4
28 3 4 4 4 4 4 4 4 4
29 3 4 4 4 4 4 4 4 4
30 3 4 4 4 4 4 4 4 4
31 3 4 4 4 4 4 4 4 4
32 3 4 4 4 4 4 4 4 4
33 3 4 4 4 4 4 4 4 4
34 3 4 4 4 4 4 4 4 4
35 3 4 4 4 4 4 4 4 4
36 3 4 4 4 4 4 4 4 4
37 3 4 4 4 4 4 4 4 4
38 3 4 4 4 4 4 4 4 4
39 3 4 4 4 4 4 4 4 4
40 3 4 4 4 4 4 4 4 4
41 3 4 4 4 4 4 4 4 4
42 3 4 4 4 4 4 4 4 4
43 3 4 4 4 4 4 4 4 4
44 3 4 4 4 4 4 4 4 4
45 3 4 4 4 4 4 4 4 4
46 3 4 4 4 4 4 4 4 4
47 3 4 4 4 4 4 4 4 4
48 3 4 4 4 4 4 4 4 4
49 3 4 4 4 4 4 4 4 4
50 3 4 4 4 4 4 4 4 4
11 3 5 4 4 2 0 0 0 0
12 3 5 4 4 3 1 0 0 0
13 3 5 4 4 4 2 0 0 0
14 3 5 4 4 4 3 1 0 0
15 3 5 4 4 4 4 2 0 0
16 3 5 4 4 4 4 3 1 0
17 3 5 4 4 4 4 4 2 0
18 3 5 4 4 4 4 4 3 1
19 3 5 4 4 4 4 4 4 2
20 3 5 4 4 4 4 4 4 4
21 3 5 4 4 4 4 4 4 4
22 3 5 4 4 4 4 4 4 4
23 3 5 4 4 4 4 4 4 4
24 3 5 4 4 4 4 4 4 4
25 3 5 4 4 4 4 4 4 4
26 3 5 4 4 4 4 4 4 4
27 3 5 4 4 4 4 4 4 4
28 3 5 4 4 4 4 4 4 4
29 3 5 4 4 4 4 4 4 4
30 3 5 4 4 4 4 4 4 4
31 3 5 4 4 4 4 4 4 4
32 3 5 4 4 4 4 4 4 4
33 3 5 4 4 4 4 4 4 4
34 3 5 4 4 4 4 4 4 4
35 3 5 4 4 4 4 4 4 4
36 3 5 4 4 4 4 4 4 4
37 3 5 4 4 4 4 4 4 4
38 3 5 4 4 4 4 4 4 4
39 3 5 4 4 4 4 4 4 4
40 3 5 4 4 4 4 4 4 4
41 3 5 4 4 4 4 4 4 4
42 3 5 4 4 4 4 4 4 4
43 3 5 4 4 4 4 4 4 4
44 3 5 4 4 4 4 4 4 4
45 3 5 4 4 4 4 4 4 4
46 3 5 4 4 4 4 4 4 4
47 3 5 4 4 4 4 4 4 4
48 3 5 4 4 4 4 4 4 4
49 3 5 4 4 4 4 4 4 4
50 3 5 4 4 4 4 4 4 4
80 changes: 40 additions & 40 deletions TomeAndBlood/data/level_one_cantrips/mxsplsrc.2da
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,43 +11,43 @@
8 4 6 5 3 0 0 0 0 0
9 4 6 6 4 0 0 0 0 0
10 4 6 6 5 3 0 0 0 0
11 4 6 6 6 4 0 0 0 0
12 4 6 6 6 5 3 0 0 0
13 4 6 6 6 6 4 0 0 0
14 4 6 6 6 6 5 3 0 0
15 4 6 6 6 6 6 4 0 0
16 4 6 6 6 6 6 5 3 0
17 4 6 6 6 6 6 6 4 0
18 4 6 6 6 6 6 6 5 3
19 4 6 6 6 6 6 6 6 4
20 4 6 6 6 6 6 6 6 6
21 4 6 6 6 6 6 6 6 6
22 4 6 6 6 6 6 6 6 6
23 4 6 6 6 6 6 6 6 6
24 4 6 6 6 6 6 6 6 6
25 4 6 6 6 6 6 6 6 6
26 4 6 6 6 6 6 6 6 6
27 4 6 6 6 6 6 6 6 6
28 4 6 6 6 6 6 6 6 6
29 4 6 6 6 6 6 6 6 6
30 4 6 6 6 6 6 6 6 6
31 4 6 6 6 6 6 6 6 6
32 4 6 6 6 6 6 6 6 6
33 4 6 6 6 6 6 6 6 6
34 4 6 6 6 6 6 6 6 6
35 4 6 6 6 6 6 6 6 6
36 4 6 6 6 6 6 6 6 6
37 4 6 6 6 6 6 6 6 6
38 4 6 6 6 6 6 6 6 6
39 4 6 6 6 6 6 6 6 6
40 4 6 6 6 6 6 6 6 6
41 4 6 6 6 6 6 6 6 6
42 4 6 6 6 6 6 6 6 6
43 4 6 6 6 6 6 6 6 6
44 4 6 6 6 6 6 6 6 6
45 4 6 6 6 6 6 6 6 6
46 4 6 6 6 6 6 6 6 6
47 4 6 6 6 6 6 6 6 6
48 4 6 6 6 6 6 6 6 6
49 4 6 6 6 6 6 6 6 6
50 4 6 6 6 6 6 6 6 6
11 4 7 6 6 4 0 0 0 0
12 4 7 6 6 5 3 0 0 0
13 4 7 6 6 6 4 0 0 0
14 4 7 6 6 6 5 3 0 0
15 4 7 6 6 6 6 4 0 0
16 4 7 6 6 6 6 5 3 0
17 4 7 6 6 6 6 6 4 0
18 4 7 6 6 6 6 6 5 3
19 4 7 6 6 6 6 6 6 4
20 4 7 6 6 6 6 6 6 6
21 4 7 6 6 6 6 6 6 6
22 4 7 6 6 6 6 6 6 6
23 4 7 6 6 6 6 6 6 6
24 4 7 6 6 6 6 6 6 6
25 4 7 6 6 6 6 6 6 6
26 4 7 6 6 6 6 6 6 6
27 4 7 6 6 6 6 6 6 6
28 4 7 6 6 6 6 6 6 6
29 4 7 6 6 6 6 6 6 6
30 4 7 6 6 6 6 6 6 6
31 4 7 6 6 6 6 6 6 6
32 4 7 6 6 6 6 6 6 6
33 4 7 6 6 6 6 6 6 6
34 4 7 6 6 6 6 6 6 6
35 4 7 6 6 6 6 6 6 6
36 4 7 6 6 6 6 6 6 6
37 4 7 6 6 6 6 6 6 6
38 4 7 6 6 6 6 6 6 6
39 4 7 6 6 6 6 6 6 6
40 4 7 6 6 6 6 6 6 6
41 4 7 6 6 6 6 6 6 6
42 4 7 6 6 6 6 6 6 6
43 4 7 6 6 6 6 6 6 6
44 4 7 6 6 6 6 6 6 6
45 4 7 6 6 6 6 6 6 6
46 4 7 6 6 6 6 6 6 6
47 4 7 6 6 6 6 6 6 6
48 4 7 6 6 6 6 6 6 6
49 4 7 6 6 6 6 6 6 6
50 4 7 6 6 6 6 6 6 6

0 comments on commit 3ddeb6b

Please # to comment.