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

Commit

Permalink
0.86sd6
Browse files Browse the repository at this point in the history
  • Loading branch information
@subtledoctor
subtledoctor committed Jan 18, 2024
1 parent 27e4360 commit 06913c1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
14 changes: 5 additions & 9 deletions faiths_and_powers/Faiths_and_Powers.tp2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BACKUP ~weidu_external/backup/faiths_and_powers~
AUTHOR ~SubtleD and Grammarsalad~


VERSION ~0.86sd5~
VERSION ~0.86sd6~


//README ~faiths_and_powers/readme-pnp.html~
Expand Down Expand Up @@ -308,10 +308,9 @@ INCLUDE ~override/fnp_sphere_list.tpa~

COPY ~d5/d5spsph.2da~ ~override~

COPY_EXISTING_REGEXP ~^[Ss][Pp][Pp][Rr][1-7]\([0-4][0-9]\|50\)\.spl$~ ~override~
COPY_EXISTING_REGEXP ~^[Ss][Pp][Pp][Rr][1-7][0-5a-zA-Z][0-9a-zA-Z]\.spl$~ ~override~
PATCH_IF (%SOURCE_SIZE% > 0x71) BEGIN
PATCH_IF !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR721~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR722~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR723~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR724~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR725~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR726~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR727~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR728~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR729~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR730~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR731~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR732~) BEGIN
PATCH_IF !(FILE_CONTAINS_EVALUATED (~hidespl.2da~ ~%SOURCE_RES%~)) BEGIN
PATCH_IF !(FILE_CONTAINS_EVALUATED (~hidespl.2da~ ~%SOURCE_RES%~)) OR !(~%SOURCE_RES%~ STRING_MATCHES_REGEXP ~[Ss][Pp][Pp][Rr][1-7]50~) BEGIN
READ_SHORT 0x1c ~spelltype~
PATCH_IF (~spelltype~ = 2) BEGIN
READ_BYTE 0x21 exclude
Expand All @@ -328,7 +327,6 @@ COPY_EXISTING_REGEXP ~^[Ss][Pp][Pp][Rr][1-7]\([0-4][0-9]\|50\)\.spl$~ ~override~
SPRINT $shaman_only_spells(~%SOURCE_RES%~)~1~
END
END
END
END
END
BUT_ONLY
Expand Down Expand Up @@ -425,10 +423,9 @@ INCLUDE ~override/fnp_sphere_list.tpa~

COPY ~d5/d5spsph.2da~ ~override~

COPY_EXISTING_REGEXP ~^[Ss][Pp][Pp][Rr][1-7]\([0-4][0-9]\|50\)\.spl$~ ~override~
COPY_EXISTING_REGEXP ~^[Ss][Pp][Pp][Rr][1-7][0-5a-zA-Z][0-9a-zA-Z]\.spl$~ ~override~
PATCH_IF (%SOURCE_SIZE% > 0x71) BEGIN
PATCH_IF !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR721~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR722~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR723~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR724~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR725~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR726~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR727~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR728~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR729~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR730~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR731~) AND !(~%SOURCE_RES%~ STRING_EQUAL_CASE ~SPPR732~) BEGIN
PATCH_IF !(FILE_CONTAINS_EVALUATED (~hidespl.2da~ ~%SOURCE_RES%~)) BEGIN
PATCH_IF !(FILE_CONTAINS_EVALUATED (~hidespl.2da~ ~%SOURCE_RES%~)) OR !(~%SOURCE_RES%~ STRING_MATCHES_REGEXP ~[Ss][Pp][Pp][Rr][1-7]50~) BEGIN
READ_SHORT 0x1c ~spelltype~
PATCH_IF (~spelltype~ = 2) BEGIN
READ_BYTE 0x21 exclude
Expand All @@ -445,7 +442,6 @@ COPY_EXISTING_REGEXP ~^[Ss][Pp][Pp][Rr][1-7]\([0-4][0-9]\|50\)\.spl$~ ~override~
SPRINT $shaman_only_spells(~%SOURCE_RES%~)~1~
END
END
END
END
END
BUT_ONLY
Expand Down
14 changes: 7 additions & 7 deletions faiths_and_powers/lib/spells_new_v75.tpa
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3959,7 +3959,7 @@ END

//Portrait icon: Nauseated. Update portrait icons and change to pain

ACTION_IF !(FILE_CONTAINS_EVALUATED(~spell.ids~ ~[ %TAB%]CLERIC_SYMBOL_OF_PAIN[ %TAB%%LNL%%MNL%%WNL%]~)) BEGIN
ACTION_IF !(FILE_CONTAINS_EVALUATED(~spell.ids~ ~[ %TAB%]CLERIC_SYMBOL_PAIN[ %TAB%%LNL%%MNL%%WNL%]~)) BEGIN

//Projectile
ADD_PROJECTILE ~faiths_and_powers/spheres/iwd_spells/priest_7/ICEGLYP.pro~ //projectile
Expand All @@ -3984,14 +3984,14 @@ COPY ~faiths_and_powers/spheres/iwd_spells/priest_7/EFF_P22A.WAV~ ~override~ /
COPY ~faiths_and_powers/spheres/iwd_spells/priest_7/B_P714a.eff~ ~override~ //
//secondary spell
//Spell itself
ADD_SPELL ~faiths_and_powers/spheres/iwd_spells/priest_7/b_p714.spl~ 1 7 ~CLERIC_SYMBOL_OF_PAIN~ // Spell
ADD_SPELL ~faiths_and_powers/spheres/iwd_spells/priest_7/b_p714.spl~ 1 7 ~CLERIC_SYMBOL_PAIN~ // Spell
SAY NAME1 @71400000
SAY NAME2 @71400000
SAY UNIDENTIFIED_DESC @71400001
SAY DESC @71400001
WRITE_SHORT 0x098 ~%ICEGLYP%~ //Projectile
LAF RES_NUM_OF_SPELL_NAME
STR_VAR spell_name = ~CLERIC_SYMBOL_OF_PAIN~
STR_VAR spell_name = ~CLERIC_SYMBOL_PAIN~
RET spell_res
END
COPY_EXISTING ~%spell_res%.spl~ ~override~
Expand Down Expand Up @@ -4023,7 +4023,7 @@ END
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


ACTION_IF !(FILE_CONTAINS_EVALUATED(~spell.ids~ ~[ %TAB%]CLERIC_SYMBOL_OF_HOPELESSNESS[ %TAB%%LNL%%MNL%%WNL%]~)) BEGIN
ACTION_IF !(FILE_CONTAINS_EVALUATED(~spell.ids~ ~[ %TAB%]CLERIC_SYMBOL_HOPELESSNESS[ %TAB%%LNL%%MNL%%WNL%]~)) BEGIN

//Projectile
ADD_PROJECTILE ~faiths_and_powers/spheres/iwd_spells/priest_7/b_hpless.pro~ //projectile
Expand All @@ -4046,14 +4046,14 @@ COPY ~faiths_and_powers/spheres/iwd_spells/priest_7/#EFF_E04.WAV~ ~override~ /
//effs
//secondary spell
//Spell itself
ADD_SPELL ~faiths_and_powers/spheres/iwd_spells/priest_7/b_p716.spl~ 1 7 ~CLERIC_SYMBOL_OF_HOPELESSNESS~ // Spell
ADD_SPELL ~faiths_and_powers/spheres/iwd_spells/priest_7/b_p716.spl~ 1 7 ~CLERIC_SYMBOL_HOPELESSNESS~ // Spell
SAY NAME1 @71600000
SAY NAME2 @71600000
SAY UNIDENTIFIED_DESC @71600001
SAY DESC @71600001
WRITE_SHORT 0x098 ~%b_hpless%~ //Projectile
LAF RES_NUM_OF_SPELL_NAME
STR_VAR spell_name = ~CLERIC_SYMBOL_OF_HOPELESSNESS~
STR_VAR spell_name = ~CLERIC_SYMBOL_HOPELESSNESS~
RET spell_res
END

Expand Down Expand Up @@ -4102,7 +4102,7 @@ COPY ~faiths_and_powers/spheres/iwd_spells/priest_7/#EFF_P01.WAV~ ~override~ /
//Spell itself
//First, we must copy the spell to protect from symbol of hopelessness
LAF RES_NUM_OF_SPELL_NAME
STR_VAR spell_name = ~CLERIC_SYMBOL_OF_HOPELESSNESS~
STR_VAR spell_name = ~CLERIC_SYMBOL_HOPELESSNESS~
RET spell_res
END
COPY ~faiths_and_powers/spheres/iwd_spells/priest_7/b_p733.spl~ ~override~
Expand Down

0 comments on commit 06913c1

Please sign in to comment.