[Xedra Evolved] Add more changeling traits (#79312)

* Add selkie attribute traits * Some trow traits * Add beguilement spells * Add The One Who Knocks * Add further powers * Fixes * More fixes * Implement suggestions from code review * Change to recurring EoC so trow NPCs don't cause EoCsplosion
CleverRaven · Jan 28, 2025 · e433893 · e433893
1 parent b68eb06
commit e433893
Show file tree

Hide file tree

Showing 11 changed files with 491 additions and 41 deletions.
diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json
@@ -2428,6 +2428,22 @@
     "name": [ "" ],
     "desc": [ "" ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_trow_no_eating_or_sleep",
+    "//": "Hidden effect, used to give you no metabolism or sleep gain while mining",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "enchantments": [
+      {
+        "values": [
+          { "value": "METABOLISM", "multiply": -1 },
+          { "value": "THIRST", "multiply": -1 },
+          { "value": "SLEEPINESS", "multiply": -1 }
+        ]
+      }
+    ]
+  },
   {
     "type": "effect_type",
     "id": "called_daffodil",

diff --git a/data/mods/Xedra_Evolved/enchantments/armor.json b/data/mods/Xedra_Evolved/enchantments/armor.json
@@ -186,5 +186,12 @@
     "condition": { "not": "u_has_weapon" },
     "melee_damage_bonus": [ { "type": "bash", "add": { "math": [ "10 * (1 + (u_has_trait('IERDE_SKIN_3') * 0.5) )" ] } } ],
     "values": [ { "value": "ATTACK_SPEED", "multiply": 0.15 } ]
+  },
+  {
+    "id": "ench_trow_stone_fists",
+    "type": "enchantment",
+    "has": "WORN",
+    "condition": { "not": "u_has_weapon" },
+    "melee_damage_bonus": [ { "type": "bash", "add": 6 } ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json
@@ -162,7 +162,7 @@
     "volume": "500 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "material": [ "mut_wood" ],
+    "material": [ "stone" ],
     "symbol": ",",
     "color": "brown",
     "flags": [ "INTEGRATED", "SEMITANGIBLE", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "PADDED" ],
@@ -920,6 +920,23 @@
     ],
     "melee_damage": { "bash": 6 }
   },
+  {
+    "id": "integrated_trow_fists",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str_sp": "stone fists" },
+    "description": "Your thick skin and nails means your hands can be used as simple tools.  You also do slightly more damage when punching.",
+    "weight": "300 g",
+    "volume": "500 ml",
+    "price": "0 cent",
+    "price_postapoc": "0 cent",
+    "material": [ "fae_flesh" ],
+    "symbol": ",",
+    "color": "brown",
+    "flags": [ "INTEGRATED", "SEMITANGIBLE", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "PADDED" ],
+    "qualities": [ [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "PRYING_NAIL", 1 ], [ "PRY", 2 ] ],
+    "relic_data": { "passive_effects": [ { "id": "ench_trow_stone_fists" } ] }
+  },
   {
     "id": "internal_mp3_fruit",
     "type": "TOOL_ARMOR",

diff --git a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json
@@ -1157,6 +1157,64 @@
       { "u_lose_trait": "GOBLIN_FRUIT_ANIMAL_IGNORE" }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "GOBLIN_FRUIT_ANIMAL_IGNORE_ATTACK_RANGED",
+    "eoc_type": "EVENT",
+    "required_event": "character_ranged_attacks_monster",
+    "condition": {
+      "and": [
+        { "u_has_trait": "GOBLIN_FRUIT_ANIMAL_IGNORE" },
+        {
+          "or": [
+            { "npc_has_species": "MAMMAL" },
+            { "npc_has_species": "AMPHIBIAN" },
+            { "npc_has_species": "BIRD" },
+            { "npc_has_species": "REPTILE" },
+            { "npc_has_species": "FISH" },
+            { "npc_has_species": "KRAKEN" },
+            { "npc_has_species": "INSECT" },
+            { "npc_has_species": "CENTIPEDE" },
+            { "npc_has_species": "INSECT_FLYING" },
+            { "npc_has_species": "SPIDER" }
+          ]
+        }
+      ]
+    },
+    "effect": [
+      { "u_lose_trait": "GOBLIN_FRUIT_ANIMAL_IGNORE" },
+      { "u_message": "Nearby animals stop ignoring your presence.", "type": "info" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "GOBLIN_FRUIT_ANIMAL_IGNORE_ATTACK_MELEE",
+    "eoc_type": "EVENT",
+    "required_event": "character_melee_attacks_monster",
+    "condition": {
+      "and": [
+        { "u_has_trait": "GOBLIN_FRUIT_ANIMAL_IGNORE" },
+        {
+          "or": [
+            { "npc_has_species": "MAMMAL" },
+            { "npc_has_species": "AMPHIBIAN" },
+            { "npc_has_species": "BIRD" },
+            { "npc_has_species": "REPTILE" },
+            { "npc_has_species": "FISH" },
+            { "npc_has_species": "KRAKEN" },
+            { "npc_has_species": "INSECT" },
+            { "npc_has_species": "CENTIPEDE" },
+            { "npc_has_species": "INSECT_FLYING" },
+            { "npc_has_species": "SPIDER" }
+          ]
+        }
+      ]
+    },
+    "effect": [
+      { "u_lose_trait": "GOBLIN_FRUIT_ANIMAL_IGNORE" },
+      { "u_message": "Nearby animals stop ignoring your presence.", "type": "info" }
+    ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "goblin_fruit_mend_bone",

diff --git a/data/mods/Xedra_Evolved/monsters/changeling.json b/data/mods/Xedra_Evolved/monsters/changeling.json
@@ -165,7 +165,7 @@
     "description": "Nearly seven feet tall and whip thin, this warlord of the border realm of the Nether is clothed in silks and silvery tightly woven chainmail.  It glares at you and an ethereal sword manifests in its hand.",
     "default_faction": "changeling",
     "bodytype": "human",
-    "species": [ "CHANGELING" ],
+    "species": [ "CHANGELING", "CHANGELING_NOBLE" ],
     "volume": "72500 ml",
     "weight": "91500 g",
     "hp": 190,
@@ -221,7 +221,7 @@
     "description": "Shrouded in an obscuring cloak, this fae warrior is crowned with an impressive rack of antlers spreading through rents in its gossamer hood.  Two burning blue eyes are all that is visible of its features.  In one mailed hand, it holds a sword made of wood as black as ebony.",
     "default_faction": "changeling",
     "bodytype": "human",
-    "species": [ "CHANGELING" ],
+    "species": [ "CHANGELING", "CHANGELING_NOBLE" ],
     "volume": "72500 ml",
     "weight": "91500 g",
     "hp": 250,

diff --git a/data/mods/Xedra_Evolved/monsters/species.json b/data/mods/Xedra_Evolved/monsters/species.json
@@ -13,6 +13,12 @@
     "description": "a creature from under the hill",
     "fear_triggers": [ "HURT" ]
   },
+  {
+    "type": "SPECIES",
+    "id": "CHANGELING_NOBLE",
+    "description": "one of the leaders of the people under the hill",
+    "fear_triggers": [ "HURT" ]
+  },
   {
     "type": "SPECIES",
     "id": "IERDE",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/homullus_eocs.json
@@ -125,8 +125,10 @@
     "required_event": "character_wakes_up",
     "condition": {
       "and": [
-        { "u_has_trait": "HOMULLUS_DREAMWALKER" },
-        { "x_in_y_chance": { "x": { "math": [ "1 + u_has_trait('THRESH_HOMULLUS')" ] }, "y": 10 } },
+        { "or": [ { "u_has_trait": "HOMULLUS_DREAMWALKER" }, { "u_has_trait": "CHANGELING_NOBLE_DREAMWALKER" } ] },
+        {
+          "x_in_y_chance": { "x": { "math": [ "1 + u_has_trait('THRESH_HOMULLUS') + u_has_trait('THRESH_FAIR_FOLK_NOBLE')" ] }, "y": 10 }
+        },
         { "math": [ "u_characters_nearby('radius': 30, 'attitude': 'any') > 0" ] }
       ]
     },

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json
@@ -9,7 +9,7 @@
     "description": "Your skin has turned the color of manganese stained soil.  Your skin is now a purplish black.  This has no gameplay effects.",
     "types": [ "skin_tone" ],
     "leads_to": [ "IERDE_SKIN_2" ],
-    "category": [ "IERDE" ]
+    "category": [ "IERDE", "FAIR_FOLK_COMMONER_TROW" ]
   },
   {
     "type": "mutation",
@@ -20,7 +20,7 @@
     "ugliness": 3,
     "description": "Your skin has toughened and formed pebble-like growths in some places, acting as natural armor.  Somewhat reduces wet effects.",
     "types": [ "SKIN" ],
-    "category": [ "IERDE" ],
+    "category": [ "IERDE", "FAIR_FOLK_COMMONER_TROW" ],
     "prereqs": [ "IERDE_SKIN_1" ],
     "changes_to": [ "IERDE_SKIN_3" ],
     "wet_protection": [