Skip to content

Commit

Permalink
0.77sd10
Browse files Browse the repository at this point in the history 
fixed universal
fixed 2E spheres
  • Loading branch information
@subtledoctor
subtledoctor committed Jun 18, 2019
1 parent 0e8a27b commit 5dd3430
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 59 deletions.
2 changes: 1 addition & 1 deletion faiths_and_powers/Faiths_and_Powers.tp2
View file
Expand Up @@ -2,7 +2,7 @@ BACKUP ~faiths_and_powers/backup~
AUTHOR ~SubtleD and Grammarsalad~


VERSION ~0.77sd9~
VERSION ~0.77sd10~


//README ~faiths_and_powers/readme-pnp.html~
Expand Down
2 changes: 1 addition & 1 deletion faiths_and_powers/d5_fnp_settings.ini
View file
Expand Up @@ -17,7 +17,7 @@ END

DEFINE_ACTION_MACRO d5_2E_spheres BEGIN

OUTER_SET d5_2E_spheres = 0 // change to 1 for a conservative, 2E-style sphere system
OUTER_SET d5_2E_spheres = 1 // change to 1 for a conservative, 2E-style sphere system

END

Expand Down
77 changes: 40 additions & 37 deletions faiths_and_powers/lib/sphere_list_2E.tpa
View file
Expand Up @@ -5,31 +5,34 @@
// There can be 23 spheres at most; they must correspond to the FnP spheres
// So DO NOT change anything in the left column.

ACTION_DEFINE_ASSOCIATIVE_ARRAY sphere_name_changes BEGIN
Life => Healing
Death => Necromantic
Benediction => Creation //All is a Pseudo-sphere (universal)
Destruction => Decay
Protection => Protection
War => Combat //+ war
Exploration => Travelers
Knowledge => Divination
Deception => Wards
Thought => Thought //+ numbers
Dread => Charm
Vigor => Law
Affliction => Chaos
Animal => Animal
Plant => Plant
Earth => Earth
Air => Air
Water => Water
Fire => Fire
Light => Sun
Shadow => Shadow
Magic => Weather
Perdition => Astral //replace with something else - Time??? Cosmos??? Give Shamans the 'Astral' pseudo-sphere as normal.
END
<<<<<<<< d5/d5altsph.2da
2DA
Life Healing
Death Necromantic
Benediction Creation
Destruction Harm
Protection Protection
War Combat
Exploration Travelers
Knowledge Divination
Deception Wards
Thought Thought
Dread Charm
Vigor Law
Affliction Chaos
Animal Animal
Plant Plant
Earth Earth
Air Air
Water Water
Fire Fire
Light Sun
Shadow Shadow
Magic Weather
Perdition Astral
>>>>>>>>

COPY ~d5/d5altsph.2da~ ~override~
//____________________________________________________________________________________


Expand All @@ -49,18 +52,18 @@ ACTION_DEFINE_ASSOCIATIVE_ARRAY alt_spheres BEGIN
// those are the rules you MUST abide by if you want to change which spells are universal

//Universal/all
CLERIC_BLESS , 1 => Universal
CLERIC_CURSE , 1 => Universal
CLERIC_CHANT , 2 => Universal
CLERIC_REMOVE_CURSE , 2 => Universal
CLERIC_DISPEL_MAGIC , 3 => Universal
CLERIC_PRAYER , 3 => Universal
CLERIC_RECITATION , 4 => Universal
CLERIC_RIGHTEOUS_WRATH_OF_THE_FAITHFUL , 5 => Universal
//SR_WIZARD_DEATH_SPELL , 5 => Universal //sr banishment
CLERIC_WONDROUS_RECALL , 6 => Universal
CLERIC_HOLY_WORD , 7 => Universal
CLERIC_UNHOLY_WORD , 7 => Universal
CLERIC_BLESS , 0 => Universal
CLERIC_CURSE , 0 => Universal
CLERIC_CHANT , 0 => Universal
CLERIC_REMOVE_CURSE , 0 => Universal
CLERIC_DISPEL_MAGIC , 0 => Universal
CLERIC_PRAYER , 0 => Universal
CLERIC_RECITATION , 0 => Universal
CLERIC_RIGHTEOUS_WRATH_OF_THE_FAITHFUL , 0 => Universal
//SR_WIZARD_DEATH_SPELL , 0 => Universal //sr banishment
CLERIC_WONDROUS_RECALL , 0 => Universal
CLERIC_HOLY_WORD , 0 => Universal
CLERIC_UNHOLY_WORD , 0 => Universal

// "Healing"
CLERIC_CURE_LIGHT_WOUNDS , 1 => Healing
Expand Down
34 changes: 17 additions & 17 deletions faiths_and_powers/lib/sphere_list_base.tpa
View file
Expand Up @@ -24,14 +24,14 @@ ACTION_DEFINE_ASSOCIATIVE_ARRAY spellsphere BEGIN
// and their spell level MUST NOT be changed from the vanilla game
// those are the rules you MUST abide by if you want to change which spells are uiniversal

CLERIC_CURE_LIGHT_WOUNDS , 1 => Universal
CLERIC_RESIST_FIRE_AND_COLD , 2 => Universal
CLERIC_DISPEL_MAGIC , 3 => Universal
CLERIC_LESSER_RESTORATION , 4 => Universal
CLERIC_CURE_CRITICAL_WOUNDS , 5 => Universal
CLERIC_WONDROUS_RECALL , 6 => Universal
CLERIC_HOLY_WORD , 7 => Universal
CLERIC_UNHOLY_WORD , 7 => Universal
CLERIC_CURE_LIGHT_WOUNDS , 0 => Universal // level 1
CLERIC_HOLD_PERSON , 0 => Universal // level 2
CLERIC_DISPEL_MAGIC , 0 => Universal // level 3
CLERIC_LESSER_RESTORATION , 0 => Universal // level 4
CLERIC_CURE_CRITICAL_WOUNDS , 0 => Universal // level 5
CLERIC_WONDROUS_RECALL , 0 => Universal // level 6
CLERIC_HOLY_WORD , 0 => Universal // level 7
CLERIC_UNHOLY_WORD , 0 => Universal // level 7

// LIFE

Expand Down Expand Up @@ -77,7 +77,7 @@ CLERIC_IMPERVIOUS_SANCTITY_OF_MIND , 7 => Benediction
CLERIC_HAND_OF_CARNAGE , 1 => Destruction
//PALADIN_SMITE_EVIL , 1 => Destruction
CLERIC_CAUSE_LIGHT_WOUNDS , 1 => Destruction
CLERIC_SHATTER , 2 => Destruction
CLERIC_SHATTER , 2 => Destruction
CLERIC_CAUSE_MODERATE_WOUNDS , 2 => Destruction
CLERIC_CAUSE_MEDIUM_WOUNDS , 3 => Destruction
CLERIC_HOLY_SMITE , 3 => Destruction
Expand Down Expand Up @@ -123,7 +123,7 @@ CLERIC_SYMBOL_FEAR , 7 => War
// EXPLORATION

b_w101 , 1 => Exploration // Expeditious Retreat
CLERIC_FIND_TRAPS , 2 => Exploration
CLERIC_FIND_TRAPS , 1 => Exploration
CLERIC_FAR_SIGHT , 2 => Exploration
WIZARD_HASTE , 3 => Exploration
CLERIC_FREE_ACTION , 3 => Exploration // move higher; make new low-level version
Expand Down Expand Up @@ -184,7 +184,6 @@ CLERIC_NATURE_BEAUTY , 7 => Thought
CLERIC_CURSE , 1 => Dread
CLERIC_DOOM , 1 => Dread
CLERIC_FORBID , 2 => Dread
CLERIC_HOLD_PERSON , 3 => Dread
CLERIC_CLOAK_OF_FEAR , 3 => Dread
WIZARD_GREATER_MALISON , 4 => Dread
WIZARD_EMOTION_FEAR , 4 => Dread
Expand Down Expand Up @@ -215,7 +214,7 @@ WIZARD_RAY_OF_ENFEEBLEMENT , 2 => Affliction
CLERIC_MOLD_TOUCH , 3 => Affliction
CLERIC_POISON , 4 => Affliction
WIZARD_CONTAGION , 4 => Affliction
CLERIC_WAVES_OF_AGONY , 5 => Affliction
CLERIC_WAVES_OF_AGONY , 5 => Affliction
CLERIC_CLOUD_OF_PESTILENCE , 5 => Affliction
CLERIC_DOLOROUS_DECAY , 6 => Affliction
CLERIC_SYMBOL_OF_PAIN , 6 => Affliction
Expand All @@ -224,7 +223,7 @@ CLERIC_SYMBOL_STUN , 7 => Affliction

// ANIMAL

CLERIC_ANIMAL_EYES , 1 => Animal
CLERIC_ANIMAL_EYES , 1 => Animal
CLERIC_HOLD_ANIMAL , 1 => Animal
CLERIC_BEAST_CLAW , 2 => Animal
CLERIC_SUMMON_INSECTS , 3 => Animal
Expand All @@ -248,17 +247,17 @@ CLERIC_THORN_SPRAY , 3 => Plant
CLERIC_SNARE , 3 => Plant
CLERIC_SPIKE_GROWTH , 4 => Plant
CLERIC_CALL_WOODLAND_BEINGS , 5 => Plant
CLERIC_NATURES_WRATH , 6 => Plant
CLERIC_NATURES_WRATH , 6 => Plant
//d5pr601 /*nature's wrath*/ , 6 => Plant //commented out
CLERIC_ASSASSIN_VINES , 6 => Plant
CLERIC_ASSASSIN_VINES , 6 => Plant
CLERIC_STALKER , 7 => Plant

// EARTH

CLERIC_MAGIC_STONE , 1 => Earth
CLERIC_CAMOUFLAGE , 1 => Earth
CLERIC_PROTECTION_FROM_LIGHTNING , 2 => Earth
CLERIC_STONE_FIST , 3 => Earth
CLERIC_STONE_FIST , 3 => Earth
CLERIC_STAR_METAL_CUDGEL , 4 => Earth
CLERIC_SPIKE_STONES , 4 => Earth
CLERIC_IRONSKIN , 5 => Earth
Expand All @@ -285,6 +284,7 @@ WIZARD_DEATH_FOG , 7 => Air
// WATER

CLERIC_FROST_FINGERS , 1 => Water
CLERIC_RESIST_COLD , 1 => Water
CLERIC_WATERY_FIST , 2 => Water
CLERIC_ICE_BLADE , 2 => Water
b_w204 , 2 => Water //Snowball Swarm
Expand All @@ -300,7 +300,7 @@ b_w724 , 7 => Water //acid storm
// FIRE

WIZARD_BURNING_HANDS , 1 => Fire
//CLERIC_RESIST_FIRE , 1 => Fire
CLERIC_RESIST_FIRE , 1 => Fire
CLERIC_FLAME_BLADE , 2 => Fire
WIZARD_AGANNAZAR_SCORCHER , 2 => Fire
CLERIC_PROTECTION_FROM_FIRE , 3 => Fire
Expand Down
2 changes: 1 addition & 1 deletion faiths_and_powers/lib/sphere_list_iwd_sr.tpa
View file
Expand Up @@ -17,6 +17,7 @@ ACTION_DEFINE_ASSOCIATIVE_ARRAY spellsphere BEGIN
// those are the rules you MUST abide by if you want to change which spells are uiniversal

CLERIC_CURE_LIGHT_WOUNDS , 0 => Universal
CLERIC_HOLD_PERSON , 0 => Universal // level 2
CLERIC_RESIST_FIRE_AND_COLD , 0 => Universal
CLERIC_RESIST_ELEMENTS , 0 => Universal // sppr210 - looks like SR's C_RFaC
CLERIC_REMOVE_CURSE , 0 => Universal // SR break enchantment
Expand Down Expand Up @@ -175,7 +176,6 @@ CLERIC_NATURE_BEAUTY , 7 => Thought
CLERIC_CURSE , 1 => Dread
CLERIC_DOOM , 1 => Dread
b_c201 /*forbiddance*/ , 2 => Dread
CLERIC_HOLD_PERSON , 3 => Dread
CLERIC_CLOAK_OF_FEAR , 3 => Dread
WIZARD_GREATER_MALISON , 4 => Dread
WIZARD_EMOTION_HOPELESSNESS , 4 => Dread
Expand Down
2 changes: 1 addition & 1 deletion faiths_and_powers/lib/sphere_list_sr.tpa
View file
Expand Up @@ -17,6 +17,7 @@ ACTION_DEFINE_ASSOCIATIVE_ARRAY spellsphere BEGIN
// those are the rules you MUST abide by if you want to change which spells are uiniversal

CLERIC_CURE_LIGHT_WOUNDS , 0 => Universal // sppr103
CLERIC_HOLD_PERSON , 0 => Universal // level 2
CLERIC_RESIST_FIRE_AND_COLD , 0 => Universal // sppr210
CLERIC_RESIST_ELEMENTS , 0 => Universal // sppr210 - looks like SR's C_RFaC
CLERIC_REMOVE_CURSE , 0 => Universal // sppr307 - SR break enchantment
Expand Down Expand Up @@ -175,7 +176,6 @@ CLERIC_NATURE_BEAUTY , 7 => Thought
CLERIC_CURSE , 1 => Dread
CLERIC_DOOM , 1 => Dread
b_c201 /*forbiddance*/ , 2 => Dread
CLERIC_HOLD_PERSON , 2 => Dread
CLERIC_CLOAK_OF_FEAR , 3 => Dread
WIZARD_GREATER_MALISON , 4 => Dread
WIZARD_EMOTION_FEAR , 4 => Dread
Expand Down
23 changes: 22 additions & 1 deletion faiths_and_powers/lib/sphere_system.tpa
View file
Expand Up @@ -888,7 +888,8 @@ DEFINE_ACTION_FUNCTION universal_spells BEGIN

//finally, make sure universal spells are universal_________________________________
//
ACTION_PHP_EACH spellsphere AS spl => sph BEGIN
ACTION_IF !(FILE_EXISTS_IN_GAME ~d5altsph.2da~) BEGIN
ACTION_PHP_EACH spellsphere AS spl => sph BEGIN
ACTION_IF (~%sph%~ STRING_EQUAL_CASE ~universal~) BEGIN
ACTION_IF (FILE_CONTAINS_EVALUATED (~spell.ids~ ~%spl%~)) BEGIN
LAF RES_NUM_OF_SPELL_NAME STR_VAR spell_name = EVAL ~%spl%~ RET spell_res spell_num END
Expand All @@ -903,7 +904,27 @@ ACTION_PHP_EACH spellsphere AS spl => sph BEGIN
BUT_ONLY
END
END
END
END
ACTION_IF (FILE_EXISTS_IN_GAME ~d5altsph.2da~) BEGIN
ACTION_PHP_EACH alt_spheres AS spl => sph BEGIN
ACTION_IF (~%sph%~ STRING_EQUAL_CASE ~universal~) BEGIN
ACTION_IF (FILE_CONTAINS_EVALUATED (~spell.ids~ ~%spl%~)) BEGIN
LAF RES_NUM_OF_SPELL_NAME STR_VAR spell_name = EVAL ~%spl%~ RET spell_res spell_num END
OUTER_TEXT_SPRINT the_spell ~%spell_res%~
END
ELSE BEGIN
OUTER_TEXT_SPRINT the_spell ~%spl%~
END
ACTION_IF FILE_EXISTS_IN_GAME ~%the_spell%.spl~ BEGIN
COPY_EXISTING ~%the_spell%.spl~ ~override~
WRITE_BYTE 0x21 (THIS BAND 0b00111111)
BUT_ONLY
END
END
END
END

//__________________________________________________________________________________

END // end universal spells function
Expand Down

0 comments on commit 5dd3430

Please sign in to comment.