Rewrites Lore Inconsistent Profession Descriptions

data/json/items/armor/coats.json

@@ -1624,7 +1624,7 @@
       {
         "id": "black_white_varsity_jacket",
         "name": { "str": "black and white varsity jacket" },
-        "description": "This one is is black except the white arms, and has no discerning emblem or writing.",
+        "description": "This one is black except for its white arms, and has no discerning emblem or writing.",
         "color": "white",
         "weight": 10,
         "append": true
@@ -1696,7 +1696,7 @@
       {
         "id": "pink_white_varsity_jacket",
         "name": { "str": "pink and white varsity jacket" },
-        "description": "This one has a pink torso and white arms.  Somone has sewn an equally pink heart on its front right.",
+        "description": "This one has a pink torso and white arms.  Someone has sewn an equally pink heart on its front right.",
         "color": "pink",
         "weight": 10,
         "append": true

data/json/professions.json

@@ -258,19 +258,19 @@
   {
     "type": "item_group",
     "subtype": "collection",
-    "id": "army_mags_usp45",
+    "id": "army_mags_usp9",
     "entries": [
-      { "item": "usp45mag", "ammo-item": "45_acp", "charges": 12 },
-      { "item": "usp45mag", "ammo-item": "45_acp", "charges": 12 }
+      { "item": "usp9mag", "ammo-item": "9mmfmj", "charges": 15 },
+      { "item": "usp9mag", "ammo-item": "9mmfmj", "charges": 15 }
     ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
-    "id": "army_mags_usp9",
+    "id": "police_mags_glock17",
     "entries": [
-      { "item": "usp9mag", "ammo-item": "9mmfmj", "charges": 15 },
-      { "item": "usp9mag", "ammo-item": "9mmfmj", "charges": 15 }
+      { "item": "glock17_17", "ammo-item": "9mm", "charges": 17 },
+      { "item": "glock17_17", "ammo-item": "9mm", "charges": 17 }
     ]
   },
   {
@@ -1036,7 +1036,7 @@
     "type": "profession",
     "id": "basketball_player",
     "name": "Basketball Player",
-    "description": "Your first major game was abruptly cancelled when zombies stormed the court.  Quick feet and good reflexes meant you were among the lucky few to escape the stadium alive.",
+    "description": "Whether a professional athlete or a casual hoop-shooter, you were pretty handy at dribbling a mean ball — a skill that, unfortunately, has little relevance to the cataclysm.  When evacuation had been declared, you'd packed your old jacket and favourite B-ball, and, now, all you can bank on is that your athleticism might give you a leg up in the coming days.  Hopefully, your sentimental keepsakes are enough reminders of the life you've left behind.",
     "points": 2,
     "skills": [ { "level": 5, "name": "dodge" }, { "level": 5, "name": "throw" }, { "level": 4, "name": "swimming" } ],
     "proficiencies": [ "prof_athlete_basic" ],
@@ -1051,7 +1051,8 @@
           { "item": "sports_drink" },
           { "item": "runner_bag" },
           { "item": "jersey", "snippets": [ "basin" ] },
-          { "group": "charged_smart_phone" }
+          { "group": "charged_smart_phone" },
+          { "item": "jacket_varsity", "variant": "black_varsity_jacket" }
         ]
       },
       "male": { "entries": [ { "item": "boxer_shorts" } ] },
@@ -1062,8 +1063,11 @@
   {
     "type": "profession",
     "id": "football_player",
-    "name": "Football Player",
-    "description": "Your epic touchdown was ruined when your coach's guts were torn out by undead fans.  Now you're first pick in the apocalypse draft.",
+    "name": "Soccer Player",
+    "description": {
+      "male": "Soccer, rugby, American football — whatever you term it, you'd played it extensively before the Cataclysm and were quite the sportsman.  Now, your trade has left you with a set of football armour that you'd packed along during the evacuation, a strong throwing arm, and experience in pitch-side tussling.  With your ball at your side, the only keepsake you'd been able to hold on to through the end of days, you suppose that it's time to hustle.",
+      "female": "Soccer, rugby, American football — whatever you term it, you'd played it extensively before the Cataclysm and were quite the sportswoman.  Now, your trade has left you with a set of football armour that you'd packed along during the evacuation, a strong throwing arm, and experience in pitch-side tussling.  With your ball at your side, the only keepsake you'd been able to hold on to through the end of days, you suppose that it's time to hustle."
+    },
     "points": 3,
     "skills": [
       { "level": 5, "name": "throw" },
@@ -1086,7 +1090,8 @@
           { "item": "sports_drink" },
           { "item": "jersey", "snippets": [ "endsville" ] },
           { "group": "charged_smart_phone" },
-          { "item": "pants", "variant": "pants_blue" }
+          { "item": "pants", "variant": "pants_blue" },
+          { "item": "jacket_varsity", "variant": "green_varsity_jacket" }
         ]
       },
       "male": { "entries": [ { "item": "under_armor_shorts" } ] },
@@ -2273,8 +2278,8 @@
           { "group": "charged_smart_phone" },
           { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
-          { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
+          { "item": "glock_17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
+          { "item": "legpouch_large", "contents-group": "police_mags_glock17[ ]" },
           { "item": "kevlar_harness", "container-item": "runner_bag" },
           { "item": "sheriffshirt", "variant": "sheriff" }
         ]
@@ -2405,7 +2410,7 @@
     "id": "cop",
     "name": "Police Officer",
     "requirement": "achievement_reach_police_station",
-    "description": "Just a small-town deputy, you got the call and were ready to come to the rescue.  Soon it was you who needed rescuing, and you were lucky to escape with your life.  Who's going to respect your authority when the government this badge represents might not even exist anymore?",
+    "description": "Being a lawman in the end hadn't been easy, not when the department was working with the national guard during the riots or when the PD had been tasked with helping local evacuations — it's certainly not going to get any simpler now that you're on your own.  Left with your duty gear and police training, you wonder who's going to respect your authority now that the government your badge represents doesn't even exist anymore.",
     "points": 4,
     "skills": [
       { "level": 4, "name": "gun" },
@@ -2431,8 +2436,8 @@
           { "group": "charged_smart_phone" },
           { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
-          { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
+          { "item": "glock_17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
+          { "item": "legpouch_large", "contents-group": "police_mags_glock17[ ]" },
           { "item": "sheriffshirt", "variant": "sheriff" }
         ]
       },
@@ -2445,7 +2450,7 @@
     "id": "detective",
     "name": "Police Detective",
     "requirement": "achievement_reach_police_station",
-    "description": "You were on the brink of a major breakthrough in your latest homicide case when the Cataclysm struck.  Now your prime suspect is dead.  Everyone's dead.  You could really use a smoke.",
+    "description": "You used to be a homicide detective, a job that grew overwhelming across your PD's end when slaughter cases had become as numerous as the cigarettes you'd resorted to smoking to stave off the exhaustion and stress.  Now, after being assigned to assist with local evacuations and the government collapsing, all you have left is your crumpled work clothes and a badge that no longer means anything.  You solved murders, but with billions dead, this is beyond your pay grade.",
     "points": 4,
     "traits": [ "PROF_PD_DET" ],
     "proficiencies": [ "prof_spotting", "prof_gun_cleaning" ],
@@ -2454,8 +2459,7 @@
         "entries": [
           { "item": "dress_shirt" },
           { "item": "tie_skinny" },
-          { "item": "waistcoat" },
-          { "item": "trenchcoat" },
+          { "item": "duster" },
           { "item": "police_belt" },
           { "item": "badge_detective" },
           { "item": "gloves_leather" },
@@ -2464,13 +2468,13 @@
           { "item": "wristwatch" },
           { "item": "socks" },
           { "item": "dress_shoes" },
-          { "item": "cig" },
+          { "group": "charged_cigs" },
           { "group": "charged_smart_phone" },
           { "group": "charged_two_way_radio" },
           { "group": "charged_ref_lighter" },
           { "item": "pants", "variant": "pants_stone" },
-          { "group": "speedloaders_s&w619_magnum" },
-          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 7, "container-item": "holster" }
+          { "group": "police_mags_glock17" },
+          { "item": "glock_17", "ammo-item": "9mm", "charges": 17, "container-item": "shoulder_holster" }
         ]
       },
       "male": { "entries": [ { "item": "briefs" } ] },
@@ -2634,8 +2638,8 @@
           { "group": "charged_two_way_radio" },
           { "item": "glasses_bal", "custom-flags": [ "no_auto_equip" ] },
           { "group": "charged_powered_earmuffs" },
-          { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
-          { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
+          { "item": "glock_17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
+          { "item": "legpouch_large", "contents-group": "police_mags_glock17[ ]" },
           { "item": "762_51", "charges": 20 },
           { "item": "M24", "ammo-item": "762_51", "charges": 5, "contents-item": "shoulder_strap" },
           { "item": "sheriffshirt", "variant": "sheriff" }
@@ -2679,8 +2683,8 @@
           { "item": "gasbomb" },
           { "group": "charged_two_way_radio" },
           { "group": "full_gasmask" },
-          { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
-          { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
+          { "item": "glock_17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
+          { "item": "legpouch_large", "contents-group": "police_mags_glock17[ ]" },
           { "item": "tonfa", "container-item": "police_belt" },
           { "group": "charged_tazer" }
         ]
@@ -2694,18 +2698,20 @@
     "id": "cop_motor",
     "name": "Motorized Police Officer",
     "requirement": "achievement_reach_police_station",
-    "description": "Just a small-town deputy, you got the call and were ready to ride to the rescue.  Soon it was you who needed rescuing, and you had to abandon your motorcycle to escape.  Who's going to respect your authority when the government this badge represents doesn't exist anymore?",
+    "description": "Nobody expected that the evacuation convoy you'd been escorting astride your motorcycle was going to stumble upon something.  Now, you laugh at the naiveté.  A section of the world that shifted in fractal desinence: you still don't know what it'd been, but when writhing limbs that rend bloody skeletons from men had stretched forth, you were thrown from your bike and had to flee.  All you know is that, now, your sleep's going to echo with the screams of those you left behind.",
     "points": 4,
     "skills": [
       { "level": 4, "name": "gun" },
+      { "level": 4, "name": "shotgun" },
       { "level": 4, "name": "pistol" },
       { "level": 3, "name": "melee" },
       { "level": 3, "name": "bashing" },
+      { "level": 3, "name": "driving" },
       { "level": 2, "name": "dodge" },
       { "level": 2, "name": "swimming" }
     ],
     "traits": [ "PROF_POLICE" ],
-    "proficiencies": [ "prof_spotting", "prof_gun_cleaning", "prof_batons_familiar", "prof_auto_pistols_familiar" ],
+    "proficiencies": [ "prof_spotting", "prof_gun_cleaning", "prof_batons_familiar", "prof_auto_pistols_familiar", "prof_driver" ],
     "items": {
       "both": {
         "entries": [
@@ -2723,14 +2729,18 @@
           { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "gloves_leather", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
-          { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
+          { "item": "helmet_motor_raised" },
+          { "item": "tactical_shotshell_pouch", "contents-group": "bandolier_swat_cqc1" },
+          { "item": "remington_870_express", "ammo-item": "shot_00", "charges": 7, "contents-item": "shoulder_strap" },
+          { "item": "glock_17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
+          { "item": "legpouch_large", "contents-group": "police_mags_glock17[ ]" },
           { "item": "sheriffshirt", "variant": "sheriff" }
         ]
       },
       "male": { "entries": [ { "item": "boxer_shorts" } ] },
-      "female": { "entries": [ { "item": "bra" }, { "item": "boy_shorts" } ] }
-    }
+      "female": { "entries": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] }
+    },
+    "missions": [ "MISSION_MOTORIZED_POLICE" ]
   },
   {
     "type": "profession",
@@ -2886,7 +2896,7 @@
           { "group": "charged_smart_phone" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           {
-            "item": "remington_870",
+            "item": "remington_870m",
             "ammo-item": "shot_00",
             "charges": 5,
             "contents-item": "shoulder_strap_simple",
@@ -2982,7 +2992,7 @@
     "type": "profession",
     "id": "hillbilly",
     "name": { "male": "Hillbilly", "female": "Hillbilly Girl" },
-    "description": "You n' yer kin always figured shit would hit the fan some day, but never like this!  When they turned on you, you grabbed yer gun and a six pack, and hauled ass in the family truck.",
+    "description": "You'd never been one for the cities, and that spared you after the first weeks of rioting, when the going really got rough.  The nightmares didn't overlook you for long, however, and when they came, you'd hightailed it in the family truck.  Days later, you can't count the number of overrun sanctuaries you've passed, and a reliance on drinking to stave off impending dejection has left the case of boos in the back mostly empty.",
     "points": 4,
     "proficiencies": [ "prof_driver" ],
     "skills": [
@@ -3003,8 +3013,8 @@
           { "item": "jacket_flannel" },
           { "item": "slingpack" },
           { "group": "charged_smart_phone" },
-          { "item": "shot_00", "charges": 25 },
-          { "item": "beer", "count": 6 },
+          { "group": "ammo_box_shot", "count": 4 },
+          { "item": "beer" },
           { "item": "remington_870", "ammo-item": "shot_00", "charges": 5, "contents-item": "shoulder_strap_simple" }
         ]
       },
@@ -3050,7 +3060,7 @@
     "type": "profession",
     "id": "trucker",
     "name": "Trucker",
-    "description": "You once ruled the road in your big rig.  When the riots hit, you hopped in and drove it to safety.  Now it's just you and your truck against the world.",
+    "description": "You once ruled the road in your big rig.  Long-haul deliveries had grown scarce by the riots’ height, and when nightmares had joined the mix in strength, you’d conveniently assumed ownership of your vehicle and scrammed, taking it to the remotest location possible and using it as a makeshift mobile home, hiding away from the madness.  Now it's just you and your truck against the world.",
     "points": 4,
     "proficiencies": [ "prof_driver" ],
     "skills": [ { "level": 6, "name": "driving" }, { "level": 3, "name": "mechanics" } ],
@@ -3063,9 +3073,9 @@
           { "item": "multitool" },
           { "item": "wristwatch" },
           { "item": "gloves_work" },
-          { "item": "hat_ball" },
+          { "item": "hat_ball", "variant": "generic_truckball" },
           { "group": "charged_smart_phone" },
-          { "item": "pants", "variant": "pants_stone" },
+          { "item": "pants", "variant": "pants_olive_khaki" },
           { "item": "tank_top", "variant": "tank_top_generic" }
         ]
       },
@@ -3246,8 +3256,8 @@
           { "group": "charged_smart_phone" },
           { "group": "charged_two_way_radio" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
-          { "item": "legpouch_large", "contents-group": "army_mags_usp45" },
+          { "item": "glock_17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
+          { "item": "legpouch_large", "contents-group": "police_mags_glock17[ ]" },
           { "item": "sheriffshirt", "variant": "sheriff" }
         ]
       },

data/json/starting_missions.json

@@ -741,5 +741,19 @@
     "start": "kill_nemesis",
     "end": { "effect": [ { "u_lose_trait": "HAS_NEMESIS" } ] },
     "origins": [ "ORIGIN_GAME_START" ]
+  },
+  {
+    "id": "MISSION_MOTORIZED_POLICE",
+    "type": "mission_definition",
+    "name": { "str": "Reach The Evacuation Site." },
+    "description": "Before the evacuation group you were escorting got obliterated, your mission had been to accompany it to a refugee processing encampment.  The convoy's no more and higher authority may have collapsed days ago, but you can only hope that the camp's still secure and has room for one more refugee.",
+    "goal": "MGOAL_GO_TO_TYPE",
+    "destination": "fema_entrance_north",
+    "difficulty": 1,
+    "value": 0,
+    "start": {
+      "assign_mission_target": { "om_terrain": "fema_entrance_north", "reveal_radius": 3, "om_special": "FEMA Camp", "search_range": 80 }
+    },
+    "origins": [ "ORIGIN_GAME_START" ]
   }
 ]