Merge pull request #85 from chaosvolt/location-overhaul-part-2

Location Overhaul Part 2: The Unknown Lab
Noctifer-de-Mortem · Mar 25, 2019 · 11c7e01 · 11c7e01
2 parents f19afac + 2356546
commit 11c7e01
Show file tree

Hide file tree

Showing 12 changed files with 1,106 additions and 245 deletions.
diff --git a/Monsters/c_monster_factions.json b/Monsters/c_monster_factions.json
@@ -0,0 +1,20 @@
+[
+  {
+    "type": "MONSTER_FACTION",
+    "name": "super_soldat",
+    "base_faction": "zombie",
+    "friendly": [ "military" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "fbio_weapon",
+    "friendly": [ "military" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "military",
+    "base_faction": "bot",
+    "neutral": [ "bot", "small_animal" ],
+    "friendly": [ "super_soldat", "fbio_weapon" ]
+  }
+]
diff --git a/Monsters/c_monsters.json b/Monsters/c_monsters.json
@@ -3,7 +3,7 @@
     "id": "mon_zombie_failed_weapon",
     "type": "MONSTER",
     "name": "zombie failed Bio-Weapon",
-    "description": "A zombie bionic mutant. One of the more 'enhanced' zombies. Dangerous on its own but even more so in groups.",
+    "description": "A zombie bionic mutant.  One of the more enhanced zombies.  Dangerous on its own but even more so in groups.",
     "default_faction": "zombie",
     "species": [ "ZOMBIE" ],
     "diff": 25,
@@ -40,7 +40,6 @@
       "STUMBLES",
       "POISON",
       "ELECTRIC",
-      "ATTACKMON",
       "BASHES",
       "GROUP_BASH",
       "NO_BREATHE",
@@ -52,7 +51,7 @@
     "id": "mon_failed_weapon",
     "type": "MONSTER",
     "name": "failed Bio-Weapon",
-    "description": "A walking bionic mutant. Deformed from its 'enhancements', and jealous of your existence, it hunts and kills whatever it finds.",
+    "description": "A walking bionic mutant.  Deformed from its \"enhancements\", and jealous of your existence, it hunts and kills whatever it finds.",
     "default_faction": "fbio-weapon",
     "species": [ "FBIO-WEAPON" ],
     "diff": 25,
@@ -88,7 +87,6 @@
       "WARM",
       "HUMAN",
       "ELECTRIC",
-      "ATTACKMON",
       "BASHES",
       "GROUP_BASH",
       "PATH_AVOID_DANGER_2"
@@ -98,7 +96,7 @@
     "id": "hulk_weapon",
     "type": "MONSTER",
     "name": "Bio-Weapon Apophis",
-    "description": "The ultimate bionic mutant.  Only god knows why it exists.  With incredible power, armor and bionics on its side, victory won't come easy.",
+    "description": "The ultimate bionic mutant.  Only God knows why it exists.  With incredible power, armor and bionics on its side, victory won't come easy.",
     "default_faction": "fbio-weapon",
     "species": [ "BIO-WEAPON" ],
     "diff": 75,
@@ -161,7 +159,6 @@
       "SMELLS",
       "WARM",
       "HUMAN",
-      "ATTACKMON",
       "PUSH_MON",
       "ELECTRIC",
       "GRABS",
@@ -232,8 +229,8 @@
     "type": "MONSTER",
     "looks_like": "mon_zombie_bio_infantry",
     "name": "zombie super soldier",
-    "description": "A zombie of a former member of the military. This one wields a particular rifle and bionics and appears to know how to use them.",
-    "default_faction": "zombie",
+    "description": "A zombie of a former member of the military.  This one wields a particular rifle and bionics and appears to know how to use them.",
+    "default_faction": "super_soldat",
     "species": [ "ZOMBIE" ],
     "diff": 25,
     "size": "MEDIUM",
@@ -287,15 +284,15 @@
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_drops": "wild_bio_infantry_rifle",
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "BASHES", "NO_BREATHE", "FILTHY", "PATH_AVOID_DANGER_1" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "NO_BREATHE", "FILTHY", "PATH_AVOID_DANGER_1" ]
   },
   {
     "id": "mon_zombie_bio_infantry_shotgun",
     "type": "MONSTER",
     "looks_like": "mon_zombie_bio_infantry",
     "name": "zombie super soldier",
-    "description": "A zombie of a former member of the military. This one wields a particular shotgun and bionics and appears to know how to use them.",
-    "default_faction": "zombie",
+    "description": "A zombie of a former member of the military.  This one wields a particular shotgun and bionics and appears to know how to use them.",
+    "default_faction": "super_soldat",
     "species": [ "ZOMBIE" ],
     "diff": 25,
     "size": "MEDIUM",
@@ -349,15 +346,15 @@
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_drops": "wild_bio_infantry_shotgun",
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "BASHES", "NO_BREATHE", "FILTHY", "PATH_AVOID_DANGER_1" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "NO_BREATHE", "FILTHY", "PATH_AVOID_DANGER_1" ]
   },
   {
     "id": "mon_zombie_bio_knight_lmg",
     "type": "MONSTER",
     "looks_like": "mon_zombie_bio_knight",
-    "name": "zombie super jauggernaut",
-    "description": "A zombie of a former member of the military. This one wields a particular LMG, bionics and armor and appears to know how to use them.",
-    "default_faction": "zombie",
+    "name": "zombie super juggernaut",
+    "description": "A zombie of a former member of the military.  This one wields a particular LMG, bionics, and armor, and appears to know how to use them.",
+    "default_faction": "super_soldat",
     "species": [ "ZOMBIE" ],
     "diff": 25,
     "size": "MEDIUM",
@@ -399,7 +396,7 @@
         "targeting_cost": 200,
         "targeting_sound": "swoosh...click!",
         "targeting_volume": 20,
-        "description": "The super soldier fires its lmg!",
+        "description": "The super soldier fires its LMG!",
         "no_ammo_sound": "beep-beep-beep!"
       },
       [ "GRAB", 5 ],
@@ -411,15 +408,15 @@
     "anger_triggers": [ "HURT", "PLAYER_CLOSE" ],
     "death_drops": "wild_bio_knight_lmg",
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "REGENERATES_50", "HEARS", "SMELLS", "POISON", "BASHES", "NO_BREATHE", "BONES", "FILTHY", "REGEN_MORALE" ]
+    "flags": [ "SEES", "REGENERATES_50", "HEARS", "SMELLS", "POISON", "NO_BREATHE", "BONES", "FILTHY", "REGEN_MORALE" ]
   },
   {
     "id": "mon_zombie_bio_knight_lauhcher",
     "type": "MONSTER",
     "looks_like": "mon_zombie_bio_knight",
-    "name": "zombie super jauggernaut",
-    "description": "A zombie of a former member of the military. This one wields a particular launcher, bionics and armor and appears to know how to use them.",
-    "default_faction": "zombie",
+    "name": "zombie super juggernaut",
+    "description": "A zombie of a former member of the military.  This one wields a particular launcher, bionics, and armor,  and appears to know how to use them.  Run.",
+    "default_faction": "super_soldat",
     "species": [ "ZOMBIE" ],
     "diff": 25,
     "size": "MEDIUM",
@@ -473,15 +470,15 @@
     "anger_triggers": [ "HURT", "PLAYER_CLOSE" ],
     "death_drops": "wild_bio_knight_launcher",
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "REGENERATES_50", "HEARS", "SMELLS", "POISON", "BASHES", "NO_BREATHE", "BONES", "FILTHY", "REGEN_MORALE" ]
+    "flags": [ "SEES", "REGENERATES_50", "HEARS", "SMELLS", "POISON", "NO_BREATHE", "BONES", "FILTHY", "REGEN_MORALE" ]
   },
   {
     "id": "mon_zombie_bio_scout_sniper",
     "type": "MONSTER",
     "looks_like": "mon_zombie_bio_scout",
     "name": "zombie super scout",
-    "description": "A zombie of a former member of the military. This one wields a particular rifle and bionics and appears to know how to use them. For some reson it seems to just be watching you...  As if waiting for you to make a move...",
-    "default_faction": "zombie",
+    "description": "A zombie of a former member of the military.  This one wields a particular rifle and bionics and appears to know how to use them.  For some reson it seems to just be watching you, as if waiting for you to make a move...",
+    "default_faction": "super_soldat",
     "species": [ "ZOMBIE" ],
     "diff": 25,
     "size": "MEDIUM",
@@ -535,15 +532,15 @@
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_drops": "wild_bio_scout_sniper",
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "BASHES", "NO_BREATHE", "FILTHY", "PATH_AVOID_DANGER_1" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "NO_BREATHE", "FILTHY", "PATH_AVOID_DANGER_1" ]
   },
   {
     "id": "mon_zombie_bio_tool_pistol",
     "type": "MONSTER",
     "looks_like": "mon_zombie_bio_tool",
     "name": "zombie super B.A.M.R.U",
-    "description": "A zombie of a former member of the military. This one wields a particular pistol and bionics and appears to know how to use them.",
-    "default_faction": "zombie",
+    "description": "A zombie of a former member of the military.  This one wields a particular pistol and bionics and appears to know how to use them.",
+    "default_faction": "super_soldat",
     "species": [ "ZOMBIE" ],
     "diff": 25,
     "size": "MEDIUM",
@@ -596,15 +593,15 @@
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_drops": "wild_bio_tool_pistol",
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "BASHES", "NO_BREATHE", "REGENERATES_10", "FILTHY", "PATH_AVOID_DANGER_2" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "POISON",  "NO_BREATHE", "REGENERATES_10", "FILTHY", "PATH_AVOID_DANGER_2" ]
   },
   {
     "id": "mon_zombie_bio_tool_smg",
     "type": "MONSTER",
     "looks_like": "mon_zombie_bio_tool",
     "name": "zombie super B.A.M.R.U",
-    "description": "A zombie of a former member of the military. This one wields a particular smg and bionics and appears to know how to use them.",
-    "default_faction": "zombie",
+    "description": "A zombie of a former member of the military.  This one wields a particular smg and bionics and appears to know how to use them.",
+    "default_faction": "super_soldat",
     "species": [ "ZOMBIE" ],
     "diff": 25,
     "size": "MEDIUM",
@@ -657,6 +654,6 @@
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_drops": "wild_bio_tool_smg",
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "BASHES", "NO_BREATHE", "REGENERATES_10", "FILTHY", "PATH_AVOID_DANGER_2" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "POISON", "NO_BREATHE", "REGENERATES_10", "FILTHY", "PATH_AVOID_DANGER_2" ]
   }
 ]
diff --git a/Npc/c_mission_def.json b/Npc/c_mission_def.json
@@ -9,7 +9,7 @@
     "item": "badge_bio_weapon_apophis",
     "start": {
       "effect": { "u_add_effect": "router_mission", "duration": "PERMANENT" },
-      "assign_mission_target": { "om_terrain": "Unknown_Bunker", "om_special": "Unknown_Lab_s", "reveal_radius": 3, "search_range": 180, "z": 0 }
+      "assign_mission_target": { "om_terrain": "Unknown_Lab_4", "om_special": "Unknown_Lab_s", "reveal_radius": 3, "search_range": 180, "z": 0 }
     },
     "count": 1,
     "origins": [ "ORIGIN_SECONDARY" ],

diff --git a/Surv_help/c_books.json b/Surv_help/c_books.json
@@ -1070,5 +1070,22 @@
     "intelligence": 12,
     "time": 45,
     "fun": -1
+  },
+  {
+    "type": "GENERIC",
+    "id": "note_apophis",
+    "looks_like": "survnote",
+    "category": "books",
+    "symbol": ",",
+    "color": "white",
+    "name": "printed note",
+    "name_plural": "printed notes",
+    "snippet_category": "note_apophis",
+    "description": "A scrap of paper.  Something's been printed on it.",
+    "price": 0,
+    "material": "paper",
+    "flags": "TRADER_AVOID",
+    "weight": 3,
+    "volume": 0
   }
 ]
diff --git a/Surv_help/c_snippets.json b/Surv_help/c_snippets.json
@@ -0,0 +1,13 @@
+[
+  {
+    "type": "snippet",
+    "category": "note_apophis",
+    "text": [
+      "\"The director has confirmed positive ID on local research sites also connected to Project Mesektet, with further contacts linking them to commercial and military research directives across the tri-county area.\"",
+      "\"We've tracked down the primary rehabilitation and disposal sites used by the other project assets.  The director has expressed interest in securing them after Unit One is brought online.\"",
+      "\"Unit One is to remain in standby mode in case the \"disturbance\" causes us any difficulty.  Contingency plan for on-site activation shall be provided to the research director.\"",
+      "\"3-XII is dispatching a squad to this site, with a unit from 4-VII in tow to secure against hostile action.  Cooperate as best as you are able, but do not allow them into the lab complex itself.\"",
+      "\"We've received confirmation that they're onto us.  Orders are to delay the security dispatch as long as possible, while the director gets Unit One online.\""
+    ]
+  }
+]
diff --git a/Surv_help/c_tools.json b/Surv_help/c_tools.json
@@ -760,7 +760,7 @@
     "use_action": {
       "type": "reveal_map",
       "radius": 180,
-      "terrain": [ "Unknown_Bunker" ],
+      "terrain": [ "Unknown_Lab_1", "Unknown_Lab_2", "Unknown_Lab_3", "Unknown_Lab_4" ],
       "message": "You read the map.  You gulp and realize what must be done..."
     }
   },

diff --git a/Terrain/Bio_Weapon_Lab.json b/Terrain/Bio_Weapon_Lab.json
@@ -136,7 +136,7 @@
         "|&.....66-_<<_-66.....&|",
         "|L.cac...-....-...cac.L|",
         "|L.._....+....+...._..L|",
-        "|L.sSS...+....+...sSS.L|",
+        "|L.sSs...+....+...sSs.L|",
         "|L.......-_.._-.......L|",
         "|----------DD----------|",
         "|r...+............+...r|",

diff --git a/Terrain/Unknown_Bunker.json b/Terrain/Unknown_Bunker.json