Replace hardcoded personality modifiers with json

data/json/npcs/classes.json

@@ -87,6 +87,8 @@
     "bonus_dex": { "rng": [ -2, 0 ] },
     "bonus_int": { "rng": [ 1, 5 ] },
     "bonus_per": { "rng": [ -2, 0 ] },
+    "bonus_aggression": { "rng": [ -3, -1 ] },
+    "bonus_bravery": { "rng": [ -2, 0 ] },
     "skills": [
       { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "rng": [ -1, -2 ] } ] } ] } },
       { "skill": "electronics", "bonus": { "rng": [ 1, 4 ] } },
@@ -102,6 +104,7 @@
     "bonus_str": { "rng": [ -2, 0 ] },
     "bonus_int": { "rng": [ 0, 2 ] },
     "bonus_per": { "rng": [ 0, 2 ] },
+    "bonus_aggression": { "rng": [ -4, 0 ] },
     "shopkeeper_item_group": "NC_DOCTOR_misc",
     "proficiencies": [
       "prof_intro_chemistry",
@@ -127,7 +130,8 @@
     "job_description": "I'm collecting gear and selling it.",
     "traits": [ { "group": "BG_survival_story_EVACUEE" }, { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "bonus_int": { "one_in": 4 },
-    "bonus_per": { "one_in": 4 }
+    "bonus_per": { "one_in": 4 },
+    "bonus_collector": { "rng": [ 1, 5 ] }
   },
   {
     "type": "npc_class",
@@ -138,6 +142,8 @@
     "bonus_str": { "rng": [ -1, 0 ] },
     "bonus_dex": { "rng": [ 0, 2 ] },
     "bonus_per": { "rng": [ 0, 2 ] },
+    "bonus_bravery": { "rng": [ 0, 3 ] },
+    "bonus_collector": { "rng": [ -6, -1 ] },
     "skills": [
       { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "rng": [ -1, -2 ] } ] } ] } },
       { "skill": "dodge", "bonus": { "rng": [ 2, 4 ] } },
@@ -155,6 +161,8 @@
     "bonus_str": { "rng": [ 0, 1 ] },
     "bonus_int": { "rng": [ -2, 0 ] },
     "bonus_per": { "rng": [ 0, 2 ] },
+    "bonus_aggression": { "rng": [ 0, 2 ] },
+    "bonus_bravery": { "rng": [ 1, 5 ] },
     "skills": [
       { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "rng": [ 0, -4 ] } ] } ] } },
       { "skill": "gun", "bonus": { "rng": [ 1, 3 ] } },
@@ -213,6 +221,9 @@
     "bonus_str": { "rng": [ -1, -3 ] },
     "bonus_dex": { "rng": [ -1, 0 ] },
     "bonus_int": { "rng": [ 2, 5 ] },
+    "bonus_aggression": { "rng": [ -5, -1 ] },
+    "bonus_bravery": { "rng": [ -8, -2 ] },
+    "bonus_collector": { "rng": [ 0, 2 ] },
     "proficiencies": [
       "prof_intro_chemistry",
       "prof_intro_biology",
@@ -235,6 +246,8 @@
     "name": { "str": "Bounty Hunter" },
     "job_description": "I'm a killer for hire.",
     "traits": [ { "group": "BG_survival_story_POLICE" }, { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
+    "bonus_aggression": { "rng": [ 1, 6 ] },
+    "bonus_bravery": { "rng": [ 0, 5 ] },
     "skills": [
       { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -3 } ] } },
       { "skill": "gun", "bonus": { "rng": [ 2, 4 ] } },
@@ -275,6 +288,8 @@
     ],
     "bonus_str": { "rng": [ 2, 4 ] },
     "bonus_dex": { "rng": [ 0, 2 ] },
+    "bonus_aggression": { "rng": [ 1, 6 ] },
+    "bonus_bravery": { "rng": [ 0, 5 ] },
     "skills": [
       { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -4 } ] } },
       { "skill": "dodge", "bonus": { "rng": [ 1, 3 ] } },
@@ -291,6 +306,8 @@
     "name": { "str": "Scavenger" },
     "job_description": "I'm just trying to survive.",
     "traits": [ { "group": "BG_survival_story_EVACUEE" }, { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
+    "bonus_aggression": { "rng": [ 1, 3 ] },
+    "bonus_bravery": { "rng": [ 1, 4 ] },
     "skills": [
       { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -3 } ] } },
       { "skill": "gun", "bonus": { "rng": [ 2, 4 ] } },
@@ -415,6 +432,8 @@
     "bonus_str": { "rng": [ 0, 2 ] },
     "bonus_dex": { "one_in": 2 },
     "bonus_int": { "rng": [ 0, -2 ] },
+    "bonus_aggression": { "rng": [ 1, 3 ] },
+    "bonus_bravery": { "rng": [ 0, 3 ] },
     "skills": [
       { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -3 } ] } },
       { "skill": "dodge", "bonus": { "rng": [ 1, 2 ] } },
@@ -432,6 +451,7 @@
     "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "common": false,
     "bonus_per": { "one_in": 4 },
+    "bonus_collector": { "rng": [ 1, 5 ] },
     "shopkeeper_item_group": "NC_BARTENDER_misc",
     "skills": [
       {
@@ -450,6 +470,7 @@
     "//": "This is a unique NPC who doesn't get randomly selected background traits",
     "common": false,
     "bonus_per": { "one_in": 4 },
+    "bonus_collector": { "rng": [ 1, 5 ] },
     "shopkeeper_item_group": "NC_JUNK_SHOPKEEP_misc",
     "skills": [
       {

data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json

@@ -60,6 +60,7 @@
     "common": false,
     "bonus_int": { "one_in": 4 },
     "bonus_per": { "one_in": 4 },
+    "bonus_collector": { "rng": [ 1, 5 ] },
     "shopkeeper_item_group": "NC_EVAC_SHOPKEEP_misc",
     "carry_override": "NC_EVAC_SHOPKEEP_misc",
     "skills": [

data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json

@@ -41,6 +41,8 @@
     "bonus_dex": { "rng": [ 2, 2 ] },
     "bonus_int": { "rng": [ 1, 1 ] },
     "bonus_per": { "rng": [ 2, 2 ] },
+    "bonus_aggression": { "rng": [ 0, 1 ] },
+    "bonus_collector": { "rng": [ 0, 2 ] },
     "shopkeeper_item_group": "NC_ARSONIST_STOCK",
     "carry_override": "NC_ARSONIST_STOCK",
     "worn_override": "NC_ARSONIST_worn",

src/npc.cpp

@@ -837,53 +837,6 @@ void npc::randomize( const npc_class_id &type, const npc_template_id &tem_id )
         set_skill_level( skill.ident(), level );
     }
 
-    if( type.is_null() ) { // Untyped; no particular specialization
-    } else if( type == NC_EVAC_SHOPKEEP || type == NC_BARTENDER || type == NC_JUNK_SHOPKEEP ) {
-        personality.collector += rng( 1, 5 );
-
-    } else if( type == NC_ARSONIST ) {
-        personality.aggression += rng( 0, 1 );
-        personality.collector += rng( 0, 2 );
-
-    } else if( type == NC_SOLDIER ) {
-        personality.aggression += rng( 1, 3 );
-        personality.bravery += rng( 0, 5 );
-
-    } else if( type == NC_HACKER ) {
-        personality.bravery -= rng( 1, 3 );
-        personality.aggression -= rng( 0, 2 );
-
-    } else if( type == NC_DOCTOR ) {
-        personality.aggression -= rng( 0, 4 );
-        cash += 10000 * rng( 0, 3 ) * rng( 0, 3 );
-
-    } else if( type == NC_TRADER ) {
-        personality.collector += rng( 1, 5 );
-        cash += 25000 * rng( 1, 10 );
-
-    } else if( type == NC_NINJA ) {
-        personality.bravery += rng( 0, 3 );
-        personality.collector -= rng( 1, 6 );
-        // TODO: give ninja his styles back
-
-    } else if( type == NC_COWBOY ) {
-        personality.aggression += rng( 0, 2 );
-        personality.bravery += rng( 1, 5 );
-
-    } else if( type == NC_SCIENTIST ) {
-        personality.aggression -= rng( 1, 5 );
-        personality.bravery -= rng( 2, 8 );
-        personality.collector += rng( 0, 2 );
-
-    } else if( type == NC_BOUNTY_HUNTER || type == NC_THUG ) {
-        personality.aggression += rng( 1, 6 );
-        personality.bravery += rng( 0, 5 );
-
-    } else if( type == NC_SCAVENGER ) {
-        personality.aggression += rng( 1, 3 );
-        personality.bravery += rng( 1, 4 );
-
-    }
     //A universal barter boost to keep NPCs competitive with players
     //The int boost from trade wasn't active... now that it is, most
     //players will vastly outclass npcs in trade without a little help.