Merge branch 'CleverRaven:master' into TE-power-draw-update

data/json/monsters/zed-pupating.json

@@ -5,6 +5,7 @@
     "name": { "str": "pupating zombie crawler" },
     "description": "This half of a human corpse is wrapped in sticky black fibers that cover everything from the neck down.  Beneath the wrapping there is a strange rhythmic movement, grotesque to behold.",
     "copy-from": "mon_zombie_crawler",
+    "species": [ "ZOMBIE" ],
     "delete": { "categories": [ "CLASSIC" ] },
     "bleed_rate": 50,
     "regenerates": 10,
@@ -33,6 +34,7 @@
     "name": { "str": "pupating zombie" },
     "description": "This human corpse is wrapped in sticky black fibers that cover everything from the neck down.  Beneath the wrapping there is a strange rhythmic movement, grotesque to behold.",
     "copy-from": "mon_zombie_fat",
+    "species": [ "ZOMBIE" ],
     "harvest": "zombie_pupating",
     "delete": { "categories": [ "CLASSIC" ] },
     "bleed_rate": 50,
@@ -62,6 +64,7 @@
     "name": { "str": "pupating brute" },
     "description": "This muscular human corpse is wrapped in sticky black fibers that cover everything from the neck down.  Beneath the wrapping there is a strange rhythmic movement, grotesque to behold.",
     "copy-from": "mon_zombie_brute",
+    "species": [ "ZOMBIE" ],
     "delete": { "categories": [ "CLASSIC" ] },
     "harvest": "zombie_pupating",
     "speed": 95,
@@ -90,6 +93,7 @@
     "name": { "str": "hive hulk" },
     "description": "The bloated torso of this gigantic corpse is wrapped in sticky black fibers.  Beneath the wrapping there is a strange rhythmic movement, grotesque to behold.",
     "copy-from": "mon_zombie_hulk",
+    "species": [ "ZOMBIE" ],
     "hp": 300,
     "speed": 85,
     "color": "white_magenta",
@@ -124,6 +128,7 @@
     "name": { "str": "shady pupating zombie" },
     "description": "An uncanny shadow envelops this creature.  You can make out the outline of what once may have been a human being, but its edges bulge rhythmically in places that are not anatomically possible for humans.",
     "copy-from": "mon_zombie_fat",
+    "species": [ "ZOMBIE" ],
     "delete": { "categories": [ "CLASSIC" ] },
     "special_attacks": [ { "type": "bite", "cooldown": 3 } ],
     "regenerates": 5,

data/json/monsters/zed-winged.json

@@ -5,6 +5,7 @@
     "name": { "str": "batwing zombie" },
     "description": "This zombie's arms have stretched far beyond human limits, the skin lengthened into a gruesome, fleshy membrane.  The mutation does not suit it well: it moves clumsily, even compared to other zombies, but can occasionally leap a significant distance.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "weight": "65200 g",
     "hp": 64,
     "color": "light_green",
@@ -41,6 +42,7 @@
     "name": { "str": "garghoul" },
     "description": "This zombie's arms have stretched far beyond human limits, the skin lengthened into a gruesome, fleshy membrane.  The rest has become emaciated, with thin, rope-like muscles ripping through taut flesh.  While it doesn't appear to be able to fly, it uses its mutated arms to make shockingly fast leaps through the air.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "diff": 2,
     "volume": "52 L",
     "weight": "41 kg",
@@ -82,7 +84,7 @@
     "type": "MONSTER",
     "name": { "str": "flesh-raptor" },
     "description": "This small, winged predator darts through the air on three thinly-haired wings that look like stretched human hands.  A sheer, jagged spike juts out from the point where the wings meet.  It looks like nothing you've seen on Earth, and yet strangely like it is made of human parts.",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "default_faction": "zombie",
     "diff": 1,
     "volume": "4 L",

data/json/monsters/zed_acid.json

@@ -21,6 +21,7 @@
     "name": { "str": "corrosive zombie" },
     "description": "This zombie has swollen to immense proportions, but still manages to hold itself together with semi-congealed acid all over its bloated, leathery body.  It moves clumsily, but spits from a large reserve of acid with uncanny accuracy.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "diff": 15,
     "volume": "108500 ml",
     "weight": "120 kg",

data/json/monsters/zed_burned.json

@@ -72,6 +72,7 @@
     "name": { "str": "fiend" },
     "description": "A monstrous burnt vaguely humanoid creature, walking around on its knuckles like a gorilla.  Tattered and blackened strands of muscle fibers dangle all around its body, with patches of fused melded skin and bone visible between.  Its forelimbs end in lengthy skeletal claws.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "volume": "875 L",
     "weight": "200 kg",
     "hp": 275,
@@ -108,6 +109,7 @@
     "type": "MONSTER",
     "description": "An oversized charred human form.  The remains of its burnt and blackened musculature are clearly visible between the cracks of the shell formed from its melted skin.  This one appears to have metal fragments sticking out of its body.",
     "copy-from": "mon_zombie_scorched_brute",
+    "species": [ "ZOMBIE" ],
     "harvest": "zombie_rust",
     "decay": "zombie_decay_bone_human_skull_rust"
   }

data/json/monsters/zed_command.json

@@ -5,6 +5,7 @@
     "name": { "str": "skeletal master" },
     "description": "A strange zombie covered in bone plates from face to toe.  Despite the added weight on its body, its movements are coordinated, almost as if capable of analyzing your movements.",
     "copy-from": "mon_zombie_master",
+    "species": [ "ZOMBIE" ],
     "hp": 90,
     "speed": 60,
     "material": [ "bone" ],
@@ -26,6 +27,7 @@
     "name": { "str": "zombie lich", "str_pl": "zombie liches" },
     "description": "A twisted visage of the human body decked in bone from head to toe.  Its vague shape is reminiscent of some tabletop monster, and it walks and watches your actions with a cold and calculating demeanor.",
     "copy-from": "mon_zombie_necro",
+    "species": [ "ZOMBIE" ],
     "speed": 70,
     "material": [ "bone" ],
     "color": "dark_gray",

data/json/monsters/zed_ferrous.json

@@ -67,6 +67,7 @@
     "name": { "str": "rust urchin" },
     "description": "A spiked horror of a zombie covered in long, rusty spikes.  A walking tetanus infection waiting to happen.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "weight": "90 kg",
     "hp": 100,
     "speed": 60,

data/json/monsters/zed_fusion.json

@@ -153,7 +153,7 @@
     "default_faction": "zombie",
     "volume": "875000 ml",
     "weight": "200 kg",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 35,
     "hp": 500,
     "speed": 100,
@@ -186,7 +186,7 @@
     "description": "Covered in grievous wounds, this wretch's gray skin has bloated to near-rupture with putrid gas.  Between lumps of unrecognizable gore, a human head lamely follows your movements with empty, black eyes.",
     "default_faction": "zombie",
     "bodytype": "human",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 5,
     "volume": "62500 ml",
     "weight": "81500 g",
@@ -218,7 +218,7 @@
     "description": "A nightmarish, spidery abomination born from human gore.  It deftly crawls between the walls and ceiling with limbs grown from its own disjointed ribs.",
     "default_faction": "zombie",
     "bodytype": "spider",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 5,
     "volume": "62500 ml",
     "weight": "81500 g",
@@ -251,7 +251,7 @@
     "description": "A corpse hideously twisted into an insect-like form.  A hollow tendril reaches out from its open thorax.",
     "default_faction": "zombie",
     "bodytype": "spider",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 14,
     "volume": "30000 ml",
     "weight": "40750 g",
@@ -298,7 +298,7 @@
     "description": "A nightmarish spider of gore standing tall among the ruins, keeping silent watch of the blighted landscape.  Its spindly limbs of bone slip between the rubble with otherworldly speed.",
     "default_faction": "zombie",
     "bodytype": "spider",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 5,
     "volume": "122500 ml",
     "weight": "81500 g",
@@ -329,7 +329,7 @@
     "description": "Great snakes of flesh hang from the ceiling above, madly thrashing and reaching about.",
     "default_faction": "zombie",
     "bodytype": "spider",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 5,
     "volume": "122500 ml",
     "weight": "81500 g",
@@ -368,7 +368,7 @@
     "default_faction": "zombie",
     "volume": "875000 ml",
     "weight": "200 kg",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 1,
     "hp": 3,
     "speed": 100,
@@ -392,7 +392,7 @@
     "default_faction": "zombie",
     "volume": "875000 ml",
     "weight": "200 kg",
-    "species": [ "ZOMBIE", "HUMAN" ],
+    "species": [ "ZOMBIE" ],
     "diff": 1,
     "hp": 3,
     "speed": 100,

data/json/monsters/zed_misc.json

@@ -152,6 +152,7 @@
     "name": { "str": "zombie wrestler" },
     "description": "A slab of festering muscle the size of a well-toned bodybuilder.  With popping and cracking sounds its arm muscles constantly lengthen and contract as it reaches out with deformed muscular hands the size of dinner plates.",
     "copy-from": "mon_zombie_brute",
+    "species": [ "ZOMBIE" ],
     "diff": 3,
     "volume": "108500 ml",
     "weight": "94500 g",
@@ -210,6 +211,7 @@
     "name": { "str": "zombie prowler" },
     "description": "Enveloped in darkness is the outline of what used to be a person, quick and spindly - and nigh invisible in the shadows.  Even with the unnatural camouflage hiding its features you can make out large teeth and even larger claws.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "looks_like": "mon_zombie_brute_ninja",
     "diff": 2,
     "hp": 160,
@@ -249,6 +251,7 @@
     "//": "Upgraded version of brainless.  Regenerating Skull with huge ears.",
     "description": "This zombie's head was once obviously destroyed, the gaps in its scraps of face now filling with a peculiar gray goo.  Human ears hang from the sides, enormous and unsettling.  Thin slits at the front suggest it may have a (very limited) sense of sight.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "volume": "62275 ml",
     "weight": "79800 g",
     "//2": "Weight and volume changed to reflect a (mostly) lack of head.",
@@ -271,6 +274,7 @@
     "name": { "str": "relentless hulk" },
     "description": "A hulking zombie swollen to the size of six men.  Its inky black eyes are locked on you.  No matter how far you run, it always seems to find you.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "diff": 5,
     "volume": "875000 ml",
     "weight": "1000 kg",
@@ -361,6 +365,7 @@
     "name": { "str": "zombie hollow" },
     "description": "This zombie's hollow black eyes survey its surroundings as it stretches and bends in ways that whoever the original body belonged to never could.  The only things that seem solid on this flexible, black-veined body are the rows of sharp, black teeth.  You get the feeling that the only human thing remaining is the skin, worn as one might wear clothes.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "hp": 100,
     "color": "black_white",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
@@ -388,6 +393,7 @@
     "name": { "str": "zombie hulk" },
     "description": "A human corpse swollen to the size of six men, with arms as wide as trash cans.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "diff": 5,
     "volume": "875 L",
     "weight": "1000 kg",
@@ -421,6 +427,7 @@
     "name": { "str": "zombie hunter" },
     "description": "You're barely able to believe this thing was ever human; it scrambles about on all fours, its nails and teeth sharpened into dangerous-looking spikes.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "hp": 90,
     "speed": 110,
     "color": "brown",
@@ -455,6 +462,7 @@
     "name": { "str": "zombie snapper" },
     "description": "With a crocodile-like snout and rows of protruding teeth, this swimwear-clad zombie lurks in the water.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "hp": 120,
     "speed": 100,
     "color": "light_green_cyan",
@@ -522,6 +530,7 @@
     "name": { "str": "zombie necromancer" },
     "description": "A twisted mockery of the human form, emaciated, with jet-black skin and glowing red eyes.  It is somehow painful to look at, awakening fears deep within your psyche, and even the surrounding air seems more sinister, somehow darker and more dangerous.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "diff": 20,
     "hp": 100,
     "speed": 100,
@@ -605,6 +614,7 @@
     "name": { "str": "fleshy hunter" },
     "description": "A zombie prowling around on all fours; its exposed muscles churn and snake, unraveling before restitching themselves elsewhere along its red-raw figure.",
     "copy-from": "mon_zombie_hunter",
+    "species": [ "ZOMBIE" ],
     "regenerates": 12,
     "color": "red_cyan",
     "upgrades": { "half_life": 35, "into": "mon_zombie_regenerating_final" },
@@ -647,6 +657,7 @@
     "name": { "str": "zombie predator" },
     "description": "With its joints in odd places and angles, this humanoid creature prowls across the landscape with surprising speed.  Its teeth and arms are sharpened into fine points, and black ooze seeps out from cuts between its muscles.",
     "copy-from": "mon_zombie_hunter",
+    "species": [ "ZOMBIE" ],
     "speed": 140,
     "color": "brown_green",
     "melee_skill": 5,
@@ -704,6 +715,7 @@
     "name": { "str": "shady zombie" },
     "description": "An uncanny shadow envelops this creature, as if light itself were too repulsed to touch it.  All you can make out is its shambling, human-shaped outline.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "color": "light_gray",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
     "vision_day": 3,

data/json/monsters/zed_skeletal.json

@@ -5,6 +5,7 @@
     "name": { "str": "skeletal zombie" },
     "description": "A monstrous overgrowth of ossified tissue has replaced this zombie's rotting skin with an organic armor of dense bone.  Large clumps of black goo seep from its joints as it shambles aimlessly, with sickening crackling sounds filling the surrounding air.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "speed": 60,
     "material": [ "bone" ],
     "color": "white",
@@ -25,6 +26,7 @@
     "name": { "str": "skeletal brute" },
     "description": "Distorted outgrowths of calcified bone plates cover this zombie's rotten skin.  Joints and cracks around its body ooze with black goo.",
     "copy-from": "mon_zombie_brute",
+    "species": [ "ZOMBIE" ],
     "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 175,
@@ -58,6 +60,7 @@
     "name": { "str": "skeletal shocker" },
     "description": "Heavy, jagged bone plates have grown out of the surface of this zombie's skin.  Underneath, its flesh glows and crackles with the occasional jolt of electricity.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "diff": 15,
     "hp": 105,
     "speed": 60,
@@ -89,6 +92,7 @@
     "name": { "str": "skeletal juggernaut" },
     "description": "This hideous golem of plated bones and misshapen flesh drags its heavy, pointed limbs behind it like an unwanted burden.  Formerly soft and vulnerable, bones grew around its form to protect it - only, they kept growing.  And growing.  And growing.",
     "copy-from": "mon_zombie_hulk",
+    "species": [ "ZOMBIE" ],
     "speed": 60,
     "material": [ "bone" ],
     "color": "white",

data/json/monsters/zed_soldiers.json

@@ -312,6 +312,7 @@
     "id": "mon_bestial_stalker",
     "type": "MONSTER",
     "copy-from": "mon_zombie_marine_upgrade",
+    "species": [ "ZOMBIE" ],
     "looks_like": "mon_zombie_marine_upgrade",
     "//": "This is a variation which will drop default military equipment, rather than specific naval uniforms and gear.",
     "description": "Lumbering about on all fours, this mutated beast's dagger-like claws clack against the ground as it predatorially moves: thick strands of exposed muscle tissue running across its rotting body.  The addition of its new bulk has caused the skin along its arms and back to split, and the brute's teeth have extended into spikes of bone.  The military insignias on the remains of the creature's pulverized gear are the only testaments to the soldier that this hulking abomination used to be.",

data/json/monsters/zed_tentacle.json

@@ -54,6 +54,7 @@
     "name": { "str": "zombie strider" },
     "description": "In front of you lies the most disgusting rendition of a starfish you've ever seen.  Not just the arms, but the legs and even the head have been horrendously deformed and stretched several meters long.  It walks around hunchback, looking through the remains of its head for its next victim.",
     "copy-from": "mon_zombie_base",
+    "species": [ "ZOMBIE" ],
     "diff": 10,
     "hp": 180,
     "speed": 60,

data/json/recipes/recipe_music_instruments.json

@@ -10,7 +10,7 @@
     "time": "620 m",
     "autolearn": true,
     "qualities": [ { "id": "LUTHIER", "level": 1 }, { "id": "SAW_W", "level": 2 }, { "id": "CHISEL_WOOD", "level": 1 } ],
-    "proficiencies": [ { "proficiency": "prof_carpentry_basic" } ],
+    "proficiencies": [ { "proficiency": "prof_carpentry_basic" }, { "proficiency": "prof_luthier_basic" } ],
     "byproducts": [ [ "splinter", 68 ] ],
     "components": [
       [ [ "tonewood", 2 ] ],
@@ -31,7 +31,7 @@
     "time": "420 m",
     "autolearn": true,
     "qualities": [ { "id": "LUTHIER", "level": 1 }, { "id": "SAW_W", "level": 2 }, { "id": "CHISEL_WOOD", "level": 1 } ],
-    "proficiencies": [ { "proficiency": "prof_carpentry_basic" } ],
+    "proficiencies": [ { "proficiency": "prof_carpentry_basic" }, { "proficiency": "prof_luthier_basic" } ],
     "byproducts": [ [ "splinter", 68 ] ],
     "components": [
       [ [ "tonewood", 3 ] ],
@@ -52,7 +52,7 @@
     "time": "720 m",
     "autolearn": true,
     "qualities": [ { "id": "LUTHIER", "level": 1 }, { "id": "SAW_W", "level": 2 }, { "id": "CHISEL_WOOD", "level": 1 } ],
-    "proficiencies": [ { "proficiency": "prof_carpentry_basic" } ],
+    "proficiencies": [ { "proficiency": "prof_carpentry_basic" }, { "proficiency": "prof_luthier_basic" } ],
     "byproducts": [ [ "splinter", 89 ] ],
     "components": [
       [ [ "tonewood", 2 ] ],

data/mods/Aftershock/EOC/monster_weakpoint_eocs.json

@@ -0,0 +1,19 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_AFS_INSTANT_DEATH",
+    "condition": "has_beta",
+    "effect": [ "npc_die" ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_AFS_REACTOR_MELTDOWN",
+    "condition": "has_beta",
+    "effect": [
+      { "npc_location_variable": { "context_val": "loc" } },
+      { "map_spawn_item": "afs_reactor_unstable", "loc": { "context_val": "loc" } },
+      { "npc_add_effect": "effect_robot_immobilized", "duration": "PERMANENT" },
+      { "u_message": "The malfunctioning reactor is ejected." }
+    ]
+  }
+]