Merge pull request #2 from BrianJackson/phelegethos-1.2

Phelegethos 1.2
BrianJackson · Nov 14, 2020 · 09618d8 · 09618d8
2 parents 12830bc + 7455008
commit 09618d8
Show file tree

Hide file tree

Showing 11 changed files with 213 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.zip
+*.pak
diff --git a/Mods/EldritchEdge/meta.lsx b/Mods/EldritchEdge/meta.lsx
@@ -22,7 +22,7 @@
                     <attribute id="Tags" type="LSWString" value=""/>
                     <attribute id="Type" type="FixedString" value="Add-on"/>
 					<attribute id="UUID" type="FixedString" value="3452abda-651b-4ead-9dde-9a535e225b05"/>
-					<attribute id="Version" type="int32" value="1.1"/>
+					<attribute id="Version" type="int32" value="1.2.1"/>
                     <children>
                         <node id="PublishVersion">
                             <attribute id="Version" type="int32" value="268435456"/>

diff --git a/Public/EldritchEdge/ClassDescriptions/ClassDescriptions.lsx b/Public/EldritchEdge/ClassDescriptions/ClassDescriptions.lsx
@@ -9,8 +9,8 @@
                     <attribute id="CanLearnSpells" type="bool" value="false"/>
                     <attribute id="CharacterCreationPose" type="guid" value="00000000-0000-0000-0000-000000000000"/>
                     <attribute id="ClassEquipment" type="FixedString" value=""/>
-                    <attribute id="Description" type="FixedString" value="Warlocks known as wielders of the Eldritch Edge use martial prowess combined with eldritch power to defeat their foes."/>
-                    <attribute id="DisplayName" type="FixedString" value="Eldritch Edge"/>
+                    <attribute id="Description" type="FixedString" value="Warlocks who draw power from Phelegothos, the 4th layer of the Nine Hells immolate themselves to draw power from the Pit of Flame itself. The pain they experience is a path to power, allowing them to draw strength and lifeforce from others who are burning in the hellish flames."/>
+                    <attribute id="DisplayName" type="FixedString" value="Nine Hells-Phelegothos"/>
                     <attribute id="HasGod" type="bool" value="false"/>
                     <attribute id="HpPerLevel" type="int32" value="0"/>
                     <attribute id="LearningStrategy" type="uint8" value="2"/>

diff --git a/Public/EldritchEdge/Lists/SpellLists.lsx b/Public/EldritchEdge/Lists/SpellLists.lsx
@@ -9,7 +9,7 @@
                     <attribute id="UUID" type="guid" value="b19351e6-bef1-438b-8e1f-978be5bc205e"/>
                 </node>  
                 <node id="SpellList">
-                    <attribute id="Spells" type="LSString" value="Shout_SiphoningWard;"/>
+                    <attribute id="Spells" type="LSString" value="Shout_SiphoningWard;Target_EldritchWeapon_PH;Projectile_FireFlash_PH"/>
                     <attribute id="UUID" type="guid" value="58f47339-ae18-45cf-b64a-feb2c6e9b026"/>
                 </node>  
                 <node id="SpellList">
@@ -27,7 +27,11 @@
                 <node id="SpellList">
                     <attribute id="Spells" type="LSString" value="Target_Darkness;Shout_DetectThoughts;Target_HoldPerson;Target_Invisibility;Shout_MirrorImage;Target_MistyStep;Projectile_RayOfEnfeeblement;Target_Shatter;Target_Silence;Shout_ArmorOfAgathys;Shout_ArmsOfHadar;Target_CharmPerson;Shout_ExpeditiousRetreat;Target_Hex;Target_ProtectionFromEvilAndGood;Projectile_WitchBolt"/>
                     <attribute id="UUID" type="guid" value="5bedbb55-0f8c-4a4a-aa5d-58460b453bb4"/>
-                </node> 
+                </node>
+                <node id="SpellList">
+                    <attribute id="Spells" type="LSString" value="Target_EldritchWeapon_PH;"/>
+                    <attribute id="UUID" type="guid" value="ecc4d627-c810-4bac-8e7d-9050a3a0961b"/>
+                </node>  
             </children>
         </node>
     </region>

diff --git a/Public/EldritchEdge/Progressions/Progressions.lsx b/Public/EldritchEdge/Progressions/Progressions.lsx
@@ -33,10 +33,10 @@
                 </node>
 				<node id="Progression">
                     <attribute id="AllowImprovement" type="bool" value="false"/>
-                    <attribute id="Boosts" type="LSString" value=""/>
+                    <attribute id="Boosts" type="LSString" value="Resistance(Fire, Resistant)"/>
                     <attribute id="Level" type="uint8" value="1"/>
-                    <attribute id="Name" type="LSString" value="EldritchEdge"/>
-                    <attribute id="PassivesAdded" type="LSString" value="EE_CombatTraining"/>
+                    <attribute id="Name" type="LSString" value="Phelegethos"/>
+                    <attribute id="PassivesAdded" type="LSString" value="Abilities_PH;Fiery_WardPH;Obscuring_FlamePH"/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
                     <attribute id="Selectors" type="LSString" value="AddSpells(58f47339-ae18-45cf-b64a-feb2c6e9b026,,,,AlwaysPrepared);SelectSpells(4823a292-f584-4f7f-8434-6630c72e5411,2,0,,,e9127b70-22b7-42a1-b172-d02f828f260a)"/>
@@ -47,7 +47,7 @@
                     <attribute id="AllowImprovement" type="bool" value="false"/>
                     <attribute id="Boosts" type="LSString" value=""/>
                     <attribute id="Level" type="uint8" value="2"/>
-                    <attribute id="Name" type="LSString" value="EldritchEdge"/>
+                    <attribute id="Name" type="LSString" value="Phelegethos"/>
                     <attribute id="PassivesAdded" type="LSString" value=""/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
@@ -59,7 +59,7 @@
                     <attribute id="AllowImprovement" type="bool" value="false"/>
                     <attribute id="Boosts" type="LSString" value=""/>
                     <attribute id="Level" type="uint8" value="3"/>
-                    <attribute id="Name" type="LSString" value="EldritchEdge"/>
+                    <attribute id="Name" type="LSString" value="Phelegethos"/>
                     <attribute id="PassivesAdded" type="LSString" value=""/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
@@ -71,7 +71,7 @@
                     <attribute id="AllowImprovement" type="bool" value="false"/>
                     <attribute id="Boosts" type="LSString" value=""/>
                     <attribute id="Level" type="uint8" value="4"/>
-                    <attribute id="Name" type="LSString" value="EldritchEdge"/>
+                    <attribute id="Name" type="LSString" value="Phelegethos"/>
                     <attribute id="PassivesAdded" type="LSString" value=""/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
@@ -84,7 +84,7 @@
                     <attribute id="Boosts" type="LSString" value=""/>
                     <attribute id="Level" type="uint8" value="1"/>
                     <attribute id="Name" type="LSString" value="Zanassu"/>
-                    <attribute id="PassivesAdded" type="LSString" value="ARANEA_ELDRITCH_STRIKE;PACT_OF_ZANASSU_TRAINING"/>
+                    <attribute id="PassivesAdded" type="LSString" value="ARANEA_ELDRITCH_STRIKE;PACT_OF_ZANASSU_TRAINING;"/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
                     <attribute id="Selectors" type="LSString" value="AddSpells(86cdd326-978a-4cf2-95e9-c5a3c5e936f7,,,,AlwaysPrepared);SelectSpells(3a7522d8-f1d0-4b05-b49a-8e1b1bd8fa5b,2,0,,,e9127b70-22b7-42a1-b172-d02f828f260a)"/>
@@ -96,7 +96,7 @@
                     <attribute id="Boosts" type="LSString" value=""/>
                     <attribute id="Level" type="uint8" value="2"/>
                     <attribute id="Name" type="LSString" value="Zanassu"/>
-                    <attribute id="PassivesAdded" type="LSString" value="ARANEA_AGONIZING_STRIKE"/>
+                    <attribute id="PassivesAdded" type="LSString" value=""/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
                     <attribute id="Selectors" type="LSString" value="SelectSpells(3a7522d8-f1d0-4b05-b49a-8e1b1bd8fa5b,1,1,,,e9127b70-22b7-42a1-b172-d02f828f260a)"/>
@@ -108,7 +108,7 @@
                     <attribute id="Boosts" type="LSString" value=""/>
                     <attribute id="Level" type="uint8" value="3"/>
                     <attribute id="Name" type="LSString" value="Zanassu"/>
-                    <attribute id="PassivesAdded" type="LSString" value="Entangling_Spray;ARANEA_POISON_STRIKE"/>
+                    <attribute id="PassivesAdded" type="LSString" value="Entangling_Spray;"/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
                     <attribute id="Selectors" type="LSString" value="SelectSpells(5bedbb55-0f8c-4a4a-aa5d-58460b453bb4,1,1,,,e9127b70-22b7-42a1-b172-d02f828f260a)"/>
@@ -120,13 +120,37 @@
                     <attribute id="Boosts" type="LSString" value=""/>
                     <attribute id="Level" type="uint8" value="4"/>
                     <attribute id="Name" type="LSString" value="Zanassu"/>
-                    <attribute id="PassivesAdded" type="LSString" value=""/>
+                    <attribute id="PassivesAdded" type="LSString" value="ARANEA_POISON_STRIKE_1"/>
                     <attribute id="PassivesRemoved" type="LSString" value=""/>
                     <attribute id="ProgressionType" type="uint8" value="1"/>
                     <attribute id="Selectors" type="LSString" value="SelectSpells(f5c4af9c-5d8d-4526-9057-94a4b243cd40,1,0);SelectSpells(5bedbb55-0f8c-4a4a-aa5d-58460b453bb4,1,1,,,e9127b70-22b7-42a1-b172-d02f828f260a)"/>
                     <attribute id="TableUUID" type="guid" value="5c2a60c1-9254-4f33-b5ae-9e3d7563b235"/>
                     <attribute id="UUID" type="guid" value="4886e1b0-96a5-4f91-beee-ee81d366a2b7"/>
                 </node>
+                <node id="Progression">
+                    <attribute id="AllowImprovement" type="bool" value="false"/>
+                    <attribute id="Boosts" type="LSString" value=""/>
+                    <attribute id="Level" type="uint8" value="5"/>
+                    <attribute id="Name" type="LSString" value="Zanassu"/>
+                    <attribute id="PassivesAdded" type="LSString" value="ARANEA_AGONIZING_STRIKE"/>
+                    <attribute id="PassivesRemoved" type="LSString" value=""/>
+                    <attribute id="ProgressionType" type="uint8" value="1"/>
+                    <attribute id="Selectors" type="LSString" value="SelectSpells(f5c4af9c-5d8d-4526-9057-94a4b243cd40,1,0);SelectSpells(5bedbb55-0f8c-4a4a-aa5d-58460b453bb4,1,1,,,e9127b70-22b7-42a1-b172-d02f828f260a)"/>
+                    <attribute id="TableUUID" type="guid" value="5c2a60c1-9254-4f33-b5ae-9e3d7563b235"/>
+                    <attribute id="UUID" type="guid" value="822e861a-9a26-4402-8d70-baaa97022b99"/>
+                </node>
+                <node id="Progression">
+                    <attribute id="AllowImprovement" type="bool" value="false"/>
+                    <attribute id="Boosts" type="LSString" value=""/>
+                    <attribute id="Level" type="uint8" value="6"/>
+                    <attribute id="Name" type="LSString" value="Zanassu"/>
+                    <attribute id="PassivesAdded" type="LSString" value="ARANEA_POISON_STRIKE_2;Spiderling_Spray"/>
+                    <attribute id="PassivesRemoved" type="LSString" value="ARANEA_POISON_STRIKE_1"/>
+                    <attribute id="ProgressionType" type="uint8" value="1"/>
+                    <attribute id="Selectors" type="LSString" value="SelectSpells(f5c4af9c-5d8d-4526-9057-94a4b243cd40,1,0);SelectSpells(5bedbb55-0f8c-4a4a-aa5d-58460b453bb4,1,1,,,e9127b70-22b7-42a1-b172-d02f828f260a)"/>
+                    <attribute id="TableUUID" type="guid" value="5c2a60c1-9254-4f33-b5ae-9e3d7563b235"/>
+                    <attribute id="UUID" type="guid" value="fc9ef654-1171-48b8-bcbf-18f97e12f2ad"/>
+                </node>
             </children>
         </node>
     </region>

diff --git a/Public/EldritchEdge/Stats/Generated/Data/Passive.txt b/Public/EldritchEdge/Stats/Generated/Data/Passive.txt
@@ -14,14 +14,33 @@ data "Conditions" "HasDamageEffectFlag(DamageFlags.Hit) and not FightingStyle_Gr
 data "StatsFunctors" "IF(context.HitDescription.AttackType==AttackType.MeleeWeaponAttack or context.HitDescription.AttackType==AttackType.MeleeOffHandWeaponAttack):DealDamage(max(0,CharismaModifier),Force);IF(HasPassive('Entangling_Spray', context.Source) and (context.HitDescription.AttackType==AttackType.MeleeWeaponAttack or context.HitDescription.AttackType==AttackType.MeleeOffHandWeaponAttack):DealDamage(max(0,CharismaModifier),Force);"
 data "StatsFunctorContext" "OnAttack"
 
-new entry "ARANEA_POISON_STRIKE"
+new entry "ARANEA_POISON_STRIKE_1"
+type "PassiveData"
+data "DisplayName" "Spider Venom"
+data "Description" "While Aranea Aspect is active, Eldritch Strike also deals 1d4 poison damage."
+data "Conditions" "HasDamageEffectFlag(DamageFlags.Hit) and HasStatus('ARANEA_POISON',context.Source) and not FightingStyle_GreatWeapon(context.Source)"
+data "StatsFunctors" "IF(context.HitDescription.AttackType==AttackType.MeleeWeaponAttack or context.HitDescription.AttackType==AttackType.MeleeOffHandWeaponAttack):DealDamage(1d4,Poison);"
+data "StatsFunctorContext" "OnAttack"
+
+
+new entry "ARANEA_POISON_STRIKE_2"
 type "PassiveData"
 data "DisplayName" "Spider Venom"
 data "Description" "While Aranea Aspect is active, Eldritch Strike also deals 2d4 poison damage."
 data "Conditions" "HasDamageEffectFlag(DamageFlags.Hit) and HasStatus('ARANEA_POISON',context.Source) and not FightingStyle_GreatWeapon(context.Source)"
-data "StatsFunctors" "IF(context.HitDescription.AttackType==AttackType.MeleeWeaponAttack or context.HitDescription.AttackType==AttackType.MeleeOffHandWeaponAttack):DealDamage(2d4,Poison);"
+data "StatsFunctors" "IF(context.HitDescription.AttackType==AttackType.MeleeWeaponAttack or context.HitDescription.AttackType==AttackType.MeleeOffHandWeaponAttack):DealDamage(1d4,Poison);"
+data "StatsFunctorContext" "OnAttack"
+
+
+new entry "ARANEA_POISON_STRIKE_3"
+type "PassiveData"
+data "DisplayName" "Spider Venom"
+data "Description" "While Aranea Aspect is active, Eldritch Strike also deals 3d4 poison damage."
+data "Conditions" "HasDamageEffectFlag(DamageFlags.Hit) and HasStatus('ARANEA_POISON',context.Source) and not FightingStyle_GreatWeapon(context.Source)"
+data "StatsFunctors" "IF(context.HitDescription.AttackType==AttackType.MeleeWeaponAttack or context.HitDescription.AttackType==AttackType.MeleeOffHandWeaponAttack):DealDamage(1d4,Poison);"
 data "StatsFunctorContext" "OnAttack"
 
+
 new entry "PACT_OF_ZANASSU_TRAINING"
 type "PassiveData"
 data "DisplayName" "Pact of Zanassu Training"
@@ -36,11 +55,19 @@ data "Conditions" "SpellId('Projectile_PoisonSpray') and HasDamageEffectFlag(Dam
 data "StatsFunctors" "ApplyStatus(HEX_WEB,100,2);GROUND:CreateSurface(3,3,Web)"
 data "StatsFunctorContext" "OnAttack"
 
-new entry "EE_CombatTraining"
+new entry "Spiderling_Spray"
+type "PassiveData"
+data "DisplayName" "Infested Webbing"
+data "Description" "Cursed webbing is now crawling with hundreds of tiny spiderlings that infest the target, biting and poisoning it and potentially spreading to other targets."
+data "Conditions" "SpellId('Projectile_PoisonSpray') and HasDamageEffectFlag(DamageFlags.Hit)"
+data "StatsFunctors" "ApplyStatus(SPIDER_INFESTATION,100,2)"
+data "StatsFunctorContext" "OnAttack"
+
+new entry "Abilities_PH"
 type "PassiveData"
-data "DisplayName" "Eldritch Edge Combat Training"
-data "Description" "Adepts of the Eldritch Edge are trained in the use of medium armor, shortswords, rapiers and scimitars."
-data "Boosts" "Proficiency(MediumArmor);Proficiency(Rapiers);Proficiency(ShortSwords);Proficiency(Scimitars);ProficiencyBonus(Skill,Athletics);"
+data "DisplayName" "Nine Hells - Phelegeos Abilities"
+data "Description" "Warlocks of Phelegeos practice the use of medium armor, shortswords, rapiers and scimitars."
+data "Boosts" "Proficiency(MediumArmor);Proficiency(Rapiers);Proficiency(ShortSwords);Proficiency(Scimitars);ProficiencyBonus(Skill,Arcana);"
 
 new entry "EldritchEdge_Dueling"
 type "PassiveData"
@@ -50,14 +77,21 @@ data "DescriptionParams" "RollBonus(MeleeWeaponAttack, CharismaModifier);Charact
 data "Boosts" "RollBonus(MeleeWeaponAttack, CharismaModifier);CharacterWeaponDamage(CharismaModifier);"
 data "BoostContext" "OnEquip"
 
-new entry "EldritchEdge_SiphoningWard"
+new entry "Fiery_WardPH"
 type "PassiveData"
-data "DisplayName" "Siphoning Flames"
-data "Description" "As a reaction, deal Charisma Modifer + Level to any creature that hits you in melee combat.  If the creature is hexed, you heal for the same amount. On a successful save, the attacker takes no damage."
-data "DescriptionParams" "DealDamage(CharismaModifier+Level, fire);RegainHitPoints(CharismaModifier+Level)"
-data "Conditions" "IsMeleeAttack() and HasActionResource('ReactionActionPoint', 1, 0, false, context.Source) and HasDamageEffectFlag(DamageFlags.Hit)"
-data "StatsFunctors" "UseActionResource(SELF, ReactionActionPoint,1);IF(not SavingThrow:(Ability.Dexterity, SourceSpellDC())):(DealDamage(CharismaModifier+Level, Necrotic);IF(HasStatus('PASSIVE_HEX',context.Target)):RegainHitPoints(CharismaModifier+Level));"
+data "DisplayName" "Fiery Ward"
+data "Description" "While you are burning, as a reaction, deal Charisma Modifer to any creature that hits you in melee combat.  If the creature is hexed, you heal for the same amount. On a successful save, the attacker takes no damage."
+data "DescriptionParams" "DealDamage(CharismaModifier, fire);RegainHitPoints(CharismaModifier)"
+data "Conditions" "IsMeleeAttack() and HasActionResource('ReactionActionPoint', 1, 0, false, context.Source) and HasDamageEffectFlag(DamageFlags.Hit) and HasStatus('BURNING',context.Source) and FightingStyle_Dueling(context.Source)"
+data "StatsFunctors" "UseActionResource(SELF, ReactionActionPoint,1);IF(not SavingThrow:(Ability.Dexterity, SourceSpellDC())):((DealDamage(CharismaModifier+Level, Necrotic);IF(HasStatus('PASSIVE_HEX',context.Target)):RegainHitPoints(CharismaModifier+Level)));"
 data "StatsFunctorContext" "OnAttacked"
 
 
-
+new entry "Obscuring_FlamePH"
+type "PassiveData"
+data "DisplayName" "Obscuring Flames"
+data "Description" "While you are burning, flames and smoke partially obscure you, raising your AC by 1."
+data "DescriptionParams" "DealDamage(CharismaModifier+Level, fire);RegainHitPoints(CharismaModifier+Level)"
+data "Conditions" "FightingStyle_Dueling(context.Source);HasStatus('BURNING',context.Source)"
+data "StatsFunctors" "AC(1)"
+data "StatsFunctorContext" "OnAttacked"