From cd4fe380fbb74b0b3e937f2e9629d6d78c7d13fa Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Fri, 6 Dec 2019 17:10:55 -0500
Subject: [PATCH] Afs Mi-go turrets fix (#35897)

* AFS turret fix

* Update afs_bioparts.json

* Update afs_deconstruction.json

* Update afs_robots.json
---
 data/mods/Aftershock/items/afs_bioparts.json  | 19 ++++++++++++++++++-
 data/mods/Aftershock/mobs/afs_robots.json     |  2 +-
 .../recipes/afs_deconstruction.json           |  4 ++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/afs_bioparts.json
index b23e873406192..eb43c4a03da3b 100644
--- a/data/mods/Aftershock/items/afs_bioparts.json
+++ b/data/mods/Aftershock/items/afs_bioparts.json
@@ -41,7 +41,7 @@
     "name_plural": "sensory clusters",
     "description": "This lump of flesh has various lobes protruding from it that at intervals will emit toned sounds.  Perhaps it works via echolocation. Like all mi-go bioparts the openings on this piece closed up after it was cut free and it seems to have gone into a form of hibernation with the pulses occurring slower and slower as it conserves energy.",
     "weight": "40 g",
-    "volume": "250 mL",
+    "volume": "250 ml",
     "price": 100,
     "to_hit": -1,
     "bashing": 1,
@@ -67,6 +67,23 @@
     "color": "pink",
     "looks_like": "ruined_chunks"
   },
+  {
+    "type": "GENERIC",
+    "id": "broken_afs_mon_migoturret",
+    "symbol": ",",
+    "color": "green",
+    "name": "broken mi-go turret",
+    "category": "other",
+    "description": "A broken mi-go turret.  It's leaking fluids and smells you can't identify.  Could be butchered for parts.",
+    "price": 1000,
+    "material": [ "alien_resin", "flesh" ],
+    "weight": "40750 g",
+    "volume": "30 L",
+    "bashing": 6,
+    "cutting": 6,
+    "to_hit": -3,
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
+  },
   {
     "id": "vibrating_blaster",
     "looks_like": "ar15",
diff --git a/data/mods/Aftershock/mobs/afs_robots.json b/data/mods/Aftershock/mobs/afs_robots.json
index 05dd2bb9a4387..42e052301ade5 100644
--- a/data/mods/Aftershock/mobs/afs_robots.json
+++ b/data/mods/Aftershock/mobs/afs_robots.json
@@ -25,7 +25,7 @@
       {
         "type": "gun",
         "cooldown": 1,
-        "gun_type": "laser_cannon",
+        "gun_type": "vibrating_blaster",
         "fake_skills": [ [ "gun", 2 ], [ "rifle", 3 ] ],
         "ranges": [ [ 0, 20, "DEFAULT" ] ]
       }
diff --git a/data/mods/Aftershock/recipes/afs_deconstruction.json b/data/mods/Aftershock/recipes/afs_deconstruction.json
index 72145ead92b67..23d3494fe4e61 100644
--- a/data/mods/Aftershock/recipes/afs_deconstruction.json
+++ b/data/mods/Aftershock/recipes/afs_deconstruction.json
@@ -1,6 +1,6 @@
 [
   {
-    "result": "broken_migoturret",
+    "result": "broken_afs_mon_migoturret",
     "type": "uncraft",
     "skill_used": "survival",
     "difficulty": 5,
@@ -9,7 +9,7 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "living_brain_jar", 1 ] ],
-      [ [ "brains", 4 ] ],
+      [ [ "brain", 4 ] ],
       [ [ "mutant_meat", 12 ] ],
       [ [ "vibrating_blaster", 1 ] ],
       [ [ "humming_heart", 1 ] ],