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

Commit

Permalink
0.79.27
Browse files Browse the repository at this point in the history
better spontaneous
  • Loading branch information
subtledoctor committed Aug 16, 2021
1 parent d21281e commit 648825e
Show file tree
Hide file tree
Showing 13 changed files with 4,093 additions and 1,286 deletions.
2 changes: 1 addition & 1 deletion FnP_Multiclass/FnP_Multiclass.tp2
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BACKUP ~faiths_and_powers/backup~
AUTHOR ~SubtleD and Grammarsalad~


VERSION ~0.79.26~
VERSION ~0.79.27~


ALWAYS
Expand Down
37 changes: 35 additions & 2 deletions faiths_and_powers/Faiths_and_Powers.tp2
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BACKUP ~faiths_and_powers/backup~
AUTHOR ~SubtleD and Grammarsalad~


VERSION ~0.79.26~
VERSION ~0.79.27~


//README ~faiths_and_powers/readme-pnp.html~
Expand All @@ -28,6 +28,11 @@ ALWAYS
COPY ~faiths_and_powers/d5_fnp_settings.ini~ ~override~
END

COPY_EXISTING ~d5_fnp_settings.ini~ ~override~
PATCH_IF (FILE_EXISTS_IN_GAME ~d5__5E_casting_divine.d5~) BEGIN
REPLACE_TEXTUALLY ~d5_spell_spontaneous = 1~ ~d5_spell_spontaneous = 0~
END

INCLUDE ~override/d5_fnp_settings.ini~

LAM d5_spont_option
Expand Down Expand Up @@ -287,6 +292,34 @@ COPY ~faiths_and_powers/lib/markers/d5_marker.d5~ ~override/d5__no_spheres.d5~
////////////////////////////////////////////////////////////////////////////////////////


//__________________________________________________________________________________
//__________________________________________________________________________________
//
// SPONTANEOUS CASTING OPTION
//__________________________________________________________________________________
//__________________________________________________________________________________


BEGIN @29 // install spont option
DESIGNATED 29
REQUIRE_PREDICATE (FILE_EXISTS_IN_GAME ~d5__spheres.d5~) @8
REQUIRE_PREDICATE !(FILE_EXISTS_IN_GAME ~d5__5E_casting_divine.d5~) @8

ACTION_IF NOT FILE_EXISTS ~override/d5_fnp_settings.ini~ BEGIN
COPY ~faiths_and_powers/d5_fnp_settings.ini~ ~override~
END

COPY_EXISTING ~d5_fnp_settings.ini~ ~override~
REPLACE_TEXTUALLY ~d5_spell_spontaneous = 0~ ~d5_spell_spontaneous = 1~


//__________________________________________________________________________________


////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////


//__________________________________________________________________________________
//__________________________________________________________________________________
//
Expand Down Expand Up @@ -804,7 +837,7 @@ INCLUDE ~faiths_and_powers/lib/item_usability.tpa~

BEGIN @80 // apply sphere systen
DESIGNATED 80
//INSTALL_BY_DEFAULT
INSTALL_BY_DEFAULT
REQUIRE_PREDICATE (GAME_IS ~bgee bg2ee eet iwdee~) @8
REQUIRE_PREDICATE (FILE_EXISTS_IN_GAME ~d5__spheres.d5~) @8
FORBID_COMPONENT ~faiths_and_powers.tp2~ ~24~ @8
Expand Down
1 change: 1 addition & 0 deletions faiths_and_powers/d5_fnp_settings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ DEFINE_ACTION_MACRO d5_kit_choices BEGIN
OUTER_SET cleric_tempus_spontaneous = 0
OUTER_SET priest_tempus_spontaneous = 0
OUTER_SET cleric_torm_spontaneous = 0
OUTER_SET cleric_tyr_spontaneous = 0
OUTER_SET cleric_tymora_spontaneous = 0
OUTER_SET cleric_umberlee_spontaneous = 0
OUTER_SET cleric_clangeddin_spontaneous = 0
Expand Down
1 change: 1 addition & 0 deletions faiths_and_powers/language/english/setup.tra
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@23 = ~Custom: a player-supplied custom sphere system~
@24 = ~None: no sphere system, just vanilla-style kits~
//
@29 = ~Give Divine Casters an Option to Cast Like Sorcerers~
@31 = ~Install Cleric kits~
@33 = ~Install Druid kits~
@35 = ~Install Paladin kits~
Expand Down
17 changes: 16 additions & 1 deletion faiths_and_powers/lib/default_kit_spheres.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

DEFINE_ACTION_FUNCTION vanilla_kit_spheres BEGIN

LAM d5_kit_choices

//DEFINE SPHERE ACCESS______________________________________________________________
//
ACTION_IF FILE_EXISTS_IN_GAME ~clabshgs.2da~ BEGIN
Expand Down Expand Up @@ -266,6 +268,11 @@ ACTION_IF FILE_EXISTS_IN_GAME ~ohtyr.2da~ BEGIN
class = ~cleric~
multiclass = ~fc~
END
ACTION_IF (FILE_EXISTS_IN_GAME ~d5__spheres.d5~) BEGIN
ACTION_IF (cleric_tyr_spontaneous > 0) OR (d5_spell_spontaneous > 0) BEGIN
LAF fnp_spontaneous STR_VAR kit_clab = ~ohtyr~ learn_res = ~ohtyrz~ END
END
END
END
//__________________________________________________________________________________

Expand All @@ -274,6 +281,9 @@ END
// base cleric of tempus
//
ACTION_IF FILE_EXISTS_IN_GAME ~ohtempus.2da~ BEGIN
COPY_EXISTING ~ohtempus.2da~ ~override/d5tmpus.2da~
COPY_EXISTING ~kitlist.2da~ ~override~
REPLACE_TEXTUALLY ~ohtempus~ ~d5tmpus~
LAF ~DEFINE_FNP_KIT_INFO~
INT_VAR
u_leather_armor = 1
Expand All @@ -298,10 +308,15 @@ ACTION_IF FILE_EXISTS_IN_GAME ~ohtempus.2da~ BEGIN
u_bows = 0
u_crossbows = 1
STR_VAR
clab_name = ~ohtempus~
clab_name = ~d5tmpus~
sphere_list = ~tempus_spheres~
class = ~cleric~
END
ACTION_IF (FILE_EXISTS_IN_GAME ~d5__spheres.d5~) BEGIN
ACTION_IF (cleric_tempus_spontaneous > 0) OR (d5_spell_spontaneous > 0) BEGIN
LAF fnp_spontaneous STR_VAR kit_clab = ~d5tmpus~ learn_res = ~d5tmpuz~ END
END
END
END
//__________________________________________________________________________________

Expand Down
Loading

0 comments on commit 648825e

Please sign in to comment.