CleverRaven · kevingranade · Jan 2, 2020 · Dec 7, 2019 · Dec 18, 2019 · Dec 18, 2019
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -704,6 +704,23 @@
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
+  {
+    "id": "flesh_plant",
+    "type": "harvest",
+    "entries": [
+      { "drop": "meat_bark", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "meat_frond", "type": "flesh", "mass_ratio": 0.5 }
+    ]
+  },
+  {
+    "id": "flesh_plant_bloom",
+    "type": "harvest",
+    "entries": [
+      { "drop": "meat_bark", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "leech_flower", "type": "flesh", "mass_ratio": 0.25 },
+      { "drop": "meat_frond", "type": "flesh", "mass_ratio": 0.5 }
+    ]
+  },
   {
     "id": "biollante",
     "type": "harvest",

diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -932,5 +932,51 @@
     "material": [ "flesh" ],
     "volume": "250 ml",
     "fun": -30
+  },
+  {
+    "id": "meat_frond",
+    "copy-from": "meat_tainted",
+    "type": "COMESTIBLE",
+    "name": "alien fronds",
+    "use_action": "POISON",
+    "description": "The fleshy fronds harvested from an alien plant.  Eating these membranous leaves and gut-like stems is likely a terrible idea, and yet they have a paradoxically pleasant and inviting sweet smell.  Might be non-vegan.",
+    "fun": 15,
+    "stim": 3,
+    "vitamins": [ [ "vitA", 6 ], [ "vitC", 2 ], [ "calcium", 0 ], [ "iron", 8 ], [ "vitB", 6 ], [ "mutant_toxin", 8 ] ]
+  },
+  {
+    "id": "leech_flower",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": "leech flower",
+    "color": "blue",
+    "weight": "10 g",
+    "volume": "250 ml",
+    "symbol": "%",
+    "spoils_in": "30 days",
+    "description": "The alien beauty of this indigo flower is betrayed by its disgustingly fleshy composition.  What from afar appear to be petals are but layered membranes of transparent veiny flesh, given color by a covering of blue iridescent ichor.  Even if it is certainly poisonous, it has a pleasant medicinal smell to it.",
+    "stim": 30,
+    "healthy": -10,
+    "fun": 15,
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "Even a close smell of this alien flower feels deeply intoxicating.",
+      "effects": [
+        { "id": "pkill3", "duration": 360 },
+        { "id": "pkill2", "duration": 810 },
+        { "id": "foodpoison", "duration": 810 },
+        { "id": "badpoison", "duration": 3600 },
+        { "id": "shakes", "duration": 810 }
+      ]
+    }
+  },
+  {
+    "id": "meat_bark",
+    "copy-from": "meat_frond",
+    "type": "COMESTIBLE",
+    "name": "leech bark",
+    "name_plural": "scraps of leech bark",
+    "description": "Dry and tough bark matter harvested from an alien plant.  It is slightly translucent, and if placed against the light you can distinguish glistening blue veins running through it.",
+    "vitamins": [ [ "vitA", 6 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 8 ], [ "vitB", 6 ], [ "mutant_toxin", 12 ] ]
   }
 ]
diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
@@ -29,5 +29,36 @@
     "range": 12,
     "dispersion": 100,
     "durability": 8
+  },
+  {
+    "id": "emp_frond",
+    "type": "GUN",
+    "symbol": "%",
+    "color": "red",
+    "name": "electric alien frond",
+    "description": "Electricity unnaturally arcs from the tips of this alien frond.",
+    "material": [ "hflesh" ],
+    "flags": [
+      "PRIMITIVE_RANGED_WEAPON",
+      "NEVER_JAMS",
+      "NONCONDUCTIVE",
+      "NO_REPAIR",
+      "WATERPROOF_GUN",
+      "NO_SALVAGE",
+      "NO_UNLOAD",
+      "NO_AMMO"
+    ],
+    "skill": "pistol",
+    "ammo_effects": [ "EMP", "LIGHTNING" ],
+    "ranged_damage": { "damage_type": "electric", "amount": 1 },
+    "weight": "540 g",
+    "volume": "750ml",
+    "bashing": 2,
+    "to_hit": 1,
+    "reload_noise_volume": 2,
+    "loudness": 2,
+    "range": 12,
+    "dispersion": 150,
+    "durability": 8
   }
 ]
diff --git a/data/json/mapgen/microlab/microlab_special_tiles.json b/data/json/mapgen/microlab/microlab_special_tiles.json
@@ -117,6 +117,49 @@
       "place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ]
     }
   },
+  {
+    "type": "mapgen",
+    "om_terrain": [ [ "microlab_generic" ] ],
+    "method": "json",
+    "object": {
+      "fill_ter": "t_strconc_floor",
+      "rows": [
+        " cc  |   c|  |c  c|r    ",
+        " cc  |   c| u|c  c|r  c ",
+        "     | h 6| k2    2u  c ",
+        " dd  |==|||  ||||||6h   ",
+        "uhd  |tt|--  -----|6uku ",
+        "|||u ||||-    uuu-||||||",
+        " c|ku|##|-DDd  ku-|hd^= ",
+        " c|u ||||-      k-| d = ",
+        " c|   uku(   u  c-|   ] ",
+        "  uk   u|-k  A  u-|=]== ",
+        "|||k    |- ukuu  -|kuk||",
+        "          u TAu   u     ",
+        " kkuu    k kuAc   2     ",
+        "||u|| uk|-uukuk  -|  |||",
+        "  kk|  Y|-kk Au  (  u|r ",
+        "cc  |    (k uu   ( uk|r ",
+        "cc  |||||-  ddd u-|  |r ",
+        "     2 r|-ku h ku-|  |r ",
+        "||2|||rr|-- u--((-|  |||",
+        "     ||||||uk||  ||  |c ",
+        "  c      6|k        k|c ",
+        "  iccc   6|          uk ",
+        "  c      6| k||22|||||  ",
+        "  c c|c   |  |    |cc   "
+      ],
+      "palettes": [ "microlab" ],
+      "terrain": { "A": "t_plut_generator" },
+      "item": { "u": { "item": "corpse" }, "k": { "item": "corpse" }, "T": { "item": "corpse" } },
+      "monster": {
+        "T": { "monster": "mon_leech_blossom" },
+        "k": { "monster": "mon_leech_pod_cluster" },
+        "u": { "monster": "mon_leech_stalk" }
+      },
+      "place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ]
+    }
+  },
   {
     "type": "mapgen",
     "om_terrain": [ [ "microlab_generic" ] ],

diff --git a/data/json/monsters/power_leech.json b/data/json/monsters/power_leech.json
@@ -0,0 +1,198 @@
+[
+  {
+    "id": "mon_leech_blossom",
+    "type": "MONSTER",
+    "name": "leech blossom",
+    "description": "A resplendent alien fern, crowned with flowers colored deep indigo.  It appears to be the centerpiece of this otherworldly bloom.",
+    "default_faction": "nether",
+    "species": [ "LEECH_PLANT" ],
+    "volume": "92500 ml",
+    "weight": "40 kg",
+    "hp": 100,
+    "speed": 100,
+    "diff": 30,
+    "material": [ "flesh" ],
+    "symbol": "K",
+    "color": "light_cyan",
+    "aggression": 100,
+    "morale": 100,
+    "armor_bash": 15,
+    "vision_day": 30,
+    "vision_night": 12,
+    "luminance": 200,
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 5,
+        "gun_type": "emp_frond",
+        "fake_skills": [ [ "gun", 3 ], [ "pistol", 3 ] ],
+        "ranges": [ [ 0, 12, "DEFAULT" ] ],
+        "targeting_sound": "a faint buzz",
+        "description": "Lightning arcs from the leech blossom!"
+      },
+      [ "LEECH_SPAWNER", 25 ],
+      [ "MON_LEECH_EVOLUTION", 40 ],
+      [ "PARROT", 40 ]
+    ],
+    "special_when_hit": [ "ZAPBACK", 100 ],
+    "death_drops": {  },
+    "death_function": [ "NORMAL" ],
+    "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "QUEEN", "HARDTOSHOOT" ]
+  },
+  {
+    "id": "mon_leech_stalk",
+    "type": "MONSTER",
+    "name": "leech stalk",
+    "description": "A resplendent and voluminous alien fern.  A faint buzzing sound emanates from it, and the shadow cast by its canopy continuously glows with electric charge.",
+    "default_faction": "nether",
+    "species": [ "LEECH_PLANT" ],
+    "volume": "30000 ml",
+    "weight": "40 kg",
+    "hp": 40,
+    "speed": 100,
+    "diff": 20,
+    "material": [ "flesh" ],
+    "symbol": "y",
+    "color": "light_blue",
+    "aggression": 100,
+    "morale": 100,
+    "armor_bash": 15,
+    "vision_day": 30,
+    "vision_night": 8,
+    "luminance": 200,
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 15,
+        "gun_type": "emp_frond",
+        "fake_skills": [ [ "gun", 2 ], [ "pistol", 2 ] ],
+        "ranges": [ [ 0, 12, "DEFAULT" ] ],
+        "targeting_sound": "a faint buzz",
+        "description": "Lightning arcs from the leech stalk!"
+      },
+      [ "MON_LEECH_EVOLUTION", 30 ]
+    ],
+    "special_when_hit": [ "ZAPBACK", 100 ],
+    "death_drops": {  },
+    "death_function": [ "NORMAL" ],
+    "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE", "HARDTOSHOOT" ]
+  },
+  {
+    "id": "mon_leech_pod_cluster",
+    "type": "MONSTER",
+    "name": "leech pod cluster",
+    "description": "The translucent egg pods of an alien plant, firmly attached by luminous rhizomes.  You can barely distinguish a root drone floating within a cloudy substance.",
+    "default_faction": "nether",
+    "species": [ "LEECH_PLANT" ],
+    "volume": "30000 ml",
+    "weight": "60 kg",
+    "hp": 40,
+    "speed": 100,
+    "diff": 20,
+    "material": [ "flesh" ],
+    "symbol": "g",
+    "color": "white",
+    "aggression": 100,
+    "morale": 100,
+    "armor_bash": 15,
+    "luminance": 60,
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 15,
+        "gun_type": "emp_frond",
+        "ranges": [ [ 0, 1, "DEFAULT" ] ],
+        "targeting_sound": "a faint buzz",
+        "description": "Lightning arcs from the pod cluster!"
+      },
+      [ "LEECH_SPAWNER", 35 ]
+    ],
+    "death_drops": {  },
+    "death_function": [ "NORMAL" ],
+    "flags": [ "SEES", "NOHEAD", "IMMOBILE", "NO_BREATHE" ]
+  },
+  {
+    "id": "mon_leech_root_runner",
+    "type": "MONSTER",
+    "name": "root runner",
+    "description": "This clump of woody vegetation hastily clambers around in a lizard-like fashion.  Three translucent scale-leaves stand tall on the backside of the creature, and the thin ridges within them periodically glow through some unknown mean.  It's seemingly a symbiote of the nearby alien ferns, and looks ready to defend them with its life.",
+    "default_faction": "nether",
+    "species": [ "LEECH_PLANT" ],
+    "volume": "4000 ml",
+    "weight": "6 kg",
+    "hp": 40,
+    "speed": 120,
+    "diff": 20,
+    "material": [ "flesh" ],
+    "symbol": "m",
+    "color": "blue",
+    "aggression": 100,
+    "morale": 100,
+    "melee_skill": 4,
+    "melee_dice": 1,
+    "melee_dice_sides": 2,
+    "armor_bash": 15,
+    "luminance": 60,
+    "vision_day": 30,
+    "vision_night": 5,
+    "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
+    "upgrades": { "half_life": 9999, "into": "mon_leech_stalk" },
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 15,
+        "gun_type": "emp_frond",
+        "fake_skills": [ [ "gun", 1 ], [ "pistol", 1 ] ],
+        "ranges": [ [ 0, 2, "DEFAULT" ] ],
+        "targeting_sound": "a faint buzz",
+        "description": "Sparks fly from the root runner!"
+      },
+      [ "EVOLVE_KILL_STRIKE", 3 ]
+    ],
+    "special_when_hit": [ "ZAPBACK", 100 ],
+    "death_drops": {  },
+    "death_function": [ "NORMAL" ],
+    "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ]
+  },
+  {
+    "id": "mon_leech_root_drone",
+    "type": "MONSTER",
+    "name": "root drone",
+    "description": "A small bulb with a beak-like protuberance, skittishly roaming about under three tendril rhizomes.  Dripping and glistening, it resembles a creature newly born rather than a sapling grown from seeds.",
+    "default_faction": "nether",
+    "species": [ "LEECH_PLANT" ],
+    "volume": "3000 ml",
+    "weight": "2 kg",
+    "hp": 40,
+    "speed": 80,
+    "material": [ "flesh" ],
+    "symbol": "p",
+    "color": "blue",
+    "aggression": 100,
+    "morale": 100,
+    "melee_skill": 2,
+    "melee_dice": 1,
+    "melee_dice_sides": 2,
+    "armor_bash": 15,
+    "luminance": 60,
+    "vision_day": 30,
+    "vision_night": 5,
+    "melee_damage": [ { "damage_type": "electric", "amount": 3 } ],
+    "upgrades": { "half_life": 999, "into": "mon_leech_pod_cluster" },
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 15,
+        "gun_type": "emp_frond",
+        "fake_skills": [ [ "gun", 1 ], [ "pistol", 1 ] ],
+        "ranges": [ [ 0, 2, "DEFAULT" ] ],
+        "targeting_sound": "a faint buzz",
+        "description": "Lightning arcs from the root pod!"
+      },
+      [ "EVOLVE_KILL_STRIKE", 6 ]
+    ],
+    "death_drops": {  },
+    "death_function": [ "NORMAL" ],
+    "flags": [ "SEES", "NOHEAD", "NO_BREATHE", "HARDTOSHOOT" ]
+  }
+]
diff --git a/data/json/species.json b/data/json/species.json
@@ -44,6 +44,11 @@
     "id": "FUNGUS",
     "fear_triggers": [ "HURT", "FIRE" ]
   },
+  {
+    "type": "SPECIES",
+    "id": "LEECH_PLANT",
+    "fear_triggers": [ "HURT", "FIRE" ]
+  },
   {
     "type": "SPECIES",
     "id": "INSECT",