From 7068aa67c7732a7bf70ab82e9addbae50b2a2ed7 Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Wed, 9 Aug 2023 18:47:19 -0600 Subject: [PATCH 1/5] Spriggans --- .../ESCP_BodyDefs_Spriggan.xml | 53 ++ .../ESCP_ThingDef_Spriggan.xml | 577 ++++++++++++++++++ 2 files changed, 630 insertions(+) create mode 100644 Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml create mode 100644 Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml diff --git a/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml new file mode 100644 index 0000000000..4ad3adfb0d --- /dev/null +++ b/Patches/ESCP - Spriggans/ESCP_BodyDefs_Spriggan.xml @@ -0,0 +1,53 @@ + + + + + +
  • ESCP - Spriggan
    • +     + + + + + + +
  • + + Defs/BodyDef[defName="ECP_Spriggan"]//*[ + def="Body" or + def="Ear" or + def="Nose" or + def="Neck" or + def="Leg"] + + + + +
    • + +
  • + + Defs/BodyDef[defName="ECP_Spriggan"]//*[ + def="Body" or + def="Neck" or + def="Head" or + def="Ear" or + def="Nose" or + def="AnimalJaw" or + def="Shoulder" or + def="Arm" or + def="Hand" or + def="FrontClaw" or + def="Leg" or + def="Foot"]/groups + + +
  • CoveredByNaturalArmor
    • + + + +     +     +     + +     \ No newline at end of file diff --git a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml new file mode 100644 index 0000000000..e0d7bbece7 --- /dev/null +++ b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml @@ -0,0 +1,577 @@ + + + + +
  • ESCP - Spriggan
    • +     + + + + + +
  • + Defs/ThingDef[@Name="ESCP_SprigganThingBase"]/tools +
    • + +
  • + Defs/ThingDef[@Name="ESCP_SprigganThingBase"] + +
  • + Humanoid +
    • + + + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"]/statBases + + 0.18 + 0.33 + 0.33 + +
    • + +
  • + Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"] + + +
  • + + +
  • Scratch
    • + + 22 + 1.7 + FrontLeftClaws + + +
  • + Stun + 14 +
    • +     +     + 1.75 + 14 + +
  • + + +
  • Scratch
    • + + 22 + 1.7 + FrontRightClaws + + +
  • + Stun + 14 +
    • +     +     + 1.8 + 14 + +
  • + + +
  • Blunt
    • + + 11 + 2 + HeadAttackTool + 8 + 0.2 + + + + + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/statBases + + 0.18 + 0.33 + 0.33 + +
    • + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/tools + + +
  • + + +
  • Scratch
    • +
  • ScratchToxic
    • + + 22 + 1.7 + FrontLeftClaws + + +
  • + Stun + 14 +
    • +     +     + 1.75 + 14 + +
  • + + +
  • Scratch
    • +
  • ScratchToxic
    • + + 22 + 1.7 + FrontRightClaws + + +
  • + Stun + 14 +
    • +     +     + 1.8 + 14 + +
  • + + +
  • Blunt
    • + + 11 + 2 + HeadAttackTool + 8 + 0.2 + + + + + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/statBases + + 0.18 + 0.33 + 0.33 + +
    • + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/tools + + +
  • + + +
  • Scratch
    • + + 22 + 1.7 + FrontLeftClaws + +
  • + Flame + 10 + 0.2 +
    • +     + + +
  • + Stun + 14 +
    • +     +     + 1.75 + 14 + +
  • + + +
  • Scratch
    • + + 22 + 1.7 + FrontRightClaws + +
  • + Flame + 10 + 0.2 +
    • +     + + +
  • + Stun + 14 +
    • +     +     + 1.8 + 14 + +
  • + + +
  • Blunt
    • + + 11 + 2 + HeadAttackTool + 8 + 0.2 + + + + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/verbs +
    • + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/statBases + + 0.2 + 0.58 + 0.66 + +
    • + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/tools + + +
  • + + +
  • Scratch
    • + + 26 + 1.6 + FrontLeftClaws + + +
  • + Stun + 14 +
    • +     +     + 2.4 + 17 + +
  • + + +
  • Scratch
    • +
  • Blunt
    • + + 26 + 1.6 + FrontRightClaws + + +
  • + Stun + 14 +
    • +     +     + 2.4 + 17 + +
  • + +
  • Bite
    • + + 24 + 1.9 + Teeth + 0.7 + + +
  • + Stun + 14 +
    • +     +     + 2.8 + 17 + +
  • + + +
  • Blunt
    • + + 8 + 2 + HeadAttackTool + 1 + 0.2 + + + + + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/statBases + + 0.2 + 0.58 + 0.66 + +
    • + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/tools + + +
  • + + +
  • Scratch
    • + + 26 + 1.6 + FrontLeftClaws + + +
  • + Stun + 14 +
    • +     +     + 2.4 + 17 + +
  • + + +
  • Scratch
    • +
  • Blunt
    • + + 26 + 1.6 + FrontRightClaws + + +
  • + Stun + 14 +
    • +     +     + 2.4 + 17 + +
  • + +
  • Bite
    • + + 24 + 1.9 + Teeth + 0.7 + + +
  • + Stun + 14 +
    • +     +     + 2.8 + 17 + +
  • + + +
  • Blunt
    • + + 8 + 2 + HeadAttackTool + 1 + 0.2 + + + + + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Thorni"]/statBases + + 0.18 + 0.33 + 0.33 + +
    • + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Thorni"]/tools + + +
  • + + +
  • Scratch
    • + + 13 + 1.45 + FrontLeftClaws + + +
  • + Stun + 14 +
    • +     +     + 0.5 + 5 + +
  • + + +
  • Scratch
    • + + 13 + 1.45 + FrontRightClaws + + +
  • + Stun + 14 +
    • +     +     + 0.5 + 5 + +
  • + +
  • Bite
    • + + 14 + 1.85 + Teeth + 0.7 + + +
  • + Stun + 14 +
    • +     +     + 0.8 + 5 + +
  • + + +
  • Blunt
    • + + 6 + 2 + HeadAttackTool + 4 + 0.2 + + + + + + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/statBases + + 0.18 + 0.33 + 0.33 + +
    • + +
  • + Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/tools + + +
  • + + +
  • Scratch
    • + + 22 + 1.7 + FrontLeftClaws + + +
  • + Stun + 14 +
    • +     +     + 1.75 + 14 + +
  • + + +
  • Scratch
    • + + 22 + 1.7 + FrontRightClaws + + +
  • + Stun + 14 +
    • +     +     + 1.8 + 14 + +
  • + + +
  • Blunt
    • + + 11 + 2 + HeadAttackTool + 8 + 0.2 + + + + + +     +     +     + +     \ No newline at end of file From 25453613f39432780f3ad2f98bb8d4bdfd7bcf63 Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Tue, 22 Aug 2023 19:46:10 -0600 Subject: [PATCH 2/5] housekeeping --- .../ESCP_ThingDef_Spriggan.xml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml index e0d7bbece7..084c87c335 100644 --- a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml +++ b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml @@ -1,10 +1,10 @@ +
  • ESCP - Spriggan
    •  - @@ -21,7 +21,7 @@ - +
  • Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"]/statBases @@ -31,7 +31,7 @@ 0.33
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan" or defName="ESCP_Spriggan_Anima" or defName="ESCP_Spriggan_Parasol"] @@ -88,7 +88,7 @@
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/statBases @@ -98,7 +98,7 @@ 0.33
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Bog"]/tools @@ -157,7 +157,7 @@
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/statBases @@ -167,7 +167,7 @@ 0.33
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/tools @@ -238,11 +238,11 @@
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/verbs
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/statBases @@ -252,7 +252,7 @@ 0.66
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_EarthMother"]/tools @@ -329,7 +329,7 @@
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/statBases @@ -339,7 +339,7 @@ 0.66
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Matron"]/tools @@ -416,7 +416,7 @@
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Thorni"]/statBases @@ -502,7 +502,7 @@
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/statBases @@ -512,7 +512,7 @@ 0.33
    • - +
  • Defs/ThingDef[defName="ESCP_Spriggan_Tundra"]/tools @@ -573,5 +573,5 @@ - + \ No newline at end of file From 6a4f61d3b16db6258868ec92f543f66e666a0141 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 23 Aug 2023 09:51:42 +0330 Subject: [PATCH 3/5] ESCP - Spriggan housekeeping --- Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml | 5 +++-- SupportedThirdPartyMods.md | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml index 084c87c335..63b8ff0903 100644 --- a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml +++ b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml @@ -5,12 +5,13 @@
  • ESCP - Spriggan
    • +
  • - Defs/ThingDef[@Name="ESCP_SprigganThingBase"]/tools + Defs/ThingDef[@Name="ESCP_SprigganThingBase"]/tools
  • @@ -240,7 +241,7 @@
  • - Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/verbs + Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/verbs
    • diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 00459c2daf..d33223ee37 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -192,6 +192,7 @@ Erin's Mountain Animals | Erin's Sephyr | Erin's Shisune | Erin's Viera | +ESCP - Spriggan | ESCP - Trolls | EvolvedOrgansRedux | Exotic Arsenal | From 8c900d9cf1c59f2ec96c7389e6a05f68e93b65c4 Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Wed, 23 Aug 2023 17:54:09 -0600 Subject: [PATCH 4/5] Patching missing fireball --- .../ESCP_Projectiles_Spriggan.xml | 38 +++++++++++++++++++ .../ESCP_ThingDef_Spriggan.xml | 18 ++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml diff --git a/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml new file mode 100644 index 0000000000..841d035304 --- /dev/null +++ b/Patches/ESCP - Spriggans/ESCP_Projectiles_Spriggan.xml @@ -0,0 +1,38 @@ + + + + + +
  • ESCP - Spriggan
    • +     + + + + + +
  • + Defs/ThingDef[defName="ESCP_SprigganFireball"]/thingClass + + CombatExtended.BulletCE + +
    • + +
  • + Defs/ThingDef[defName="ESCP_SprigganFireball"]/projectile + + + false + Flame + 10 + 50 + true + + +
    • + +     +     + +     + +     \ No newline at end of file diff --git a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml index 63b8ff0903..bffb4bdef4 100644 --- a/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml +++ b/Patches/ESCP - Spriggans/ESCP_ThingDef_Spriggan.xml @@ -240,8 +240,23 @@ -
  • +
  • Defs/ThingDef[defName="ESCP_Spriggan_Burnt"]/verbs + + +
  • + CombatExtended.Verb_ShootCE + true + ESCP_SprigganFireball + 1.8 + 19.9 + 2 + ESCP_Spriggan_Fireball + 9 + +
    • + + @@ -573,6 +588,7 @@     +     \ No newline at end of file From 281405b2d13cb4743e17bd649c58f3e2178224b8 Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:02:59 -0600 Subject: [PATCH 5/5] Patch Spriggan Scenario --- .../ESCP_Spriggan_Scenario.xml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml diff --git a/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml b/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml new file mode 100644 index 0000000000..033f16b0a7 --- /dev/null +++ b/Patches/ESCP - Spriggans/ESCP_Spriggan_Scenario.xml @@ -0,0 +1,27 @@ + + + + + +
  • Combat Extended
    • +     + + + + +
  • + Defs/ScenarioDef[defName="ESCP_SprigganScenario"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Stone + 100 +
    • + + + +     +     +     + +     \ No newline at end of file