Give npcs semi-random appearance traits.

Rewrite npc class descriptions.
Sort overrides.
Human NPCs gain random starting traits.
Try to fix the disaster that is shopkeeper drop tables.

2 files changed, 40 insertions, 39 deletions

diff --git a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
index a4800e9..54f0f13 100644
--- a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
+++ b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "item_group",
-    "id": "VAMP_UNDERTRADER_sell",
+    "id": "VAMP_UNDERTRADER_misc",
     "subtype": "collection",
     "items": [
       [ "sword_dive", 50 ],
@@ -19,7 +19,7 @@
   },
   {
     "type": "item_group",
-    "id": "VAMP_GUNSHOP_sell",
+    "id": "VAMP_GUNSHOP_misc",
     "subtype": "collection",
     "items": [
       [ "b11_striker", 20 ],
@@ -33,7 +33,7 @@
   },
   {
     "type": "item_group",
-    "id": "HUMAN_JUNKSHOP_sell",
+    "id": "H_JUNKSHOP_misc",
     "subtype": "collection",
     "items": [
       { "item": "RobofacCoin", "count-min": 5, "count-max": 30, "prob": 30 },
diff --git a/vamp_stuff/Modification_Files/NPC/v_classes.json b/vamp_stuff/Modification_Files/NPC/v_classes.json
index f97dba2..17c56ba 100644
--- a/vamp_stuff/Modification_Files/NPC/v_classes.json
+++ b/vamp_stuff/Modification_Files/NPC/v_classes.json
@@ -4,7 +4,7 @@
     "id": "V_LONELY",
     "common": false,
     "name": { "str": "Vampire" },
-    "job_description": "Isolated vampires.",
+    "job_description": "I am a vampire living on my own.",
     "bonus_str": { "rng": [ 4, 8 ] },
     "bonus_dex": { "rng": [ 4, 8 ] },
     "bonus_int": { "rng": [ 4, 8 ] },
@@ -20,10 +20,11 @@
       { "skill": "survival", "bonus": { "rng": [ 1, 8 ] } },
       { "skill": "bashing", "bonus": { "rng": [ 1, 4 ] } }
     ],
-    "worn_override": "VAMP_worn",
     "carry_override": "VAMP_carry",
     "weapon_override": "VAMP_wielded_weapon",
+    "worn_override": "VAMP_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -47,7 +48,6 @@
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
       [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_long", 100 ],
       [ "BGSS_VAMPIRE_ISOLATED_1", 100 ]
     ]
   },
@@ -55,7 +55,7 @@
     "type": "npc_class",
     "id": "V_UNDERREFUGEE",
     "name": { "str": "Underground Vampires" },
-    "job_description": "Underground vampire refugees.",
+    "job_description": "I am a refugee at the vampire cove.",
     "common": false,
     "bonus_str": { "rng": [ 4, 8 ] },
     "bonus_dex": { "rng": [ 4, 8 ] },
@@ -72,10 +72,11 @@
       { "skill": "survival", "bonus": { "rng": [ 1, 8 ] } },
       { "skill": "bashing", "bonus": { "rng": [ 1, 4 ] } }
     ],
-    "worn_override": "VAMP_UNDERGUARD_worn",
     "carry_override": "VAMP_carry",
     "weapon_override": "VAMP_wielded_weapon",
+    "worn_override": "VAMP_UNDERGUARD_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -98,21 +99,19 @@
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_medium", 100 ]
+      [ "VAMP_HUNGER", 100 ]
     ]
   },
   {
     "type": "npc_class",
     "id": "V_UNDERTRADER",
     "name": { "str": "Underground Vampires" },
-    "job_description": "Underground vampire traders.",
+    "job_description": "I am a trader at the vampire cove.",
     "common": false,
     "bonus_str": { "rng": [ 4, 8 ] },
     "bonus_dex": { "rng": [ 4, 8 ] },
     "bonus_int": { "rng": [ 4, 8 ] },
     "bonus_per": { "rng": [ 4, 8 ] },
-    "shopkeeper_item_group": "VAMP_UNDERTRADER_sell",
     "skills": [
       { "skill": "ALL", "level": { "mul": [ { "one_in": 2 }, { "sum": [ { "dice": [ 2, 5 ] }, { "constant": -1 } ] } ] } },
       { "skill": "dodge", "bonus": { "rng": [ 1, 5 ] } },
@@ -124,10 +123,12 @@
       { "skill": "survival", "bonus": { "rng": [ 1, 8 ] } },
       { "skill": "bashing", "bonus": { "rng": [ 1, 4 ] } }
     ],
-    "worn_override": "VAMP_UNDERGUARD_worn",
     "carry_override": "VAMP_carry",
+    "shopkeeper_item_group": "V_UNDERTRADER_misc",
     "weapon_override": "VAMP_wielded_weapon",
+    "worn_override": "VAMP_UNDERGUARD_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -150,8 +151,7 @@
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_short", 100 ]
+      [ "VAMP_HUNGER", 100 ]
     ]
   },
   {
@@ -181,10 +181,11 @@
       { "skill": "launcher", "bonus": { "rng": [ 2, 5 ] } },
       { "skill": "gun", "bonus": { "rng": [ 2, 5 ] } }
     ],
-    "worn_override": "VAMP_UNDERGUARD_worn",
     "carry_override": "VAMP_UNDERCOMMANDO_carry",
     "weapon_override": "VAMP_UNDERCOMMANDO_wielded_weapon",
+    "worn_override": "VAMP_UNDERGUARD_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -207,15 +208,14 @@
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_crewcut", 100 ]
+      [ "VAMP_HUNGER", 100 ]
     ]
   },
   {
     "type": "npc_class",
     "id": "V_WASTELAND",
     "name": { "str": "Wasteland Vampires" },
-    "job_description": "Wasteland refugees.",
+    "job_description": "I am a refugee at the wastelands.",
     "common": false,
     "bonus_str": { "rng": [ 4, 8 ] },
     "bonus_dex": { "rng": [ 4, 8 ] },
@@ -232,10 +232,11 @@
       { "skill": "survival", "bonus": { "rng": [ 1, 8 ] } },
       { "skill": "bashing", "bonus": { "rng": [ 1, 4 ] } }
     ],
-    "worn_override": "VAMP_worn",
     "carry_override": "VAMP_carry",
     "weapon_override": "VAMP_wielded_weapon",
+    "worn_override": "VAMP_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -258,15 +259,14 @@
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_medium", 100 ]
+      [ "VAMP_HUNGER", 100 ]
     ]
   },
   {
     "type": "npc_class",
     "id": "V_WASTEGUARD1",
     "name": { "str": "Wasteland Guard Vampire" },
-    "job_description": "Wasteland refugee guard.",
+    "job_description": "I am a guard at the wastelands.",
     "common": false,
     "bonus_str": { "rng": [ 4, 8 ] },
     "bonus_dex": { "rng": [ 4, 8 ] },
@@ -283,10 +283,11 @@
       { "skill": "survival", "bonus": { "rng": [ 1, 8 ] } },
       { "skill": "bashing", "bonus": { "rng": [ 1, 4 ] } }
     ],
-    "worn_override": "VAMP_worn",
     "carry_override": "VAMP_carry",
     "weapon_override": "VAMP_wielded_weapon",
+    "worn_override": "VAMP_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -309,15 +310,14 @@
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_crewcut", 100 ]
+      [ "VAMP_HUNGER", 100 ]
     ]
   },
   {
     "type": "npc_class",
     "id": "V_WASTEGUARD2",
     "name": { "str": "Wasteland Guard Vampire" },
-    "job_description": "Wasteland refugee guard.",
+    "job_description": "I am a guard at the wastelands.",
     "common": false,
     "bonus_str": { "rng": [ 4, 8 ] },
     "bonus_dex": { "rng": [ 4, 8 ] },
@@ -334,10 +334,11 @@
       { "skill": "survival", "bonus": { "rng": [ 1, 8 ] } },
       { "skill": "bashing", "bonus": { "rng": [ 1, 4 ] } }
     ],
-    "worn_override": "VAMP_worn",
     "carry_override": "VAMP_carry",
     "weapon_override": "VAMP_wielded_weapon",
+    "worn_override": "VAMP_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -360,21 +361,19 @@
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_short", 100 ]
+      [ "VAMP_HUNGER", 100 ]
     ]
   },
   {
     "type": "npc_class",
     "id": "V_GUNSHOP",
     "name": { "str": "Vampire Gunkeeper" },
-    "job_description": "Gunshop owner.",
+    "job_description": "I run the wastelands gunshop.",
     "common": false,
     "bonus_str": { "rng": [ 4, 8 ] },
     "bonus_dex": { "rng": [ 4, 8 ] },
     "bonus_int": { "rng": [ 4, 8 ] },
     "bonus_per": { "rng": [ 4, 8 ] },
-    "shopkeeper_item_group": "VAMP_GUNSHOP_sell",
     "skills": [
       { "skill": "ALL", "level": { "mul": [ { "one_in": 2 }, { "sum": [ { "dice": [ 2, 5 ] }, { "constant": -1 } ] } ] } },
       { "skill": "dodge", "bonus": { "rng": [ 1, 5 ] } },
@@ -392,10 +391,12 @@
       { "skill": "launcher", "bonus": { "rng": [ 2, 5 ] } },
       { "skill": "gun", "bonus": { "rng": [ 2, 5 ] } }
     ],
-    "worn_override": "VAMP_worn",
     "carry_override": "VAMP_GUNSHOP_carry",
+    "shopkeeper_item_group": "VAMP_GUNSHOP_misc",
     "weapon_override": "VAMP_GUNSHOP_wielded_weapon",
+    "worn_override": "VAMP_worn",
     "traits": [
+      { "group": "Appearance_Germanic" },
       [ "THRESH_VAMP", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "FLEET", 100 ],
@@ -418,15 +419,15 @@
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "SUNBURN", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "hair_white_short", 100 ]
+      [ "VAMP_HUNGER", 100 ]
     ]
   },
   {
     "type": "npc_class",
     "id": "H_WASTELAND",
     "name": { "str": "Wasteland Refugee" },
-    "job_description": "I hide at wastelands.",
+    "job_description": "I hide at the wastelands.",
+    "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "common": false,
     "bonus_per": { "one_in": 4 },
     "weapon_override": "HUMAN_WASTELAND_weapon",
@@ -448,11 +449,11 @@
     "type": "npc_class",
     "id": "H_JUNKSHOP",
     "name": { "str": "Shopkeep" },
-    "job_description": "I trade at wastelands.",
+    "job_description": "I trade at the wastelands.",
+    "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "common": false,
     "bonus_per": { "one_in": 4 },
-    "shopkeeper_item_group": "HUMAN_JUNKSHOP_sell",
-    "worn_override": "HUMAN_JUNKSHOP_worn",
+    "shopkeeper_item_group": "H_JUNKSHOP_misc",
     "skills": [
       {
         "skill": "ALL",