Skip to content

Commit d784105

Browse files
[Magiclysm] Magiclysm butchering empathy fix (#83769)
* Initial commit * Various fixes
1 parent 7f5e920 commit d784105

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

data/mods/Magiclysm/mod_interactions/xedra_evolved/traits.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"starting_trait": false,
1111
"purifiable": false,
1212
"valid": false,
13+
"empathize_with": [ "GOBLIN", "RAVENFOLK", "LIZARDFOLK", "ELF", "DWARF", "HUMAN" ],
1314
"flags": [ "HERITAGE" ]
1415
}
1516
]

data/mods/Magiclysm/monsters/zombified_fantasy_species.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"id": "mon_zombie_dwarf",
55
"name": { "str": "zombie dwarf", "str_pl": "zombie dwarves" },
66
"copy-from": "mon_zombie_tough",
7+
"species": [ "ZOMBIE", "DWARF" ],
78
"description": "Once a dwarf, this zombie now has rent flesh and a beard in tatters. Its face is twisted in an expression of rage.",
89
"proportional": { "volume": 0.7, "weight": 0.9 },
910
"speed": 65,
@@ -17,6 +18,7 @@
1718
"id": "mon_zombie_dwarf_miner",
1819
"name": { "str": "zombie dwarven miner" },
1920
"copy-from": "mon_zombie_miner",
21+
"species": [ "ZOMBIE", "DWARF" ],
2022
"description": "Once a dwarven miner, this zombie now has rent flesh and a beard in tatters. Its face is twisted in an expression of rage.",
2123
"proportional": { "hp": 1.2, "volume": 0.7, "weight": 0.9, "speed": 0.9 },
2224
"//": "Better night vision than default zombies, but not as good as living dwarves, and worse day vision.",
@@ -29,6 +31,7 @@
2931
"id": "mon_zombie_elf",
3032
"name": { "str": "zombie elf", "str_pl": "zombie elves" },
3133
"copy-from": "mon_zombie",
34+
"species": [ "ZOMBIE", "ELF" ],
3235
"description": "Its face twisted in an expression of pure rage and with glassy eyes, this elf looks nothing like the ethereal elves from before the Cataclysm. Though it also lacks the elves' characteristic grace, its movements are quieter than the other dead.",
3336
"proportional": { "hp": 0.82, "speed": 1.03, "weight": 0.85 },
3437
"//": "Better night vision than default zombies, but not as good as living elves.",
@@ -116,15 +119,15 @@
116119
],
117120
"vision_day": 35,
118121
"death_drops": "feral_ravenfolk_death_drops",
119-
"upgrades": { "half_life": 360, "into_group": "GROUP_ZOMBIE_RAVENFOLK_UPGRADE" }
122+
"upgrades": { "half_life": 120, "into_group": "GROUP_ZOMBIE_RAVENFOLK_UPGRADE" }
120123
},
121124
{
122125
"id": "mon_zombie_lizardfolk",
123126
"copy-from": "mon_zombie",
124127
"type": "MONSTER",
125128
"name": { "str_sp": "zombie lizardfolk" },
126129
"description": "A proud servant of dragons reduced to a walking corpse, this lizardfolk's scales are streaked with grime and its black eyes burn with rage. It has not lost its teeth and claws in the transition to undeath.",
127-
"species": [ "LIZARDFOLK" ],
130+
"species": [ "LIZARDFOLK", "ZOMBIE" ],
128131
"volume": "80 L",
129132
"weight": "100 kg",
130133
"weakpoint_sets": [ "wps_humanoid_body" ],

data/mods/Magiclysm/mutations/mutation_paths/fantasy_species.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"points": 1,
1414
"visibility": 2,
1515
"description": "Elves might say you are short-lived, and goblins might say you are strong, but the one thing humans really are is tenacious. Hopefully that will serve you well after the Cataclysm.",
16+
"empathize_with": [ "GOBLIN", "RAVENFOLK", "LIZARDFOLK", "ELF", "DWARF", "HUMAN" ],
1617
"flags": [ "HERITAGE" ]
1718
},
1819
{
@@ -183,6 +184,7 @@
183184
"ugliness": 0,
184185
"description": "Dwarves are smaller than humans, the better to deal with confined spaces underground, but as solid as the mountains (+2 STR, -1 DEX).",
185186
"category": [ "SPECIES_DWARF" ],
187+
"empathize_with": [ "GOBLIN", "RAVENFOLK", "LIZARDFOLK", "ELF", "DWARF", "HUMAN" ],
186188
"enchantments": [
187189
{
188190
"values": [
@@ -328,6 +330,7 @@
328330
"description": "Elves are more lithe and frail than humans, but possess an almost otherworldly grace (-1 STR, +2 DEX).",
329331
"category": [ "SPECIES_ELF" ],
330332
"threshreq": [ "THRESH_SPECIES_ELF" ],
333+
"empathize_with": [ "GOBLIN", "RAVENFOLK", "LIZARDFOLK", "ELF", "DWARF", "HUMAN" ],
331334
"enchantments": [
332335
{
333336
"condition": "ALWAYS",
@@ -552,6 +555,7 @@
552555
"category": [ "SPECIES_GOBLIN" ],
553556
"anger_relations": [ [ "WARG", -90 ] ],
554557
"spells_learned": [ [ "goblin_tame_warg_spell", 1 ] ],
558+
"empathize_with": [ "GOBLIN", "RAVENFOLK", "LIZARDFOLK", "ELF", "DWARF", "HUMAN" ],
555559
"enchantments": [
556560
{
557561
"values": [
@@ -653,6 +657,7 @@
653657
"ugliness": 0,
654658
"description": "Lizardfolk are taller and stronger than humans but not much thicker and are surprisingly fast for their size (+1 STR, +1 DEX).",
655659
"category": [ "SPECIES_LIZARDFOLK" ],
660+
"empathize_with": [ "GOBLIN", "RAVENFOLK", "LIZARDFOLK", "ELF", "DWARF", "HUMAN" ],
656661
"enchantments": [
657662
{ "condition": { "u_has_trait": "SLIT_NOSTRILS" }, "encumbrance_modifier": [ { "part": "mouth", "add": -10 } ] },
658663
{ "condition": { "u_has_trait": "SCALES" }, "encumbrance_modifier": [ { "part": "mouth", "add": -1 } ] },
@@ -788,6 +793,7 @@
788793
"description": "Ravenfolk are about the same size as humans, though their feathers and wings obviously set them apart.",
789794
"category": [ "SPECIES_RAVENFOLK" ],
790795
"enchantments": [ { "values": [ { "value": "WEIGHT", "multiply": -0.25 } ] } ],
796+
"empathize_with": [ "GOBLIN", "RAVENFOLK", "LIZARDFOLK", "ELF", "DWARF", "HUMAN" ],
791797
"flags": [ "HERITAGE" ]
792798
},
793799
{

0 commit comments

Comments
 (0)