[Aftershock] Frankenstein NPCs (#37908)

CleverRaven · Aug 4, 2020 · b74deeb · b74deeb
1 parent 2133107
commit b74deeb
Show file tree

Hide file tree

Showing 38 changed files with 1,787 additions and 26 deletions.
diff --git a/data/mods/Aftershock/itemgroups/bionics_groups.json b/data/mods/Aftershock/itemgroups/bionics_groups.json
@@ -9,6 +9,7 @@
       [ "afs_bio_linguistic_coprocessor", 10 ],
       [ "afs_bio_dopamine_stimulators", 10 ],
       [ "afs_bio_neurosoft_aeronautics", 5 ],
+      [ "afs_bio_skullgun", 5 ],
       [ "bio_blaster", 5 ]
     ]
   },
@@ -20,7 +21,7 @@
   {
     "id": "bionics_mil",
     "type": "item_group",
-    "items": [ [ "bio_blaster", 5 ], [ "afs_bio_neurosoft_aeronautics", 10 ] ]
+    "items": [ [ "bio_blaster", 5 ], [ "afs_bio_neurosoft_aeronautics", 10 ], [ "afs_bio_skullgun", 2 ] ]
   },
   {
     "id": "bionics_sci",
@@ -35,7 +36,8 @@
       [ "afs_bio_wind_turbine", 10 ],
       [ "afs_bio_missiles", 10 ],
       [ "afs_bio_neurosoft_aeronautics", 10 ],
-      [ "afs_bio_dopamine_stimulators", 10 ]
+      [ "afs_bio_dopamine_stimulators", 10 ],
+      [ "afs_bio_skullgun", 2 ]
     ]
   },
   {

diff --git a/data/mods/Aftershock/items/books.json b/data/mods/Aftershock/items/books.json
@@ -130,13 +130,33 @@
     "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod.  Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
     "copy-from": "schematics_generic"
   },
+  {
+    "id": "cyrus'_notes",
+    "type": "BOOK",
+    "name": { "str": "Cyrus Whateley's Notes on Repurposing mi-go victims", "str_pl": "copies of Cyrus Whateley's Notes" },
+    "description": "A folio of notes written by a madman.  They seem to suggestion ways to re-animate the dead and create various affronts to the natural order.",
+    "weight": "2063 g",
+    "volume": "2 L",
+    "price": 929200,
+    "bashing": 8,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "looks_like": "adv_chemistry",
+    "color": "light_green",
+    "skill": "firstaid",
+    "required_level": 8,
+    "max_level": 9,
+    "intelligence": 13,
+    "fun": -3,
+    "time": "50 m"
+  },
   {
     "id": "recipe_uplift",
     "type": "BOOK",
     "name": { "str": "Dr Moreau and You", "str_pl": "copies of Dr Moreau and You" },
     "description": "In what many considered a stunning example of poor taste and others considered overt specieism this text on the creation of Uplifted Animals references a story about sapient animals killing their creator.  Otherwise a dry text about genetic modification.",
     "copy-from": "textbook_atomic",
-    "skill": "cooking",
+    "skill": "chemistry",
     "required_level": 9,
     "max_level": 10
   },
@@ -152,11 +172,11 @@
     "symbol": "?",
     "looks_like": "ZSG",
     "color": "cyan",
-    "skill": "cooking",
+    "skill": "chemistry",
     "required_level": 10,
     "max_level": 10,
     "intelligence": 16,
-    "time": "15 m",
+    "time": "35 m",
     "fun": -3
   }
 ]
diff --git a/data/mods/Aftershock/items/frankenstein_items.json b/data/mods/Aftershock/items/frankenstein_items.json
@@ -0,0 +1,23 @@
+[
+  {
+    "id": "inactive_frankenstein",
+    "type": "TOOL",
+    "name": "inactive frankenstein",
+    "description": "This stitched together abomination in human form lies still and waiting for you to give it the spark of life.  In all likelihood you are the monster. ",
+    "weight": "68 kg",
+    "volume": "62 L",
+    "price": 600000,
+    "to_hit": -3,
+    "bashing": 8,
+    "material": "flesh",
+    "symbol": ";",
+    "color": "green",
+    "use_action": {
+      "type": "place_npc",
+      "npc_class_id": "frankenstein",
+      "summon_msg": "It's alive!",
+      "place_randomly": false,
+      "moves": 50
+    }
+  }
+]
diff --git a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json
@@ -5,6 +5,7 @@
     "om_terrain": [ "mortuary_2story" ],
     "weight": 100,
     "object": {
+      "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
       "fill_ter": "t_floor",
       "rows": [
         "..,,,,,...uuuu...,,,,,..",
@@ -95,6 +96,7 @@
     "om_terrain": [ "mortuary_basement" ],
     "weight": 200,
     "object": {
+      "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
       "rotation": [ 0, 3 ],
       "fill_ter": "t_rock",
       "rows": [
@@ -151,7 +153,7 @@
         "T": "t_linoleum_white",
         "8": "t_console_broken",
         "W": "t_water_dispenser",
-        "*": "t_utility_light"
+        "*": "t_thconc_floor_olight"
       },
       "liquids": { "E": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
       "furniture": {
@@ -200,6 +202,7 @@
     "method": "json",
     "om_terrain": [ "mortuary_2story_second" ],
     "object": {
+      "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
       "fill_ter": "t_floor",
       "rows": [
         "________________________",
@@ -217,12 +220,12 @@
         "__||wwww||%%%%||wwww||__",
         "__wZZil.b|%%%%|8....1|__",
         "|||ZZ..cb|%%%%|F.....w__",
-        "|&|A....b|%%%%|e.....|__",
-        "|%+......+%%%%m.....1|__",
+        "|&|A.*..b|%%%%|e.....|__",
+        "|%+......+%%%%m..*..1|__",
         "|S|D ll P|%%%%|E.....|__",
         "||||||||||:++:|h.....|__",
         "__|BB>CoC|1..t|a....1|__",
-        "__|B..*..+.*st|o.....w__",
+        "__|B..*..+.*st|o.*...w__",
         "__|TBBfiB|1..t|......|__",
         "__||||||||||||||w||w||__",
         "________________________"
@@ -241,7 +244,7 @@
         "m": "t_door_metal_c",
         "o": "t_centrifuge",
         "x": "t_console_broken",
-        "*": "t_utility_light",
+        "*": "t_floor_olight",
         "w": "t_window_bars_curtains",
         ">": "t_wood_stairs_down",
         "_": "t_open_air"
@@ -282,6 +285,16 @@
         "v": "f_ventilator",
         "Z": "f_bed"
       },
+      "items": {
+        "U": [
+          { "item": "cleaning", "chance": 30 },
+          { "item": "supplies_reagents_lab", "chance": 10 },
+          { "item": "home_hw", "chance": 50 },
+          { "item": "supplies_electronics", "chance": 50 }
+        ],
+        "B": [ { "item": "exotic_books", "chance": 70 } ],
+        "T": [ { "item": "SUS_office_filing_cabinet", "chance": 70 } ]
+      },
       "place_npcs": [ { "class": "millyficent_whately", "x": 17, "y": 14 } ]
     }
   },
@@ -333,5 +346,17 @@
         }
       ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "whately_cousin_update",
+    "object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "whately_cousin", "x": 0, "y": 0 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "whately_bioturret_update",
+    "object": { "mapgensize": [ 1, 1 ], "place_monster": [ { "monster": "mon_migoturret_whately", "x": 0, "y": 0 } ] }
   }
 ]