Merge pull request #178 from chaosvolt/misc-soldat-cleanup

Assorted super-soldier-related cleanup

Monsters/c_monstergroups.json

@@ -107,8 +107,8 @@
     "override": false,
     "auto_total": true,
     "monsters": [
-      { "monster": "mon_zombie_bio_dormant_unarmed", "freq": 10, "cost_multiplier": 15, "starts": 336 },
-      { "monster": "mon_zombie_bio_dormant_armed", "freq": 10, "cost_multiplier": 15, "starts": 336 }
+      { "monster": "mon_zombie_bio_dormant_unarmed", "freq": 10, "cost_multiplier": 15 },
+      { "monster": "mon_zombie_bio_dormant_armed", "freq": 10, "cost_multiplier": 15 }
     ]
   },
   {
@@ -117,8 +117,8 @@
     "override": false,
     "auto_total": true,
     "monsters": [
-      { "monster": "mon_zombie_bio_dormant_unarmed", "freq": 3, "cost_multiplier": 15, "starts": 336 },
-      { "monster": "mon_zombie_bio_dormant_armed", "freq": 2, "cost_multiplier": 15, "starts": 336 }
+      { "monster": "mon_zombie_bio_dormant_unarmed", "freq": 3, "cost_multiplier": 15, "starts": 168 },
+      { "monster": "mon_zombie_bio_dormant_armed", "freq": 2, "cost_multiplier": 15, "starts": 168 }
     ]
   },
   {

Monsters/c_monsters.json

@@ -252,12 +252,11 @@
     "morale": 100,
     "melee_skill": 3,
     "melee_dice": 2,
-    "melee_dice_sides": 4,
+    "melee_dice_sides": 5,
     "melee_cut": 2,
     "dodge": 3,
     "armor_bash": 10,
     "armor_cut": 15,
-    "armor_stab": 10,
     "armor_acid": 5,
     "armor_fire": 5,
     "vision_day": 40,
@@ -295,12 +294,11 @@
     "morale": 100,
     "melee_skill": 3,
     "melee_dice": 2,
-    "melee_dice_sides": 4,
+    "melee_dice_sides": 5,
     "melee_cut": 2,
     "dodge": 3,
     "armor_bash": 10,
     "armor_cut": 15,
-    "armor_stab": 10,
     "armor_acid": 5,
     "armor_fire": 5,
     "vision_day": 40,
@@ -331,9 +329,8 @@
     "melee_skill": 5,
     "melee_dice_sides": 6,
     "melee_cut": 10,
-    "armor_bash": 12,
-    "armor_cut": 20,
-    "armor_stab": 12,
+    "armor_bash": 10,
+    "armor_cut": 15,
     "armor_acid": 6,
     "armor_fire": 6,
     "path_settings": { "max_dist": 20 },
@@ -370,9 +367,8 @@
     "melee_dice_sides": 6,
     "melee_cut": 2,
     "dodge": 3,
-    "armor_bash": 10,
-    "armor_cut": 18,
-    "armor_stab": 10,
+    "armor_bash": 20,
+    "armor_cut": 30,
     "armor_acid": 5,
     "armor_fire": 5,
     "vision_day": 40,
@@ -437,9 +433,8 @@
     "melee_dice_sides": 6,
     "melee_cut": 2,
     "dodge": 3,
-    "armor_bash": 10,
-    "armor_cut": 18,
-    "armor_stab": 10,
+    "armor_bash": 20,
+    "armor_cut": 30,
     "armor_acid": 5,
     "armor_fire": 5,
     "vision_day": 40,
@@ -505,9 +500,8 @@
     "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
     "melee_cut": 2,
     "dodge": 3,
-    "armor_bash": 12,
-    "armor_cut": 25,
-    "armor_stab": 12,
+    "armor_bash": 20,
+    "armor_cut": 30,
     "armor_acid": 6,
     "armor_fire": 6,
     "vision_day": 40,
@@ -571,9 +565,8 @@
     "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
     "melee_cut": 2,
     "dodge": 3,
-    "armor_bash": 12,
-    "armor_cut": 25,
-    "armor_stab": 12,
+    "armor_bash": 20,
+    "armor_cut": 30,
     "armor_acid": 6,
     "armor_fire": 6,
     "vision_day": 40,
@@ -638,8 +631,7 @@
     "melee_cut": 2,
     "dodge": 3,
     "armor_bash": 10,
-    "armor_cut": 18,
-    "armor_stab": 10,
+    "armor_cut": 15,
     "armor_acid": 5,
     "armor_fire": 5,
     "vision_day": 40,
@@ -707,7 +699,6 @@
     "dodge": 3,
     "armor_bash": 10,
     "armor_cut": 15,
-    "armor_stab": 10,
     "armor_acid": 5,
     "armor_fire": 5,
     "vision_day": 40,
@@ -771,9 +762,8 @@
     "melee_dice_sides": 4,
     "melee_cut": 2,
     "dodge": 3,
-    "armor_bash": 10,
-    "armor_cut": 15,
-    "armor_stab": 10,
+    "armor_bash": 8,
+    "armor_cut": 12,
     "armor_acid": 5,
     "armor_fire": 5,
     "vision_day": 40,

Npc/NC_BIO_WEAPONS.json

@@ -18,6 +18,7 @@
       { "item": "socks" },
       { "item": "boots_combat" },
       { "item": "backpack" },
+      { "item": "sheath" },
       { "item": "badge_bio_weapon" }
     ]
   },
@@ -30,6 +31,13 @@
     "ammo": 100,
     "entries": [ { "item": "arc_laser_rifle" } ]
   },
+  {
+    "id": "NC_BIO_WEAPON_L_weapon",
+    "type": "item_group",
+    "//": "Bio-Weapon Lamba's weapon.  She's built more with a lean toward unarmed, but this ensures that she doesn't do anything weird like decide her helmet is a superior weapon.",
+    "subtype": "collection",
+    "entries": [ { "item": "knife_rm42" } ]
+  },
   {
     "id": "NC_BIO_WEAPON_carry",
     "type": "item_group",

Npc/NC_SUPER_SOLDIERS.json

@@ -63,7 +63,6 @@
       { "item": "gloves_fingerless" },
       { "item": "socks" },
       { "item": "boots_combat" },
-      { "item": "badge_bio_weapon" },
       { "item": "canteen" }
     ]
   },

Npc/TALK_BHUNTER.json

@@ -17,11 +17,17 @@
             "BIO_WEAPON_BETA",
             "BIO_WEAPON_GAMMA",
             "BIO_WEAPON_DELTA",
-            "BIO_WEAPON_FAILED",
-            "SUPER_SOLDIER_MARKER"
+            "BIO_WEAPON_FAILED"
           ]
         }
       },
+      {
+        "text": "Part of the Super Soldier project, actually.",
+        "topic": "TALK_BHUNTER_IAM_SOLDAT",
+        "condition": {
+          "u_has_trait": "SUPER_SOLDIER_MARKER"
+        }
+      },
       { "text": "Bio-Weapon?", "topic": "TALK_BHUNTER_ASK_BIO" },
       { "text": "What's going on out here?", "topic": "TALK_BHUNTER_ASK_SITUATION" },
       { "text": "What are you doing here?", "topic": "TALK_BHUNTER_ASK_DOING" },
@@ -41,8 +47,8 @@
     "type": "talk_topic",
     "dynamic_line": {
       "u_has_any_trait": [ "BIO_WEAPON_FAILED" ],
-      "yes": "Bio-Weapons.  At least they were supposed to be.  In fact, you look like you're in the same shape as them, though you're not trying to kill me at least.  Can I trust you?",
-      "no": "Bio-Weapons.  At least they were supposed to be.  I don't know what went wrong or who's ordering them around, but they seem hell-bent on destroying everything connected to the project."
+      "yes": "Those augmented abominations, the notes I found tied them to a thing called the Bio-Weapon Project.  You look like you're in the same shape as them, though you're not trying to kill me at least.  Can I trust you?",
+      "no": "Bio-Weapons, that's what the notes in this lab called those things outside.  At least they were supposed to be.  I don't know what went wrong or who's ordering them around, but they seem hell-bent on destroying everything connected to the project."
     },
     "responses": [
       {
@@ -74,7 +80,7 @@
     "type": "talk_topic",
     "dynamic_line": {
       "u_is_wearing": "badge_bio_weapon",
-      "yes": "Well I'll be damned!  How do I know you didn't just find that somewhere?  Oh well, it doesn't really matter. The fact that you have it means you at least met one. Well, if you need anything, I can help you out.",
+      "yes": "Well I'll be damned!  How do I know you didn't just find that somewhere?  Oh well, it doesn't really matter. The fact that you have it means you at least met one.  If you need anything, I can help you out.",
       "no": "Suuuure, right.  You don't even have the badge.  Try and be careful who you lie to next time."
     },
     "responses": [
@@ -83,12 +89,6 @@
         "topic": "TALK_BHUNTER_CONFIRM_BIO",
         "condition": { "u_has_any_trait": [ "BIO_WEAPON_ALPHA", "BIO_WEAPON_BETA", "BIO_WEAPON_GAMMA", "BIO_WEAPON_DELTA" ] }
       },
-      {
-        "text": "You don't recognize this aug configuration, Hunter?",
-        "topic": "TALK_BHUNTER_CONFIRM_OUST",
-        "condition": { "u_has_any_trait": [ "SUPER_SOLDIER_MARKER" ] },
-        "effect": { "u_add_effect": "evy_ousted", "duration": "PERMANENT" }
-      },
       {
         "text": "Look at me again, and tell me I'm lying.",
         "condition": { "u_has_any_trait": [ "BIO_WEAPON_FAILED" ] },
@@ -103,6 +103,20 @@
       { "text": "...", "topic": "TALK_BHUNTER" }
     ]
   },
+  {
+    "id": "TALK_BHUNTER_IAM_SOLDAT",
+    "type": "talk_topic",
+    "dynamic_line": "Is that so?  How do I know for sure you aren't just some random scavenger?  Then again, if you made it here then you can take care of yourself, guess that's a good sign.",
+    "responses": [
+      {
+        "text": "You don't recognize this aug configuration, Hunter?",
+        "topic": "TALK_BHUNTER_CONFIRM_OUST",
+        "condition": { "u_has_any_trait": [ "SUPER_SOLDIER_MARKER" ] },
+        "effect": { "u_add_effect": "evy_ousted", "duration": "PERMANENT" }
+      },
+      { "text": "Good enough, I suppose.", "topic": "TALK_BHUNTER" }
+    ]
+  },
   {
     "id": "TALK_BHUNTER_CONFIRM_BIO",
     "type": "talk_topic",
@@ -130,7 +144,7 @@
   {
     "id": "TALK_BHUNTER_NOBADGE",
     "type": "talk_topic",
-    "dynamic_line": "I'd say you're full of shit, but looking at you, those are some heavy-duty augs.  I don't know if you decided not to wear it, or if you lost yours, but either way I appreciate your honestly.",
+    "dynamic_line": "I'd say you're full of shit, but looking at you, those are some heavy-duty augs.  I don't know if you decided not to wear it, or if you lost yours, but either way I appreciate your honesty.",
     "responses": [
       {
         "text": "Thank you.",
@@ -165,8 +179,8 @@
     "type": "talk_topic",
     "dynamic_line": {
       "u_is_wearing": "badge_bio_weapon",
-      "yes": "I guess memory wipe makes sense.  Alright, I will explain.  Some time ago, the military launched a joint research project with an end goal of creating artificial combatants, made to perform various specific tasks - basically, living weapons.  They wanted them to be as low-maintenance as possible.  So to accomplish that, the research team used resources from already ongoing projects to first mutate and then cybernetically enhance humans, focusing on developing whatever qualities the military needed at the time.  You are one them.  A Bio-Weapon.  This is the lab where you were created.",
-      "no": "Well, alright, let me give you the basics. Some time ago, the military launched a joint research project with an end goal of creating artificial combatants, made to perform various specific tasks - basically, living weapons.  They wanted them to be as low-maintenance as possible.  So to accomplish that, the research team used resources from already ongoing projects to first mutate and then cybernetically enhance humans, focusing on developing whatever qualities the military needed at the time.  This lab is one of several places in which the actual modifications were performed."
+      "yes": "I guess memory wipe makes sense.  Alright, I will explain.  Some time ago, the military launched a joint research project with an end goal of creating artificial combatants, made to perform various specific tasks - basically, living weapons.  They wanted them to be as low-maintenance as possible.  So to accomplish that, the research team used resources from already ongoing projects to first mutate and then cybernetically enhance humans, focusing on developing whatever qualities the military needed at the time.  You are one them, a Bio-Weapon they called it.  This is the lab where you were created.",
+      "no": "Let me give you the basics.  Some time ago, the military launched a joint research project with an end goal of creating artificial combatants, made to perform various specific tasks - basically, living weapons.  They wanted them to be as low-maintenance as possible.  So to accomplish that, the research team used resources from already ongoing projects to first mutate and then cybernetically enhance humans, focusing on developing whatever qualities the military needed at the time.  This lab is one of several places in which the actual modifications were performed."
     },
     "responses": [
       { "text": "I'll be damned...", "topic": "TALK_BHUNTER" },
@@ -178,12 +192,12 @@
     "type": "talk_topic",
     "dynamic_line": {
       "u_has_effect": "evy_ousted",
-      "yes": "I was under orders to investigate this place and find any survivors.  Between that and having been a computer hacker during my college days, it wasn't too hard to follow the trail.  The hard part was scavenging supplues and staying alive.",
+      "yes": "I was under orders to investigate this place and find any survivors.  Between that and having been a computer hacker during my college days, it wasn't too hard to follow the trail.  The hard part was scavenging supplies and staying alive.",
       "no": "I used to be a computer hacker before the world went to hell.  After it did, when I wasn't looking for food and gear or fighting for my life, I was following leads to this place.  The military weren't all that good at keeping their secrets."
     },
     "responses": [
       {
-        "text": "You seem rather well-equiped for a mere hacker.",
+        "text": "You seem rather well-equipped for a mere hacker.",
         "condition": {
           "and": [
             { "or": [ { "u_has_intelligence": 10 }, { "u_has_perception": 10 } ] },
@@ -203,7 +217,7 @@
         }
       },
       {
-        "text": "You seem rather well-equiped for a mere hacker.",
+        "text": "You seem rather well-equipped for a mere hacker.",
         "condition": {
           "and": [
             { "or": [ { "u_has_intelligence": 11 }, { "u_has_perception": 11 } ] },
@@ -214,7 +228,7 @@
         "topic": "TALK_BHUNTER_NOPE"
       },
       {
-        "text": "Right. Research Directive Z-12 ring a bell to you, Hunter?",
+        "text": "Right.  Research Directive Z-12 ring a bell to you, Hunter?",
         "topic": "TALK_BHUNTER_CONFIRM_OUST",
         "condition": { "and": [ { "u_has_any_trait": [ "SUPER_SOLDIER_MARKER" ] }, { "not": { "u_has_effect": "evy_ousted" } } ] },
         "effect": { "u_add_effect": "evy_ousted", "duration": "PERMANENT" }
@@ -253,7 +267,7 @@
   {
     "id": "TALK_BHUNTER_ASK_DOING",
     "type": "talk_topic",
-    "dynamic_line": "I came here to see if I could find anything on the Bio-Weapons. How about yourself?",
+    "dynamic_line": "I came here to see if I could find anything on the research they were doing here.  How about yourself?",
     "responses": [
       {
         "text": "I don't have any orders, and don't remember much from before I woke up.  Had anything in mind?",
@@ -276,7 +290,7 @@
   {
     "id": "TALK_BHUNTER_ASK_DO",
     "type": "talk_topic",
-    "dynamic_line": "I'm trying to reach a hideout built by former scientists who worked on the Bio-Weapon project.  Rumor has it they live somewhere in the woods.  Maybe you could help me find it...",
+    "dynamic_line": "I'm trying to reach a hideout built by former scientists who worked on the Bio-Weapon Project.  Rumor has it they live somewhere in the woods.  Maybe you could help me find it...",
     "responses": [ { "text": "I'll think about it.", "topic": "TALK_BHUNTER" } ]
   }
 ]