diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 7d1f8be090993..31f3cceeb769d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -50,6 +50,12 @@ The easier you make your solution to understand, the faster it can get merged.
 A clear and concise description of any alternative solutions or features you've considered.
 -->
 
+#### Testing
+<!--
+Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.
+Also include testing suggestions for reviewers and maintainers.
+-->
+
 #### Additional context
 <!--
 Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature or bugfix here.
diff --git a/data/json/bionics.json b/data/json/bionics.json
index 0fb7e95653592..bd2dd4a8ffa85 100644
--- a/data/json/bionics.json
+++ b/data/json/bionics.json
@@ -5,7 +5,7 @@
     "name": "Adrenaline Pump",
     "description": "A stimulator system has been surgically implanted alongside your adrenal glands, allowing you to trigger your body's adrenaline response at the cost of some bionic power.",
     "occupied_bodyparts": [ [ "TORSO", 6 ] ],
-    "act_cost": 50
+    "act_cost": "5 J"
   },
   {
     "id": "bio_ads",
@@ -25,9 +25,9 @@
     "description": "A motion-detecting alarm system will notice almost all movement within a fifteen-foot radius, and will silently alert you.  This is very useful during sleep, or if you suspect a cloaked pursuer.",
     "occupied_bodyparts": [ [ "TORSO", 2 ], [ "HEAD", 1 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 600
+    "act_cost": "1 J",
+    "react_cost": "1 J",
+    "time": 1
   },
   {
     "id": "bio_ankles",
@@ -93,7 +93,7 @@
     "name": "Monomolecular Blade",
     "description": "A deadly foot-long blade made of advanced material now resides inside your forearm, capable of being extended through the back of your wrist at the cost of a small amount of power.  Though exceptionally sharp, it will prevent you from holding anything else while extended.",
     "occupied_bodyparts": [ [ "ARM_R", 5 ], [ "HAND_R", 2 ] ],
-    "act_cost": 200,
+    "act_cost": "50 J",
     "fake_item": "bio_blade_weapon",
     "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "BIONIC_NPC_USABLE" ]
   },
@@ -104,7 +104,7 @@
     "description": "Concealed in your left arm is a single shot 12 gauge shotgun.  Activate the bionic to fire and reload the shotgun.",
     "occupied_bodyparts": [ [ "ARM_L", 15 ] ],
     "encumbrance": [ [ "ARM_L", 5 ] ],
-    "act_cost": 5,
+    "act_cost": "50 J",
     "fake_item": "bio_shotgun_gun",
     "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "NO_UNWIELD" ]
   },
@@ -122,7 +122,7 @@
     "name": "Blood Analysis",
     "description": "Small sensors have been surgically implanted in your heart, allowing you to analyze your blood.  This will detect many illnesses, drugs, and other conditions.",
     "occupied_bodyparts": [ [ "TORSO", 5 ] ],
-    "act_cost": 25
+    "act_cost": "100 J"
   },
   {
     "id": "bio_blood_filter",
@@ -130,7 +130,7 @@
     "name": "Blood Filter",
     "description": "A filtration system in your heart allows you to actively filter out chemical impurities, primarily drugs.  It will have limited impact on viruses.  Note that it is not a targeted filter; ALL drugs in your system will be affected.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
-    "act_cost": 75
+    "act_cost": "600 J"
   },
   {
     "id": "bio_cable",
@@ -166,7 +166,7 @@
     "name": "Chain Lightning",
     "description": "Your body is equipped with a chain lightning generator, allowing you to emit a blast of lightning at a target, leaving a trail of lightning in its wake, jumping to additional targets within 4 tiles of the previous target.",
     "occupied_bodyparts": [ [ "TORSO", 16 ], [ "ARM_L", 4 ], [ "ARM_R", 4 ] ],
-    "act_cost": 125,
+    "act_cost": "100 kJ",
     "fake_item": "bio_lightning",
     "flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
   },
@@ -176,7 +176,7 @@
     "name": "Bionic Claws",
     "description": "Vicious claws have been surgically installed inside your fingers, allowing you to extend and retract them at the cost of a small amount of power.  These do considerable cutting damage, but prevent you from holding anything else while extended.",
     "occupied_bodyparts": [ [ "HAND_L", 5 ], [ "HAND_R", 5 ] ],
-    "act_cost": 100,
+    "act_cost": "25 J",
     "fake_item": "bio_claws_weapon",
     "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "BIONIC_NPC_USABLE" ]
   },
@@ -197,9 +197,9 @@
       [ "FOOT_L", 1 ],
       [ "FOOT_R", 1 ]
     ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 24,
+    "act_cost": "100 J",
+    "react_cost": "100 J",
+    "time": 1,
     "flags": [ "BIONIC_TOGGLED" ]
   },
   {
@@ -219,8 +219,8 @@
       [ "FOOT_L", 1 ],
       [ "FOOT_R", 1 ]
     ],
-    "act_cost": 50,
-    "react_cost": 50,
+    "act_cost": "30 kJ",
+    "react_cost": "30 kJ",
     "time": 1,
     "flags": [ "BIONIC_TOGGLED" ]
   },
@@ -230,8 +230,8 @@
     "name": "Close Quarters Battle",
     "description": "Bionic processors and databanks, loaded with martial arts combat programs, are surgically integrated into your nervous system.  Whilst active, the CQB module will improve your hand to hand combat skills, but prevents you from improving them through combat experience.",
     "occupied_bodyparts": [ [ "HEAD", 4 ] ],
-    "act_cost": 1,
-    "react_cost": 1,
+    "act_cost": "20 J",
+    "react_cost": "20 J",
     "time": 1,
     "flags": [ "BIONIC_TOGGLED" ]
   },
@@ -307,7 +307,7 @@
     "name": "Directional EMP",
     "description": "Surgically mounted in the palm of your hand are small parabolic EMP field generators.  You may use power to fire a wide, but short-ranged blast which will disable electronics and robots.",
     "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "HAND_R", 2 ] ],
-    "act_cost": 100
+    "act_cost": "50 kJ"
   },
   {
     "type": "bionic",
@@ -315,7 +315,7 @@
     "name": "EMP Projector",
     "description": "A ranged EMP generator system is implanted on the palm of your right hand and arm.  The system fires precise, single-target pulses that require time to aim.  Extremely effective against electronic targets but mostly useless otherwise.",
     "occupied_bodyparts": [ [ "ARM_R", 10 ], [ "HAND_R", 5 ] ],
-    "act_cost": 20,
+    "act_cost": "50 kJ",
     "fake_item": "bio_emp_gun",
     "flags": [ "BIONIC_GUN" ]
   },
@@ -333,7 +333,7 @@
     "name": "Aero-Evaporator",
     "description": "This unit draws moisture from the surrounding air, which then is poured from a fingertip in the form of water.  It may fail in very dry environments.",
     "occupied_bodyparts": [ [ "TORSO", 5 ], [ "HAND_R", 1 ] ],
-    "act_cost": 200
+    "act_cost": "720 kJ"
   },
   {
     "id": "bio_eye_enhancer",
@@ -377,9 +377,9 @@
       [ "FOOT_R", 1 ]
     ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 2
+    "act_cost": "5 J",
+    "react_cost": "5 J",
+    "time": 1
   },
   {
     "id": "bio_fingerhack",
@@ -394,7 +394,7 @@
     "name": "Flashbang Generator",
     "description": "Light emitting diodes surgically integrated into your skin can release a flash comparable to a flashbang grenade, blinding nearby enemies.  Speakers integrated into your body mimic the loud sound, deafening those nearby.",
     "occupied_bodyparts": [ [ "TORSO", 20 ], [ "ARM_L", 2 ], [ "ARM_R", 2 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ] ],
-    "act_cost": 125
+    "act_cost": "10 kJ"
   },
   {
     "id": "bio_flashlight",
@@ -402,9 +402,9 @@
     "name": "Cranial Flashlight",
     "description": "Surgically mounted between your eyes is a small but powerful LED flashlight.",
     "occupied_bodyparts": [ [ "EYES", 1 ] ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 150,
+    "act_cost": "3 J",
+    "react_cost": "3 J",
+    "time": 1,
     "flags": [ "BIONIC_TOGGLED" ]
   },
   {
@@ -412,9 +412,9 @@
     "type": "bionic",
     "name": "LED Tattoo",
     "description": "A small LED display just beneath your dermal layer can be illuminated on command to show patterns of your choice at dim or bright luminosity.  It doesn't provide enough light to comfortably read or craft, but it can suffice if you have nothing else.",
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 300,
+    "act_cost": "1 J",
+    "react_cost": "1 J",
+    "time": 1,
     "flags": [ "BIONIC_TOGGLED" ]
   },
   {
@@ -430,7 +430,7 @@
     "name": "Integrated Dosimeter",
     "description": "Small radiation sensors have been surgically implanted throughout your body, allowing you to analyze your level of absorbed radiation.  They will also alert you whenever exposed to environmental radiation.",
     "occupied_bodyparts": [ [ "TORSO", 2 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 1 ], [ "LEG_R", 1 ] ],
-    "act_cost": 25
+    "act_cost": "100 J"
   },
   {
     "id": "bio_gills",
@@ -447,8 +447,8 @@
     "description": "Your feet are equipped with precision sonar equipment, allowing you to detect the movements of creatures below the ground, buried traps, and unstable terrain.",
     "occupied_bodyparts": [ [ "FOOT_L", 3 ], [ "FOOT_R", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 5,
-    "react_cost": 1,
+    "act_cost": "200 J",
+    "react_cost": "200 J",
     "time": 1
   },
   {
@@ -488,8 +488,8 @@
       [ "FOOT_R", 1 ]
     ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-    "act_cost": 4,
-    "react_cost": 4,
+    "act_cost": "1 kJ",
+    "react_cost": "1 kJ",
     "time": 1
   },
   {
@@ -499,8 +499,8 @@
     "description": "While activated, your muscles will be greatly enhanced, increasing your strength by 20.",
     "occupied_bodyparts": [ [ "TORSO", 4 ], [ "ARM_L", 8 ], [ "ARM_R", 8 ], [ "LEG_L", 14 ], [ "LEG_R", 14 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-    "act_cost": 17,
-    "react_cost": 17,
+    "act_cost": "10 kJ",
+    "react_cost": "10 kJ",
     "time": 1
   },
   {
@@ -510,8 +510,8 @@
     "description": "Your range of vision extends into the infrared, allowing you to see warm-blooded creatures in the dark or through smoke.",
     "occupied_bodyparts": [ [ "EYES", 1 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 5,
-    "react_cost": 1,
+    "act_cost": "5 J",
+    "react_cost": "5 J",
     "time": 1
   },
   {
@@ -537,7 +537,7 @@
     "name": "Finger-Mounted Laser",
     "description": "One of your fingers has a small high-powered laser surgically embedded in it.  This long range weapon is not incredibly damaging, but is very accurate, and has the potential to start fires.",
     "occupied_bodyparts": [ [ "HAND_R", 1 ] ],
-    "act_cost": 50,
+    "act_cost": "30 kJ",
     "fake_item": "bio_laser_gun",
     "flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
   },
@@ -556,9 +556,9 @@
     "description": "You are equipped with bionic stimulators which augment your haematopoiesis system, allowing you to accelerate white blood cell production using bionic power.  It is supposed to run continuously and may cause unpleasant side effects when turned off.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
-    "act_cost": 10,
-    "react_cost": 1,
-    "time": 3600
+    "act_cost": "5 J",
+    "react_cost": "5 J",
+    "time": 1
   },
   {
     "id": "bio_lighter",
@@ -575,7 +575,7 @@
     "name": "Fingerpick",
     "description": "One of your fingers has an electronic lockpick surgically embedded in it.  This automatic system will quickly unlock all but the most advanced key locks without any skill required on the part of the user.",
     "occupied_bodyparts": [ [ "HAND_R", 2 ] ],
-    "act_cost": 25
+    "act_cost": "50 J"
   },
   {
     "id": "bio_magnet",
@@ -583,7 +583,7 @@
     "name": "Electromagnetic Unit",
     "description": "Surgically embedded in your right hand is a powerful electromagnet, allowing you to indiscriminately pull all nearby magnetic objects towards you.  Unlucky bystanders might be injured or killed by flying objects.",
     "occupied_bodyparts": [ [ "HAND_R", 3 ] ],
-    "act_cost": 50
+    "act_cost": "10 kJ"
   },
   {
     "id": "bio_membrane",
@@ -600,9 +600,9 @@
     "description": "Your memory has been enhanced with small quantum storage drives.  While active, you learn - both through reading and practice - more quickly.  Additionally, you can't forget skills you've already learned, and the layout of terrain you've explored will remain in your memory for an incredibly long time.",
     "occupied_bodyparts": [ [ "HEAD", 3 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
-    "act_cost": 10,
-    "react_cost": 1,
-    "time": 600
+    "act_cost": "2 J",
+    "react_cost": "2 J",
+    "time": 1
   },
   {
     "id": "bio_metabolics",
@@ -618,7 +618,7 @@
     "name": "Weather Reader",
     "description": "A multitude of scientific instruments and sensors collect environmental data.  The data is compiled and presented as a simple readout of the current weather.  It also passively tells you the local air temperature.",
     "occupied_bodyparts": [ [ "TORSO", 1 ], [ "HEAD", 1 ] ],
-    "act_cost": 10
+    "act_cost": "10 J"
   },
   {
     "id": "bio_nanobots",
@@ -635,8 +635,8 @@
     "description": "When active, this bionic eliminates all light within a 15 tile radius through destructive interference.",
     "occupied_bodyparts": [ [ "TORSO", 16 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 15,
-    "react_cost": 15,
+    "act_cost": "9 kJ",
+    "react_cost": "9 kJ",
     "time": 1
   },
   {
@@ -646,9 +646,9 @@
     "description": "When active, this bionic will amplify existing light, allowing you to see in the dark.",
     "occupied_bodyparts": [ [ "EYES", 1 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 10000
+    "act_cost": "10 J",
+    "react_cost": "10 J",
+    "time": 1
   },
   {
     "id": "bio_noise",
@@ -674,8 +674,8 @@
     "description": "A thin forcefield surrounds your body, continually draining power.  This field does not deflect attacks, but rather delivers a strong shock, damaging unarmed attackers and those with a conductive weapon.",
     "occupied_bodyparts": [ [ "TORSO", 10 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-    "act_cost": 10,
-    "react_cost": 10,
+    "act_cost": "10 kJ",
+    "react_cost": "10 kJ",
     "time": 1
   },
   {
@@ -746,8 +746,8 @@
     "description": "Increases your body's wavelength, allowing you to quantum tunnel through walls, reappearing on the other side.  Power drain in standby is minimal, but each tile tunneled through costs 250 bionic power.",
     "occupied_bodyparts": [ [ "TORSO", 20 ], [ "ARM_L", 2 ], [ "ARM_R", 2 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ], [ "FOOT_L", 1 ], [ "FOOT_R", 1 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 1,
-    "react_cost": 1,
+    "act_cost": "3 J",
+    "react_cost": "3 J",
     "time": 1
   },
   {
@@ -766,7 +766,7 @@
     "description": "A system of advanced piezomechanical blood filters have been surgically implanted throughout your body, allowing you to purge yourself of absorbed radiation at the cost of some bionic power.",
     "occupied_bodyparts": [ [ "TORSO", 5 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ],
     "flags": [ "BIONIC_NPC_USABLE" ],
-    "act_cost": 50
+    "act_cost": "4500 J"
   },
   {
     "id": "bio_railgun",
@@ -832,9 +832,9 @@
     "description": "While this system is powered, you're able to visually sense your own scent, making it possible for you to recognize your surroundings even in complete darkness.",
     "occupied_bodyparts": [ [ "HEAD", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 6
+    "act_cost": "2 J",
+    "react_cost": "2 J",
+    "time": 1
   },
   {
     "id": "bio_shakes",
@@ -1041,9 +1041,9 @@
     "description": "Your nervous system has been augmented with bionic processors, allowing you to dodge attacks beyond normal human capability, including bullets.",
     "occupied_bodyparts": [ [ "TORSO", 12 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "LEG_L", 5 ], [ "LEG_R", 5 ], [ "FOOT_L", 1 ], [ "FOOT_R", 1 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 10
+    "act_cost": "6 J",
+    "react_cost": "6 J",
+    "time": 1
   },
   {
     "id": "bio_ups",
@@ -1074,7 +1074,7 @@
     "name": "Water Extraction Unit",
     "description": "Nanotubes surgically embedded in the palm of your hand will pump any available fluid out of a dead body, cleanse it of impurities and convert it into drinkable water.  You must, however, have a container to store the water in.",
     "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "HAND_R", 2 ] ],
-    "act_cost": 50
+    "act_cost": "20 kJ"
   },
   {
     "id": "bio_fuel_cell_gasoline",
diff --git a/data/json/itemgroups/drugs.json b/data/json/itemgroups/drugs.json
index f52a1b5c05a52..9c75e9970983c 100644
--- a/data/json/itemgroups/drugs.json
+++ b/data/json/itemgroups/drugs.json
@@ -18,6 +18,7 @@
       [ "eyedrops", 10 ],
       [ "medical_gauze", 20 ],
       [ "medical_tape", 20 ],
+      [ "pepto", 20 ],
       [ "saline", 10 ],
       [ "weak_antibiotic", 30 ]
     ]
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
index 79fd7dff151cb..ad734f3308fc0 100644
--- a/data/json/itemgroups/item_groups.json
+++ b/data/json/itemgroups/item_groups.json
@@ -4183,6 +4183,7 @@
       [ "silver_locket", 4 ],
       [ "silver_ring", 10 ],
       [ "silver_ear", 10 ],
+      [ "bead_ear", 10 ],
       [ "jade_brooch", 2 ],
       [ "diamond", 1 ],
       [ "manual_dodge", 1 ],
@@ -4507,6 +4508,7 @@
       [ "silver_necklace", 14 ],
       [ "gold_ear", 12 ],
       [ "silver_ear", 14 ],
+      [ "bead_ear", 14 ],
       [ "platinum_ear", 1 ],
       [ "platinum_bracelet", 1 ],
       [ "gold_bracelet", 8 ],
@@ -7467,6 +7469,7 @@
       [ "geiger_off", 8 ],
       [ "rad_monitor", 2 ],
       [ "teleporter", 10 ],
+      [ "RTG_coffee", 2 ],
       [ "canister_goo", 8 ],
       [ "EMPbomb", 2 ],
       [ "pheromone", 1 ],
@@ -8643,6 +8646,7 @@
       [ "diamond_dental_grill", 5 ],
       [ "jade_brooch", 30 ],
       [ "tieclip", 35 ],
+      [ "bead_ear", 35 ],
       [ "pearl_collar", 30 ],
       [ "holy_symbol", 20 ]
     ]
@@ -9417,6 +9421,7 @@
       [ "straw_hat", 80 ],
       [ "straw_fedora", 80 ],
       [ "silver_ear", 20 ],
+      [ "bead_ear", 20 ],
       [ "silver_necklace", 20 ],
       [ "silver_bracelet", 20 ],
       [ "silver_locket", 20 ],
diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json
index 565f035f1629d..556b0fcb7429e 100644
--- a/data/json/itemgroups/mansion.json
+++ b/data/json/itemgroups/mansion.json
@@ -983,6 +983,7 @@
       [ "gold_ear", 10 ],
       [ "bone_tainted", 5 ],
       [ "silver_ear", 5 ],
+      [ "bead_ear", 5 ],
       [ "platinum_ear", 1 ],
       { "group": "corpse_mansion", "prob": 5 },
       { "group": "neckties", "prob": 1 }
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
index 1a6131460ec5c..f0fb4457bf238 100644
--- a/data/json/itemgroups/tools.json
+++ b/data/json/itemgroups/tools.json
@@ -359,6 +359,7 @@
       [ "gloves_medical", 5 ],
       [ "mask_dust", 5 ],
       [ "mask_filter", 5 ],
+      [ "gasfilter_s", 5 ],
       [ "glasses_safety", 5 ],
       [ "UPS_off", 3 ],
       [ "microscope", 5 ],
diff --git a/data/json/items/tools.json b/data/json/items/tools.json
index db64ea5e41438..96462f567d657 100644
--- a/data/json/items/tools.json
+++ b/data/json/items/tools.json
@@ -332,7 +332,13 @@
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "light_green",
-    "use_action": { "target": "atomic_lamp", "msg": "You open the lamp's cover.", "menu_text": "Open cover", "type": "transform" },
+    "use_action": {
+      "target": "atomic_lamp",
+      "active": true,
+      "msg": "You open the lamp's cover.",
+      "menu_text": "Open cover",
+      "type": "transform"
+    },
     "flags": [ "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE", "ALLOWS_REMOTE_USE" ]
   },
   {
@@ -372,7 +378,13 @@
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "light_green",
-    "use_action": { "target": "atomic_light", "msg": "You open the nightlight's cover.", "menu_text": "Open cover", "type": "transform" },
+    "use_action": {
+      "target": "atomic_light",
+      "active": true,
+      "msg": "You open the nightlight's cover.",
+      "menu_text": "Open cover",
+      "type": "transform"
+    },
     "flags": [ "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE", "ALLOWS_REMOTE_USE" ]
   },
   {
@@ -5217,6 +5229,7 @@
     "max_charges": 50,
     "use_action": {
       "type": "fireweapon_off",
+      "active": true,
       "target_id": "shishkebab_on",
       "moves": 10,
       "noise": 10,
diff --git a/data/json/mapgen/pawn_shop.json b/data/json/mapgen/pawn_shop.json
index 9f0d9285dd01e..d952c40a9e57a 100644
--- a/data/json/mapgen/pawn_shop.json
+++ b/data/json/mapgen/pawn_shop.json
@@ -289,7 +289,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "pawn_pf" ],
-    "weight": 1,
+    "weight": 50,
     "object": {
       "rows": [
         ".`''''`''''`''''`''''`..",
@@ -370,7 +370,6 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "pawn_pf_under" ],
-    "weight": 1,
     "object": {
       "rows": [
         "........................",
diff --git a/data/json/martialarts.json b/data/json/martialarts.json
index 17e4317f885b1..71d3b1cecd5d6 100644
--- a/data/json/martialarts.json
+++ b/data/json/martialarts.json
@@ -1165,6 +1165,38 @@
       "l-stick_on"
     ]
   },
+  {
+    "type": "martial_art",
+    "id": "style_snake",
+    "name": "Snake Kung Fu",
+    "description": "One of the five Shaolin animal styles.  The Snake focuses on sinuous movement and precision strikes.  Perception determines your Accuracy, rather than Dexterity.  Standing still will increases your accuracy and damage of your next attack.",
+    "initiate": [ "You adopt a fluid stance, ready to strike like a snake.", "%s assumes a snake-like stance." ],
+    "learn_difficulty": 10,
+    "arm_block": 2,
+    "static_buffs": [
+      {
+        "id": "buff_snake_static",
+        "name": "Snake's Sight",
+        "description": "You are patient and know where to hit your opponent for the best results.\n\nPerception increases Accuracy instead of Dexterity.  Accuracy increased by 25%% of Perception but decreased by 25%% of Dexterity.",
+        "min_unarmed": 0,
+        "unarmed_allowed": true,
+        "flat_bonuses": [ [ "hit", "per", 0.25 ], [ "hit", "dex", -0.25 ] ]
+      }
+    ],
+    "onpause_buffs": [
+      {
+        "id": "buff_snake_onpause",
+        "name": "Snake's Coil",
+        "description": "Every snake wait for the perfect moment to strike.  Aim as your opponents approve and attack their weakness without mercy!\n\n+1 Accuracy, gain armor penetration equal to 50%% of Perceptions.\nLasts 1 turn.  Stacks 3 times.",
+        "min_unarmed": 1,
+        "unarmed_allowed": true,
+        "buff_duration": 1,
+        "max_stacks": 3,
+        "flat_bonuses": [ [ "hit", 1.0 ], [ "arpen", "bash", "per", 0.5 ], [ "arpen", "cut", "per", 0.5 ], [ "arpen", "stab", "per", 0.5 ] ]
+      }
+    ],
+    "techniques": [ "tec_snake_rapid", "tec_snake_feint", "tec_snake_break", "tec_snake_precise" ]
+  },
   {
     "type": "martial_art",
     "id": "style_tai_chi",
@@ -1281,26 +1313,6 @@
     ],
     "techniques": [ "tec_tiger_grab" ]
   },
-  {
-    "type": "martial_art",
-    "id": "style_snake",
-    "name": "Snake Kung Fu",
-    "description": "One of the five Shaolin animal styles.  The Snake focuses on sinuous movement and precision strikes.  Your Perception improves your damage.",
-    "initiate": [ "You adopt a fluid stance, ready to strike like a snake.", "%s assumes a snake-like stance." ],
-    "learn_difficulty": 10,
-    "arm_block": 99,
-    "leg_block": 99,
-    "static_buffs": [
-      {
-        "id": "snake_static",
-        "name": "Snake Sight",
-        "description": "Perception provides a bonus to damage.",
-        "unarmed_allowed": true,
-        "flat_bonuses": [ [ "damage", "bash", "per", 0.8 ] ]
-      }
-    ],
-    "techniques": [ "tec_snake_rapid", "tec_snake_feint", "tec_snake_break", "tec_snake_precise" ]
-  },
   {
     "type": "martial_art",
     "id": "style_debug",
diff --git a/data/json/npcs/TALK_COMMON_ALLY.json b/data/json/npcs/TALK_COMMON_ALLY.json
index 0fa64f14f168a..8f00daf1920e8 100644
--- a/data/json/npcs/TALK_COMMON_ALLY.json
+++ b/data/json/npcs/TALK_COMMON_ALLY.json
@@ -90,6 +90,12 @@
         "topic": "TALK_FRIEND_GUARD",
         "effect": "assign_guard"
       },
+      {
+        "text": "I want to assign you to work at this camp.",
+        "condition": { "npc_at_om_location": "FACTION_CAMP_ANY" },
+        "topic": "TALK_FRIEND_GUARD",
+        "effect": "assign_camp"
+      },
       { "text": "Let's talk about your current activity.", "topic": "TALK_ACTIVITIES" },
       { "text": "Let's talk about faction camps.", "topic": "TALK_CAMP_GENERAL" },
       {
diff --git a/data/json/recipes/basecamps/recipe_groups.json b/data/json/recipes/basecamps/recipe_groups.json
index b99a918765b03..03b6c929953ae 100644
--- a/data/json/recipes/basecamps/recipe_groups.json
+++ b/data/json/recipes/basecamps/recipe_groups.json
@@ -16,10 +16,10 @@
     "recipes": [
       { "id": "faction_base_farm_0", "description": "Farm", "om_terrains": [ "field" ] },
       { "id": "faction_base_garage_0", "description": "Garage", "om_terrains": [ "field" ] },
-      { "id": "faction_base_canteen_0", "description": "Kitchen", "om_terrains": [ "field" ] },
+      { "id": "faction_base_canteen_0", "description": "Canteen", "om_terrains": [ "field" ] },
       { "id": "faction_base_livestock_0", "description": "Livestock Area", "om_terrains": [ "field" ] },
       { "id": "faction_base_storehouse_0", "description": "Central Storage Building", "om_terrains": [ "field" ] },
-      { "id": "faction_base_workshop_0", "description": "Fabrication workshop", "om_terrains": [ "field" ] }
+      { "id": "faction_base_workshop_0", "description": "Fabrication Workshop", "om_terrains": [ "field" ] }
     ]
   },
   {
diff --git a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json
index f23e4983cf906..5eac4fe94cdba 100644
--- a/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json
+++ b/data/json/recipes/basecamps/recipe_modular_canteen/recipe_modular_canteen_common.json
@@ -25,7 +25,7 @@
     "construction_blueprint": "fbmk_canteen_fireplace",
     "blueprint_name": "build 2 fireplaces",
     "blueprint_requires": [ { "id": "fbmk_center" } ],
-    "blueprint_provides": [ { "id": "fbmk_canteen_fire" }, { "id": "trapping" }, { "id": "kitchen" }, { "id": "kitchen_recipes_1" } ],
+    "blueprint_provides": [ { "id": "fbmk_canteen_fire" }, { "id": "trapping" }, { "id": "kitchen_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmk_canteen_fire" } ],
     "blueprint_resources": [ "fake_fireplace", "pot" ],
     "blueprint_autocalc": true,
@@ -43,7 +43,7 @@
     "construction_blueprint": "fbmk_canteen_stove",
     "blueprint_name": "build 2 wood stoves",
     "blueprint_requires": [ { "id": "fbmk_center" } ],
-    "blueprint_provides": [ { "id": "fbmk_canteen_fire" }, { "id": "trapping" }, { "id": "kitchen" }, { "id": "kitchen_recipes_1" } ],
+    "blueprint_provides": [ { "id": "fbmk_canteen_fire" }, { "id": "trapping" }, { "id": "kitchen_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmk_canteen_fire" } ],
     "blueprint_resources": [ "fake_fireplace", "pot" ],
     "blueprint_autocalc": true,
diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json
index 693899810916d..f4d832dc82936 100644
--- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json
+++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop.rock.json
@@ -25,7 +25,7 @@
     "construction_blueprint": "fbmw_room1_rock_northeast",
     "blueprint_name": "northeast kiln and forge",
     "blueprint_requires": [ { "id": "fbmw_northeast" } ],
-    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith" }, { "id": "blacksmith_recipes_1" } ],
+    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ],
     "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ],
     "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ],
diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json
index d5d2b87edf92a..f4e14ff113df7 100644
--- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json
+++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_log.json
@@ -25,7 +25,7 @@
     "construction_blueprint": "fbmw_room1_log_northeast",
     "blueprint_name": "northeast kiln and forge",
     "blueprint_requires": [ { "id": "fbmw_northeast" } ],
-    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith" }, { "id": "blacksmith_recipes_1" } ],
+    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ],
     "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ],
     "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ],
diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json
index e9eca68d98c7f..00c7058e4e1cb 100644
--- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json
+++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_metal.json
@@ -25,7 +25,7 @@
     "construction_blueprint": "fbmw_room1_metal_northeast",
     "blueprint_name": "northeast kiln and forge",
     "blueprint_requires": [ { "id": "fbmw_northeast" } ],
-    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith" }, { "id": "blacksmith_recipes_1" } ],
+    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ],
     "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ],
     "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ],
diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json
index 1d15ef5fad511..cadc5fe2b1d5e 100644
--- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json
+++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wad.json
@@ -25,7 +25,7 @@
     "construction_blueprint": "fbmw_room1_wad_northeast",
     "blueprint_name": "northeast kiln and forge",
     "blueprint_requires": [ { "id": "fbmw_northeast" } ],
-    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith" }, { "id": "blacksmith_recipes_1" } ],
+    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ],
     "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ],
     "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ],
diff --git a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json
index c9757ea3ae384..3c06e24c2aca0 100644
--- a/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json
+++ b/data/json/recipes/basecamps/recipe_modular_workshop/recipe_modular_workshop_wood.json
@@ -40,7 +40,7 @@
     "construction_blueprint": "fbmw_room1_wood_northeast",
     "blueprint_name": "northeast kiln and forge",
     "blueprint_requires": [ { "id": "fbmw_northeast" } ],
-    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith" }, { "id": "blacksmith_recipes_1" } ],
+    "blueprint_provides": [ { "id": "fbmw_northeast" }, { "id": "blacksmith_recipes_1" } ],
     "blueprint_excludes": [ { "id": "fbmw_northeast", "amount": 2 } ],
     "blueprint_resources": [ "fake_forge", "fake_char_kiln", "makeshift_hammer" ],
     "components": [ [ [ "crucible", 1 ], [ "crucible_clay", 1 ] ], [ [ "primitive_hammer", 1 ], [ "makeshift_hammer", 1 ] ] ],
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
index 1f7e9178e41ef..d1a3faab12335 100644
--- a/data/json/regional_map_settings.json
+++ b/data/json/regional_map_settings.json
@@ -687,6 +687,7 @@
         "s_electronics_1": 400,
         "pawn": 300,
         "pawn_1": 300,
+        "pawn_pf": 50,
         "mil_surplus": 200,
         "mil_surplus_1": 200,
         "mil_surplus_2": 200,
diff --git a/data/json/techniques.json b/data/json/techniques.json
index a4660b965bf4e..c80b577cc40c8 100644
--- a/data/json/techniques.json
+++ b/data/json/techniques.json
@@ -1279,6 +1279,46 @@
     "weighting": 2,
     "mult_bonuses": [ [ "damage", "bash", 1.33 ], [ "damage", "cut", 1.33 ], [ "damage", "stab", 1.33 ] ]
   },
+  {
+    "type": "technique",
+    "id": "tec_snake_rapid",
+    "name": "Snake Snap",
+    "messages": [ "You swiftly jab %s", "<npcname> swiftly jabs %s" ],
+    "min_unarmed": 0,
+    "unarmed_allowed": true,
+    "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_snake_feint",
+    "name": "Snake Slide",
+    "messages": [ "You make serpentine hand motions at %s", "<npcname> makes serpentine hand motions at %s" ],
+    "min_unarmed": 3,
+    "unarmed_allowed": true,
+    "defensive": true,
+    "miss_recovery": true
+  },
+  {
+    "type": "technique",
+    "id": "tec_snake_break",
+    "name": "Snake Slither",
+    "messages": [ "The %s tries to grab you, but you slither free!", "The %s tries to grab <npcname>, but they slither free!" ],
+    "min_unarmed": 4,
+    "unarmed_allowed": true,
+    "defensive": true,
+    "grab_break": true
+  },
+  {
+    "type": "technique",
+    "id": "tec_snake_precise",
+    "name": "Snake Strike",
+    "messages": [ "You lash out at %s with a vicious Snake Strike", "<npcname> lashes out at %s with a vicious Snake Strike" ],
+    "min_unarmed": 5,
+    "unarmed_allowed": true,
+    "crit_tec": true,
+    "stun_dur": 1,
+    "mult_bonuses": [ [ "damage", "bash", 1.5 ] ]
+  },
   {
     "type": "technique",
     "id": "tec_taichi_disarm",
@@ -1357,45 +1397,6 @@
     "down_dur": 1,
     "messages": [ "You grab and ground %s", "<npcname> grabs and grounds %s" ]
   },
-  {
-    "type": "technique",
-    "id": "tec_snake_rapid",
-    "name": "Snake Snap",
-    "min_unarmed": 2,
-    "unarmed_allowed": true,
-    "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ],
-    "messages": [ "You swiftly jab %s", "<npcname> swiftly jabs %s" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_snake_feint",
-    "name": "Snake Slide",
-    "min_unarmed": 3,
-    "unarmed_allowed": true,
-    "defensive": true,
-    "miss_recovery": true,
-    "messages": [ "You make serpentine hand motions at %s", "<npcname> makes serpentine hand motions at %s" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_snake_break",
-    "name": "Snake Slither",
-    "min_unarmed": 4,
-    "unarmed_allowed": true,
-    "defensive": true,
-    "grab_break": true,
-    "messages": [ "The %s tries to grab you, but you slither free!", "The %s tries to grab <npcname>, but they slither free!" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_snake_precise",
-    "name": "Snake Strike",
-    "min_unarmed": 4,
-    "unarmed_allowed": true,
-    "crit_tec": true,
-    "messages": [ "You strike out at %s", "<npcname> strikes out at %s" ],
-    "stun_dur": 2
-  },
   {
     "type": "technique",
     "id": "tec_debug_slow",
diff --git a/data/mods/Magiclysm/enchanted/enchanted_wands.json b/data/mods/Magiclysm/enchanted/enchanted_wands.json
index ca7c696dd00c9..bf622dd93e0ab 100644
--- a/data/mods/Magiclysm/enchanted/enchanted_wands.json
+++ b/data/mods/Magiclysm/enchanted/enchanted_wands.json
@@ -134,32 +134,32 @@
   },
   {
     "type": "TOOL",
-    "id": "wand_iceball_minor",
-    "name": "minor wand of iceball",
-    "name_plural": "minor wands of iceball",
+    "id": "wand_hoaryblast_minor",
+    "name": "minor wand of hoary blast",
+    "name_plural": "minor wands of hoary blast",
     "copy-from": "spell_wand",
-    "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts iceball.",
-    "use_action": { "type": "cast_spell", "spell_id": "iceball", "no_fail": true, "level": 5, "need_wielding": true }
+    "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts hoary blast.",
+    "use_action": { "type": "cast_spell", "spell_id": "hoary_blast", "no_fail": true, "level": 5, "need_wielding": true }
   },
   {
     "type": "TOOL",
-    "id": "wand_iceball_lesser",
-    "name": "lesser wand of iceball",
-    "name_plural": "lesser wands of iceball",
+    "id": "wand_hoaryblast_lesser",
+    "name": "lesser wand of hoary blast",
+    "name_plural": "lesser wands of hoary blast",
     "copy-from": "spell_wand",
     "price": 20000,
-    "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts iceball.",
-    "use_action": { "type": "cast_spell", "spell_id": "iceball", "no_fail": true, "level": 10, "need_wielding": true }
+    "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts hoary blast.",
+    "use_action": { "type": "cast_spell", "spell_id": "hoary_blast", "no_fail": true, "level": 10, "need_wielding": true }
   },
   {
     "type": "TOOL",
-    "id": "wand_iceball_greater",
-    "name": "greater wand of iceball",
-    "name_plural": "greater wands of iceball",
+    "id": "wand_hoaryblast_greater",
+    "name": "greater wand of hoary blast",
+    "name_plural": "greater wands of hoary blast",
     "copy-from": "spell_wand",
     "price": 30000,
-    "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts iceball.",
-    "use_action": { "type": "cast_spell", "spell_id": "iceball", "no_fail": true, "level": 15, "need_wielding": true }
+    "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts hoary blast.",
+    "use_action": { "type": "cast_spell", "spell_id": "hoary_blast", "no_fail": true, "level": 15, "need_wielding": true }
   },
   {
     "type": "TOOL",
diff --git a/data/mods/Magiclysm/items/enchanted.json b/data/mods/Magiclysm/items/enchanted.json
index 692046477a6c1..30f09660939ba 100644
--- a/data/mods/Magiclysm/items/enchanted.json
+++ b/data/mods/Magiclysm/items/enchanted.json
@@ -58,5 +58,22 @@
       "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "REGEN_MANA", "multiply": 1 } ] } ]
     },
     "flags": [ "VARSIZE" ]
+  },
+  {
+    "id": "debug_fireball_hammer",
+    "type": "GENERIC",
+    "name": "fireball hammer",
+    "copy-from": "magi_staff_minor",
+    "description": "Use with caution!  Flammable!  Explosive!",
+    "relic_data": {
+      "passive_effects": [
+        {
+          "has": "WIELD",
+          "condition": "ALWAYS",
+          "hit_you_effect": [ { "id": "fireball" } ],
+          "hit_me_effect": [ { "id": "light_healing" } ]
+        }
+      ]
+    }
   }
 ]
diff --git a/data/names/zh_CN.json b/data/names/zh_CN.json
index bffa2c244843b..714beff3fa480 100644
--- a/data/names/zh_CN.json
+++ b/data/names/zh_CN.json
@@ -1,136 +1,1827 @@
 [
-{"usage": "backer", "gender": "unisex", "name": "“坏男孩” 马克 白德爱"},
-{"usage": "backer", "gender": "unisex", "name": "丹尼尔 丹尼希"},
-{"usage": "backer", "gender": "unisex", "name": "丹尼尔 安菲尔德"},
-{"usage": "backer", "gender": "unisex", "name": "亚历山大 克里奇科"},
-{"usage": "backer", "gender": "unisex", "name": "亚历山大 威克斯"},
-{"usage": "backer", "gender": "unisex", "name": "亚历山大 德米特里耶夫"},
-{"usage": "backer", "gender": "unisex", "name": "伊恩 克利尔"},
-{"usage": "backer", "gender": "unisex", "name": "伊芙琳 弗罗斯特"},
-{"usage": "backer", "gender": "unisex", "name": "休伯特 休斯"},
-{"usage": "backer", "gender": "unisex", "name": "休伯特 罗登博"},
-{"usage": "backer", "gender": "unisex", "name": "保罗 华莱士"},
-{"usage": "backer", "gender": "unisex", "name": "迈克 华莱士"},
-{"usage": "backer", "gender": "unisex", "name": "克莱 福克森塔尔"},
-{"usage": "backer", "gender": "unisex", "name": "克里斯 沃特金斯"},
-{"usage": "backer", "gender": "unisex", "name": "克里斯多夫 福林"},
-{"usage": "backer", "gender": "unisex", "name": "克雷格 弗格森"},
-{"usage": "backer", "gender": "unisex", "name": "克雷格"},
-{"usage": "backer", "gender": "unisex", "name": "内田贵 砺波"},
-{"usage": "backer", "gender": "unisex", "name": "凯文 威特"},
-{"usage": "backer", "gender": "unisex", "name": "凯文 格拉索"},
-{"usage": "backer", "gender": "unisex", "name": "列弗 米希金"},
-{"usage": "backer", "gender": "unisex", "name": "利奥尼德 瓦斯莱夫"},
-{"usage": "backer", "gender": "unisex", "name": "加楚"},
-{"usage": "backer", "gender": "unisex", "name": "加百利 唐"},
-{"usage": "backer", "gender": "unisex", "name": "劳里 丹尼斯"},
-{"usage": "backer", "gender": "unisex", "name": "南森 卡恩"},
-{"usage": "backer", "gender": "unisex", "name": "博巴洛特"},
-{"usage": "backer", "gender": "unisex", "name": "卡米尔 克里维森"},
-{"usage": "backer", "gender": "unisex", "name": "古戈 哈克波夫"},
-{"usage": "backer", "gender": "unisex", "name": "史蒂文 彼得森"},
-{"usage": "backer", "gender": "unisex", "name": "吉姆 兰德龙"},
-{"usage": "backer", "gender": "unisex", "name": "吉姆 韦弗"},
-{"usage": "backer", "gender": "unisex", "name": "哈瑞斯 瑟本"},
-{"usage": "backer", "gender": "unisex", "name": "哈立德 拉希德"},
-{"usage": "backer", "gender": "unisex", "name": "埃利 福里斯特 基顿"},
-{"usage": "backer", "gender": "unisex", "name": "埃里克 汉格布勒"},
-{"usage": "backer", "gender": "unisex", "name": "埃里克 鲁萨克"},
-{"usage": "backer", "gender": "unisex", "name": "塞巴斯蒂安 雅弗雷"},
-{"usage": "backer", "gender": "unisex", "name": "夏洛特 霍尔"},
+{"usage": "nick", "name": "10-4"},
+{"usage": "nick", "name": "遗弃者"},
+{"usage": "nick", "name": "忍耐者"},
+{"usage": "nick", "name": "腹肌"},
+{"usage": "nick", "name": "王牌"},
+{"usage": "nick", "name": "酸"},
+{"usage": "nick", "name": "慢板"},
+{"usage": "nick", "name": "硬石"},
+{"usage": "nick", "name": "海军上将"},
+{"usage": "nick", "name": "永世"},
+{"usage": "nick", "name": "航空"},
+{"usage": "nick", "name": "AF"},
+{"usage": "nick", "name": "之后"},
+{"usage": "nick", "name": "玛瑙"},
+{"usage": "nick", "name": "代理人"},
+{"usage": "nick", "name": "暴力行为"},
+{"usage": "nick", "name": "胃灼热"},
+{"usage": "nick", "name": "渴望"},
+{"usage": "nick", "name": "啊呵"},
+{"usage": "nick", "name": "两手叉腰"},
+{"usage": "nick", "name": "信天翁"},
+{"usage": "nick", "name": "辩才"},
+{"usage": "nick", "name": "全明星"},
+{"usage": "nick", "name": "阿尔法"},
+{"usage": "nick", "name": "业余"},
+{"usage": "nick", "name": "仙酿"},
+{"usage": "nick", "name": "阿门"},
+{"usage": "nick", "name": "美国"},
+{"usage": "nick", "name": "紫水晶"},
+{"usage": "nick", "name": "弹药"},
+{"usage": "nick", "name": "疯狂"},
+{"usage": "nick", "name": "安培"},
+{"usage": "nick", "name": "锚"},
+{"usage": "nick", "name": "天使"},
+{"usage": "nick", "name": "灵魂"},
+{"usage": "nick", "name": "动物"},
+{"usage": "nick", "name": "安妮"},
+{"usage": "nick", "name": "蚂蚁"},
+{"usage": "nick", "name": "孔径"},
+{"usage": "nick", "name": "顶点"},
+{"usage": "nick", "name": "末日"},
+{"usage": "nick", "name": "远地点"},
+{"usage": "nick", "name": "苹果"},
+{"usage": "nick", "name": "苹果"},
+{"usage": "nick", "name": "苹果子"},
+{"usage": "nick", "name": "阿卡"},
+{"usage": "nick", "name": "拱廊"},
+{"usage": "nick", "name": "执政官"},
+{"usage": "nick", "name": "阿肯色州人"},
+{"usage": "nick", "name": "亚奇"},
+{"usage": "nick", "name": "亚奇"},
+{"usage": "nick", "name": "世界末日"},
+{"usage": "nick", "name": "阿斯特罗"},
+{"usage": "nick", "name": "阿特拉斯"},
+{"usage": "nick", "name": "原子"},
+{"usage": "nick", "name": "光辉"},
+{"usage": "nick", "name": "欧洲野牛"},
+{"usage": "nick", "name": "极光"},
+{"usage": "nick", "name": "澳洲人"},
+{"usage": "nick", "name": "澳大利亚"},
+{"usage": "nick", "name": "擅离职守"},
+{"usage": "nick", "name": "斧"},
+{"usage": "nick", "name": "啊"},
+{"usage": "nick", "name": "苍空"},
+{"usage": "nick", "name": "婴儿"},
+{"usage": "nick", "name": "培根"},
+{"usage": "nick", "name": "坏蛋"},
+{"usage": "nick", "name": "獾"},
+{"usage": "nick", "name": "秃头"},
+{"usage": "nick", "name": "弹道"},
+{"usage": "nick", "name": "斑比"},
+{"usage": "nick", "name": "香蕉"},
+{"usage": "nick", "name": "香蕉"},
+{"usage": "nick", "name": "强盗"},
+{"usage": "nick", "name": "潮流"},
+{"usage": "nick", "name": "爆炸"},
+{"usage": "nick", "name": "禁令"},
+{"usage": "nick", "name": "银行家"},
+{"usage": "nick", "name": "女妖"},
+{"usage": "nick", "name": "万岁"},
+{"usage": "nick", "name": "倒刺"},
+{"usage": "nick", "name": "野蛮人"},
+{"usage": "nick", "name": "理发师"},
+{"usage": "nick", "name": "吟游诗人"},
+{"usage": "nick", "name": "男爵"},
+{"usage": "nick", "name": "桶"},
+{"usage": "nick", "name": "害羞鬼"},
+{"usage": "nick", "name": "晒太阳"},
+{"usage": "nick", "name": "古怪鬼"},
+{"usage": "nick", "name": "灯塔"},
+{"usage": "nick", "name": "豆子"},
+{"usage": "nick", "name": "熊"},
+{"usage": "nick", "name": "野兽"},
+{"usage": "nick", "name": "花花公子"},
+{"usage": "nick", "name": "比波普爵士乐"},
+{"usage": "nick", "name": "混乱"},
+{"usage": "nick", "name": "蜜蜂"},
+{"usage": "nick", "name": "牛肉"},
+{"usage": "nick", "name": "哔哔"},
+{"usage": "nick", "name": "哔哔哔哔"},
+{"usage": "nick", "name": "米色"},
+{"usage": "nick", "name": "白鲸"},
+{"usage": "nick", "name": "狂暴"},
+{"usage": "nick", "name": "最好"},
+{"usage": "nick", "name": "贝塔"},
+{"usage": "nick", "name": "大"},
+{"usage": "nick", "name": "大炮"},
+{"usage": "nick", "name": "大人物"},
+{"usage": "nick", "name": "四棱大麦"},
+{"usage": "nick", "name": "多嘴多舌"},
+{"usage": "nick", "name": "大人物"},
+{"usage": "nick", "name": "比哈尔语"},
+{"usage": "nick", "name": "十亿"},
+{"usage": "nick", "name": "必应"},
+{"usage": "nick", "name": "宾果"},
+{"usage": "nick", "name": "自传"},
+{"usage": "nick", "name": "鸟"},
+{"usage": "nick", "name": "小鸟"},
+{"usage": "nick", "name": "主教"},
+{"usage": "nick", "name": "骗子"},
+{"usage": "nick", "name": "位图"},
+{"usage": "nick", "name": "黑色"},
+{"usage": "nick", "name": "21点"},
+{"usage": "nick", "name": "叶片"},
+{"usage": "nick", "name": "爆炸"},
+{"usage": "nick", "name": "爆破工"},
+{"usage": "nick", "name": "大火"},
+{"usage": "nick", "name": "攻其不备"},
+{"usage": "nick", "name": "珠宝"},
+{"usage": "nick", "name": "眨眼"},
+{"usage": "nick", "name": "作品"},
+{"usage": "nick", "name": "泡"},
+{"usage": "nick", "name": "闪电战"},
+{"usage": "nick", "name": "暴雪"},
+{"usage": "nick", "name": "块"},
+{"usage": "nick", "name": "傻子"},
+{"usage": "nick", "name": "金发"},
+{"usage": "nick", "name": "开花"},
+{"usage": "nick", "name": "反吹"},
+{"usage": "nick", "name": "蓝色"},
+{"usage": "nick", "name": "清教徒"},
+{"usage": "nick", "name": "模糊"},
+{"usage": "nick", "name": "脸红"},
+{"usage": "nick", "name": "蟒蛇"},
+{"usage": "nick", "name": "野猪"},
+{"usage": "nick", "name": "身体"},
+{"usage": "nick", "name": "尸袋"},
+{"usage": "nick", "name": "可怕的人"},
+{"usage": "nick", "name": "博洛尼亚"},
+{"usage": "nick", "name": "螺栓"},
+{"usage": "nick", "name": "善意的人"},
+{"usage": "nick", "name": "好伙计"},
+{"usage": "nick", "name": "走鸿运"},
+{"usage": "nick", "name": "债券"},
+{"usage": "nick", "name": "骨"},
+{"usage": "nick", "name": "疯狂的人"},
+{"usage": "nick", "name": "盆景"},
+{"usage": "nick", "name": "奖金"},
+{"usage": "nick", "name": "嘘"},
+{"usage": "nick", "name": "嘘嘘"},
+{"usage": "nick", "name": "赌徒"},
+{"usage": "nick", "name": "繁荣"},
+{"usage": "nick", "name": "砰砰"},
+{"usage": "nick", "name": "皮绳"},
+{"usage": "nick", "name": "靴子"},
+{"usage": "nick", "name": "毛线鞋"},
+{"usage": "nick", "name": "鲍里库"},
+{"usage": "nick", "name": "老板"},
+{"usage": "nick", "name": "加油车"},
+{"usage": "nick", "name": "男孩"},
+{"usage": "nick", "name": "大汉"},
+{"usage": "nick", "name": "大脑"},
+{"usage": "nick", "name": "头脑风暴"},
+{"usage": "nick", "name": "臭娃娃"},
+{"usage": "nick", "name": "勇敢的"},
+{"usage": "nick", "name": "喝采"},
+{"usage": "nick", "name": "巴西"},
+{"usage": "nick", "name": "巴西人"},
+{"usage": "nick", "name": "面包"},
+{"usage": "nick", "name": "打破"},
+{"usage": "nick", "name": "断路器"},
+{"usage": "nick", "name": "断脖子"},
+{"usage": "nick", "name": "砖"},
+{"usage": "nick", "name": "禁闭室"},
+{"usage": "nick", "name": "野马"},
+{"usage": "nick", "name": "青铜"},
+{"usage": "nick", "name": "喧嚣"},
+{"usage": "nick", "name": "压碎机"},
+{"usage": "nick", "name": "平庸可厌的人"},
+{"usage": "nick", "name": "布巴"},
+{"usage": "nick", "name": "泡沫"},
+{"usage": "nick", "name": "泡沫"},
+{"usage": "nick", "name": "布比人"},
+{"usage": "nick", "name": "牛仔"},
+{"usage": "nick", "name": "七叶树"},
+{"usage": "nick", "name": "虫子"},
+{"usage": "nick", "name": "棘手难题"},
+{"usage": "nick", "name": "错误"},
+{"usage": "nick", "name": "身材苗条"},
+{"usage": "nick", "name": "牛"},
+{"usage": "nick", "name": "子弹"},
+{"usage": "nick", "name": "牛眼灯"},
+{"usage": "nick", "name": "熊"},
+{"usage": "nick", "name": "土包子"},
+{"usage": "nick", "name": "兔子"},
+{"usage": "nick", "name": "面包"},
+{"usage": "nick", "name": "小豆子"},
+{"usage": "nick", "name": "破坏者"},
+{"usage": "nick", "name": "喧闹者"},
+{"usage": "nick", "name": "忙人"},
+{"usage": "nick", "name": "爱管闲事的人"},
+{"usage": "nick", "name": "大老粗"},
+{"usage": "nick", "name": "屠夫"},
+{"usage": "nick", "name": "黄油"},
+{"usage": "nick", "name": "娘娘腔"},
+{"usage": "nick", "name": "按钮"},
+{"usage": "nick", "name": "嗡嗡声"},
+{"usage": "nick", "name": "卷心菜"},
+{"usage": "nick", "name": "不和谐"},
+{"usage": "nick", "name": "仙人掌"},
+{"usage": "nick", "name": "凯撒"},
+{"usage": "nick", "name": "咖啡因"},
+{"usage": "nick", "name": "笼子里"},
+{"usage": "nick", "name": "结伙"},
+{"usage": "nick", "name": "法人后裔"},
+{"usage": "nick", "name": "灾难"},
+{"usage": "nick", "name": "石灰"},
+{"usage": "nick", "name": "海中女神"},
+{"usage": "nick", "name": "凸轮"},
+{"usage": "nick", "name": "迷彩色"},
+{"usage": "nick", "name": "可以做"},
+{"usage": "nick", "name": "加拿大"},
+{"usage": "nick", "name": "加拿大人"},
+{"usage": "nick", "name": "金丝雀"},
+{"usage": "nick", "name": "加丹戈"},
+{"usage": "nick", "name": "大炮"},
+{"usage": "nick", "name": "法裔加拿大人"},
+{"usage": "nick", "name": "帽"},
+{"usage": "nick", "name": "雀跃"},
+{"usage": "nick", "name": "卡皮沙巴"},
+{"usage": "nick", "name": "如帽般的"},
+{"usage": "nick", "name": "队长"},
+{"usage": "nick", "name": "焦糖"},
+{"usage": "nick", "name": "意大利裔巴西人"},
+{"usage": "nick", "name": "里约人"},
+{"usage": "nick", "name": "胡萝卜"},
+{"usage": "nick", "name": "携带"},
+{"usage": "nick", "name": "卡萨布兰卡"},
+{"usage": "nick", "name": "赌场"},
+{"usage": "nick", "name": "鲶鱼"},
+{"usage": "nick", "name": "洪都拉斯人"},
+{"usage": "nick", "name": "警告"},
+{"usage": "nick", "name": "雪松"},
+{"usage": "nick", "name": "蜈蚣"},
+{"usage": "nick", "name": "刻瑞斯"},
+{"usage": "nick", "name": "咬马嚼子"},
+{"usage": "nick", "name": "章"},
+{"usage": "nick", "name": "查宾"},
+{"usage": "nick", "name": "花花公子"},
+{"usage": "nick", "name": "战车"},
+{"usage": "nick", "name": "魅力"},
+{"usage": "nick", "name": "喋喋不休"},
+{"usage": "nick", "name": "唠叨的人"},
+{"usage": "nick", "name": "使彻底失败"},
+{"usage": "nick", "name": "厚脸皮"},
+{"usage": "nick", "name": "厚颜无耻"},
+{"usage": "nick", "name": "干杯"},
+{"usage": "nick", "name": "笨蛋"},
+{"usage": "nick", "name": "厨师"},
+{"usage": "nick", "name": "樱桃"},
+{"usage": "nick", "name": "国际象棋"},
+{"usage": "nick", "name": "气"},
+{"usage": "nick", "name": "首席"},
+{"usage": "nick", "name": "墨西哥城人"},
+{"usage": "nick", "name": "寒冷"},
+{"usage": "nick", "name": "中国"},
+{"usage": "nick", "name": "中国人"},
+{"usage": "nick", "name": "嘁嘁喳喳"},
+{"usage": "nick", "name": "谈天说地"},
+{"usage": "nick", "name": "巧克力"},
+{"usage": "nick", "name": "巧克力"},
+{"usage": "nick", "name": "窒息"},
+{"usage": "nick", "name": "火车 "},
+{"usage": "nick", "name": "排"},
+{"usage": "nick", "name": "铬合金"},
+{"usage": "nick", "name": "慢性子"},
+{"usage": "nick", "name": "笑着说"},
+{"usage": "nick", "name": "密友"},
+{"usage": "nick", "name": "笨蛋"},
+{"usage": "nick", "name": "再见"},
+{"usage": "nick", "name": "苹果酒"},
+{"usage": "nick", "name": "辛科"},
+{"usage": "nick", "name": "电影"},
+{"usage": "nick", "name": "肉桂"},
+{"usage": "nick", "name": "密码"},
+{"usage": "nick", "name": "叮当声"},
+{"usage": "nick", "name": "哗众取宠"},
+{"usage": "nick", "name": "爪"},
+{"usage": "nick", "name": "粘土"},
+{"usage": "nick", "name": "双刃大砍刀"},
+{"usage": "nick", "name": "神职人员"},
+{"usage": "nick", "name": "点击"},
+{"usage": "nick", "name": "多云的"},
+{"usage": "nick", "name": "三叶草"},
+{"usage": "nick", "name": "教练"},
+{"usage": "nick", "name": "海边人"},
+{"usage": "nick", "name": "眼镜蛇"},
+{"usage": "nick", "name": "蜘蛛网"},
+{"usage": "nick", "name": "伦敦"},
+{"usage": "nick", "name": "蟑螂"},
+{"usage": "nick", "name": "椰子树"},
+{"usage": "nick", "name": "咖啡"},
+{"usage": "nick", "name": "齿轮"},
+{"usage": "nick", "name": "科希"},
+{"usage": "nick", "name": "线圈"},
+{"usage": "nick", "name": "上校"},
+{"usage": "nick", "name": "昏迷"},
+{"usage": "nick", "name": "组合"},
+{"usage": "nick", "name": "喜剧"},
+{"usage": "nick", "name": "彗星"},
+{"usage": "nick", "name": "公司"},
+{"usage": "nick", "name": "骗子"},
+{"usage": "nick", "name": "浓缩"},
+{"usage": "nick", "name": "海螺"},
+{"usage": "nick", "name": "安慰"},
+{"usage": "nick", "name": "内容"},
+{"usage": "nick", "name": "违禁品"},
+{"usage": "nick", "name": "饼干"},
+{"usage": "nick", "name": "鸡笼"},
+{"usage": "nick", "name": "铜斑蛇"},
+{"usage": "nick", "name": "复制"},
+{"usage": "nick", "name": "螺旋"},
+{"usage": "nick", "name": "活泼的"},
+{"usage": "nick", "name": "宇宙"},
+{"usage": "nick", "name": "棉花"},
+{"usage": "nick", "name": "优惠券"},
+{"usage": "nick", "name": "秘密"},
+{"usage": "nick", "name": "好啊"},
+{"usage": "nick", "name": "郊狼"},
+{"usage": "nick", "name": "蟹"},
+{"usage": "nick", "name": "杰出的人"},
+{"usage": "nick", "name": "崩溃"},
+{"usage": "nick", "name": "火山口"},
+{"usage": "nick", "name": "渴望"},
+{"usage": "nick", "name": "奶油"},
+{"usage": "nick", "name": "持续噪声"},
+{"usage": "nick", "name": "水晶室女"},
+{"usage": "nick", "name": "深红色"},
+{"usage": "nick", "name": "胖子"},
+{"usage": "nick", "name": "十字交叉"},
+{"usage": "nick", "name": "嘶哑声"},
+{"usage": "nick", "name": "鳄鱼"},
+{"usage": "nick", "name": "骗子"},
+{"usage": "nick", "name": "乌鸦"},
+{"usage": "nick", "name": "吃乌鸦的人"},
+{"usage": "nick", "name": "巡洋舰"},
+{"usage": "nick", "name": "面包屑"},
+{"usage": "nick", "name": "面包屑"},
+{"usage": "nick", "name": "旷课乐"},
+{"usage": "nick", "name": "易怒的人"},
+{"usage": "nick", "name": "神秘生物"},
+{"usage": "nick", "name": "四弦吉他"},
+{"usage": "nick", "name": "杜鹃"},
+{"usage": "nick", "name": "土包子"},
+{"usage": "nick", "name": "丘比特"},
+{"usage": "nick", "name": "治愈"},
+{"usage": "nick", "name": "卷毛"},
+{"usage": "nick", "name": "诅咒"},
+{"usage": "nick", "name": "漂亮鬼"},
+{"usage": "nick", "name": "青色"},
+{"usage": "nick", "name": "氰化物"},
+{"usage": "nick", "name": "网络"},
+{"usage": "nick", "name": "旋风"},
+{"usage": "nick", "name": "独眼巨人"},
+{"usage": "nick", "name": "轻拍"},
+{"usage": "nick", "name": "疯狂的人"},
+{"usage": "nick", "name": "匕首"},
+{"usage": "nick", "name": "达拉斯"},
+{"usage": "nick", "name": "该死的人"},
+{"usage": "nick", "name": "危险"},
+{"usage": "nick", "name": "黑暗"},
+{"usage": "nick", "name": "亲爱的人"},
+{"usage": "nick", "name": "飞镖"},
+{"usage": "nick", "name": "数据"},
+{"usage": "nick", "name": "神枪手"},
+{"usage": "nick", "name": "最亲爱的人"},
+{"usage": "nick", "name": "诱饵"},
+{"usage": "nick", "name": "迪"},
+{"usage": "nick", "name": "灵巧的人"},
+{"usage": "nick", "name": "三角洲"},
+{"usage": "nick", "name": "平民"},
+{"usage": "nick", "name": "恶魔"},
+{"usage": "nick", "name": "亡命之徒"},
+{"usage": "nick", "name": "上帝"},
+{"usage": "nick", "name": "魔鬼"},
+{"usage": "nick", "name": "露水"},
+{"usage": "nick", "name": "恶魔"},
+{"usage": "nick", "name": "钻石"},
+{"usage": "nick", "name": "菱形斑纹"},
+{"usage": "nick", "name": "筹码"},
+{"usage": "nick", "name": "骰子"},
+{"usage": "nick", "name": "柴油"},
+{"usage": "nick", "name": "第戎"},
+{"usage": "nick", "name": "左右为难"},
+{"usage": "nick", "name": "昏暗的"},
+{"usage": "nick", "name": "一角银币"},
+{"usage": "nick", "name": "酒窝"},
+{"usage": "nick", "name": "恐龙"},
+{"usage": "nick", "name": "悲惨的人"},
+{"usage": "nick", "name": "挽歌"},
+{"usage": "nick", "name": "迪斯科"},
+{"usage": "nick", "name": "复制品"},
+{"usage": "nick", "name": "头晕"},
+{"usage": "nick", "name": "灯神"},
+{"usage": "nick", "name": "DOA"},
+{"usage": "nick", "name": "医生"},
+{"usage": "nick", "name": "十二关"},
+{"usage": "nick", "name": "狗"},
+{"usage": "nick", "name": "经济低潮"},
+{"usage": "nick", "name": "娃娃脸"},
+{"usage": "nick", "name": "驴"},
+{"usage": "nick", "name": "吸食大麻"},
+{"usage": "nick", "name": "小玩意儿"},
+{"usage": "nick", "name": "厄运"},
+{"usage": "nick", "name": "世界末日"},
+{"usage": "nick", "name": "涂料"},
+{"usage": "nick", "name": "迟钝的"},
+{"usage": "nick", "name": "面貌极相似的人"},
+{"usage": "nick", "name": "Dos"},
+{"usage": "nick", "name": "两面派"},
+{"usage": "nick", "name": "面团"},
+{"usage": "nick", "name": "推土机"},
+{"usage": "nick", "name": "德拉科"},
+{"usage": "nick", "name": "龙"},
+{"usage": "nick", "name": "恐惧"},
+{"usage": "nick", "name": "无畏"},
+{"usage": "nick", "name": "漂移"},
+{"usage": "nick", "name": "流浪者"},
+{"usage": "nick", "name": "机器人"},
+{"usage": "nick", "name": "下降"},
+{"usage": "nick", "name": "德鲁伊"},
+{"usage": "nick", "name": "甜食"},
+{"usage": "nick", "name": "美妙的"},
+{"usage": "nick", "name": "蠢人"},
+{"usage": "nick", "name": "愚蠢的"},
+{"usage": "nick", "name": "小飞象"},
+{"usage": "nick", "name": "饺子"},
+{"usage": "nick", "name": "甘蔗渣"},
+{"usage": "nick", "name": "灰尘"},
+{"usage": "nick", "name": "荷兰"},
+{"usage": "nick", "name": "功率计"},
+{"usage": "nick", "name": "Dys"},
+{"usage": "nick", "name": "东"},
+{"usage": "nick", "name": "容易"},
+{"usage": "nick", "name": "木树"},
+{"usage": "nick", "name": "回声"},
+{"usage": "nick", "name": "月蚀"},
+{"usage": "nick", "name": "星质"},
+{"usage": "nick", "name": "鳗鱼"},
+{"usage": "nick", "name": "书呆子"},
+{"usage": "nick", "name": "自我"},
+{"usage": "nick", "name": "八个"},
+{"usage": "nick", "name": "老八"},
+{"usage": "nick", "name": "爱因斯坦"},
+{"usage": "nick", "name": "二者择一的"},
+{"usage": "nick", "name": "喷射"},
+{"usage": "nick", "name": "大恶魔"},
+{"usage": "nick", "name": "老人"},
+{"usage": "nick", "name": "电"},
+{"usage": "nick", "name": "元素"},
+{"usage": "nick", "name": "精英"},
+{"usage": "nick", "name": "翡翠"},
+{"usage": "nick", "name": "重唱"},
+{"usage": "nick", "name": "结束时间"},
+{"usage": "nick", "name": "安德"},
+{"usage": "nick", "name": "执行者"},
+{"usage": "nick", "name": "谜"},
+{"usage": "nick", "name": "嫉妒"},
+{"usage": "nick", "name": "伊普西龙"},
+{"usage": "nick", "name": "昼夜平分点"},
+{"usage": "nick", "name": "阋神星"},
+{"usage": "nick", "name": "时尚先生"},
+{"usage": "nick", "name": "埃塔"},
+{"usage": "nick", "name": "醚"},
+{"usage": "nick", "name": "词源学"},
+{"usage": "nick", "name": "尤里卡"},
+{"usage": "nick", "name": "欧洲败类"},
+{"usage": "nick", "name": "流亡"},
+{"usage": "nick", "name": "退出"},
+{"usage": "nick", "name": "挂式"},
+{"usage": "nick", "name": "埃克塞特人"},
+{"usage": "nick", "name": "出口"},
+{"usage": "nick", "name": "眼睛"},
+{"usage": "nick", "name": "赏心悦目的人"},
+{"usage": "nick", "name": "脸"},
+{"usage": "nick", "name": "信仰"},
+{"usage": "nick", "name": "猎鹰"},
+{"usage": "nick", "name": "下降"},
+{"usage": "nick", "name": "凡登戈舞"},
+{"usage": "nick", "name": "神奇的"},
+{"usage": "nick", "name": "特别喜爱的人"},
+{"usage": "nick", "name": "恐惧"},
+{"usage": "nick", "name": "不重要的人"},
+{"usage": "nick", "name": "击剑"},
+{"usage": "nick", "name": "雪貂"},
+{"usage": "nick", "name": "留学生"},
+{"usage": "nick", "name": "小提琴"},
+{"usage": "nick", "name": "胡说"},
+{"usage": "nick", "name": "忠诚"},
+{"usage": "nick", "name": "恶魔"},
+{"usage": "nick", "name": "欺瞒"},
+{"usage": "nick", "name": "最后"},
+{"usage": "nick", "name": "手指"},
+{"usage": "nick", "name": "火"},
+{"usage": "nick", "name": "煽动者"},
+{"usage": "nick", "name": "萤火虫"},
+{"usage": "nick", "name": "爆竹"},
+{"usage": "nick", "name": "防火墙"},
+{"usage": "nick", "name": "第一"},
+{"usage": "nick", "name": "鱼"},
+{"usage": "nick", "name": "拳头"},
+{"usage": "nick", "name": "大打出手"},
+{"usage": "nick", "name": "五个"},
+{"usage": "nick", "name": "修复"},
+{"usage": "nick", "name": "饮料"},
+{"usage": "nick", "name": "防弹"},
+{"usage": "nick", "name": "火烈鸟"},
+{"usage": "nick", "name": "闪光"},
+{"usage": "nick", "name": "平地"},
+{"usage": "nick", "name": "平线"},
+{"usage": "nick", "name": "跳蚤"},
+{"usage": "nick", "name": "电影"},
+{"usage": "nick", "name": "阔鳍"},
+{"usage": "nick", "name": "浮动"},
+{"usage": "nick", "name": "佛罗里达"},
+{"usage": "nick", "name": "废料"},
+{"usage": "nick", "name": "狼狈而退"},
+{"usage": "nick", "name": "长笛"},
+{"usage": "nick", "name": "飞"},
+{"usage": "nick", "name": "飞行员"},
+{"usage": "nick", "name": "捕蝇草"},
+{"usage": "nick", "name": "焦点"},
+{"usage": "nick", "name": "箔"},
+{"usage": "nick", "name": "平易近人"},
+{"usage": "nick", "name": "傻瓜"},
+{"usage": "nick", "name": "蠢蛋"},
+{"usage": "nick", "name": "自由自在"},
+{"usage": "nick", "name": "财富"},
+{"usage": "nick", "name": "老四"},
+{"usage": "nick", "name": "福克斯"},
+{"usage": "nick", "name": "喧噪"},
+{"usage": "nick", "name": "法国"},
+{"usage": "nick", "name": "狂"},
+{"usage": "nick", "name": "冻结"},
+{"usage": "nick", "name": "法国人"},
+{"usage": "nick", "name": "摩擦"},
+{"usage": "nick", "name": "星期五"},
+{"usage": "nick", "name": "青蛙"},
+{"usage": "nick", "name": "蛙似的人"},
+{"usage": "nick", "name": "从"},
+{"usage": "nick", "name": "前面"},
+{"usage": "nick", "name": "霜"},
+{"usage": "nick", "name": "油炸"},
+{"usage": "nick", "name": "信息面板"},
+{"usage": "nick", "name": "爱好者"},
+{"usage": "nick", "name": "火焰"},
+{"usage": "nick", "name": "愤怒"},
+{"usage": "nick", "name": "未来"},
+{"usage": "nick", "name": "模糊"},
+{"usage": "nick", "name": "诅咒"},
+{"usage": "nick", "name": "星系"},
+{"usage": "nick", "name": "赌徒"},
+{"usage": "nick", "name": "伽马"},
+{"usage": "nick", "name": "石像鬼"},
+{"usage": "nick", "name": "石榴石"},
+{"usage": "nick", "name": "气囊"},
+{"usage": "nick", "name": "垫片"},
+{"usage": "nick", "name": "加特林"},
+{"usage": "nick", "name": "短吻鳄"},
+{"usage": "nick", "name": "加乌乔人"},
+{"usage": "nick", "name": "齿轮"},
+{"usage": "nick", "name": "齿轮"},
+{"usage": "nick", "name": "壁虎"},
+{"usage": "nick", "name": "古怪的人"},
+{"usage": "nick", "name": "宝石"},
+{"usage": "nick", "name": "双子座"},
+{"usage": "nick", "name": "温柔的"},
+{"usage": "nick", "name": "地理"},
+{"usage": "nick", "name": "基尼"},
+{"usage": "nick", "name": "细菌"},
+{"usage": "nick", "name": "德国人"},
+{"usage": "nick", "name": "德国"},
+{"usage": "nick", "name": "鬼"},
+{"usage": "nick", "name": "千兆"},
+{"usage": "nick", "name": "咯咯地笑"},
+{"usage": "nick", "name": "生姜"},
+{"usage": "nick", "name": "小发明"},
+{"usage": "nick", "name": "短剑"},
+{"usage": "nick", "name": "眩光"},
+{"usage": "nick", "name": "故障"},
+{"usage": "nick", "name": "发光"},
+{"usage": "nick", "name": "暴食"},
+{"usage": "nick", "name": "咬牙切齿"},
+{"usage": "nick", "name": "山羊"},
+{"usage": "nick", "name": "小妖精"},
+{"usage": "nick", "name": "神"},
+{"usage": "nick", "name": "哥斯拉"},
+{"usage": "nick", "name": "黄金"},
+{"usage": "nick", "name": "金"},
+{"usage": "nick", "name": "傀儡"},
+{"usage": "nick", "name": "高尔夫球"},
+{"usage": "nick", "name": "歌利亚"},
+{"usage": "nick", "name": "龚"},
+{"usage": "nick", "name": "花生"},
+{"usage": "nick", "name": "好人"},
+{"usage": "nick", "name": "穿帮"},
+{"usage": "nick", "name": "怪诞的人"},
+{"usage": "nick", "name": "鹅"},
+{"usage": "nick", "name": "起鸡皮疙瘩"},
+{"usage": "nick", "name": "戈尔"},
+{"usage": "nick", "name": "蛇发怪"},
+{"usage": "nick", "name": "轻飘飘的"},
+{"usage": "nick", "name": "伟大的"},
+{"usage": "nick", "name": "重大的"},
+{"usage": "nick", "name": "灰色的"},
+{"usage": "nick", "name": "油脂"},
+{"usage": "nick", "name": "油腻的"},
+{"usage": "nick", "name": "希腊"},
+{"usage": "nick", "name": "贪婪"},
+{"usage": "nick", "name": "希腊人"},
+{"usage": "nick", "name": "绿色"},
+{"usage": "nick", "name": "不懂世故的人"},
+{"usage": "nick", "name": "小鬼"},
+{"usage": "nick", "name": "悲伤"},
+{"usage": "nick", "name": "冷酷的人"},
+{"usage": "nick", "name": "露齿而笑"},
+{"usage": "nick", "name": "发火"},
+{"usage": "nick", "name": "脾气暴躁"},
+{"usage": "nick", "name": "鹰头狮"},
+{"usage": "nick", "name": "瓜希罗人"},
+{"usage": "nick", "name": "番石榴"},
+{"usage": "nick", "name": "诡计"},
+{"usage": "nick", "name": "橡皮软糖"},
+{"usage": "nick", "name": "枪手"},
+{"usage": "nick", "name": "大师"},
+{"usage": "nick", "name": "肠道"},
+{"usage": "nick", "name": "地沟"},
+{"usage": "nick", "name": "吉普赛"},
+{"usage": "nick", "name": "陀螺"},
+{"usage": "nick", "name": "多毛的"},
+{"usage": "nick", "name": "翠鸟"},
+{"usage": "nick", "name": "说唱乐"},
+{"usage": "nick", "name": "锤子"},
+{"usage": "nick", "name": "手"},
+{"usage": "nick", "name": "汉尼拔"},
+{"usage": "nick", "name": "快乐"},
+{"usage": "nick", "name": "硬汉子"},
+{"usage": "nick", "name": "安全帽"},
+{"usage": "nick", "name": "兔子"},
+{"usage": "nick", "name": "野兔脑子"},
+{"usage": "nick", "name": "鸟身女妖"},
+{"usage": "nick", "name": "手斧"},
+{"usage": "nick", "name": "哈瓦那"},
+{"usage": "nick", "name": "安息所"},
+{"usage": "nick", "name": "穷人"},
+{"usage": "nick", "name": "大破坏"},
+{"usage": "nick", "name": "鹰"},
+{"usage": "nick", "name": "鹰眼"},
+{"usage": "nick", "name": "阴霾"},
+{"usage": "nick", "name": "轻率的"},
+{"usage": "nick", "name": "无情的"},
+{"usage": "nick", "name": "热"},
+{"usage": "nick", "name": "开除"},
+{"usage": "nick", "name": "重"},
+{"usage": "nick", "name": "重量级的"},
+{"usage": "nick", "name": "继承人"},
+{"usage": "nick", "name": "赫拉"},
+{"usage": "nick", "name": "悍妇"},
+{"usage": "nick", "name": "应该下地狱的人"},
+{"usage": "nick", "name": "猛鬼追魂"},
+{"usage": "nick", "name": "铁杉"},
+{"usage": "nick", "name": "术士"},
+{"usage": "nick", "name": "全盛时期"},
+{"usage": "nick", "name": "胡桃木"},
+{"usage": "nick", "name": "隐藏"},
+{"usage": "nick", "name": "正午"},
+{"usage": "nick", "name": "高塔"},
+{"usage": "nick", "name": "车辆"},
+{"usage": "nick", "name": "乡下人"},
+{"usage": "nick", "name": "提示"},
+{"usage": "nick", "name": "臀部"},
+{"usage": "nick", "name": "河马"},
+{"usage": "nick", "name": "跛的"},
+{"usage": "nick", "name": "打击"},
+{"usage": "nick", "name": "特大号三明治"},
+{"usage": "nick", "name": "流浪汉"},
+{"usage": "nick", "name": "大杂烩"},
+{"usage": "nick", "name": "废话"},
+{"usage": "nick", "name": "废话"},
+{"usage": "nick", "name": "全垒打"},
+{"usage": "nick", "name": "蜂蜜"},
+{"usage": "nick", "name": "钩"},
+{"usage": "nick", "name": "流氓"},
+{"usage": "nick", "name": "印第安纳州人"},
+{"usage": "nick", "name": "猫头鹰叫"},
+{"usage": "nick", "name": "乡间音乐"},
+{"usage": "nick", "name": "笛"},
+{"usage": "nick", "name": "吸毒成瘾者"},
+{"usage": "nick", "name": "啤酒花"},
+{"usage": "nick", "name": "霍斯"},
+{"usage": "nick", "name": "主机"},
+{"usage": "nick", "name": "热"},
+{"usage": "nick", "name": "热狗"},
+{"usage": "nick", "name": "热的东西"},
+{"usage": "nick", "name": "酒店"},
+{"usage": "nick", "name": "恶作剧"},
+{"usage": "nick", "name": "暑热"},
+{"usage": "nick", "name": "炙手可热的"},
+{"usage": "nick", "name": "胡迪尼"},
+{"usage": "nick", "name": "猎犬"},
+{"usage": "nick", "name": "徘徊"},
+{"usage": "nick", "name": "嚎叫"},
+{"usage": "nick", "name": "狂妄自大"},
+{"usage": "nick", "name": "绿巨人"},
+{"usage": "nick", "name": "骗子"},
+{"usage": "nick", "name": "极出色的人"},
+{"usage": "nick", "name": "疯狗"},
+{"usage": "nick", "name": "饥饿"},
+{"usage": "nick", "name": "饿鬼"},
+{"usage": "nick", "name": "九头蛇"},
+{"usage": "nick", "name": "炒作"},
+{"usage": "nick", "name": "吸毒成瘾的人"},
+{"usage": "nick", "name": "超驱动器"},
+{"usage": "nick", "name": "睡神"},
+{"usage": "nick", "name": "野山羊"},
+{"usage": "nick", "name": "冰"},
+{"usage": "nick", "name": "冰镐"},
+{"usage": "nick", "name": "难闻的"},
+{"usage": "nick", "name": "图标"},
+{"usage": "nick", "name": "偶像"},
+{"usage": "nick", "name": "冰屋"},
+{"usage": "nick", "name": "点火"},
+{"usage": "nick", "name": "图像"},
+{"usage": "nick", "name": "小鬼"},
+{"usage": "nick", "name": "进口"},
+{"usage": "nick", "name": "冲动"},
+{"usage": "nick", "name": "隐身"},
+{"usage": "nick", "name": "不可思议"},
+{"usage": "nick", "name": "印度"},
+{"usage": "nick", "name": "独立"},
+{"usage": "nick", "name": "靛蓝"},
+{"usage": "nick", "name": "印度人"},
+{"usage": "nick", "name": "印第"},
+{"usage": "nick", "name": "地狱"},
+{"usage": "nick", "name": "漆黑的"},
+{"usage": "nick", "name": "检查员"},
+{"usage": "nick", "name": "即时"},
+{"usage": "nick", "name": "介绍"},
+{"usage": "nick", "name": "一点儿"},
+{"usage": "nick", "name": "爱尔兰"},
+{"usage": "nick", "name": "铁"},
+{"usage": "nick", "name": "装甲舰"},
+{"usage": "nick", "name": "铁甲军"},
+{"usage": "nick", "name": "欧文"},
+{"usage": "nick", "name": "岛"},
+{"usage": "nick", "name": "意大利人"},
+{"usage": "nick", "name": "意大利"},
+{"usage": "nick", "name": "痒"},
+{"usage": "nick", "name": "痒"},
+{"usage": "nick", "name": "小个子"},
+{"usage": "nick", "name": "象牙"},
+{"usage": "nick", "name": "豺"},
+{"usage": "nick", "name": "有作为的城市佬"},
+{"usage": "nick", "name": "玉"},
+{"usage": "nick", "name": "贾法"},
+{"usage": "nick", "name": "破旧飞机"},
+{"usage": "nick", "name": "果酱"},
+{"usage": "nick", "name": "一月"},
+{"usage": "nick", "name": "锅盖头"},
+{"usage": "nick", "name": "粗鲁无礼的人"},
+{"usage": "nick", "name": "大块硬糖"},
+{"usage": "nick", "name": "大白鲨"},
+{"usage": "nick", "name": "爵士乐"},
+{"usage": "nick", "name": "绝地武士"},
+{"usage": "nick", "name": "果冻"},
+{"usage": "nick", "name": "果冻"},
+{"usage": "nick", "name": "杰斯特"},
+{"usage": "nick", "name": "杂物"},
+{"usage": "nick", "name": "珠宝"},
+{"usage": "nick", "name": "跳汰机"},
+{"usage": "nick", "name": "拼图"},
+{"usage": "nick", "name": "运动员"},
+{"usage": "nick", "name": "小丑"},
+{"usage": "nick", "name": "快乐的"},
+{"usage": "nick", "name": "乔利"},
+{"usage": "nick", "name": "旅程"},
+{"usage": "nick", "name": "木星"},
+{"usage": "nick", "name": "法官"},
+{"usage": "nick", "name": "神像"},
+{"usage": "nick", "name": "汁"},
+{"usage": "nick", "name": "多汁的"},
+{"usage": "nick", "name": "护符"},
+{"usage": "nick", "name": "庞然大物"},
+{"usage": "nick", "name": "跳"},
+{"usage": "nick", "name": "跳投"},
+{"usage": "nick", "name": "木星"},
+{"usage": "nick", "name": "正义"},
+{"usage": "nick", "name": "凯撒"},
+{"usage": "nick", "name": "卡巴"},
+{"usage": "nick", "name": "坏了的"},
+{"usage": "nick", "name": "扑通"},
+{"usage": "nick", "name": "凯夫拉"},
+{"usage": "nick", "name": "梯形"},
+{"usage": "nick", "name": "胡说"},
+{"usage": "nick", "name": "启动"},
+{"usage": "nick", "name": "孩子"},
+{"usage": "nick", "name": "杀手"},
+{"usage": "nick", "name": "令人扫兴的人"},
+{"usage": "nick", "name": "公斤"},
+{"usage": "nick", "name": "翠鸟"},
+{"usage": "nick", "name": "主要人物"},
+{"usage": "nick", "name": "天命"},
+{"usage": "nick", "name": "吻吻"},
+{"usage": "nick", "name": "猕猴桃"},
+{"usage": "nick", "name": "骑士"},
+{"usage": "nick", "name": "迷药"},
+{"usage": "nick", "name": "结"},
+{"usage": "nick", "name": "指节"},
+{"usage": "nick", "name": "KO"},
+{"usage": "nick", "name": "海怪"},
+{"usage": "nick", "name": "德国人"},
+{"usage": "nick", "name": "花边"},
+{"usage": "nick", "name": "羊排"},
+{"usage": "nick", "name": "拉姆达"},
+{"usage": "nick", "name": "灯"},
+{"usage": "nick", "name": "新水手"},
+{"usage": "nick", "name": "青金石"},
+{"usage": "nick", "name": "云雀"},
+{"usage": "nick", "name": "激光"},
+{"usage": "nick", "name": "熔岩"},
+{"usage": "nick", "name": "铅"},
+{"usage": "nick", "name": "水蛭"},
+{"usage": "nick", "name": "左撇子"},
+{"usage": "nick", "name": "柠檬"},
+{"usage": "nick", "name": "细木匠"},
+{"usage": "nick", "name": "利维坦"},
+{"usage": "nick", "name": "生命线"},
+{"usage": "nick", "name": "光"},
+{"usage": "nick", "name": "闪电"},
+{"usage": "nick", "name": "轻量级"},
+{"usage": "nick", "name": "光年"},
+{"usage": "nick", "name": "利马"},
+{"usage": "nick", "name": "石灰"},
+{"usage": "nick", "name": "英国佬"},
+{"usage": "nick", "name": "跛行"},
+{"usage": "nick", "name": "术语"},
+{"usage": "nick", "name": "链接"},
+{"usage": "nick", "name": "点燃"},
+{"usage": "nick", "name": "蜥蜴"},
+{"usage": "nick", "name": "锁"},
+{"usage": "nick", "name": "封锁"},
+{"usage": "nick", "name": "破伤风"},
+{"usage": "nick", "name": "疯草"},
+{"usage": "nick", "name": "腰"},
+{"usage": "nick", "name": "孤独的人"},
+{"usage": "nick", "name": "丝瓜"},
+{"usage": "nick", "name": "漏洞"},
+{"usage": "nick", "name": "失败者"},
+{"usage": "nick", "name": "情人"},
+{"usage": "nick", "name": "幸运的"},
+{"usage": "nick", "name": "肿块"},
+{"usage": "nick", "name": "吸引"},
+{"usage": "nick", "name": "郁郁葱葱的"},
+{"usage": "nick", "name": "欲望"},
+{"usage": "nick", "name": "琵琶"},
+{"usage": "nick", "name": "勒克斯"},
+{"usage": "nick", "name": "猞猁"},
+{"usage": "nick", "name": "歌词"},
+{"usage": "nick", "name": "麦克"},
+{"usage": "nick", "name": "机器"},
+{"usage": "nick", "name": "麦克"},
+{"usage": "nick", "name": "迈科姆"},
+{"usage": "nick", "name": "疯狗"},
+{"usage": "nick", "name": "鲁莽的人"},
+{"usage": "nick", "name": "马德拉斯人"},
+{"usage": "nick", "name": "大漩涡"},
+{"usage": "nick", "name": "品红色的"},
+{"usage": "nick", "name": "蛆"},
+{"usage": "nick", "name": "魔法"},
+{"usage": "nick", "name": "玛格南"},
+{"usage": "nick", "name": "喜鹊"},
+{"usage": "nick", "name": "少女"},
+{"usage": "nick", "name": "大陆人"},
+{"usage": "nick", "name": "主要"},
+{"usage": "nick", "name": "胡说"},
+{"usage": "nick", "name": "马里布"},
+{"usage": "nick", "name": "庞大的"},
+{"usage": "nick", "name": "疯子"},
+{"usage": "nick", "name": "玻璃球"},
+{"usage": "nick", "name": "火星"},
+{"usage": "nick", "name": "面具"},
+{"usage": "nick", "name": "大洞子"},
+{"usage": "nick", "name": "主人"},
+{"usage": "nick", "name": "玛雅"},
+{"usage": "nick", "name": "五月天"},
+{"usage": "nick", "name": "混乱"},
+{"usage": "nick", "name": "米德"},
+{"usage": "nick", "name": "金牌"},
+{"usage": "nick", "name": "美第奇"},
+{"usage": "nick", "name": "大型"},
+{"usage": "nick", "name": "成熟的"},
+{"usage": "nick", "name": "崩溃"},
+{"usage": "nick", "name": "精神"},
+{"usage": "nick", "name": "猫叫"},
+{"usage": "nick", "name": "佣兵"},
+{"usage": "nick", "name": "商人"},
+{"usage": "nick", "name": "汞"},
+{"usage": "nick", "name": "梅林"},
+{"usage": "nick", "name": "主流"},
+{"usage": "nick", "name": "金属"},
+{"usage": "nick", "name": "密歇根人"},
+{"usage": "nick", "name": "微型"},
+{"usage": "nick", "name": "迈达斯"},
+{"usage": "nick", "name": "蚊"},
+{"usage": "nick", "name": "牛奶"},
+{"usage": "nick", "name": "乳白色的"},
+{"usage": "nick", "name": "几百万"},
+{"usage": "nick", "name": "意志薄弱的人"},
+{"usage": "nick", "name": "最小值"},
+{"usage": "nick", "name": "迷你"},
+{"usage": "nick", "name": "奴才"},
+{"usage": "nick", "name": "小"},
+{"usage": "nick", "name": "薄荷"},
+{"usage": "nick", "name": "海市蜃楼"},
+{"usage": "nick", "name": "混合"},
+{"usage": "nick", "name": "助记符"},
+{"usage": "nick", "name": "麻吉"},
+{"usage": "nick", "name": "魔力"},
+{"usage": "nick", "name": "摩摩"},
+{"usage": "nick", "name": "君主"},
+{"usage": "nick", "name": "周一"},
+{"usage": "nick", "name": "绝对的"},
+{"usage": "nick", "name": "钱"},
+{"usage": "nick", "name": "蒙戈"},
+{"usage": "nick", "name": "绰号"},
+{"usage": "nick", "name": "和尚"},
+{"usage": "nick", "name": "猴子"},
+{"usage": "nick", "name": "怪物"},
+{"usage": "nick", "name": "哞哞叫"},
+{"usage": "nick", "name": "彷徨"},
+{"usage": "nick", "name": "月亮"},
+{"usage": "nick", "name": "笨人"},
+{"usage": "nick", "name": "耽于幻想的"},
+{"usage": "nick", "name": "驼鹿"},
+{"usage": "nick", "name": "睡眠"},
+{"usage": "nick", "name": "电动机"},
+{"usage": "nick", "name": "喋喋不休的人"},
+{"usage": "nick", "name": "鼠标"},
+{"usage": "nick", "name": "Mu"},
+{"usage": "nick", "name": "泥"},
+{"usage": "nick", "name": "泥泞的"},
+{"usage": "nick", "name": "松饼"},
+{"usage": "nick", "name": "穆里根"},
+{"usage": "nick", "name": "提线木偶"},
+{"usage": "nick", "name": "杂音"},
+{"usage": "nick", "name": "武藏"},
+{"usage": "nick", "name": "音乐"},
+{"usage": "nick", "name": "芥末"},
+{"usage": "nick", "name": "杂种狗"},
+{"usage": "nick", "name": "神秘"},
+{"usage": "nick", "name": "神话"},
+{"usage": "nick", "name": "裸体"},
+{"usage": "nick", "name": "保姆"},
+{"usage": "nick", "name": "奈良"},
+{"usage": "nick", "name": "刑警"},
+{"usage": "nick", "name": "令人讨厌的"},
+{"usage": "nick", "name": "导航器"},
+{"usage": "nick", "name": "海军"},
+{"usage": "nick", "name": "不"},
+{"usage": "nick", "name": "星云"},
+{"usage": "nick", "name": "死灵法师"},
+{"usage": "nick", "name": "针"},
+{"usage": "nick", "name": "复仇者"},
+{"usage": "nick", "name": "尼奥"},
+{"usage": "nick", "name": "海王星"},
+{"usage": "nick", "name": "尼禄"},
+{"usage": "nick", "name": "新手"},
+{"usage": "nick", "name": "纽芬兰人"},
+{"usage": "nick", "name": "纽特"},
+{"usage": "nick", "name": "下一个"},
+{"usage": "nick", "name": "镍"},
+{"usage": "nick", "name": "晚上"},
+{"usage": "nick", "name": "夜猫子"},
+{"usage": "nick", "name": "毫无价值的东西"},
+{"usage": "nick", "name": "零"},
+{"usage": "nick", "name": "九个"},
+{"usage": "nick", "name": "消瘦"},
+{"usage": "nick", "name": "忍者"},
+{"usage": "nick", "name": "硝基"},
+{"usage": "nick", "name": "黑色数字"},
+{"usage": "nick", "name": "游牧"},
+{"usage": "nick", "name": "诺德人"},
+{"usage": "nick", "name": "北"},
+{"usage": "nick", "name": "西北"},
+{"usage": "nick", "name": "新星"},
+{"usage": "nick", "name": "11月"},
+{"usage": "nick", "name": "夜之女神"},
+{"usage": "nick", "name": "Nu"},
+{"usage": "nick", "name": "九点"},
+{"usage": "nick", "name": "核弹"},
+{"usage": "nick", "name": "零"},
+{"usage": "nick", "name": "麻木了"},
+{"usage": "nick", "name": "数字"},
+{"usage": "nick", "name": "笨蛋"},
+{"usage": "nick", "name": "肉豆蔻"},
+{"usage": "nick", "name": "坚果"},
+{"usage": "nick", "name": "绿洲"},
+{"usage": "nick", "name": "双簧管"},
+{"usage": "nick", "name": "海洋"},
+{"usage": "nick", "name": "八字步"},
+{"usage": "nick", "name": "辛烷"},
+{"usage": "nick", "name": "几率"},
+{"usage": "nick", "name": "食人魔"},
+{"usage": "nick", "name": "农夫移民"},
+{"usage": "nick", "name": "欧米伽"},
+{"usage": "nick", "name": "预兆"},
+{"usage": "nick", "name": "奥米克戎"},
+{"usage": "nick", "name": "泛光灯"},
+{"usage": "nick", "name": "唯一"},
+{"usage": "nick", "name": "缟玛瑙"},
+{"usage": "nick", "name": "哦"},
+{"usage": "nick", "name": "软泥"},
+{"usage": "nick", "name": "蛋白石"},
+{"usage": "nick", "name": "选择"},
+{"usage": "nick", "name": "作品"},
+{"usage": "nick", "name": "先知"},
+{"usage": "nick", "name": "橙色"},
+{"usage": "nick", "name": "东德"},
+{"usage": "nick", "name": "占卜板"},
+{"usage": "nick", "name": "不法之徒"},
+{"usage": "nick", "name": "结尾部分"},
+{"usage": "nick", "name": "越过"},
+{"usage": "nick", "name": "超速"},
+{"usage": "nick", "name": "覆盖"},
+{"usage": "nick", "name": "牛"},
+{"usage": "nick", "name": "牛津大学"},
+{"usage": "nick", "name": "疼痛"},
+{"usage": "nick", "name": "佩斯利"},
+{"usage": "nick", "name": "朋友"},
+{"usage": "nick", "name": "圣骑士"},
+{"usage": "nick", "name": "穿越"},
+{"usage": "nick", "name": "灵丹妙药"},
+{"usage": "nick", "name": "羽饰"},
+{"usage": "nick", "name": "潘乔"},
+{"usage": "nick", "name": "恐慌"},
+{"usage": "nick", "name": "装甲"},
+{"usage": "nick", "name": "典范"},
+{"usage": "nick", "name": "视差"},
+{"usage": "nick", "name": "烤干"},
+{"usage": "nick", "name": "巴黎"},
+{"usage": "nick", "name": "帕里什"},
+{"usage": "nick", "name": "鹦鹉"},
+{"usage": "nick", "name": "意大利面"},
+{"usage": "nick", "name": "同情"},
+{"usage": "nick", "name": "爱国者"},
+{"usage": "nick", "name": "兵"},
+{"usage": "nick", "name": "和平女神"},
+{"usage": "nick", "name": "和平"},
+{"usage": "nick", "name": "桃子"},
+{"usage": "nick", "name": "孔雀"},
+{"usage": "nick", "name": "花生"},
+{"usage": "nick", "name": "偷看"},
+{"usage": "nick", "name": "矮小的"},
+{"usage": "nick", "name": "鹈鹕"},
+{"usage": "nick", "name": "一分钱"},
+{"usage": "nick", "name": "完美的"},
+{"usage": "nick", "name": "橄榄石"},
+{"usage": "nick", "name": "罪犯"},
+{"usage": "nick", "name": "潮土油"},
+{"usage": "nick", "name": "法老王"},
+{"usage": "nick", "name": "酷毙了"},
+{"usage": "nick", "name": "斐"},
+{"usage": "nick", "name": "惧怕"},
+{"usage": "nick", "name": "圆周率"},
+{"usage": "nick", "name": "泡菜"},
+{"usage": "nick", "name": "泡菜"},
+{"usage": "nick", "name": "皮克"},
+{"usage": "nick", "name": "飘泊流浪的人"},
+{"usage": "nick", "name": "似松的"},
+{"usage": "nick", "name": "小指"},
+{"usage": "nick", "name": "打"},
+{"usage": "nick", "name": "美女照片"},
+{"usage": "nick", "name": "水虎鱼"},
+{"usage": "nick", "name": "手枪"},
+{"usage": "nick", "name": "照片"},
+{"usage": "nick", "name": "披萨"},
+{"usage": "nick", "name": "潇洒"},
+{"usage": "nick", "name": "瘟疫"},
+{"usage": "nick", "name": "格子"},
+{"usage": "nick", "name": "铂"},
+{"usage": "nick", "name": "梅花"},
+{"usage": "nick", "name": "冥王星"},
+{"usage": "nick", "name": "坡"},
+{"usage": "nick", "name": "诗人"},
+{"usage": "nick", "name": "弹簧单高跷"},
+{"usage": "nick", "name": "波因德克斯特"},
+{"usage": "nick", "name": "毒药"},
+{"usage": "nick", "name": "吃玉米糊糊的人"},
+{"usage": "nick", "name": "英国佬"},
+{"usage": "nick", "name": "小马"},
+{"usage": "nick", "name": "马形妖怪"},
+{"usage": "nick", "name": "小孩的"},
+{"usage": "nick", "name": "流行"},
+{"usage": "nick", "name": "砰砰响"},
+{"usage": "nick", "name": "猪排"},
+{"usage": "nick", "name": "布宜诺斯艾利斯人"},
+{"usage": "nick", "name": "豪华"},
+{"usage": "nick", "name": "家常便饭"},
+{"usage": "nick", "name": "战俘"},
+{"usage": "nick", "name": "粉"},
+{"usage": "nick", "name": "权力"},
+{"usage": "nick", "name": "珍贵的"},
+{"usage": "nick", "name": "急板"},
+{"usage": "nick", "name": "椒盐卷饼"},
+{"usage": "nick", "name": "总统"},
+{"usage": "nick", "name": "刺"},
+{"usage": "nick", "name": "骄傲"},
+{"usage": "nick", "name": "主要部"},
+{"usage": "nick", "name": "打印"},
+{"usage": "nick", "name": "棱镜"},
+{"usage": "nick", "name": "奖"},
+{"usage": "nick", "name": "职业选手"},
+{"usage": "nick", "name": "进程"},
+{"usage": "nick", "name": "先知"},
+{"usage": "nick", "name": "道具"},
+{"usage": "nick", "name": "原型"},
+{"usage": "nick", "name": "普西"},
+{"usage": "nick", "name": "神经"},
+{"usage": "nick", "name": "神经病"},
+{"usage": "nick", "name": "布丁"},
+{"usage": "nick", "name": "泡芙"},
+{"usage": "nick", "name": "彪马"},
+{"usage": "nick", "name": "穿孔"},
+{"usage": "nick", "name": "紫色的"},
+{"usage": "nick", "name": "咕噜咕噜声"},
+{"usage": "nick", "name": "推杆式"},
+{"usage": "nick", "name": "PYT"},
+{"usage": "nick", "name": "毒蛇"},
+{"usage": "nick", "name": "庸医"},
+{"usage": "nick", "name": "四方形"},
+{"usage": "nick", "name": "鹌鹑"},
+{"usage": "nick", "name": "地震"},
+{"usage": "nick", "name": "质量"},
+{"usage": "nick", "name": "季度"},
+{"usage": "nick", "name": "类星体"},
+{"usage": "nick", "name": "魁北克"},
+{"usage": "nick", "name": "水银"},
+{"usage": "nick", "name": "金镑"},
+{"usage": "nick", "name": "安静的"},
+{"usage": "nick", "name": "五胞胎"},
+{"usage": "nick", "name": "怪癖"},
+{"usage": "nick", "name": "测试"},
+{"usage": "nick", "name": "现状"},
+{"usage": "nick", "name": "报价"},
+{"usage": "nick", "name": "报价"},
+{"usage": "nick", "name": "辐射"},
+{"usage": "nick", "name": "雷达"},
+{"usage": "nick", "name": "愤怒"},
+{"usage": "nick", "name": "非常亲密的朋友"},
+{"usage": "nick", "name": "衣衫褴褛的"},
+{"usage": "nick", "name": "喷淋设备"},
+{"usage": "nick", "name": "兰博"},
+{"usage": "nick", "name": "摇摇欲坠的"},
+{"usage": "nick", "name": "游骑兵"},
+{"usage": "nick", "name": "狂喜"},
+{"usage": "nick", "name": "流氓"},
+{"usage": "nick", "name": "老鼠"},
+{"usage": "nick", "name": "棘轮"},
+{"usage": "nick", "name": "说胡话"},
+{"usage": "nick", "name": "乌鸦"},
+{"usage": "nick", "name": "夷为平地"},
+{"usage": "nick", "name": "剃须刀"},
+{"usage": "nick", "name": "收割者"},
+{"usage": "nick", "name": "反叛者"},
+{"usage": "nick", "name": "红色的"},
+{"usage": "nick", "name": "乡下人"},
+{"usage": "nick", "name": "重做"},
+{"usage": "nick", "name": "用烟熏"},
+{"usage": "nick", "name": "参考文献"},
+{"usage": "nick", "name": "蒙特雷人"},
+{"usage": "nick", "name": "混音"},
+{"usage": "nick", "name": "复古的"},
+{"usage": "nick", "name": "牧师"},
+{"usage": "nick", "name": "启示"},
+{"usage": "nick", "name": "雷克斯"},
+{"usage": "nick", "name": "雷兹"},
+{"usage": "nick", "name": "犀牛"},
+{"usage": "nick", "name": "柔"},
+{"usage": "nick", "name": "罗德岛人"},
+{"usage": "nick", "name": "跳弹"},
+{"usage": "nick", "name": "谜题"},
+{"usage": "nick", "name": "骑手"},
+{"usage": "nick", "name": "钻井平台"},
+{"usage": "nick", "name": "装配工"},
+{"usage": "nick", "name": "开伞索"},
+{"usage": "nick", "name": "丽兹"},
+{"usage": "nick", "name": "蟑螂"},
+{"usage": "nick", "name": "障碍"},
+{"usage": "nick", "name": "巡回乐队管理员"},
+{"usage": "nick", "name": "路毙的"},
+{"usage": "nick", "name": "漫游"},
+{"usage": "nick", "name": "罗宾"},
+{"usage": "nick", "name": "机器人"},
+{"usage": "nick", "name": "岩石"},
+{"usage": "nick", "name": "火箭"},
+{"usage": "nick", "name": "岩石"},
+{"usage": "nick", "name": "罗杰"},
+{"usage": "nick", "name": "流氓"},
+{"usage": "nick", "name": "顽童"},
+{"usage": "nick", "name": "浪人"},
+{"usage": "nick", "name": "车"},
+{"usage": "nick", "name": "乐观"},
+{"usage": "nick", "name": "口红"},
+{"usage": "nick", "name": "探测器"},
+{"usage": "nick", "name": "伸长脖子看"},
+{"usage": "nick", "name": "红宝石"},
+{"usage": "nick", "name": "小淘气"},
+{"usage": "nick", "name": "俄罗斯"},
+{"usage": "nick", "name": "生锈"},
+{"usage": "nick", "name": "沙沙声"},
+{"usage": "nick", "name": "生锈"},
+{"usage": "nick", "name": "军刀"},
+{"usage": "nick", "name": "马刀"},
+{"usage": "nick", "name": "贤人"},
+{"usage": "nick", "name": "圣人"},
+{"usage": "nick", "name": "火蜥蜴"},
+{"usage": "nick", "name": "盐"},
+{"usage": "nick", "name": "武士"},
+{"usage": "nick", "name": "桑切斯"},
+{"usage": "nick", "name": "旱鸭子"},
+{"usage": "nick", "name": "南卡罗莱那人"},
+{"usage": "nick", "name": "三明治"},
+{"usage": "nick", "name": "圣白托略"},
+{"usage": "nick", "name": "蓝宝石"},
+{"usage": "nick", "name": "大脚野人"},
+{"usage": "nick", "name": "周六"},
+{"usage": "nick", "name": "土星"},
+{"usage": "nick", "name": "野蛮人"},
+{"usage": "nick", "name": "学者"},
+{"usage": "nick", "name": "萨克斯"},
+{"usage": "nick", "name": "无赖汉"},
+{"usage": "nick", "name": "疤痕"},
+{"usage": "nick", "name": "注意力分散"},
+{"usage": "nick", "name": "闪烁"},
+{"usage": "nick", "name": "接穗"},
+{"usage": "nick", "name": "烧焦"},
+{"usage": "nick", "name": "蝎子"},
+{"usage": "nick", "name": "利物浦人"},
+{"usage": "nick", "name": "童子军"},
+{"usage": "nick", "name": "刮"},
+{"usage": "nick", "name": "刮伤"},
+{"usage": "nick", "name": "草率的"},
+{"usage": "nick", "name": "尖锐刺耳"},
+{"usage": "nick", "name": "谣言"},
+{"usage": "nick", "name": "长柄大镰刀"},
+{"usage": "nick", "name": "老二"},
+{"usage": "nick", "name": "第二个"},
+{"usage": "nick", "name": "乌贼"},
+{"usage": "nick", "name": "伺服"},
+{"usage": "nick", "name": "七个"},
+{"usage": "nick", "name": "老七"},
+{"usage": "nick", "name": "阴影"},
+{"usage": "nick", "name": "影子"},
+{"usage": "nick", "name": "粗野的"},
+{"usage": "nick", "name": "摇"},
+{"usage": "nick", "name": "摇摇欲坠的"},
+{"usage": "nick", "name": "鲨鱼"},
+{"usage": "nick", "name": "锋利的"},
+{"usage": "nick", "name": "工作"},
+{"usage": "nick", "name": "酋长"},
+{"usage": "nick", "name": "恶作剧"},
+{"usage": "nick", "name": "治安官"},
+{"usage": "nick", "name": "夏洛克"},
+{"usage": "nick", "name": "机智的"},
+{"usage": "nick", "name": "发光"},
+{"usage": "nick", "name": "闪亮的"},
+{"usage": "nick", "name": "刀"},
+{"usage": "nick", "name": "颤抖"},
+{"usage": "nick", "name": "冲击"},
+{"usage": "nick", "name": "嘘"},
+{"usage": "nick", "name": "矮个子"},
+{"usage": "nick", "name": "表演者"},
+{"usage": "nick", "name": "表演时间"},
+{"usage": "nick", "name": "分解"},
+{"usage": "nick", "name": "虾"},
+{"usage": "nick", "name": "缩小"},
+{"usage": "nick", "name": "洗牌"},
+{"usage": "nick", "name": "西西里人"},
+{"usage": "nick", "name": "西西里"},
+{"usage": "nick", "name": "病"},
+{"usage": "nick", "name": "神经有问题的人"},
+{"usage": "nick", "name": "响尾蛇导弹"},
+{"usage": "nick", "name": "锯齿山"},
+{"usage": "nick", "name": "谢特"},
+{"usage": "nick", "name": "西格玛"},
+{"usage": "nick", "name": "丝绸"},
+{"usage": "nick", "name": "筒仓"},
+{"usage": "nick", "name": "银"},
+{"usage": "nick", "name": "单"},
+{"usage": "nick", "name": "单调的节奏"},
+{"usage": "nick", "name": "塞壬"},
+{"usage": "nick", "name": "六个"},
+{"usage": "nick", "name": "六号"},
+{"usage": "nick", "name": "老六"},
+{"usage": "nick", "name": "十六岁"},
+{"usage": "nick", "name": "匆匆离去"},
+{"usage": "nick", "name": "白鲑"},
+{"usage": "nick", "name": "草图"},
+{"usage": "nick", "name": "皮"},
+{"usage": "nick", "name": "跳过"},
+{"usage": "nick", "name": "队长"},
+{"usage": "nick", "name": "天空"},
+{"usage": "nick", "name": "草率的"},
+{"usage": "nick", "name": "闹剧"},
+{"usage": "nick", "name": "削减"},
+{"usage": "nick", "name": "捉鬼"},
+{"usage": "nick", "name": "雪橇"},
+{"usage": "nick", "name": "睡眠"},
+{"usage": "nick", "name": "困了"},
+{"usage": "nick", "name": "浮油"},
+{"usage": "nick", "name": "苗条的"},
+{"usage": "nick", "name": "麻俐的"},
+{"usage": "nick", "name": "银"},
+{"usage": "nick", "name": "懒惰"},
+{"usage": "nick", "name": "慢"},
+{"usage": "nick", "name": "聪明的"},
+{"usage": "nick", "name": "自作聪明的人"},
+{"usage": "nick", "name": "粉碎"},
+{"usage": "nick", "name": "吞云吐雾的人"},
+{"usage": "nick", "name": "烟雾"},
+{"usage": "nick", "name": "烟雾缭绕的"},
+{"usage": "nick", "name": "光滑的"},
+{"usage": "nick", "name": "涂抹"},
+{"usage": "nick", "name": "混乱"},
+{"usage": "nick", "name": "蛇"},
+{"usage": "nick", "name": "蛇咬伤"},
+{"usage": "nick", "name": "提前"},
+{"usage": "nick", "name": "偷偷摸摸"},
+{"usage": "nick", "name": "爱打喷嚏"},
+{"usage": "nick", "name": "喷嚏鬼"},
+{"usage": "nick", "name": "哼鼻子"},
+{"usage": "nick", "name": "雪"},
+{"usage": "nick", "name": "雪人"},
+{"usage": "nick", "name": "舒适的"},
+{"usage": "nick", "name": "套接字"},
+{"usage": "nick", "name": "柔弱的人"},
+{"usage": "nick", "name": "太阳"},
+{"usage": "nick", "name": "太阳能"},
+{"usage": "nick", "name": "单挑"},
+{"usage": "nick", "name": "声波"},
+{"usage": "nick", "name": "俄克拉荷马州人"},
+{"usage": "nick", "name": "烟尘"},
+{"usage": "nick", "name": "灵魂"},
+{"usage": "nick", "name": "南"},
+{"usage": "nick", "name": "空间"},
+{"usage": "nick", "name": "调皮鬼"},
+{"usage": "nick", "name": "火花"},
+{"usage": "nick", "name": "充满活力的"},
+{"usage": "nick", "name": "麻雀"},
+{"usage": "nick", "name": "产卵"},
+{"usage": "nick", "name": "怪人"},
+{"usage": "nick", "name": "幽灵"},
+{"usage": "nick", "name": "快速"},
+{"usage": "nick", "name": "使人入迷的小说"},
+{"usage": "nick", "name": "斯芬克斯"},
+{"usage": "nick", "name": "香料"},
+{"usage": "nick", "name": "辣的"},
+{"usage": "nick", "name": "蜘蛛"},
+{"usage": "nick", "name": "使整洁"},
+{"usage": "nick", "name": "整洁的"},
+{"usage": "nick", "name": "精神"},
+{"usage": "nick", "name": "碎片"},
+{"usage": "nick", "name": "分裂"},
+{"usage": "nick", "name": "斯波克"},
+{"usage": "nick", "name": "海绵"},
+{"usage": "nick", "name": "体育运动"},
+{"usage": "nick", "name": "现货"},
+{"usage": "nick", "name": "马铃薯"},
+{"usage": "nick", "name": "土豆"},
+{"usage": "nick", "name": "矮胖子"},
+{"usage": "nick", "name": "小队"},
+{"usage": "nick", "name": "清洁刷"},
+{"usage": "nick", "name": "鱿鱼"},
+{"usage": "nick", "name": "乱涂乱画"},
+{"usage": "nick", "name": "喷射"},
+{"usage": "nick", "name": "断奏"},
+{"usage": "nick", "name": "错开"},
+{"usage": "nick", "name": "跟踪狂"},
+{"usage": "nick", "name": "明星"},
+{"usage": "nick", "name": "盯着看"},
+{"usage": "nick", "name": "统计"},
+{"usage": "nick", "name": "统计数据"},
+{"usage": "nick", "name": "钢"},
+{"usage": "nick", "name": "刺痛"},
+{"usage": "nick", "name": "臭鬼"},
+{"usage": "nick", "name": "臭"},
+{"usage": "nick", "name": "针"},
+{"usage": "nick", "name": "石头"},
+{"usage": "nick", "name": "风暴"},
+{"usage": "nick", "name": "故事"},
+{"usage": "nick", "name": "流浪"},
+{"usage": "nick", "name": "拉伸"},
+{"usage": "nick", "name": "前锋"},
+{"usage": "nick", "name": "选通脉冲"},
+{"usage": "nick", "name": "漫步"},
+{"usage": "nick", "name": "闷热的"},
+{"usage": "nick", "name": "眩晕"},
+{"usage": "nick", "name": "出色的人"},
+{"usage": "nick", "name": "豆煮玉米"},
+{"usage": "nick", "name": "糖"},
+{"usage": "nick", "name": "甜言蜜语"},
+{"usage": "nick", "name": "苏丹"},
+{"usage": "nick", "name": "周日"},
+{"usage": "nick", "name": "阳光明媚的"},
+{"usage": "nick", "name": "超级"},
+{"usage": "nick", "name": "超级巨星"},
+{"usage": "nick", "name": "神枪手"},
+{"usage": "nick", "name": "飙升"},
+{"usage": "nick", "name": "斯文加利"},
+{"usage": "nick", "name": "印度教大师"},
+{"usage": "nick", "name": "沼泽"},
+{"usage": "nick", "name": "燕式跳水"},
+{"usage": "nick", "name": "天鹅之歌"},
+{"usage": "nick", "name": "爱打扮的"},
+{"usage": "nick", "name": "斯旺西"},
+{"usage": "nick", "name": "甜蜜的"},
+{"usage": "nick", "name": "甜姐儿"},
+{"usage": "nick", "name": "三心二意"},
+{"usage": "nick", "name": "迅速的"},
+{"usage": "nick", "name": "冒牌货"},
+{"usage": "nick", "name": "开关"},
+{"usage": "nick", "name": "突如其来的变化"},
+{"usage": "nick", "name": "神魂颠倒"},
+{"usage": "nick", "name": "同步"},
+{"usage": "nick", "name": "综合症"},
+{"usage": "nick", "name": "禁忌"},
+{"usage": "nick", "name": "太妃糖"},
+{"usage": "nick", "name": "棕黄色"},
+{"usage": "nick", "name": "探戈"},
+{"usage": "nick", "name": "坦克"},
+{"usage": "nick", "name": "塔巴蒂奥"},
+{"usage": "nick", "name": "焦油"},
+{"usage": "nick", "name": "塔斯马尼亚人"},
+{"usage": "nick", "name": "马铃薯"},
+{"usage": "nick", "name": "刺青"},
+{"usage": "nick", "name": "陶"},
+{"usage": "nick", "name": "技术"},
+{"usage": "nick", "name": "泰迪"},
+{"usage": "nick", "name": "搬弄是非的"},
+{"usage": "nick", "name": "电视"},
+{"usage": "nick", "name": "脾气"},
+{"usage": "nick", "name": "十个"},
+{"usage": "nick", "name": "十元纸币"},
+{"usage": "nick", "name": "南方佬"},
+{"usage": "nick", "name": "苏格兰高地人"},
+{"usage": "nick", "name": "特克斯"},
+{"usage": "nick", "name": "那个人"},
+{"usage": "nick", "name": "西塔"},
+{"usage": "nick", "name": "第三"},
+{"usage": "nick", "name": "渴"},
+{"usage": "nick", "name": "渴了"},
+{"usage": "nick", "name": "十三"},
+{"usage": "nick", "name": "刺"},
+{"usage": "nick", "name": "打"},
+{"usage": "nick", "name": "老三"},
+{"usage": "nick", "name": "雷声"},
+{"usage": "nick", "name": "吓坏了的"},
+{"usage": "nick", "name": "周四"},
+{"usage": "nick", "name": "激情风暴"},
+{"usage": "nick", "name": "雀鸟"},
+{"usage": "nick", "name": "珍闻"},
+{"usage": "nick", "name": "扎染"},
+{"usage": "nick", "name": "老虎"},
+{"usage": "nick", "name": "木材"},
+{"usage": "nick", "name": "小"},
+{"usage": "nick", "name": "泰坦"},
+{"usage": "nick", "name": "蟾蜍"},
+{"usage": "nick", "name": "羊肚菌"},
+{"usage": "nick", "name": "马屁精"},
+{"usage": "nick", "name": "烤面包片"},
+{"usage": "nick", "name": "番茄"},
+{"usage": "nick", "name": "明天"},
+{"usage": "nick", "name": "工具"},
+{"usage": "nick", "name": "亲密的人"},
+{"usage": "nick", "name": "黄玉"},
+{"usage": "nick", "name": "乱七八糟的"},
+{"usage": "nick", "name": "火炬"},
+{"usage": "nick", "name": "鱼雷"},
+{"usage": "nick", "name": "托托"},
+{"usage": "nick", "name": "塔"},
+{"usage": "nick", "name": "悲剧"},
+{"usage": "nick", "name": "火车"},
+{"usage": "nick", "name": "恍惚"},
+{"usage": "nick", "name": "宝"},
+{"usage": "nick", "name": "三弦琴"},
+{"usage": "nick", "name": "技巧"},
+{"usage": "nick", "name": "顽皮的"},
+{"usage": "nick", "name": "棘手的"},
+{"usage": "nick", "name": "三一"},
+{"usage": "nick", "name": "波尔图人"},
+{"usage": "nick", "name": "三倍"},
+{"usage": "nick", "name": "特利克斯"},
+{"usage": "nick", "name": "巨魔"},
+{"usage": "nick", "name": "巨魔"},
+{"usage": "nick", "name": "真理"},
+{"usage": "nick", "name": "茯苓"},
+{"usage": "nick", "name": "周二"},
+{"usage": "nick", "name": "曲调"},
+{"usage": "nick", "name": "涡轮增压"},
+{"usage": "nick", "name": "火鸡"},
+{"usage": "nick", "name": "乌龟"},
+{"usage": "nick", "name": "图斯克"},
+{"usage": "nick", "name": "图图"},
+{"usage": "nick", "name": "卑鄙的人"},
+{"usage": "nick", "name": "嫩枝"},
+{"usage": "nick", "name": "苗条的"},
+{"usage": "nick", "name": "双胞胎"},
+{"usage": "nick", "name": "抽搐"},
+{"usage": "nick", "name": "两个"},
+{"usage": "nick", "name": "小孩子"},
+{"usage": "nick", "name": "台风"},
+{"usage": "nick", "name": "暴君"},
+{"usage": "nick", "name": "超级"},
+{"usage": "nick", "name": "尤比克"},
+{"usage": "nick", "name": "Uh-Oh"},
+{"usage": "nick", "name": "尤克里里琴"},
+{"usage": "nick", "name": "末音节"},
+{"usage": "nick", "name": "超"},
+{"usage": "nick", "name": "棕色的"},
+{"usage": "nick", "name": "暗影"},
+{"usage": "nick", "name": "裁判"},
+{"usage": "nick", "name": "无数的"},
+{"usage": "nick", "name": "失败者"},
+{"usage": "nick", "name": "地下"},
+{"usage": "nick", "name": "撤销"},
+{"usage": "nick", "name": "不可饶恕"},
+{"usage": "nick", "name": "统一的"},
+{"usage": "nick", "name": "单位"},
+{"usage": "nick", "name": "第一"},
+{"usage": "nick", "name": "不可阻挡的"},
+{"usage": "nick", "name": "宇普西龙"},
+{"usage": "nick", "name": "自命不凡的人"},
+{"usage": "nick", "name": "天王星"},
+{"usage": "nick", "name": "冲动"},
+{"usage": "nick", "name": "犹他人"},
+{"usage": "nick", "name": "情人节"},
+{"usage": "nick", "name": "匆匆离开"},
+{"usage": "nick", "name": "鞋面"},
+{"usage": "nick", "name": "蒸汽"},
+{"usage": "nick", "name": "向量"},
+{"usage": "nick", "name": "蔬菜"},
+{"usage": "nick", "name": "维加斯"},
+{"usage": "nick", "name": "报复"},
+{"usage": "nick", "name": "威尼斯"},
+{"usage": "nick", "name": "毒液"},
+{"usage": "nick", "name": "超大杯"},
+{"usage": "nick", "name": "金星"},
+{"usage": "nick", "name": "眩晕"},
+{"usage": "nick", "name": "才能"},
+{"usage": "nick", "name": "否决"},
+{"usage": "nick", "name": "烦恼"},
+{"usage": "nick", "name": "胜利"},
+{"usage": "nick", "name": "取景器"},
+{"usage": "nick", "name": "维京人"},
+{"usage": "nick", "name": "醋"},
+{"usage": "nick", "name": "贵宾"},
+{"usage": "nick", "name": "毒蛇"},
+{"usage": "nick", "name": "伏特"},
+{"usage": "nick", "name": "志愿者"},
+{"usage": "nick", "name": "伏都教"},
+{"usage": "nick", "name": "沃克斯"},
+{"usage": "nick", "name": "秃鹰"},
+{"usage": "nick", "name": "瓦克"},
+{"usage": "nick", "name": "华夫饼"},
+{"usage": "nick", "name": "醒来"},
+{"usage": "nick", "name": "沃克"},
+{"usage": "nick", "name": "壁花"},
+{"usage": "nick", "name": "减弱"},
+{"usage": "nick", "name": "水性杨花的女人"},
+{"usage": "nick", "name": "战争"},
+{"usage": "nick", "name": "监狱长"},
+{"usage": "nick", "name": "军阀"},
+{"usage": "nick", "name": "征途"},
+{"usage": "nick", "name": "疣猪"},
+{"usage": "nick", "name": "黄鼠狼"},
+{"usage": "nick", "name": "楔子"},
+{"usage": "nick", "name": "周三"},
+{"usage": "nick", "name": "怪人"},
+{"usage": "nick", "name": "西德佬"},
+{"usage": "nick", "name": "西"},
+{"usage": "nick", "name": "西部人"},
+{"usage": "nick", "name": "西部佬"},
+{"usage": "nick", "name": "老生常谈的"},
+{"usage": "nick", "name": "反复无常"},
+{"usage": "nick", "name": "旋风"},
+{"usage": "nick", "name": "威士忌"},
+{"usage": "nick", "name": "耳语"},
+{"usage": "nick", "name": "白色"},
+{"usage": "nick", "name": "奇才"},
+{"usage": "nick", "name": "威兹班"},
+{"usage": "nick", "name": "哇"},
+{"usage": "nick", "name": "为什么"},
+{"usage": "nick", "name": "小部件"},
+{"usage": "nick", "name": "摆动"},
+{"usage": "nick", "name": "野生"},
+{"usage": "nick", "name": "莽撞的人"},
+{"usage": "nick", "name": "懦弱的"},
+{"usage": "nick", "name": "饶舌之人"},
+{"usage": "nick", "name": "翅膀"},
+{"usage": "nick", "name": "剔出"},
+{"usage": "nick", "name": "惨败"},
+{"usage": "nick", "name": "线"},
+{"usage": "nick", "name": "电线"},
+{"usage": "nick", "name": "自以为聪明者"},
+{"usage": "nick", "name": "向导"},
+{"usage": "nick", "name": "狼"},
+{"usage": "nick", "name": "狼人"},
+{"usage": "nick", "name": "想知道"},
+{"usage": "nick", "name": "书呆子"},
+{"usage": "nick", "name": "旺卡"},
+{"usage": "nick", "name": "靠不住的"},
+{"usage": "nick", "name": "汪"},
+{"usage": "nick", "name": "兰开夏人"},
+{"usage": "nick", "name": "老王"},
+{"usage": "nick", "name": "词"},
+{"usage": "nick", "name": "蠕虫"},
+{"usage": "nick", "name": "哇"},
+{"usage": "nick", "name": "幽灵"},
+{"usage": "nick", "name": "忿怒"},
+{"usage": "nick", "name": "造成"},
+{"usage": "nick", "name": "沉船"},
+{"usage": "nick", "name": "肇事者"},
+{"usage": "nick", "name": "坏蛋"},
+{"usage": "nick", "name": "韩国帝王"},
+{"usage": "nick", "name": "Xi"},
+{"usage": "nick", "name": "x射线"},
+{"usage": "nick", "name": "Yadda Yadda"},
+{"usage": "nick", "name": "雅虎"},
+{"usage": "nick", "name": "山药"},
+{"usage": "nick", "name": "美国佬"},
+{"usage": "nick", "name": "杨基佬"},
+{"usage": "nick", "name": "亚迪"},
+{"usage": "nick", "name": "雅特"},
+{"usage": "nick", "name": "黄色的"},
+{"usage": "nick", "name": "懦夫"},
+{"usage": "nick", "name": "金翼啄木鸟"},
+{"usage": "nick", "name": "雪人"},
+{"usage": "nick", "name": "迎泽"},
+{"usage": "nick", "name": "乡巴佬"},
+{"usage": "nick", "name": "密歇根上半岛人"},
+{"usage": "nick", "name": "年轻人"},
+{"usage": "nick", "name": "悠悠球"},
+{"usage": "nick", "name": "令人反感的"},
+{"usage": "nick", "name": "百胜百胜"},
+{"usage": "nick", "name": "精力"},
+{"usage": "nick", "name": "斑马"},
+{"usage": "nick", "name": "老Z"},
+{"usage": "nick", "name": "时代精神"},
+{"usage": "nick", "name": "禅"},
+{"usage": "nick", "name": "天顶"},
+{"usage": "nick", "name": "零"},
+{"usage": "nick", "name": "泽塔"},
+{"usage": "nick", "name": "急转"},
+{"usage": "nick", "name": "瑞格"},
+{"usage": "nick", "name": "锯齿形"},
+{"usage": "nick", "name": "无价值之物"},
+{"usage": "nick", "name": "邮政编码"},
+{"usage": "nick", "name": "活泼的"},
+{"usage": "nick", "name": "星座"},
+{"usage": "nick", "name": "区"},
+{"usage": "nick", "name": "巴拿马美国人"},
+{"usage": "nick", "name": "巴拿马美国佬"},
+{"usage": "nick", "name": "不省人事"},
+{"usage": "nick", "name": "变焦"},
+{"usage": "backer", "gender": "male", "name": "阿杰伊·钱德拉"},
+{"usage": "backer", "gender": "male", "name": "亚历山大·德米特里耶夫"},
+{"usage": "backer", "gender": "male", "name": "亚历山大·克里奇科"},
+{"usage": "backer", "gender": "male", "name": "亚历山大·威克斯"},
+{"usage": "backer", "gender": "unisex", "name": "阿尔法伊"},
+{"usage": "backer", "gender": "male", "name": "安德鲁·瓜斯泰拉"},
+{"usage": "backer", "gender": "male", "name": "安德鲁·韦伯斯特"},
+{"usage": "backer", "gender": "male", "name": "安东尼·伯利"},
+{"usage": "backer", "gender": "male", "name": "安东·斯特鲁伊克"},
+{"usage": "backer", "gender": "unisex", "name": "阿克"},
+{"usage": "backer", "gender": "male", "name": "阿格斯·M.·洛厄尔"},
+{"usage": "backer", "gender": "male", "name": "阿切尔"},
+{"usage": "backer", "gender": "unisex", "name": "阿童木"},
+{"usage": "backer", "gender": "male", "name": "本杰明·里普洛格尔"},
+{"usage": "backer", "gender": "male", "name": "本·麦克卢尔"},
+{"usage": "backer", "gender": "male", "name": "博巴洛特"},
+{"usage": "backer", "gender": "male", "name": "布莱恩·戴维森"},
+{"usage": "backer", "gender": "male", "name": "布莱恩·霍斯特曼"},
+{"usage": "backer", "gender": "female", "name": "夏洛特·霍尔"},
+{"usage": "backer", "gender": "male", "name": "克里斯多夫·福林"},
+{"usage": "backer", "gender": "male", "name": "克里斯·沃特金斯"},
+{"usage": "backer", "gender": "unisex", "name": "克莱·福克森塔尔"},
+{"usage": "backer", "gender": "male", "name": "加里同志"},
+{"usage": "backer", "gender": "male", "name": "克雷格·弗格森"},
+{"usage": "backer", "gender": "male", "name": "克雷格·马顿"},
+{"usage": "backer", "gender": "male", "name": "达喀尔"},
+{"usage": "backer", "gender": "male", "name": "丹尼尔·安菲尔德"},
+{"usage": "backer", "gender": "male", "name": "丹尼尔·丹尼希"},
+{"usage": "backer", "gender": "male", "name": "戴夫·斯蒂尔德文森"},
+{"usage": "backer", "gender": "male", "name": "迪克·瑟吉斯"},
 {"usage": "backer", "gender": "unisex", "name": "多利奥"},
-{"usage": "backer", "gender": "unisex", "name": "威尔 沃克"},
-{"usage": "backer", "gender": "unisex", "name": "威廉 福里斯特"},
-{"usage": "backer", "gender": "unisex", "name": "安东 斯特鲁伊克"},
-{"usage": "backer", "gender": "unisex", "name": "安东尼 伯利"},
-{"usage": "backer", "gender": "unisex", "name": "安德鲁 瓜斯泰拉"},
-{"usage": "backer", "gender": "unisex", "name": "安德鲁 韦伯斯特"},
-{"usage": "backer", "gender": "unisex", "name": "尤瑞斯特 麦克普鲁丹特"},
-{"usage": "backer", "gender": "unisex", "name": "尼克 “轰炸机” 帕克"},
-{"usage": "backer", "gender": "unisex", "name": "尼克 斯蒂芬"},
-{"usage": "backer", "gender": "unisex", "name": "居尔法 马戈利克"},
-{"usage": "backer", "gender": "unisex", "name": "山姆 施泰因"},
-{"usage": "backer", "gender": "unisex", "name": "布莱恩 戴维森"},
-{"usage": "backer", "gender": "unisex", "name": "布莱恩 霍斯特曼"},
-{"usage": "backer", "gender": "unisex", "name": "希姆费尔米"},
-{"usage": "backer", "gender": "unisex", "name": "希尔克 范德沙夫"},
-{"usage": "backer", "gender": "unisex", "name": "帕斯卡尔 菲利波维奇"},
-{"usage": "backer", "gender": "unisex", "name": "延斯 贝克尔"},
-{"usage": "backer", "gender": "unisex", "name": "彼特 斯皮尔伯格"},
-{"usage": "backer", "gender": "unisex", "name": "恩里克 阿隆索"},
-{"usage": "backer", "gender": "unisex", "name": "戴夫 斯蒂尔德文森"},
-{"usage": "backer", "gender": "unisex", "name": "托德里克 罗霍普"},
-{"usage": "backer", "gender": "unisex", "name": "托拜厄斯 弗兰克"},
-{"usage": "backer", "gender": "unisex", "name": "托马斯 西蒙"},
-{"usage": "backer", "gender": "unisex", "name": "托马斯 拉尔森"},
-{"usage": "backer", "gender": "unisex", "name": "拉克伦"},
-{"usage": "backer", "gender": "unisex", "name": "拉奎尔 麦克马洪"},
+{"usage": "backer", "gender": "male", "name": "道格·奥格登"},
+{"usage": "backer", "gender": "male", "name": "希尔克·范德沙夫博士"},
+{"usage": "backer", "gender": "unisex", "name": "达斯克·高"},
+{"usage": "backer", "gender": "female", "name": "埃利·福里斯特·基顿"},
+{"usage": "backer", "gender": "male", "name": "恩里克·阿隆索"},
+{"usage": "backer", "gender": "male", "name": "埃里克·鲁萨克"},
+{"usage": "backer", "gender": "male", "name": "埃里克·汉格布勒"},
+{"usage": "backer", "gender": "female", "name": "伊芙琳·弗罗斯特"},
+{"usage": "backer", "gender": "male", "name": "菲利克斯·阿普林"},
+{"usage": "backer", "gender": "male", "name": "菲利克斯·福克斯"},
+{"usage": "backer", "gender": "unisex", "name": "弗罗森·福克希"},
+{"usage": "backer", "gender": "male", "name": "加百利·唐"},
+{"usage": "backer", "gender": "unisex", "name": "加楚"},
+{"usage": "backer", "gender": "female", "name": "格伦·卢恩塞特"},
+{"usage": "backer", "gender": "male", "name": "纪尧姆·勒比格特"},
+{"usage": "backer", "gender": "male", "name": "古尔法斯·马戈洛克"},
+{"usage": "backer", "gender": "male", "name": "古尔戈·哈克波夫"},
+{"usage": "backer", "gender": "male", "name": "汉克·莱克拉姆"},
+{"usage": "backer", "gender": "female", "name": "哈瑞斯·瑟本"},
+{"usage": "backer", "gender": "male", "name": "荷马"},
+{"usage": "backer", "gender": "male", "name": "休伯特·休斯"},
+{"usage": "backer", "gender": "male", "name": "休伯特·罗登博"},
+{"usage": "backer", "gender": "male", "name": "伊恩·克利尔"},
+{"usage": "backer", "gender": "male", "name": "詹姆斯·肯尼"},
+{"usage": "backer", "gender": "male", "name": "杰夫·梅杰"},
+{"usage": "backer", "gender": "male", "name": "延斯·贝克"},
+{"usage": "backer", "gender": "male", "name": "热雷米亚斯·卜拉布"},
+{"usage": "backer", "gender": "male", "name": "吉姆·兰德龙"},
+{"usage": "backer", "gender": "male", "name": "吉姆·韦弗"},
+{"usage": "backer", "gender": "male", "name": "约翰·恩尼恩"},
+{"usage": "backer", "gender": "male", "name": "约翰·哈梅尔"},
+{"usage": "backer", "gender": "male", "name": "约瑟夫·扎卡维·巴特利特"},
+{"usage": "backer", "gender": "male", "name": "约书亚·扬"},
+{"usage": "backer", "gender": "male", "name": "贾斯汀·麦金农"},
+{"usage": "backer", "gender": "male", "name": "卡米尔·克里维森"},
+{"usage": "backer", "gender": "male", "name": "黑川健二"},
+{"usage": "backer", "gender": "male", "name": "凯文·格拉索"},
+{"usage": "backer", "gender": "male", "name": "凯文·威特"},
+{"usage": "backer", "gender": "male", "name": "哈立德·拉希德"},
+{"usage": "backer", "gender": "unisex", "name": "拉克兰"},
 {"usage": "backer", "gender": "unisex", "name": "拉瑞安"},
-{"usage": "backer", "gender": "unisex", "name": "斯帕兹 佩克洛特"},
-{"usage": "backer", "gender": "unisex", "name": "斯帕洛 格里芬"},
-{"usage": "backer", "gender": "unisex", "name": "斯泰特纳"},
-{"usage": "backer", "gender": "unisex", "name": "本 麦克卢尔"},
-{"usage": "backer", "gender": "unisex", "name": "本杰明 里普洛格尔"},
-{"usage": "backer", "gender": "unisex", "name": "杰夫 梅杰"},
-{"usage": "backer", "gender": "unisex", "name": "栗川 健二"},
-{"usage": "backer", "gender": "unisex", "name": "格伦"},
-{"usage": "backer", "gender": "unisex", "name": "梭克丝 伽柏 费伦茨"},
-{"usage": "backer", "gender": "unisex", "name": "欧文 邓恩"},
-{"usage": "backer", "gender": "unisex", "name": "汉克 莱克拉姆"},
-{"usage": "backer", "gender": "unisex", "name": "汤姆 霍珀"},
-{"usage": "backer", "gender": "unisex", "name": "温塔尔 戈特伯德"},
-{"usage": "backer", "gender": "unisex", "name": "热雷米亚斯 卜拉布"},
-{"usage": "backer", "gender": "unisex", "name": "特拉维斯 吉布森"},
-{"usage": "backer", "gender": "unisex", "name": "瑞克 曹尼玛"},
-{"usage": "backer", "gender": "unisex", "name": "簪南"},
-{"usage": "backer", "gender": "unisex", "name": "米克 巴特"},
-{"usage": "backer", "gender": "unisex", "name": "米格尔 赫尔梅斯"},
-{"usage": "backer", "gender": "unisex", "name": "米歇尔 贝杰龙"},
-{"usage": "backer", "gender": "unisex", "name": "米洛斯"},
-{"usage": "backer", "gender": "unisex", "name": "约书亚 扬"},
-{"usage": "backer", "gender": "unisex", "name": "约瑟夫 扎卡沃 巴特利特"},
-{"usage": "backer", "gender": "unisex", "name": "约翰 哈梅尔"},
-{"usage": "backer", "gender": "unisex", "name": "约翰 恩嫩"},
-{"usage": "backer", "gender": "unisex", "name": "纪尧姆"},
-{"usage": "backer", "gender": "unisex", "name": "纳撒尼尔 福特"},
+{"usage": "backer", "gender": "male", "name": "劳里·丹尼斯"},
+{"usage": "backer", "gender": "male", "name": "列昂尼德·瓦斯莱夫"},
+{"usage": "backer", "gender": "male", "name": "列弗·米希金"},
+{"usage": "backer", "gender": "unisex", "name": "马尼柯·德帕赛文"},
+{"usage": "backer", "gender": "male", "name": "马克·'坏男孩'·巴多伊"},
+{"usage": "backer", "gender": "male", "name": "马丁·斯文松"},
+{"usage": "backer", "gender": "male", "name": "马丁·伍达德"},
+{"usage": "backer", "gender": "male", "name": "马特·戴维斯"},
+{"usage": "backer", "gender": "male", "name": "马修·圣约翰"},
+{"usage": "backer", "gender": "male", "name": "马特·威廉姆斯"},
+{"usage": "backer", "gender": "male", "name": "迈克尔·'死于非命'·琼斯"},
+{"usage": "backer", "gender": "male", "name": "迈克尔·希尔"},
+{"usage": "backer", "gender": "male", "name": "迈克尔·金凯德"},
+{"usage": "backer", "gender": "male", "name": "米歇尔·贝杰龙"},
+{"usage": "backer", "gender": "male", "name": "米克·巴特"},
+{"usage": "backer", "gender": "male", "name": "米格尔·赫尔梅斯"},
+{"usage": "backer", "gender": "male", "name": "迈尔斯·普洛韦斯"},
+{"usage": "backer", "gender": "male", "name": "米洛克"},
+{"usage": "backer", "gender": "male", "name": "南森·卡恩"},
+{"usage": "backer", "gender": "male", "name": "纳撒尼尔·福特"},
+{"usage": "backer", "gender": "male", "name": "尼克·'轰炸机'·帕克"},
+{"usage": "backer", "gender": "male", "name": "尼克·斯蒂芬"},
+{"usage": "backer", "gender": "male", "name": "欧文·邓恩"},
+{"usage": "backer", "gender": "male", "name": "帕斯卡尔·菲利波维奇"},
+{"usage": "backer", "gender": "male", "name": "保罗·华莱士"},
+{"usage": "backer", "gender": "male", "name": "彼特·斯皮尔伯格"},
+{"usage": "backer", "gender": "male", "name": "菲力浦·特朗布莱"},
+{"usage": "backer", "gender": "male", "name": "瑞克·'桀骜不驯之人'"},
+{"usage": "backer", "gender": "female", "name": "拉奎尔·麦克马洪"},
+{"usage": "backer", "gender": "male", "name": "雷蒙德·贝莱斯"},
+{"usage": "backer", "gender": "unisex", "name": "雷诺·帕克"},
+{"usage": "backer", "gender": "male", "name": "罗布·基斯"},
+{"usage": "backer", "gender": "male", "name": "罗布·韦策尔"},
 {"usage": "backer", "gender": "unisex", "name": "罗尔"},
-{"usage": "backer", "gender": "unisex", "name": "罗尼 马格努松"},
-{"usage": "backer", "gender": "unisex", "name": "罗布 基斯"},
-{"usage": "backer", "gender": "unisex", "name": "罗布 韦策尔"},
-{"usage": "backer", "gender": "unisex", "name": "罗恩 “噪音” 哈基姆"},
-{"usage": "backer", "gender": "unisex", "name": "罗素 雷诺兹 三世"},
-{"usage": "backer", "gender": "unisex", "name": "菲利克斯 福克斯"},
-{"usage": "backer", "gender": "unisex", "name": "菲利克斯 阿普林"},
-{"usage": "backer", "gender": "unisex", "name": "菲力浦 特朗布莱"},
-{"usage": "backer", "gender": "unisex", "name": "萨拉勒 科伊尔"},
-{"usage": "backer", "gender": "unisex", "name": "西恩 邓肯"},
-{"usage": "backer", "gender": "unisex", "name": "西蒙 托雷森 赫尔特"},
-{"usage": "backer", "gender": "unisex", "name": "詹姆斯 肯尼"},
-{"usage": "backer", "gender": "unisex", "name": "贾斯汀 麦金农"},
-{"usage": "backer", "gender": "unisex", "name": "达喀尔"},
-{"usage": "backer", "gender": "unisex", "name": "迈克尔 金凯德"},
-{"usage": "backer", "gender": "unisex", "name": "迈克尔 希尔"},
-{"usage": "backer", "gender": "unisex", "name": "迈克尔 “死亡恐惧” 琼斯"},
-{"usage": "backer", "gender": "unisex", "name": "迈尔斯 普洛韦斯"},
-{"usage": "backer", "gender": "unisex", "name": "迪克 舒克"},
+{"usage": "backer", "gender": "unisex", "name": "罗尼·马格努松"},
+{"usage": "backer", "gender": "male", "name": "罗恩·'噪音'·哈基姆"},
+{"usage": "backer", "gender": "male", "name": "鲁道夫·施密特"},
+{"usage": "backer", "gender": "male", "name": "罗素·雷诺兹三世"},
+{"usage": "backer", "gender": "male", "name": "山姆·施泰因"},
+{"usage": "backer", "gender": "male", "name": "肖恩·邓肯"},
+{"usage": "backer", "gender": "male", "name": "塞巴斯蒂安·雅弗雷"},
+{"usage": "backer", "gender": "male", "name": "萨拉勒·科伊尔"},
+{"usage": "backer", "gender": "unisex", "name": "希姆·费尔米"},
+{"usage": "backer", "gender": "male", "name": "西蒙·托雷森·赫尔特"},
+{"usage": "backer", "gender": "unisex", "name": "斯诺·'喵星人'"},
+{"usage": "backer", "gender": "unisex", "name": "斯帕洛·格里芬"},
+{"usage": "backer", "gender": "unisex", "name": "斯帕兹·佩克洛特"},
+{"usage": "backer", "gender": "male", "name": "史蒂文·彼得森"},
+{"usage": "backer", "gender": "male", "name": "斯泰特纳"},
+{"usage": "backer", "gender": "male", "name": "索奇·加博尔·费伦茨"},
+{"usage": "backer", "gender": "male", "name": "托马斯·拉尔森"},
+{"usage": "backer", "gender": "male", "name": "托拜厄斯·弗兰克"},
+{"usage": "backer", "gender": "male", "name": "托德里克·罗霍普"},
+{"usage": "backer", "gender": "male", "name": "托马斯·西蒙"},
+{"usage": "backer", "gender": "male", "name": "汤姆·霍珀"},
+{"usage": "backer", "gender": "male", "name": "砺波·约根森"},
 {"usage": "backer", "gender": "unisex", "name": "通萨"},
-{"usage": "backer", "gender": "unisex", "name": "道格 奥格登"},
-{"usage": "backer", "gender": "unisex", "name": "阿切尔"},
-{"usage": "backer", "gender": "unisex", "name": "阿尔法"},
-{"usage": "backer", "gender": "unisex", "name": "阿杰伊 钱德拉"},
-{"usage": "backer", "gender": "unisex", "name": "阿格斯 M. 洛厄尔"},
-{"usage": "backer", "gender": "unisex", "name": "阿童木"},
-{"usage": "backer", "gender": "unisex", "name": "雷蒙德 贝莱斯"},
-{"usage": "backer", "gender": "unisex", "name": "雷诺 帕克"},
-{"usage": "backer", "gender": "unisex", "name": "霍默"},
-{"usage": "backer", "gender": "unisex", "name": "韦恩 A. 阿瑟顿"},
-{"usage": "backer", "gender": "unisex", "name": "马丁 伍达德"},
-{"usage": "backer", "gender": "unisex", "name": "马丁 斯文松"},
-{"usage": "backer", "gender": "unisex", "name": "马修 圣约翰"},
-{"usage": "backer", "gender": "unisex", "name": "马尼柯 德帕赛文"},
-{"usage": "backer", "gender": "unisex", "name": "马特 威廉姆斯"},
-{"usage": "backer", "gender": "unisex", "name": "马特 戴维斯"},
-{"usage": "backer", "gender": "unisex", "name": "鲁道夫 施密特"},
+{"usage": "backer", "gender": "male", "name": "特拉维斯·吉布森"},
+{"usage": "backer", "gender": "female", "name": "特里安娜"},
+{"usage": "backer", "gender": "unisex", "name": "尤瑞斯特·麦克普鲁丹特"},
+{"usage": "backer", "gender": "male", "name": "维克多·库罗皮尼科"},
+{"usage": "backer", "gender": "male", "name": "韦恩·A.·阿瑟顿"},
+{"usage": "backer", "gender": "male", "name": "威廉·福里斯特"},
+{"usage": "backer", "gender": "male", "name": "威尔·沃克"},
+{"usage": "backer", "gender": "male", "name": "温塔尔·戈特伯德"},
+{"usage": "backer", "gender": "male", "name": "正男"},
+{"usage": "backer", "gender": "male", "name": "知傲"},
 {"usage": "city", "name": "万斯伯勒"},
 {"usage": "city", "name": "不伦瑞克"},
 {"usage": "city", "name": "不来梅"},
diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
index bd3fc53ba4a80..ae5082e0a6984 100644
--- a/data/raw/keybindings.json
+++ b/data/raw/keybindings.json
@@ -605,6 +605,13 @@
     "name": "Previous level",
     "bindings": [ { "input_method": "keyboard", "key": "-" } ]
   },
+  {
+    "type": "keybinding",
+    "id": "RESET",
+    "category": "SOKOBAN",
+    "name": "Reset level",
+    "bindings": [ { "input_method": "keyboard", "key": "r" } ]
+  },
   {
     "type": "keybinding",
     "id": "UNDO",
diff --git a/doc/TILESET.md b/doc/TILESET.md
new file mode 100644
index 0000000000000..0ac50b57d09b3
--- /dev/null
+++ b/doc/TILESET.md
@@ -0,0 +1,229 @@
+# TILESETS
+A tileset provides graphic images for the game.  Each tileset has one or more tilesheets of image sprites and a `tile_config.json` file that describes how to map the contents of the sprite sheets to various entities in the game.  It also has a `tileset.txt` file that provides metadata.
+
+## Compositing Tilesets
+Prior October 2019, tilesets had to be submitted to the repo with each tilesheet fully composited and the sprite indices in `tile_config.json` calculated by hand.  After October 2019, tilesets can be submitted to repos as directories of individual sprite files and tile entry JSON files that used sprite file names, and a Python script that runs at compile time would merge the sprite images into tilesheets, convert the files names into sprite indices for the tile entries, and merge the tile entries into a `tile_config.json`.
+
+For the rest of this document, tilesets that are submitted as fully composited tilesheets are called legacy tilesets, and tilesets that submitted as individual sprite image files are compositing tilesets.
+
+### tools/gfx_tools/decompose.py
+This is a Python script that will convert a legacy tileset into a compositing tileset.  It reads the `tile_config.json` and assigns semi-arbitrary file names to each sprite index.  Then it changes all the sprite indexes references to the file names.  Then it breaks up `tile_config.json` into many small tile_entry JSON files with arbitrary file names, and pulls out each sprite and writes it to aseparate file.
+
+It requires pyvips to do the image processing.
+
+It takes a single mandatory argument, which is the path to the tileset directory.  For example:
+`python tools/gfx_tools/decompose.py gfx/ChestHole16Tileset` will convert the legacy ChestHole16 tileset to a compositing tileset.
+
+decompose.py creates a sufficient directory hierarchy and file names for a tileset to be compositing, but it is machine generated and badly organized.  New compositing tilesets should use more sensible file names and a better organization.
+
+It shouldn't be necessary to run decompose.py very often.  Legacy tilesets should only need to be converted to composite tilesets one time.
+
+### tools/gfx_tools/compose.py
+This is a Python script that creates the tilesheets for a compositing tileset.  It reads all of the directories in a tileset's directory with names that start with `pngs_` for sprite files and `tile_entry` JSON files, creates mappings of sprite file names to indices, merges the sprite files into tilesheets, changes all of the sprite file name references in the `tile_entries` to indices, and merges the `tile_entries` into a `tile_config.json`.
+
+Like decompose.py, it requires pyvips to the image processing.
+
+The original sprite files and `tile_entry` JSON files are preserved.
+
+### directory structure
+Each compositing tileset has one or more directories in it with a name that starts with `pngs_`, such as `pngs_tree_32x40` or `pngs_overlay`.  These are the image directories.  All of the sprites in an image directory must have the same height and width and will be merged into a single tilesheet.
+
+It is recommended that tileset developers include the sprite dimensions in the image directory name, but this is not required.  `pngs_overlay_24x24` is preferred over `pngs_overlay` but both are allowed.  As each image directory creates its own tilesheet, and tilesheets should be as large as possible for performance reasons, tileset developers are strongly encouraged to minimize the number of image directories.
+
+Each image directory contains a hierarchy of subdirectories, `tile_entry` JSON files, and sprite files.  There is no restriction on the arrangement or names of these files, except for `tile_entry` JSON files for expansion tilesheets must be at the top level of the image directory.  Subdirectories are not required but are recommended to keep things manageable.
+
+#### `tile_entry` JSON
+Each `tile_entry` JSON is a dictionary that describes how to map one or more game entities to one or more sprites.  The simplest version has a single game entity, a single foreground sprite, an *optional* background sprite, and a rotation value.  For instance:
+```C++
+{                                           // this is an object and doesn't require a list
+    "id": "mon_cat",                        // the game entity represented by this sprite
+    "fg": "mon_cat_black",                  // some sprite name
+    "bg": "shadow_bg_1",                    // some sprite name; always a single value
+    "rotates": false                        // true for things that rotate like vehicle parts
+}
+```
+
+The values in `"id"`, `"fg"`, and `"bg"` can be repeated within an image directory or in different image directories.  `"fg"` and `"bg"` sprite images can be referenced across image directories, but the sprites must be stored in an image directory with other sprites of the same height and width.
+
+`"id"` can also be a list of multiple game entities sharing the same sprite, like `"id": ["vp_door"], ["vp_hddoor"]`.  `"id"` can be any vehicle part, terrain, furniture, item, or monster in the game.  The special ids `"player_female", "player_male", "npc_female", "npc_male"` are used to identify the sprites for the player avatar and NPCs.  The special id `"unknown"` provides a sprite that is displayed when an entity has no other sprite.
+
+The special suffixes `_season_spring`, `_season_summer`, `_season_autumn`, and `_season_winter` can be applied to any entity id to create a seasonal variant for that entity that will be displayed in the appropriate season like this `"id": "mon_wolf_season_winter"`.
+
+The special prefixes `overlay_mutation_`, `overlay_female_mutation_`, `overlay_male_mutation_` can prefix any trait or bionic in the game to specify an overlay image that will be laid over the player and NPC sprites to indicate they have that mutation or bionic.
+
+The special prefixes `overlay_worn_`, `overlay_female_worn_`, `overlay_male_worn_` can prefix any item in the game to specify an overlay image that will be laid over the player and NPC sprites to indicate they are wearing that item.
+
+The special prefixes `overlay_wielded_`, `overlay_female_wielded_`, `overlay_male_wielded_` can prefix any item in the game to specify an overlay image that will be laid over the player and NPC sprites to indicate they are holding that item.
+
+`"fg"` and `"bg"` can also be a list of 2 or 4 pre-rotated rotational variants, like `"bg": ["t_wall_n", "t_wall_e", "t_wall_s", "t_wall_w"]` or `"fg": ["mon_dog_left", "mon_dog_right"]`.
+
+`"fg"` and `"bg"` can also be a list of dictionaries of weighted, randomly chosen options, any of which can also be a rotated list:
+```C++
+    "fg": [
+        { "weight": 50, "sprite": "t_dirt_brown"},       // appears in 50 of 53 tiles
+        { "weight": 1, "sprite": "t_dirt_black_specks"}, // appears 1 in 53 tiles
+        { "weight": 1, "sprite": "t_dirt_specks_gray"},
+        { "weight": 1, "sprite": "t_patchy_grass"}       // file names are arbitrary
+    ],
+```
+
+`"multitle"` is an *optional* field.  If it is present and `true`, there must be an `additional_tiles` list with 1 or more dictionaries for entities and sprites associated with this tile, such as broken versions of an item or wall connections.  Each dictionary in the list has an `"id`" field, as above, and a `"fg"` field, which can be a single filename, a list of filenames, or a list of dictionaries as above.
+
+#### expansion `tile_entry` JSON
+Tilesheets can have expansion tilesheets, which are tilesheets from mods.  Each expansion tilesheet is a single `"id"` value, `"rotates": false"`, and `"fg": 0`.  Expansion `tile_entry` JSON are the only `tile_entry` JSONs that use an integer value for `"fg"` and that value must be 0.  Expansion `tile_entry` JSONs must be located at the top layer of each image directory.
+
+#### Sprite Images
+Every sprite inside an image directory must have the same height and width as every other sprite in the image directory.
+
+Sprites can be organized into subdirectories within the image directory however the tileset developer prefers.  Sprite filenames are completely arbitrary and should be chosen using a scheme that makes sense to the tileset developer.
+
+After loading a tileset, config/debug.log will contain a space separated list of every entity missing a sprite in the tileset.  Entities that have sprites because of a `"looks_like"` definition will not show up in the list.
+
+### `tile_info.json`
+Each compositing tileset *must* have a `tile_info.json`, laid out like so:
+```
+[
+  {
+    "width": 32,
+    "pixelscale": 1,
+    "height": 32
+  },
+  {
+    "1_tiles_32x32_0-5199.png": {}
+  },
+  {
+    "2_expan_32x32_5200-5391.png": {}
+  },
+  {
+    "3_tree_64x80_5392-5471.png": {
+      "sprite_offset_x": -16,
+      "sprite_offset_y": -48,
+      "sprite_height": 80,
+      "sprite_width": 64
+    }
+  },
+  {
+    "4_fallback_5472-9567.png": { "fallback": true }
+  }
+]
+```
+The first dictionary is mandatory, and gives the default sprite width and sprite height for all tilesheets in the tileset.  Each of the image directories must have a separate dictionary, containing the tilesheet png name as its key.  If the tilesheet has the default sprite dimensions and no special offsets, it can have an empty dictionary as the value for the tilesheet name key.  Otherwise, it should have a dictionary of the sprite offsets, height, and width.
+
+A special key is `"fallback"` which should be `true` if present.  If a tilesheet is designated as fallback, it will be treated as a tilesheet of fallback ASCII characters.  `compose.py` will also compose the fallback tilesheet to the end of the tileset, and will add a "fallback.png" to `tile_config.json` if there is no `"fallback"` entry in `tile_info.json`.
+
+## Legacy tilesets
+### tilesheets
+Each tilesheet contains 1 or more sprites with the same width and height.  Each tilesheet contains one or more rows of exactly 16 sprites.  Sprite index 0 is special and the first sprite of the first tilesheet in a tileset should be blank.  Indices run sequentially through each sheet and continue incrementing for each new sheet without reseting, so index 32 is the first sprite in the third row of the first sheet.  If the first sheet has 320 sprites in it, index 352 would be the first sprite of the third row of the second sheet.
+
+### `tile_config`
+Each legacy tileset has a `tile_config.json` describing how to map the contents of a sprite sheet to various tile identifiers, different orientations, etc. The ordering of the overlays used for displaying mutations can be controlled as well. The ordering can be used to override the default ordering provided in `mutation_ordering.json`. Example:
+
+```C++
+  {                                             // whole file is a single object
+    "tile_info": [                              // tile_info is mandatory
+      {
+        "height": 32,
+        "width": 32,
+        "iso" : true,                             //  Optional. Indicates an isometric tileset. Defaults to false.
+        "pixelscale" : 2                          //  Optional. Sets a multiplier for resizing a tileset. Defaults to 1.
+      }
+    ],
+    "tiles-new": [                              // tiles-new is an array of sprite sheets
+      {                                           //   alternately, just one "tiles" array
+        "file": "tiles.png",                      // file containing sprites in a grid
+        "tiles": [                                // array with one entry per tile
+          {
+            "id": "10mm",                         // id is how the game maps things to sprites
+            "fg": 1,                              //   lack of prefix mostly indicates items
+            "bg": 632,                            // fg and bg can be sprite indexes in the image
+            "rotates": false
+          },
+          {
+            "id": "t_wall",                       // "t_" indicates terrain
+            "fg": [2918, 2919, 2918, 2919],       // 2 or 4 sprite numbers indicates pre-rotated
+            "bg": 633,
+            "rotates": true,
+            "multitile": true,
+            "additional_tiles": [                 // connected/combined versions of sprite
+              {                                   //   or variations, see below
+                "id": "center",
+                "fg": [2919, 2918, 2919, 2918]
+              },
+              {
+                "id": "corner",
+                "fg": [2924, 2922, 2922, 2923]
+              },
+              {
+                "id": "end_piece",
+                "fg": [2918, 2919, 2918, 2919]
+              },
+              {
+                "id": "t_connection",
+                "fg": [2919, 2918, 2919, 2918]
+              },
+              {
+                "id": "unconnected",
+                "fg": 2235
+              }
+            ]
+          },
+          {
+            "id": "vp_atomic_lamp",               // "vp_" vehicle part
+            "fg": 3019,
+            "bg": 632,
+            "rotates": false,
+            "multitile": true,
+            "additional_tiles": [
+              {
+                "id": "broken",                   // variant sprite
+                "fg": 3021
+              }
+            ]
+          },
+          {
+            "id": "t_dirt",
+            "rotates": false,
+            "fg": [
+              { "weight":50, "sprite":640},       // weighted random variants
+              { "weight":1, "sprite":3620},
+              { "weight":1, "sprite":3621},
+              { "weight":1, "sprite":3622}
+            ]
+          },
+          {
+            "id": [
+              "overlay_mutation_GOURMAND",        // character overlay for mutation
+              "overlay_mutation_male_GOURMAND",   // overlay for specified gender
+              "overlay_mutation_active_GOURMAND"  // overlay for activated mutation
+            ],
+            "fg": 4040
+          }
+        ]
+      },
+      {                                           // second entry in tiles-new
+        "file": "moretiles.png",                  // another sprite sheet
+        "tiles": [
+          {
+            "id": ["xxx","yyy"],                  // define two ids at once
+            "fg": 1,
+            "bg": 234
+          }
+        ]
+      }d
+    ],
+    "overlay_ordering": [
+      {
+        "id" : "WINGS_BAT",                         // mutation name, in a string or array of strings
+        "order" : 1000                              // range from 0 - 9999, 9999 being the topmost layer
+      },
+      {
+        "id" : [ "PLANTSKIN", "BARK" ],             // mutation name, in a string or array of strings
+        "order" : 3500                              // order is applied to all items in the array
+      },
+      {
+        "id" : "bio_armor_torso",                   // Overlay order of bionics is controlled in the same way
+        "order" : 500
+      }
+    ]
+  }
+```
diff --git a/src/basecamp.cpp b/src/basecamp.cpp
index d46411b42c54b..22facb44a6879 100644
--- a/src/basecamp.cpp
+++ b/src/basecamp.cpp
@@ -472,7 +472,7 @@ void basecamp::validate_assignees()
 {
     for( auto it2 = assigned_npcs.begin(); it2 != assigned_npcs.end(); ) {
         auto ptr = *it2;
-        if( ptr->mission != NPC_MISSION_GUARD_ALLY || ptr->global_omt_location() != omt_pos ||
+        if( ptr->mission != NPC_MISSION_ASSIGNED_CAMP || ptr->global_omt_location() != omt_pos ||
             ptr->has_companion_mission() ) {
             it2 = assigned_npcs.erase( it2 );
         } else {
@@ -484,12 +484,20 @@ void basecamp::validate_assignees()
         if( !npc_to_add ) {
             continue;
         }
-        if( npc_to_add->global_omt_location() == omt_pos &&
-            npc_to_add->mission == NPC_MISSION_GUARD_ALLY &&
-            !npc_to_add->has_companion_mission() ) {
-            assigned_npcs.push_back( npc_to_add );
+        if( std::find( assigned_npcs.begin(), assigned_npcs.end(), npc_to_add ) != assigned_npcs.end() ) {
+            continue;
+        } else {
+            if( npc_to_add->global_omt_location() == omt_pos &&
+                npc_to_add->mission == NPC_MISSION_ASSIGNED_CAMP &&
+                !npc_to_add->has_companion_mission() ) {
+                assigned_npcs.push_back( npc_to_add );
+            }
         }
     }
+    // remove duplicates - for legacy handling.
+    std::sort( assigned_npcs.begin(), assigned_npcs.end() );
+    auto last = std::unique( assigned_npcs.begin(), assigned_npcs.end() );
+    assigned_npcs.erase( last, assigned_npcs.end() );
 }
 
 std::vector<npc_ptr> basecamp::get_npcs_assigned()
diff --git a/src/basecamp.h b/src/basecamp.h
index 28597471da9b6..c6d7a99cbb1d4 100644
--- a/src/basecamp.h
+++ b/src/basecamp.h
@@ -258,6 +258,7 @@ class basecamp
                             bool by_radio );
         std::string om_upgrade_description( const std::string &bldg, bool trunc = false ) const;
         void start_menial_labor();
+        void job_assignment_ui();
         void start_crafting( const std::string &cur_id, const point &cur_dir,
                              const std::string &type, const std::string &miss_id,
                              bool by_radio = false );
diff --git a/src/bonuses.cpp b/src/bonuses.cpp
index fa8840ae590ce..2f0bb8a25f4f7 100644
--- a/src/bonuses.cpp
+++ b/src/bonuses.cpp
@@ -229,12 +229,12 @@ std::string bonus_container::get_description() const
         for( const auto &sf : boni.second ) {
             if( sf.stat ) {
                 //~ %1$s: bonus name, %2$d: bonus percentage, %3$s: stat name
-                dump << string_format( "* %1$s: <stat>%2$d%%</stat> of %3$s", type,
-                                       static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$d%%</stat> of %3$s" ),
+                                       type, static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
             } else {
                 //~ %1$s: bonus name, %2$d: bonus percentage
-                dump << string_format( "* %1$s: <stat>%2$d%%</stat>", type,
-                                       static_cast<int>( sf.scale * 100 ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$d%%</stat>" ),
+                                       type, static_cast<int>( sf.scale * 100 ) );
             }
             dump << std::endl;
         }
@@ -252,12 +252,12 @@ std::string bonus_container::get_description() const
         for( const auto &sf : boni.second ) {
             if( sf.stat ) {
                 //~ %1$s: bonus name, %2$+d: bonus percentage, %3$s: stat name
-                dump << string_format( "* %1$s: <stat>%2$+d%%</stat> of %3$s", type,
-                                       static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$+d%%</stat> of %3$s" ),
+                                       type, static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
             } else {
                 //~ %1$s: bonus name, %2$+d: bonus value
-                dump << string_format( "* %1$s: <stat>%2$+d</stat>", type,
-                                       static_cast<int>( sf.scale ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$+d</stat>" ),
+                                       type, static_cast<int>( sf.scale ) );
             }
             dump << std::endl;
         }
diff --git a/src/character.cpp b/src/character.cpp
index f1f0d7232e645..29d29dc9e7ca8 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -431,6 +431,64 @@ bool Character::is_mounted() const
     return has_effect( effect_riding ) && mounted_creature;
 }
 
+/** Returns true if the character has two functioning arms */
+bool Character::has_two_arms() const
+{
+    return get_working_arm_count() >= 2;
+}
+
+// working is defined here as not disabled which means arms can be not broken
+// and still not count if they have low enough hitpoints
+int Character::get_working_arm_count() const
+{
+    if( has_active_mutation( trait_id( "SHELL2" ) ) ) {
+        return 0;
+    }
+
+    int limb_count = 0;
+    if( !is_limb_disabled( hp_arm_l ) ) {
+        limb_count++;
+    }
+    if( !is_limb_disabled( hp_arm_r ) ) {
+        limb_count++;
+    }
+    if( has_bionic( bionic_id( "bio_blaster" ) ) && limb_count > 0 ) {
+        limb_count--;
+    }
+
+    return limb_count;
+}
+
+// working is defined here as not broken
+int Character::get_working_leg_count() const
+{
+    int limb_count = 0;
+    if( !is_limb_broken( hp_leg_l ) ) {
+        limb_count++;
+    }
+    if( !is_limb_broken( hp_leg_r ) ) {
+        limb_count++;
+    }
+    return limb_count;
+}
+
+bool Character::is_limb_hindered( hp_part limb ) const
+{
+    return hp_cur[limb] < hp_max[limb] * .40;
+}
+
+bool Character::is_limb_disabled( hp_part limb ) const
+{
+    return hp_cur[limb] <= hp_max[limb] * .125;
+}
+
+// this is the source of truth on if a limb is broken so all code to determine
+// if a limb is broken should point here to make any future changes to breaking easier
+bool Character::is_limb_broken( hp_part limb ) const
+{
+    return hp_cur[limb] == 0;
+}
+
 bool Character::move_effects( bool attacking )
 {
     if( has_effect( effect_downed ) ) {
@@ -3109,7 +3167,7 @@ bool Character::is_immune_field( const field_type_id fid ) const
             return true;
         }
     }
-    bool immune_by_body_part_resistance = false;
+    bool immune_by_body_part_resistance = !ft.immunity_data_body_part_env_resistance.empty();
     for( const std::pair<body_part, int> &fide : ft.immunity_data_body_part_env_resistance ) {
         immune_by_body_part_resistance = immune_by_body_part_resistance &&
                                          get_env_resist( fide.first ) >= fide.second;
@@ -4217,6 +4275,74 @@ static void destroyed_armor_msg( Character &who, const std::string &pre_damage_n
                                pre_damage_name );
 }
 
+static void item_armor_enchantment_adjust( Character &guy, damage_unit &du, item &armor )
+{
+    switch( du.type ) {
+        case DT_ACID:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_ACID );
+            break;
+        case DT_BASH:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_BASH );
+            break;
+        case DT_BIOLOGICAL:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_BIO );
+            break;
+        case DT_COLD:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_COLD );
+            break;
+        case DT_CUT:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_CUT );
+            break;
+        case DT_ELECTRIC:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_ELEC );
+            break;
+        case DT_HEAT:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_HEAT );
+            break;
+        case DT_STAB:
+            du.amount = armor.calculate_by_enchantment( guy, du.amount, enchantment::mod::ITEM_ARMOR_STAB );
+            break;
+        default:
+            return;
+    }
+    du.amount = std::max( 0.0f, du.amount );
+}
+
+// adjusts damage unit depending on type by enchantments.
+// the ITEM_ enchantments only affect the damage resistance for that one item, while the others affect all of them
+static void armor_enchantment_adjust( Character &guy, damage_unit &du )
+{
+    switch( du.type ) {
+        case DT_ACID:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_ACID );
+            break;
+        case DT_BASH:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_BASH );
+            break;
+        case DT_BIOLOGICAL:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_BIO );
+            break;
+        case DT_COLD:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_COLD );
+            break;
+        case DT_CUT:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_CUT );
+            break;
+        case DT_ELECTRIC:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_ELEC );
+            break;
+        case DT_HEAT:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_HEAT );
+            break;
+        case DT_STAB:
+            du.amount = guy.calculate_by_enchantment( du.amount, enchantment::mod::ARMOR_STAB );
+            break;
+        default:
+            return;
+    }
+    du.amount = std::max( 0.0f, du.amount );
+}
+
 void Character::absorb_hit( body_part bp, damage_instance &dam )
 {
     std::list<item> worn_remains;
@@ -4246,6 +4372,8 @@ void Character::absorb_hit( body_part bp, damage_instance &dam )
             }
         }
 
+        armor_enchantment_adjust( *this, elem );
+
         // Only the outermost armor can be set on fire
         bool outermost = true;
         // The worn vector has the innermost item first, so
@@ -4261,6 +4389,7 @@ void Character::absorb_hit( body_part bp, damage_instance &dam )
             const std::string pre_damage_name = armor.tname();
             bool destroy = false;
 
+            item_armor_enchantment_adjust( *this, elem, armor );
             // Heat damage can set armor on fire
             // Even though it doesn't cause direct physical damage to it
             if( outermost && elem.type == DT_HEAT && elem.amount >= 1.0f ) {
@@ -4411,3 +4540,13 @@ float Character::bionic_armor_bonus( body_part bp, damage_type dt ) const
     return result;
 }
 
+void Character::did_hit( Creature &target )
+{
+    enchantment_cache.cast_hit_you( *this, target.pos() );
+}
+
+void Character::on_hit( Creature * /*source*/, body_part /*bp_hit*/,
+                        float /*difficulty*/, dealt_projectile_attack const *const /*proj*/ )
+{
+    enchantment_cache.cast_hit_me( *this );
+}
diff --git a/src/character.h b/src/character.h
index 2713b1d8a5240..b8eac8cdd35fa 100644
--- a/src/character.h
+++ b/src/character.h
@@ -401,6 +401,11 @@ class Character : public Creature, public visitable<Character>
          */
         void check_item_encumbrance_flag();
 
+        // any side effects that might happen when the Character is hit
+        void on_hit( Creature *source, body_part /*bp_hit*/,
+                     float /*difficulty*/, dealt_projectile_attack const *const /*proj*/ ) override;
+        // any side effects that might happen when the Character hits a Creature
+        void did_hit( Creature &target );
 
         /**
          * Check for relevant passive, non-clothing that can absorb damage, and reduce by specified
@@ -452,6 +457,19 @@ class Character : public Creature, public visitable<Character>
         static body_part hp_to_bp( hp_part hpart );
 
         bool is_mounted() const;
+
+        /** Returns true if the player has two functioning arms */
+        bool has_two_arms() const;
+        /** Returns the number of functioning arms */
+        int get_working_arm_count() const;
+        /** Returns the number of functioning legs */
+        int get_working_leg_count() const;
+        /** Returns true if the limb is disabled */
+        bool is_limb_disabled( hp_part limb ) const;
+        /** Returns true if the limb is hindered(40% or less hp) */
+        bool is_limb_hindered( hp_part limb ) const;
+        /** Returns true if the limb is broken */
+        bool is_limb_broken( hp_part limb ) const;
         /**
          * Displays menu with body part hp, optionally with hp estimation after healing.
          * Returns selected part.
diff --git a/src/craft_command.cpp b/src/craft_command.cpp
index bf78837c0ddbf..b18ad6b097b2a 100644
--- a/src/craft_command.cpp
+++ b/src/craft_command.cpp
@@ -261,6 +261,11 @@ item craft_command::create_in_progress_craft()
     return new_craft;
 }
 
+skill_id craft_command::get_skill_id()
+{
+    return rec->skill_used;
+}
+
 std::vector<comp_selection<item_comp>> craft_command::check_item_components_missing(
                                         const inventory &map_inv ) const
 {
diff --git a/src/craft_command.h b/src/craft_command.h
index f87cf8188d203..a0071e8e41634 100644
--- a/src/craft_command.h
+++ b/src/craft_command.h
@@ -83,6 +83,7 @@ class craft_command
         bool empty() const {
             return rec == nullptr;
         }
+        skill_id get_skill_id();
 
     private:
         const recipe *rec = nullptr;
diff --git a/src/crafting.cpp b/src/crafting.cpp
index 1db635b39334c..a07d9edaf37a2 100644
--- a/src/crafting.cpp
+++ b/src/crafting.cpp
@@ -737,6 +737,10 @@ void player::start_craft( craft_command &command, const tripoint &loc )
     }
 
     item craft = command.create_in_progress_craft();
+    const recipe &making = craft.get_making();
+    if( get_skill_level( command.get_skill_id() ) > making.difficulty * 1.25 ) {
+        handle_skill_warning( command.get_skill_id(), true );
+    }
 
     // In case we were wearing something just consumed
     if( !craft.components.empty() ) {
@@ -769,7 +773,9 @@ void player::start_craft( craft_command &command, const tripoint &loc )
 
     // Crafting without a workbench
     if( target == tripoint_zero ) {
-        if( !is_armed() ) {
+        if( !has_two_arms() ) {
+            craft_in_world = set_item_map_or_vehicle( *this, pos(), craft );
+        } else if( !is_armed() ) {
             if( cata::optional<item_location> it_loc = wield_craft( *this, craft ) ) {
                 craft_in_world = *it_loc;
             }  else {
@@ -860,7 +866,7 @@ void player::craft_skill_gain( const item &craft, const int &multiplier )
         const int base_practice = roll_remainder( ( making.difficulty * 15 + 10 ) * batch_mult /
                                   20.0 ) * multiplier;
         const int skill_cap = static_cast<int>( making.difficulty * 1.25 );
-        practice( making.skill_used, base_practice, skill_cap );
+        practice( making.skill_used, base_practice, skill_cap, true );
 
         // NPCs assisting or watching should gain experience...
         for( auto &helper : helpers ) {
diff --git a/src/faction.cpp b/src/faction.cpp
index 099c20260d962..06caacd37a8e1 100644
--- a/src/faction.cpp
+++ b/src/faction.cpp
@@ -587,6 +587,11 @@ int npc::faction_display( const catacurses::window &fac_w, const int width ) con
         current_status += _( "Guarding" );
     }
     mvwprintz( fac_w, point( width, ++y ), status_col, current_status );
+    if( is_stationed ) {
+        std::string current_job = _( "Basecamp job : " );
+        current_job += npc_job_name( job );
+        mvwprintz( fac_w, point( width, ++y ), col, current_job );
+    }
 
     const std::pair <std::string, nc_color> condition = hp_description();
     mvwprintz( fac_w, point( width, ++y ), condition.second, _( "Condition : " ) + condition.first );
diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp
index b76bddf4f603c..4ec65aebe5c69 100644
--- a/src/faction_camp.cpp
+++ b/src/faction_camp.cpp
@@ -21,6 +21,7 @@
 #include "editmap.h"
 #include "game.h"
 #include "iexamine.h"
+#include "input.h"
 #include "item_group.h"
 #include "itype.h"
 #include "line.h"
@@ -388,7 +389,7 @@ std::vector<tripoint> om_companion_path( const tripoint &start, int range_start
 time_duration companion_travel_time_calc( const tripoint &omt_pos, const tripoint &omt_tgt,
         time_duration work, int trips = 1, int haulage = 0 );
 time_duration companion_travel_time_calc( const std::vector<tripoint> &journey, time_duration work,
-        int trips = 1, int haulauge = 0 );
+        int trips = 1, int haulage = 0 );
 /// Determines how many round trips a given NPC @ref comp will take to move all of the
 /// items @ref itms
 int om_carry_weight_to_trips( const std::vector<item *> &itms, npc_ptr comp = nullptr );
@@ -749,6 +750,15 @@ void basecamp::get_available_missions( mission_data &mission_key, bool by_radio
                                       "sorted using the normal rules for automatic zone "
                                       "sorting." ) );
             mission_key.add( "Reset Sort Points", _( "Reset Sort Points" ), entry );
+            validate_assignees();
+            std::vector<npc_ptr> npc_list = get_npcs_assigned();
+            entry = string_format( _( "Notes:\n"
+                                      "Assign repeating job duties to NPCs stationed here.\n"
+                                      "Difficulty: N/A \n"
+                                      "Effects:\n"
+                                      "\n\nRisk: None\n"
+                                      "Time: Ongoing" ) );
+            mission_key.add( "Assign Jobs", _( "Assign Jobs" ), entry );
         }
     }
 
@@ -775,7 +785,6 @@ void basecamp::get_available_missions( mission_data &mission_key, bool by_radio
                                     cata::nullopt, entry, avail );
         }
     }
-
     if( has_provides( "sorting" ) ) {
         if( !by_radio ) {
             comp_list npc_list = get_mission_workers( "_faction_camp_menial" );
@@ -1335,6 +1344,10 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional<
         menial_return();
     }
 
+    if( miss_id == "Assign Jobs" ) {
+        job_assignment_ui();
+    }
+
     if( miss_id == "Cut Logs" ) {
         start_cut_logs();
     } else if( miss_id == "Recover Log Cutter" ) {
@@ -1558,6 +1571,103 @@ void basecamp::start_upgrade( const std::string &bldg, const point &dir,
     }
 }
 
+void basecamp::job_assignment_ui()
+{
+    int term_x = TERMY > FULL_SCREEN_HEIGHT ? ( TERMY - FULL_SCREEN_HEIGHT ) / 2 : 0;
+    int term_y = TERMX > FULL_SCREEN_WIDTH ? ( TERMX - FULL_SCREEN_WIDTH ) / 2 : 0;
+
+    catacurses::window w_jobs = catacurses::newwin( FULL_SCREEN_HEIGHT, FULL_SCREEN_WIDTH,
+                                point( term_y, term_x ) );
+    const int entries_per_page = FULL_SCREEN_HEIGHT - 4;
+    size_t selection = 0;
+    input_context ctxt( "FACTION MANAGER" );
+    ctxt.register_cardinal();
+    ctxt.register_updown();
+    ctxt.register_action( "ANY_INPUT" );
+    ctxt.register_action( "CONFIRM" );
+    ctxt.register_action( "QUIT" );
+    while( true ) {
+        werase( w_jobs );
+        // create a list of npcs stationed at this camp
+        std::vector<npc *> stationed_npcs;
+        for( const auto elem : get_npcs_assigned() ) {
+            if( elem ) {
+                stationed_npcs.push_back( elem.get() );
+            }
+        }
+        npc *cur_npc = nullptr;
+        // entries_per_page * page number
+        const size_t top_of_page = entries_per_page * ( selection / entries_per_page );
+        if( !stationed_npcs.empty() ) {
+            cur_npc = stationed_npcs[selection];
+        }
+
+        for( int i = 0; i < FULL_SCREEN_HEIGHT - 1; i++ ) {
+            mvwputch( w_jobs, point( 45, i ), BORDER_COLOR, LINE_XOXO );
+        }
+        draw_border( w_jobs );
+        const nc_color col = c_white;
+        const std::string no_npcs = _( "There are no npcs stationed here" );
+        if( !stationed_npcs.empty() ) {
+            draw_scrollbar( w_jobs, selection, entries_per_page, stationed_npcs.size(),
+                            point( 0, 3 ) );
+            for( size_t i = top_of_page; i < stationed_npcs.size(); i++ ) {
+                const int y = i - top_of_page + 3;
+                trim_and_print( w_jobs, point( 1, y ), 43, selection == i ? hilite( col ) : col,
+                                stationed_npcs[i]->disp_name() );
+            }
+            if( selection < stationed_npcs.size() ) {
+                std::string job_description;
+                if( cur_npc && cur_npc->has_job() ) {
+                    // get the current NPCs job
+                    job_description = npc_job_name( cur_npc->get_job() );
+                } else {
+                    job_description = _( "No particular job" );
+                }
+                mvwprintz( w_jobs, point( 46, 3 ), c_light_gray, job_description );
+            } else {
+                mvwprintz( w_jobs, point( 46, 4 ), c_light_red, no_npcs );
+            }
+        } else {
+            mvwprintz( w_jobs, point( 46, 4 ), c_light_red, no_npcs );
+        }
+        mvwprintz( w_jobs, point( 1, FULL_SCREEN_HEIGHT - 1 ), c_light_gray,
+                   _( "Press %s to change this workers job." ), ctxt.get_desc( "CONFIRM" ) );
+        wrefresh( w_jobs );
+        const std::string action = ctxt.handle_input();
+        if( action == "DOWN" ) {
+            selection++;
+            if( selection >= stationed_npcs.size() ) {
+                selection = 0;
+            }
+        } else if( action == "UP" ) {
+            if( selection == 0 ) {
+                selection = stationed_npcs.empty() ? 0 : stationed_npcs.size() - 1;
+            } else {
+                selection--;
+            }
+        } else if( action == "CONFIRM" ) {
+            if( !stationed_npcs.empty() ) {
+                uilist smenu;
+                smenu.text = _( "Assign which job?" );
+                int count = 0;
+                for( const auto &entry : all_jobs() ) {
+                    smenu.addentry( count++, true, MENU_AUTOASSIGN, entry );
+                }
+
+                smenu.query();
+                if( smenu.ret >= 0 ) {
+                    cur_npc->set_job( static_cast<npc_job>( smenu.ret ) );
+                }
+            }
+        } else if( action == "QUIT" ) {
+            break;
+        }
+    }
+
+    g->refresh_all();
+}
+
 void basecamp::start_menial_labor()
 {
     if( camp_food_supply() < time_to_food( 3_hours ) ) {
diff --git a/src/iexamine.cpp b/src/iexamine.cpp
index 6812c2d95c4cb..c6c48285d4799 100644
--- a/src/iexamine.cpp
+++ b/src/iexamine.cpp
@@ -2902,11 +2902,14 @@ void iexamine::keg( player &p, const tripoint &examp )
     const auto keg_name = g->m.name( examp );
     units::volume keg_cap = get_keg_capacity( examp );
 
+    const bool has_container_with_liquid = map_cursor( examp ).has_item_with( []( const item & it ) {
+        return !it.is_container_empty() && it.can_unload_liquid();
+    } );
     const bool liquid_present = map_cursor( examp ).has_item_with( []( const item & it ) {
         return it.made_of_from_type( LIQUID );
     } );
 
-    if( !liquid_present ) {
+    if( !liquid_present || has_container_with_liquid ) {
         add_msg( m_info, _( "It is empty." ) );
         // Get list of all drinks
         auto drinks_inv = p.items_with( []( const item & it ) {
@@ -4497,7 +4500,7 @@ void iexamine::autodoc( player &p, const tripoint &examp )
         case BONESETTING: {
             int broken_limbs_count = 0;
             for( int i = 0; i < num_hp_parts; i++ ) {
-                const bool broken = patient.get_hp( static_cast<hp_part>( i ) ) <= 0;
+                const bool broken = patient.is_limb_broken( static_cast<hp_part>( i ) );
                 body_part part = player::hp_to_bp( static_cast<hp_part>( i ) );
                 effect &existing_effect = patient.get_effect( effect_mending, part );
                 // Skip part if not broken or already healed 50%
diff --git a/src/item.cpp b/src/item.cpp
index 4851caf6d11ad..16ebd66dcf51f 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -1354,9 +1354,9 @@ std::string item::info( std::vector<iteminfo> &info, const iteminfo_query *parts
             }
         }
 
-        if( food_item->get_comestible()->fun != 0 && parts->test( iteminfo_parts::FOOD_JOY ) ) {
-            info.push_back( iteminfo( "FOOD", _( "Enjoyability: " ),
-                                      g->u.fun_for( *food_item ).first ) );
+        const std::pair<int, int> fun_for_food_item = g->u.fun_for( *food_item );
+        if( fun_for_food_item.first != 0 && parts->test( iteminfo_parts::FOOD_JOY ) ) {
+            info.push_back( iteminfo( "FOOD", _( "Enjoyability: " ), fun_for_food_item.first ) );
         }
 
         if( parts->test( iteminfo_parts::FOOD_PORTIONS ) ) {
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
index 4e8e53eff3bde..30d0708273584 100644
--- a/src/iuse_actor.cpp
+++ b/src/iuse_actor.cpp
@@ -3661,7 +3661,7 @@ static hp_part pick_part_to_heal(
             return healed_part;
         }
 
-        if( patient.hp_cur[healed_part] == 0 ) {
+        if( patient.is_limb_broken( healed_part ) ) {
             if( healed_part == hp_arm_l || healed_part == hp_arm_r ) {
                 add_msg( m_info, _( "That arm is broken.  It needs surgical attention or a splint." ) );
             } else if( healed_part == hp_leg_l || healed_part == hp_leg_r ) {
diff --git a/src/lightmap.cpp b/src/lightmap.cpp
index c2dd277ceb8e0..bb09c161ba37d 100644
--- a/src/lightmap.cpp
+++ b/src/lightmap.cpp
@@ -448,7 +448,7 @@ void map::generate_lightmap( const int zlev )
 
     if( g->u.has_active_bionic( bionic_id( "bio_night" ) ) ) {
         for( const tripoint &p : points_in_rectangle( cache_start, cache_end ) ) {
-            if( rl_dist( p, g->u.pos() ) < 15 ) {
+            if( rl_dist( p, g->u.pos() ) < 2 ) {
                 lm[p.x][p.y].fill( LIGHT_AMBIENT_MINIMAL );
             }
         }
diff --git a/src/magic_enchantment.cpp b/src/magic_enchantment.cpp
index a6a7aea94328d..3fab89e767ba3 100644
--- a/src/magic_enchantment.cpp
+++ b/src/magic_enchantment.cpp
@@ -89,6 +89,14 @@ namespace io
             case enchantment::mod::SOCIAL_LIE: return "SOCIAL_LIE";
             case enchantment::mod::SOCIAL_PERSUADE: return "SOCIAL_PERSUADE";
             case enchantment::mod::SOCIAL_INTIMIDATE: return "SOCIAL_INTIMIDATE";
+            case enchantment::mod::ARMOR_ACID: return "ARMOR_ACID";
+            case enchantment::mod::ARMOR_BASH: return "ARMOR_BASH";
+            case enchantment::mod::ARMOR_BIO: return "ARMOR_BIO";
+            case enchantment::mod::ARMOR_COLD: return "ARMOR_COLD";
+            case enchantment::mod::ARMOR_CUT: return "ARMOR_CUT";
+            case enchantment::mod::ARMOR_ELEC: return "ARMOR_ELEC";
+            case enchantment::mod::ARMOR_HEAT: return "ARMOR_HEAT";
+            case enchantment::mod::ARMOR_STAB: return "ARMOR_STAB";
             case enchantment::mod::ITEM_DAMAGE_BASH: return "ITEM_DAMAGE_BASH";
             case enchantment::mod::ITEM_DAMAGE_CUT: return "ITEM_DAMAGE_CUT";
             case enchantment::mod::ITEM_DAMAGE_STAB: return "ITEM_DAMAGE_STAB";
@@ -373,3 +381,17 @@ void enchantment::activate_passive( Character &guy ) const
     guy.mod_speed_bonus( get_value_add( mod::SPEED ) );
     guy.mod_speed_bonus( mult_bonus( mod::SPEED, guy.get_speed_base() ) );
 }
+
+void enchantment::cast_hit_you( Character &caster, const tripoint &target ) const
+{
+    for( const fake_spell &sp : hit_you_effect ) {
+        sp.get_spell( sp.level ).cast_all_effects( caster, target );
+    }
+}
+
+void enchantment::cast_hit_me( Character &caster ) const
+{
+    for( const fake_spell &sp : hit_me_effect ) {
+        sp.get_spell( sp.level ).cast_all_effects( caster, caster.pos() );
+    }
+}
diff --git a/src/magic_enchantment.h b/src/magic_enchantment.h
index 34ab30767558b..d5f738a099020 100644
--- a/src/magic_enchantment.h
+++ b/src/magic_enchantment.h
@@ -69,6 +69,14 @@ class enchantment
             SOCIAL_LIE,
             SOCIAL_PERSUADE,
             SOCIAL_INTIMIDATE,
+            ARMOR_BASH,
+            ARMOR_CUT,
+            ARMOR_STAB,
+            ARMOR_HEAT,
+            ARMOR_COLD,
+            ARMOR_ELEC,
+            ARMOR_ACID,
+            ARMOR_BIO,
             // effects for the item that has the enchantment
             ITEM_DAMAGE_BASH,
             ITEM_DAMAGE_CUT,
@@ -124,6 +132,11 @@ class enchantment
         bool was_loaded;
 
         void serialize( JsonOut &jsout ) const;
+
+        // casts all the hit_you_effects on the target
+        void cast_hit_you( Character &caster, const tripoint &target ) const;
+        // casts all the hit_me_effects on self
+        void cast_hit_me( Character &caster ) const;
     private:
         // values that add to the base value
         std::map<mod, int> values_add;
diff --git a/src/map.cpp b/src/map.cpp
index 68a71c99baa0e..087f2b453af41 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -610,6 +610,13 @@ vehicle *map::move_vehicle( vehicle &veh, const tripoint &dp, const tileray &fac
     // Now we're gonna handle traps we're standing on (if we're still moving).
     if( !vertical && can_move ) {
         const auto wheel_indices = veh.wheelcache; // Don't use a reference here, it causes a crash.
+
+        // Values to deal with crushing items.
+        // The math needs to be floating-point to work, so the values might as well be.
+        const float vehicle_grounded_wheel_area = static_cast<int>( vehicle_wheel_traction( veh, true ) );
+        const float weight_to_damage_factor = 0.05; // Nobody likes a magic number.
+        const float vehicle_mass_kg = to_kilogram( veh.total_mass() );
+
         for( auto &w : wheel_indices ) {
             const tripoint wheel_p = veh.global_part_pos3( w );
             if( one_in( 2 ) && displace_water( wheel_p ) ) {
@@ -619,9 +626,16 @@ vehicle *map::move_vehicle( vehicle &veh, const tripoint &dp, const tileray &fac
 
             veh.handle_trap( wheel_p, w );
             if( !has_flag( "SEALED", wheel_p ) ) {
-                // TODO: Make this value depend on the wheel
+                const float wheel_area =  veh.parts[ w ].wheel_area();
+
+                // Damage is calculated based on the weight of the vehicle,
+                // The area of it's wheels, and the area of the wheel running over the items.
+                // This number is multiplied by weight_to_damage_factor to get reasonable results, damage-wise.
+                const int wheel_damage = static_cast<int>( ( ( wheel_area / vehicle_grounded_wheel_area ) *
+                                         vehicle_mass_kg ) * weight_to_damage_factor );
+
                 //~ %1$s: vehicle name
-                smash_items( wheel_p, 5, string_format( _( "weight of %1$s" ), veh.disp_name() ) );
+                smash_items( wheel_p, wheel_damage, string_format( _( "weight of %1$s" ), veh.disp_name() ) );
             }
         }
     }
diff --git a/src/map.h b/src/map.h
index af3d06d241934..376f118be7fe7 100644
--- a/src/map.h
+++ b/src/map.h
@@ -571,8 +571,9 @@ class map
         bool displace_water( const tripoint &dp );
 
         // Returns the wheel area of the vehicle multiplied by traction of the surface
+        // When ignore_movement_modifiers is set to true, it returns the area of the wheels touching the ground
         // TODO: Remove the ugly sinking vehicle hack
-        float vehicle_wheel_traction( const vehicle &veh ) const;
+        float vehicle_wheel_traction( const vehicle &veh, bool ignore_movement_modifiers = false ) const;
 
         // Executes vehicle-vehicle collision based on vehicle::collision results
         // Returns impulse of the executed collision
diff --git a/src/map_field.cpp b/src/map_field.cpp
index 6b0b75c0a1919..69a8d763d4abd 100644
--- a/src/map_field.cpp
+++ b/src/map_field.cpp
@@ -630,12 +630,12 @@ bool map::process_fields_in_submap( submap *const current_submap,
                                         cur.get_field_intensity() == fire_there->get_field_intensity() ) {
                                         new_intensity++;
                                     }
-                                    fire_there->set_field_intensity( new_intensity );
                                     // A raging fire below us can support us for a while
                                     // Otherwise decay and decay fast
-                                    if( new_intensity < 3 || one_in( 10 ) ) {
+                                    if( fire_there->get_field_intensity() < 3 || one_in( 10 ) ) {
                                         cur.set_field_intensity( cur.get_field_intensity() - 1 );
                                     }
+                                    fire_there->set_field_intensity( new_intensity );
                                 }
                                 break;
                             }
@@ -648,7 +648,7 @@ bool map::process_fields_in_submap( submap *const current_submap,
                         // Nothing to burn = fire should be dying out faster
                         // Drain more power from big fires, so that they stop raging over nothing
                         // Except for fires on stoves and fireplaces, those are made to keep the fire alive
-                        cur.set_field_age( cur.get_field_age() + 10_seconds * cur.get_field_intensity() );
+                        cur.mod_field_age( 10_seconds * cur.get_field_intensity() );
                     }
 
                     // Below we will access our nearest 8 neighbors, so let's cache them now
@@ -785,7 +785,7 @@ bool map::process_fields_in_submap( submap *const current_submap,
                             dst_ter.has_flag( TFLAG_FLAMMABLE_HARD ) ) {
                             field_entry *nearfire = dst.find_field( fd_fire );
                             if( nearfire != nullptr ) {
-                                nearfire->set_field_age( nearfire->get_field_age() - 2_minutes );
+                                nearfire->mod_field_age( -2_turns );
                             } else {
                                 dst.add_field( fd_fire, 1, 0_turns );
                             }
diff --git a/src/martialarts.cpp b/src/martialarts.cpp
index 1b434bc3448e4..e56bf8ea21218 100644
--- a/src/martialarts.cpp
+++ b/src/martialarts.cpp
@@ -912,7 +912,7 @@ bool player::can_leg_block() const
                             skill_id( "unarmed" ) );
 
     // Success conditions.
-    if( hp_cur[hp_leg_l] > 0 || hp_cur[hp_leg_r] > 0 ) {
+    if( get_working_leg_count() >= 1 ) {
         if( unarmed_skill >= ma.leg_block ) {
             return true;
         } else if( ma.leg_block_with_bio_armor_legs && has_bionic( bionic_id( "bio_armor_legs" ) ) ) {
@@ -931,7 +931,7 @@ bool player::can_arm_block() const
                             skill_id( "unarmed" ) );
 
     // Success conditions.
-    if( hp_cur[hp_arm_l] > 0 || hp_cur[hp_arm_r] > 0 ) {
+    if( !is_limb_broken( hp_arm_l ) || !is_limb_broken( hp_arm_r ) ) {
         if( unarmed_skill >= ma.arm_block ) {
             return true;
         } else if( ma.arm_block_with_bio_armor_arms && has_bionic( bionic_id( "bio_armor_arms" ) ) ) {
diff --git a/src/melee.cpp b/src/melee.cpp
index ce0ee2b7d128e..85c0b2f434865 100644
--- a/src/melee.cpp
+++ b/src/melee.cpp
@@ -53,6 +53,7 @@
 #include "material.h"
 #include "type_id.h"
 #include "point.h"
+#include "projectile.h"
 #include "vehicle.h"
 #include "vpart_position.h"
 #include "mapdata.h"
@@ -563,6 +564,11 @@ void player::melee_attack( Creature &t, bool allow_special, const matec_id &forc
     ma_onattack_effects(); // trigger martial arts on-attack effects
     // some things (shattering weapons) can harm the attacking creature.
     check_dead_state();
+    did_hit( t );
+    if( t.as_character() ) {
+        dealt_projectile_attack dp = dealt_projectile_attack();
+        t.as_character()->on_hit( this, body_part::num_bp, 0.0f, &dp );
+    }
     return;
 }
 
diff --git a/src/npc.cpp b/src/npc.cpp
index 931d945882662..a16191d446ccd 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -1967,7 +1967,7 @@ bool npc::is_assigned_to_camp() const
     if( !bcp ) {
         return false;
     }
-    return !has_companion_mission() && mission == NPC_MISSION_GUARD_ALLY;
+    return !has_companion_mission() && mission == NPC_MISSION_ASSIGNED_CAMP;
 }
 
 bool npc::is_enemy() const
@@ -2515,13 +2515,22 @@ std::string npc_job_id( npc_job job )
     return iter->second;
 }
 
+std::vector<std::string> all_jobs()
+{
+    std::vector<std::string> ret;
+    for( int i = 0; i < NPCJOB_END; i++ ) {
+        ret.push_back( npc_job_name( static_cast<npc_job>( i ) ) );
+    }
+    return ret;
+}
+
 std::string npc_job_name( npc_job job )
 {
     switch( job ) {
         case NPCJOB_NULL:
-            return _( "Not much" );
+            return _( "No particular job" );
         case NPCJOB_COOKING:
-            return _( "Cooking" );
+            return _( "Cooking and butchering" );
         case NPCJOB_MENIAL:
             return _( "Tidying and cleaning" );
         case NPCJOB_VEHICLES:
@@ -2539,7 +2548,7 @@ std::string npc_job_name( npc_job job )
         case NPCJOB_HUSBANDRY:
             return _( "Caring for the livestock" );
         case NPCJOB_HUNTING:
-            return _( "Hunting for meat" );
+            return _( "Hunting and fishing" );
         case NPCJOB_FORAGING:
             return _( "Gathering edibles" );
         default:
diff --git a/src/npc.h b/src/npc.h
index f3d0d13302786..57fe8a95d5b44 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -128,24 +128,21 @@ enum npc_job : int {
     NPCJOB_END
 };
 
-static const std::map<npc_job, std::vector<activity_id>> job_duties = {
+std::vector<std::string> all_jobs();
+std::string npc_job_id( npc_job job );
+std::string npc_job_name( npc_job job );
+
+static std::map<npc_job, std::vector<activity_id>> job_duties = {
     { NPCJOB_NULL, std::vector<activity_id>{ activity_id( activity_id::NULL_ID() ) } },
-    { NPCJOB_COOKING, std::vector<activity_id>{ activity_id( "ACT_MULTIPLE_CRAFT" ), activity_id( "ACT_MULTIPLE_BUTCHER" ) } },
+    { NPCJOB_COOKING, std::vector<activity_id>{ activity_id( "ACT_MULTIPLE_BUTCHER" ) } },
     { NPCJOB_MENIAL, std::vector<activity_id>{ activity_id( "ACT_MOVE_LOOT" ), activity_id( "ACT_TIDY_UP" ) } },
     { NPCJOB_VEHICLES, std::vector<activity_id>{ activity_id( "ACT_VEHICLE_REPAIR" ), activity_id( "ACT_VEHICLE_DECONSTRUCTION" ) } },
     { NPCJOB_CONSTRUCTING, std::vector<activity_id>{ activity_id( "ACT_MULTIPLE_CONSTRUCTION" ) } },
-    { NPCJOB_CRAFTING, std::vector<activity_id>{ activity_id( "ACT_MULTIPLE_CRAFT" ) } },
-    { NPCJOB_SECURITY, std::vector<activity_id>{ activity_id( activity_id::NULL_ID() ) } }, // no corresponding activities yet.
     { NPCJOB_FARMING, std::vector<activity_id>{ activity_id( "ACT_MULTIPLE_FARM" ) } },
     { NPCJOB_LUMBERJACK, std::vector<activity_id>{ activity_id( "ACT_MULTIPLE_CHOP_TREES" ), activity_id( "ACT_MULTIPLE_CHOP_PLANKS" ) } },
-    { NPCJOB_HUSBANDRY, std::vector<activity_id>{ activity_id( activity_id::NULL_ID() ) } }, // no corresponding activities yet.
     { NPCJOB_HUNTING, std::vector<activity_id>{ activity_id( "ACT_MULTIPLE_FISH" ) } },
-    { NPCJOB_FORAGING, std::vector<activity_id>{ activity_id( activity_id::NULL_ID() ) } }, // no corresponding activities yet.
 };
 
-std::string npc_job_id( npc_job job );
-std::string npc_job_name( npc_job job );
-
 enum npc_mission : int {
     NPC_MISSION_NULL = 0, // Nothing in particular
     NPC_MISSION_LEGACY_1,
@@ -160,6 +157,7 @@ enum npc_mission : int {
     NPC_MISSION_GUARD_PATROL, // Assigns a non-allied NPC to guard and investigate
     NPC_MISSION_ACTIVITY, // Perform a player_activity until it is complete
     NPC_MISSION_TRAVELLING,
+    NPC_MISSION_ASSIGNED_CAMP, // this npc is assigned to a camp.
 };
 
 struct npc_companion_mission {
diff --git a/src/npcmove.cpp b/src/npcmove.cpp
index 8f145f1290871..63ffd3918856f 100644
--- a/src/npcmove.cpp
+++ b/src/npcmove.cpp
@@ -834,6 +834,29 @@ void npc::move()
                 mission = NPC_MISSION_NULL;
             }
         }
+        if( mission == NPC_MISSION_ASSIGNED_CAMP ) {
+            bool found_job = false;
+            if( has_job() && calendar::once_every( 30_minutes ) ) {
+                if( job_duties.find( job ) != job_duties.end() ) {
+                    const std::vector<activity_id> jobs_to_rotate = job_duties[job];
+                    if( !jobs_to_rotate.empty() ) {
+                        assign_activity( random_entry( jobs_to_rotate ) );
+                        set_mission( NPC_MISSION_ACTIVITY );
+                        set_attitude( NPCATT_ACTIVITY );
+                        action = npc_player_activity;
+                        found_job = true;
+                    } else {
+                        debugmsg( "NPC is assigned to a job, but the job: %s has no duties", npc_job_id( job ) );
+                        set_mission( NPC_MISSION_GUARD_ALLY );
+                        set_attitude( NPCATT_NULL );
+                    }
+                }
+            }
+            if( !found_job ) {
+                action = npc_pause;
+                goal = global_omt_location();
+            }
+        }
         if( is_stationary( true ) ) {
             // if we're in a vehicle, stay in the vehicle
             if( in_vehicle ) {
@@ -1923,7 +1946,7 @@ npc_action npc::long_term_goal_action()
 {
     add_msg( m_debug, "long_term_goal_action()" );
 
-    if( mission == NPC_MISSION_SHOPKEEP || mission == NPC_MISSION_SHELTER ) {
+    if( mission == NPC_MISSION_SHOPKEEP || mission == NPC_MISSION_SHELTER || is_player_ally() ) {
         return npc_pause;    // Shopkeepers just stay put.
     }
 
diff --git a/src/npctalk.cpp b/src/npctalk.cpp
index c798a1c314ad7..8340c98858c7f 100644
--- a/src/npctalk.cpp
+++ b/src/npctalk.cpp
@@ -2507,6 +2507,7 @@ void talk_effect_t::parse_string_effect( const std::string &effect_id, JsonObjec
             WRAP( do_butcher ),
             WRAP( do_farming ),
             WRAP( assign_guard ),
+            WRAP( assign_camp ),
             WRAP( stop_guard ),
             WRAP( start_camp ),
             WRAP( buy_cow ),
diff --git a/src/npctalk.h b/src/npctalk.h
index 73b0ef4ae59f4..0debe5e30486d 100644
--- a/src/npctalk.h
+++ b/src/npctalk.h
@@ -50,6 +50,7 @@ void revert_activity( npc & );
 void goto_location( npc & );
 void assign_base( npc & );
 void assign_guard( npc & );
+void assign_camp( npc & );
 void stop_guard( npc & );
 void end_conversation( npc & );
 void insult_combat( npc & );
diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp
index 8a083e8631f8b..19e7aaa19c3fc 100644
--- a/src/npctalk_funcs.cpp
+++ b/src/npctalk_funcs.cpp
@@ -363,39 +363,43 @@ void talk_function::assign_guard( npc &p )
     p.set_mission( NPC_MISSION_GUARD_ALLY );
     p.chatbin.first_topic = "TALK_FRIEND_GUARD";
     p.set_omt_destination();
+}
+
+void talk_function::assign_camp( npc &p )
+{
     cata::optional<basecamp *> bcp = overmap_buffer.find_camp( p.global_omt_location().xy() );
     if( bcp ) {
         basecamp *temp_camp = *bcp;
+        p.set_attitude( NPCATT_NULL );
+        p.set_mission( NPC_MISSION_ASSIGNED_CAMP );
         temp_camp->validate_assignees();
-        if( p.rules.has_flag( ally_rule::ignore_noise ) ) {
-            //~ %1$s is the NPC's translated name, %2$s is the translated faction camp name
-            add_msg( _( "%1$s is assigned to %2$s" ), p.disp_name(), temp_camp->camp_name() );
-        } else {
-            //~ %1$s is the NPC's translated name, %2$s is the translated faction camp name
-            add_msg( _( "%1$s is assigned to guard %2$s" ), p.disp_name(), temp_camp->camp_name() );
+        add_msg( _( "%1$s is assigned to %2$s" ), p.disp_name(), temp_camp->camp_name() );
+        if( p.has_player_activity() ) {
+            p.revert_after_activity();
         }
-    } else {
-        if( p.rules.has_flag( ally_rule::ignore_noise ) ) {
-            //~ %1$s is the NPC's translated name, %2$s is the pronoun for the NPC's gender
-            add_msg( _( "%1$s will wait for you where %2$s is." ), p.disp_name(),
-                     p.male ? _( "he" ) : _( "she" ) );
-        } else {
-            add_msg( _( "%s is posted as a guard." ), p.disp_name() );
+
+        if( p.is_travelling() ) {
+            if( p.has_companion_mission() ) {
+                p.reset_companion_mission();
+            }
         }
+        p.chatbin.first_topic = "TALK_FRIEND_GUARD";
+        p.set_omt_destination();
+        temp_camp->job_assignment_ui();
     }
 }
 
 void talk_function::stop_guard( npc &p )
 {
-    if( p.mission != NPC_MISSION_GUARD_ALLY ) {
+    if( p.mission != NPC_MISSION_GUARD_ALLY && p.mission != NPC_MISSION_ASSIGNED_CAMP ) {
         p.set_attitude( NPCATT_NULL );
         p.set_mission( NPC_MISSION_NULL );
         return;
     }
-
     p.set_attitude( NPCATT_FOLLOW );
     add_msg( _( "%s begins to follow you." ), p.name );
     p.set_mission( NPC_MISSION_NULL );
+    p.set_job( static_cast<npc_job>( 0 ) );
     p.chatbin.first_topic = "TALK_FRIEND";
     p.goal = npc::no_goal_point;
     p.guard_pos = npc::no_goal_point;
diff --git a/src/options.cpp b/src/options.cpp
index b2092d52cfb3b..ae1932ae3fa6d 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -2363,9 +2363,9 @@ std::string options_manager::show( bool ingame, const bool world_options_only )
 {
     // temporary alias so the code below does not need to be changed
     options_container &OPTIONS = options;
-    options_container &ACTIVE_WORLD_OPTIONS = world_generator->active_world ?
-            world_generator->active_world->WORLD_OPTIONS :
-            world_options_only ? *world_options : OPTIONS;
+    options_container &ACTIVE_WORLD_OPTIONS = world_options.has_value() ?
+            *world_options.value() :
+            OPTIONS;
 
     auto OPTIONS_OLD = OPTIONS;
     auto WOPTIONS_OLD = ACTIVE_WORLD_OPTIONS;
@@ -2891,11 +2891,11 @@ options_manager::cOpt &options_manager::get_option( const std::string &name )
     if( options.count( name ) == 0 ) {
         debugmsg( "requested non-existing option %s", name );
     }
-    if( !world_generator || !world_generator->active_world ) {
+    if( !world_options.has_value() ) {
         // Global options contains the default for new worlds, which is good enough here.
         return options[name];
     }
-    auto &wopts = world_generator->active_world->WORLD_OPTIONS;
+    auto &wopts = *world_options.value();
     if( wopts.count( name ) == 0 ) {
         auto &opt = options[name];
         if( opt.getPage() != "world_default" ) {
@@ -2926,6 +2926,15 @@ std::vector<std::string> options_manager::getWorldOptPageItems() const
     return temp[iWorldOptPage];
 }
 
+void options_manager::set_world_options( options_container *options )
+{
+    if( options == nullptr ) {
+        world_options.reset();
+    } else {
+        world_options = options;
+    }
+}
+
 void options_manager::update_global_locale()
 {
     std::string lang = ::get_option<std::string>( "USE_LANG" );
diff --git a/src/options.h b/src/options.h
index 04500e7a0f7eb..1a3abd93587bd 100644
--- a/src/options.h
+++ b/src/options.h
@@ -216,7 +216,7 @@ class options_manager
         options_container get_world_defaults() const;
         std::vector<std::string> getWorldOptPageItems() const;
 
-        options_container *world_options;
+        void set_world_options( options_container *options );
 
         /** Check if an option exists? */
         bool has_option( const std::string &name ) const;
@@ -269,6 +269,7 @@ class options_manager
 
     private:
         options_container options;
+        cata::optional<options_container *> world_options;
         // first is page id, second is untranslated page name
         std::vector<std::pair<std::string, std::string>> vPages;
         std::map<int, std::vector<std::string>> mPageItems;
diff --git a/src/panels.cpp b/src/panels.cpp
index 3f813eed5b026..cac5eb710d314 100644
--- a/src/panels.cpp
+++ b/src/panels.cpp
@@ -858,7 +858,8 @@ static void draw_limb_health( avatar &u, const catacurses::window &w, int limb_i
             wprintz( w, color, sym );
         }
     };
-    if( u.hp_cur[limb_index] == 0 && ( limb_index >= hp_arm_l && limb_index <= hp_leg_r ) ) {
+    if( u.is_limb_broken( static_cast<hp_part>( limb_index ) ) && ( limb_index >= hp_arm_l &&
+            limb_index <= hp_leg_r ) ) {
         //Limb is broken
         std::string limb = "~~%~~";
         nc_color color = c_light_red;
diff --git a/src/player.cpp b/src/player.cpp
index f03be82d7d0f7..297aca399478e 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1589,15 +1589,15 @@ int player::run_cost( int base_cost, bool diag ) const
                     75; // Mycal characters are faster on their home territory, even through things like shrubs
             }
         }
-        if( hp_cur[hp_leg_l] == 0 ) {
+        if( is_limb_broken( hp_leg_l ) ) {
             movecost += 50;
-        } else if( hp_cur[hp_leg_l] < hp_max[hp_leg_l] * .40 ) {
+        } else if( is_limb_hindered( hp_leg_l ) ) {
             movecost += 25;
         }
 
-        if( hp_cur[hp_leg_r] == 0 ) {
+        if( is_limb_broken( hp_leg_r ) ) {
             movecost += 50;
-        } else if( hp_cur[hp_leg_r] < hp_max[hp_leg_r] * .40 ) {
+        } else if( is_limb_hindered( hp_leg_r ) ) {
             movecost += 25;
         }
         movecost *= Character::mutation_value( "movecost_modifier" );
@@ -1781,7 +1781,7 @@ bool player::digging() const
 
 bool player::is_on_ground() const
 {
-    return hp_cur[hp_leg_l] == 0 || hp_cur[hp_leg_r] == 0 || has_effect( effect_downed );
+    return get_working_leg_count() < 2 || has_effect( effect_downed );
 }
 
 bool player::is_elec_immune() const
@@ -2305,14 +2305,6 @@ bool player::sight_impaired() const
              has_trait( trait_PER_SLIME ) );
 }
 
-bool player::has_two_arms() const
-{
-    // If you've got a blaster arm, low hp arm, or you're inside a shell then you don't have two
-    // arms to use.
-    return !( ( has_bionic( bio_blaster ) || hp_cur[hp_arm_l] < hp_max[hp_arm_l] * 0.125 ||
-                hp_cur[hp_arm_r] < hp_max[hp_arm_r] * 0.125 ) || has_active_mutation( trait_id( "SHELL2" ) ) );
-}
-
 bool player::avoid_trap( const tripoint &pos, const trap &tr ) const
 {
     /** @EFFECT_DEX increases chance to avoid traps */
@@ -2801,6 +2793,7 @@ void player::on_hit( Creature *source, body_part bp_hit,
             add_effect( effect_downed, 2_turns );
         }
     }
+    Character::on_hit( source, bp_hit, 0.0f, proj );
 }
 
 int player::get_lift_assist() const
@@ -10076,7 +10069,7 @@ int player::adjust_for_focus( int amount ) const
     return roll_remainder( tmp );
 }
 
-void player::practice( const skill_id &id, int amount, int cap )
+void player::practice( const skill_id &id, int amount, int cap, bool suppress_warning )
 {
     SkillLevel &level = get_skill_level_object( id );
     const Skill &skill = id.obj();
@@ -10128,13 +10121,10 @@ void player::practice( const skill_id &id, int amount, int cap )
 
     if( amount > 0 && get_skill_level( id ) > cap ) { //blunt grinding cap implementation for crafting
         amount = 0;
-        if( is_player() && one_in( 5 ) ) { //remind the player intermittently that no skill gain takes place
-            int curLevel = get_skill_level( id );
-            add_msg( m_info, _( "This task is too simple to train your %s beyond %d." ),
-                     skill_name, curLevel );
+        if( !suppress_warning ) {
+            handle_skill_warning( id, false );
         }
     }
-
     if( amount > 0 && level.isTraining() ) {
         int oldLevel = get_skill_level( id );
         get_skill_level_object( id ).train( amount );
@@ -10161,6 +10151,21 @@ void player::practice( const skill_id &id, int amount, int cap )
     get_skill_level_object( id ).practice();
 }
 
+void player::handle_skill_warning( const skill_id &id, bool force_warning )
+{
+    //remind the player intermittently that no skill gain takes place
+    if( is_player() && ( force_warning || one_in( 5 ) ) ) {
+        SkillLevel &level = get_skill_level_object( id );
+
+        const Skill &skill = id.obj();
+        std::string skill_name = skill.name();
+        int curLevel = level.level();
+
+        add_msg( m_info, _( "This task is too simple to train your %s beyond %d." ),
+                 skill_name, curLevel );
+    }
+}
+
 int player::exceeds_recipe_requirements( const recipe &rec ) const
 {
     return get_all_skills().exceeds_recipe_requirements( rec );
diff --git a/src/player.h b/src/player.h
index 4dcb34262228c..c7dcdcc19100a 100644
--- a/src/player.h
+++ b/src/player.h
@@ -399,8 +399,6 @@ class player : public Character
         int  clairvoyance() const;
         /** Returns true if the player has some form of impaired sight */
         bool sight_impaired() const;
-        /** Returns true if the player has two functioning arms */
-        bool has_two_arms() const;
         /** Calculates melee weapon wear-and-tear through use, returns true if item is destroyed. */
         bool handle_melee_wear( item &shield, float wear_multiplier = 1.0f );
         /** True if unarmed or wielding a weapon with the UNARMED_WEAPON flag */
@@ -1196,8 +1194,10 @@ class player : public Character
         static int thirst_speed_penalty( int thirst );
 
         int adjust_for_focus( int amount ) const;
-        void practice( const skill_id &id, int amount, int cap = 99 );
-
+        /** This handles giving xp for a skill */
+        void practice( const skill_id &id, int amount, int cap = 99, bool suppress_warning = false );
+        /** This handles warning the player that there current activity will not give them xp */
+        void handle_skill_warning( const skill_id &id, bool force_warning = false );
         /** Legacy activity assignment, should not be used where resuming is important. */
         void assign_activity( const activity_id &type, int moves = calendar::INDEFINITELY_LONG,
                               int index = -1, int pos = INT_MIN,
diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp
index ba06b68e7d4c8..a10cbd2070444 100644
--- a/src/player_hardcoded_effects.cpp
+++ b/src/player_hardcoded_effects.cpp
@@ -161,8 +161,8 @@ static void eff_fun_fungus( player &u, effect &it )
                 }
                 // We're fucked
             } else if( one_in( 36000 + bonus * 120 ) ) {
-                if( u.hp_cur[hp_arm_l] <= 0 || u.hp_cur[hp_arm_r] <= 0 ) {
-                    if( u.hp_cur[hp_arm_l] <= 0 && u.hp_cur[hp_arm_r] <= 0 ) {
+                if( u.is_limb_broken( hp_arm_l ) || u.is_limb_broken( hp_arm_r ) ) {
+                    if( u.is_limb_broken( hp_arm_l ) && u.is_limb_broken( hp_arm_r ) ) {
                         u.add_msg_player_or_npc( m_bad,
                                                  _( "The flesh on your broken arms bulges. Fungus stalks burst through!" ),
                                                  _( "<npcname>'s broken arms bulge. Fungus stalks burst out of the bulges!" ) );
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index a918d156a2903..c84dc055de03e 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -3154,10 +3154,9 @@ int vehicle::fuel_left( const itype_id &ftype, bool recurse ) const
             const int p = avail_part_with_feature( vp->part_index(), VPFLAG_ENGINE, true );
             if( p >= 0 && is_part_on( p ) && part_info( p ).fuel_type == fuel_type_muscle ) {
                 //Broken limbs prevent muscle engines from working
-                if( ( part_info( p ).has_flag( "MUSCLE_LEGS" ) && g->u.hp_cur[hp_leg_l] > 0 &&
-                      g->u.hp_cur[hp_leg_r] > 0 ) || ( part_info( p ).has_flag( "MUSCLE_ARMS" ) &&
-                                                       g->u.hp_cur[hp_arm_l] > 0 &&
-                                                       g->u.hp_cur[hp_arm_r] > 0 ) ) {
+                if( ( part_info( p ).has_flag( "MUSCLE_LEGS" ) && ( g->u.get_working_leg_count() >= 2 ) ) ||
+                    ( part_info( p ).has_flag( "MUSCLE_ARMS" ) &&
+                      ( g->u.get_working_arm_count() >= 2 ) ) ) {
                     fl += 10;
                 }
             }
diff --git a/src/vehicle_move.cpp b/src/vehicle_move.cpp
index f055379923c6c..7705a690666db 100644
--- a/src/vehicle_move.cpp
+++ b/src/vehicle_move.cpp
@@ -1431,7 +1431,8 @@ void vehicle::check_falling_or_floating()
     in_water =  2 * water_tiles >= pts.size();
 }
 
-float map::vehicle_wheel_traction( const vehicle &veh ) const
+float map::vehicle_wheel_traction( const vehicle &veh,
+                                   const bool ignore_movement_modifiers /*=false*/ ) const
 {
     if( veh.is_in_water( true ) ) {
         return veh.can_float() ? 1.0f : -1.0f;
@@ -1477,6 +1478,12 @@ float map::vehicle_wheel_traction( const vehicle &veh ) const
                 break;
             }
         }
+
+        // Ignore the movement modifier if needed.
+        if( ignore_movement_modifiers ) {
+            move_mod = 2;
+        }
+
         traction_wheel_area += 2.0 * wheel_area / move_mod;
     }
 
diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp
index c4124f94eb52b..2f2b3e1dfc9fc 100644
--- a/src/vehicle_use.cpp
+++ b/src/vehicle_use.cpp
@@ -854,12 +854,10 @@ bool vehicle::start_engine( const int e )
     if( out_of_fuel ) {
         if( einfo.fuel_type == fuel_type_muscle ) {
             // Muscle engines cannot start with broken limbs
-            if( einfo.has_flag( "MUSCLE_ARMS" ) && ( g->u.hp_cur[hp_arm_l] == 0 ||
-                    g->u.hp_cur[hp_arm_r] == 0 ) ) {
+            if( einfo.has_flag( "MUSCLE_ARMS" ) && ( g->u.get_working_arm_count() >= 2 ) ) {
                 add_msg( _( "You cannot use %s with a broken arm." ), eng.name() );
                 return false;
-            } else if( einfo.has_flag( "MUSCLE_LEGS" ) && ( g->u.hp_cur[hp_leg_l] == 0 ||
-                       g->u.hp_cur[hp_leg_r] == 0 ) ) {
+            } else if( einfo.has_flag( "MUSCLE_LEGS" ) && ( g->u.get_working_leg_count() >= 2 ) ) {
                 add_msg( _( "You cannot use %s with a broken leg." ), eng.name() );
                 return false;
             }
diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp
index d6f11bf0a1f14..a593986a86d28 100644
--- a/src/worldfactory.cpp
+++ b/src/worldfactory.cpp
@@ -208,6 +208,11 @@ WORLDPTR worldfactory::make_new_world( special_game_id special_type )
 void worldfactory::set_active_world( WORLDPTR world )
 {
     world_generator->active_world = world;
+    if( world ) {
+        get_options().set_world_options( &world->WORLD_OPTIONS );
+    } else {
+        get_options().set_world_options( nullptr );
+    }
 }
 
 bool WORLD::save( const bool is_conversion ) const
@@ -538,6 +543,7 @@ void worldfactory::remove_world( const std::string &worldname )
     if( it != all_worlds.end() ) {
         WORLDPTR wptr = it->second.get();
         if( active_world == wptr ) {
+            get_options().set_world_options( nullptr );
             active_world = nullptr;
         }
         all_worlds.erase( it );
@@ -576,8 +582,9 @@ std::string worldfactory::pick_random_name()
 
 int worldfactory::show_worldgen_tab_options( const catacurses::window &/*win*/, WORLDPTR world )
 {
-    get_options().world_options = &world->WORLD_OPTIONS;
+    get_options().set_world_options( &world->WORLD_OPTIONS );
     const std::string action = get_options().show( false, true );
+    get_options().set_world_options( nullptr );
     if( action == "PREV_TAB" ) {
         return -1;
 
diff --git a/tools/gfx_tools/compose.py b/tools/gfx_tools/compose.py
new file mode 100644
index 0000000000000..5631ca1387ba6
--- /dev/null
+++ b/tools/gfx_tools/compose.py
@@ -0,0 +1,292 @@
+#!/bin/python
+
+# compose.py
+# Split a gfx directory made of 1000s of little images and files into a set of tilesheets
+# and a tile_config.json
+
+import argparse
+import copy
+import json
+import os
+import string
+import subprocess
+
+try:
+    import pyvips
+    Vips = pyvips
+except ImportError:
+    import gi
+    gi.require_version('Vips', '8.0')
+    from gi.repository import Vips
+
+FALLBACK = {
+    "file": "fallback.png",
+    "tiles": [],
+    "ascii": [
+        { "offset": 0, "bold": False, "color": "BLACK" },
+        { "offset": 256, "bold": True, "color": "WHITE" },
+        { "offset": 512, "bold": False, "color": "WHITE" },
+        { "offset": 768, "bold": True, "color": "BLACK" },
+        { "offset": 1024, "bold": False, "color": "RED" },
+        { "offset": 1280, "bold": False, "color": "GREEN" },
+        { "offset": 1536, "bold": False, "color": "BLUE" },
+        { "offset": 1792, "bold": False, "color": "CYAN" },
+        { "offset": 2048, "bold": False, "color": "MAGENTA" },
+        { "offset": 2304, "bold": False, "color": "YELLOW" },
+        { "offset": 2560, "bold": True, "color": "RED" },
+        { "offset": 2816, "bold": True, "color": "GREEN" },
+        { "offset": 3072, "bold": True, "color": "BLUE" },
+        { "offset": 3328, "bold": True, "color": "CYAN" },
+        { "offset": 3584, "bold": True, "color": "MAGENTA" },
+        { "offset": 3840, "bold": True, "color": "YELLOW" }
+    ]
+}
+
+# stupid stinking Python 2 versus Python 3 syntax
+def write_to_json(pathname, data):
+    with open(pathname, "w") as fp:
+        try:
+            json.dump(data, fp)
+        except ValueError:
+            fp.write(json.dumps(data))
+
+    json_formatter = "./tools/format/json_formatter.cgi"
+    if os.path.isfile(json_formatter):
+        cmd = [json_formatter, pathname]
+        subprocess.call(cmd)
+
+
+def find_or_make_dir(pathname):
+    try:
+        os.stat(pathname)
+    except OSError:
+        os.mkdir(pathname)
+
+
+class PngRefs(object):
+    def __init__(self, tileset_dirname):
+        # dict of pngnames to png numbers; used to control uniqueness
+        self.pngname_to_pngnum = { "null_image": 0 }
+        # dict of png absolute numbers to png names
+        self.pngnum_to_pngname = { 0: "null_image" }
+        self.pngnum = 0
+        self.tileset_pathname = tileset_dirname
+        if not tileset_dirname.startswith("gfx/"):
+            self.tileset_pathname = "gfx/" + tileset_dirname
+
+        try:
+            os.stat(self.tileset_pathname)
+        except KeyError:
+            print("cannot find a directory {}".format(self.tileset_pathname))
+            exit -1
+
+        tileset_info_path = self.tileset_pathname + "/tile_info.json"
+        self.tileset_width = 16
+        self.tileset_height = 16
+        self.tileset_info = [{}]
+        with open(tileset_info_path, "r") as fp:
+            self.tileset_info = json.load(fp)
+            self.tileset_width = self.tileset_info[0].get("width")
+            self.tileset_height = self.tileset_info[0].get("height")
+
+    def convert_pngname_to_pngnum(self, index):
+        new_index = []
+        if isinstance(index, list):
+            for pngname in index:
+                if isinstance(pngname, dict):
+                    sprite_ids = pngname.get("sprite")
+                    valid = False
+                    if isinstance(sprite_ids, list):
+                        new_sprites = []
+                        for sprite_id in sprite_ids:
+                            if sprite_id != "no_entry":
+                                new_sprites.append(self.pngname_to_pngnum.get(sprite_id, 0))
+                                valid = True
+                        pngname["sprite"] = new_sprites
+                    elif sprite_ids and sprite_ids != "no_entry":
+                        pngname["sprite"] = self.pngname_to_pngnum.get(sprite_ids, 0)
+                        valid = True
+                    if valid:
+                        new_index.append(pngname)
+                elif pngname != "no_entry":
+                    new_index.append(self.pngname_to_pngnum.get(pngname, 0))
+        elif index and index != "no_entry":
+            new_index.append(self.pngname_to_pngnum.get(index, 0))
+        if new_index and len(new_index) == 1:
+            return new_index[0]
+        return new_index
+
+    def convert_tile_entry(self, tile_entry):
+        fg_id = tile_entry.get("fg")
+        if fg_id:
+            tile_entry["fg"] = self.convert_pngname_to_pngnum(fg_id)
+
+        bg_id = tile_entry.get("bg")
+        if bg_id:
+            tile_entry["bg"] = self.convert_pngname_to_pngnum(bg_id)
+
+        add_tile_entrys = tile_entry.get("additional_tiles", [])
+        for add_tile_entry in add_tile_entrys:
+            self.convert_tile_entry(add_tile_entry)
+
+        return tile_entry
+
+class TilesheetData(object):
+    def __init__(self, subdir_index, refs):
+        ts_all = refs.tileset_info[subdir_index]
+        self.ts_specs = {}
+        for ts_name, ts_spec in ts_all.items():
+            self.ts_specs = ts_spec
+            self.ts_name = ts_name
+            break
+        self.ts_path = refs.tileset_pathname + "/" + self.ts_name
+        print("parsing tilesheet {}".format(self.ts_name))
+        self.tile_entries = []
+        self.row_num = 0
+        self.width = self.ts_specs.get("sprite_width", refs.tileset_width)
+        self.height = self.ts_specs.get("sprite_height", refs.tileset_height)
+        self.offset_x = 0
+        self.offset_y = 0
+        subdir_name = self.ts_name.split(".png")[0] + "_{}x{}".format(self.width, self.height)
+        self.subdir_path = refs.tileset_pathname + "/pngs_" + subdir_name
+        if not self.standard(refs):
+            self.offset_x = self.ts_specs.get("sprite_offset_x", 0)
+            self.offset_y = self.ts_specs.get("sprite_offset_y", 0)
+        self.null_image = Vips.Image.grey(self.width, self.height)
+        self.row_pngs = ["null_image"]
+        self.fallback = False;
+        if self.ts_specs.get("fallback"):
+            self.fallback = True
+            return
+        refs.pngnum += 1
+        self.first_index = refs.pngnum
+        self.max_index = refs.pngnum
+
+    def standard(self, refs):
+        if self.offset_x or self.offset_y:
+            return False
+        return self.width == refs.tileset_width and self.height == refs.tileset_height
+
+    def merge_row(self, refs):
+        spacer = 16 - len(self.row_pngs)
+        refs.pngnum += spacer
+
+        in_list = []
+        
+        for png_pathname in self.row_pngs:
+            if png_pathname == "null_image":
+                in_list.append(self.null_image)
+            else:
+                vips_image = Vips.Image.pngload(png_pathname)
+                if not vips_image.hasalpha():
+                    vips_image = vips_image.addalpha()
+                if vips_image.width != self.width or vips_image.height != self.height:
+                    size_msg = "{} is {}x{}, sheet sprites are {}x{}."
+                    print(size_msg.format(png_pathname, vips_image.width, vips_image.height,
+                                          self.width, self.height))
+                    print("sprites in the {} tilesheet may be resized.".format(self.ts_name))
+                    print("All sprites in a tilesheet directory should have the same dimensions.")
+                in_list.append(vips_image)
+        for i in range(0, spacer):
+            in_list.append(self.null_image)
+
+        return in_list
+
+    def walk_dirs(self, refs):
+        tmp_merged_pngs = []
+        for subdir_fpath, dirnames, filenames in os.walk(self.subdir_path):
+            #print("{} has dirs {} and files {}".format(subdir_fpath, dirnames, filenames))
+            for filename in filenames:
+                filepath = subdir_fpath + "/" + filename
+                if filename.endswith(".png"):
+                    pngname = filename.split(".png")[0]
+                    if pngname in refs.pngname_to_pngnum or pngname == "no_entry":
+                        print("skipping {}".format(pngname))
+                        continue
+                    self.row_pngs.append(filepath)
+                    refs.pngname_to_pngnum[pngname] = refs.pngnum
+                    refs.pngnum_to_pngname[refs.pngnum] = pngname
+                    refs.pngnum += 1
+                    if len(self.row_pngs) > 15:
+                        merged = self.merge_row(refs)
+                        self.row_num += 1
+                        self.row_pngs = []
+                        tmp_merged_pngs += merged
+                elif filename.endswith(".json"):
+                    with open(filepath, "r") as fp:
+                        try:
+                            tile_entry = json.load(fp)
+                        except:
+                            print("error loading {}".format(filepath))
+                            raise
+
+                        self.tile_entries.append(tile_entry)
+        if self.row_pngs:
+            merged = self.merge_row(refs)
+            tmp_merged_pngs += merged
+        return tmp_merged_pngs
+
+    def finalize_merges(self, merge_pngs):
+        out_image = Vips.Image.arrayjoin(merge_pngs, across=16)
+        out_image.pngsave(self.ts_path)
+
+args = argparse.ArgumentParser(description="Merge all the individal tile_entries and pngs in a tileset's directory into a tile_config.json and 1 or more tilesheet pngs.")
+args.add_argument("tileset_dir", action="store",
+                  help="local name of the tileset directory under gfx/")
+argsDict = vars(args.parse_args())
+
+tileset_dirname = argsDict.get("tileset_dir", "")
+
+refs = PngRefs(tileset_dirname)
+
+all_ts_data = []
+fallback_name = "fallback.png"
+
+for subdir_index in range(1, len(refs.tileset_info)):
+    ts_data = TilesheetData(subdir_index, refs)
+    if not ts_data.fallback:
+        tmp_merged_pngs = ts_data.walk_dirs(refs)
+
+        ts_data.finalize_merges(tmp_merged_pngs)
+
+        ts_data.max_index = refs.pngnum
+    all_ts_data.append(ts_data)
+
+#print("pngname to pngnum {}".format(json.dumps(refs.pngname_to_pngnum, indent=2)))
+#print("pngnum to pngname {}".format(json.dumps(refs.pngnum_to_pngname, sort_keys=True, indent=2)))
+
+tiles_new = []
+    
+for ts_data in all_ts_data:
+    if ts_data.fallback:
+        fallback_name = ts_data.ts_name
+        continue
+    ts_tile_entries = []
+    for tile_entry in ts_data.tile_entries:
+        converted_tile_entry = refs.convert_tile_entry(tile_entry)
+        ts_tile_entries.append(converted_tile_entry)
+    ts_conf = {
+        "file": ts_data.ts_name,
+        "tiles": ts_tile_entries,
+        "//": "range {} to {}".format(ts_data.first_index, ts_data.max_index)
+    }
+    if not ts_data.standard(refs):
+        ts_conf["sprite_width"] = ts_data.width
+        ts_conf["sprite_height"] = ts_data.height
+        ts_conf["sprite_offset_x"] = ts_data.offset_x
+        ts_conf["sprite_offset_y"] = ts_data.offset_y
+
+    #print("\tfinalizing tilesheet {}".format(ts_name))
+    tiles_new.append(ts_conf)
+
+FALLBACK["file"] = fallback_name
+tiles_new.append(FALLBACK)
+conf_data = {
+    "tile_info": [{
+        "width": refs.tileset_width,
+        "height": refs.tileset_height
+    }],
+    "tiles-new": tiles_new
+}
+tileset_confpath = refs.tileset_pathname + "/" + "tile_config.json"
+write_to_json(tileset_confpath, conf_data)
diff --git a/tools/gfx_tools/decompose.py b/tools/gfx_tools/decompose.py
new file mode 100644
index 0000000000000..0bd63d41e9541
--- /dev/null
+++ b/tools/gfx_tools/decompose.py
@@ -0,0 +1,464 @@
+#!/bin/python
+
+# decompose.py
+# Split a gfx tile_config.json into 1000s of little directories, each with their own config
+# file and tile image.
+
+import argparse
+import copy
+import json
+import math
+import os
+import subprocess
+
+try:
+    import pyvips
+    Vips = pyvips
+except ImportError:
+    import gi
+    gi.require_version('Vips', '8.0')
+    from gi.repository import Vips
+
+# stupid stinking Python 2 versus Python 3 syntax
+def write_to_json(pathname, data, prettify=False):
+    with open(pathname, "w") as fp:
+        try:
+            json.dump(data, fp)
+        except ValueError:
+            fp.write(json.dumps(data))
+    cmd = ["./tools/format/json_formatter.cgi", pathname]
+    if prettify:
+        subprocess.call(cmd)
+
+
+def find_or_make_dir(pathname):
+    try:
+        os.stat(pathname)
+    except OSError:
+        os.mkdir(pathname)
+
+
+class TileSheetData(object):
+    def __init__(self, tilesheet_data, refs):
+        self.ts_filename = tilesheet_data.get("file", "")
+        #print("working on {}".format(self.ts_filename))
+        self.tile_id_to_tile_entrys = {}
+        self.sprite_height = tilesheet_data.get("sprite_height", refs.default_height)
+        self.sprite_width = tilesheet_data.get("sprite_width", refs.default_width)
+        self.sprite_offset_x = tilesheet_data.get("sprite_offset_x", 0)
+        self.sprite_offset_y = tilesheet_data.get("sprite_offset_y", 0)
+        self.write_dim = self.sprite_width != refs.default_width
+        self.write_dim |= self.sprite_height != refs.default_height
+        self.write_dim |= self.sprite_offset_x or self.sprite_offset_y
+        self.ts_pathname = refs.tileset_pathname + "/" + self.ts_filename
+        self.ts_image = Vips.Image.pngload(self.ts_pathname)
+        self.ts_width = self.ts_image.width
+        self.ts_tiles_per_row = math.floor(self.ts_width / self.sprite_width)
+        self.ts_height = self.ts_image.height
+        self.ts_rows = math.floor(self.ts_height / self.sprite_height)
+        self.pngnum_min = refs.last_pngnum
+        self.pngnum_max = refs.last_pngnum + self.ts_tiles_per_row * self.ts_rows - 1
+        #print("\t{}x{}; {} rows; spans {} to {}".format(self.ts_width, self.ts_height,
+        #                                                self.ts_rows, self.pngnum_min,
+        #                                                self.pngnum_max))
+        self.expansions = []
+        self.fallback = tilesheet_data.get("ascii")
+        refs.last_pngnum = self.pngnum_max + 1
+        refs.tspathname_to_tsfilename.setdefault(self.ts_pathname, self.ts_filename)
+
+    def check_for_expansion(self, tile_entry):
+        if tile_entry.get("fg", -10) == 0:
+            self.expansions.append(tile_entry)
+            return True
+        return False
+
+    def check_id_valid(self, tile_id):
+        if not tile_id:
+            return True
+        # wielded terrain isn't valid
+        if tile_id.startswith("overlay_wielded_t_"):
+            return False
+        if tile_id.startswith("overlay_wielded_mon_"):
+            return False
+        if tile_id.startswith("overlay_wielded_fd_"):
+            return False
+        if tile_id.startswith("overlay_wielded_f_"):
+            return False
+        # wielding or wearing overlays makes no sense
+        if tile_id.startswith("overlay_wielded_overlay"):
+            return False
+        if tile_id.startswith("overlay_worn_overlay"):
+            return False
+        return True
+
+    def parse_id(self, tile_entry):
+        all_tile_ids = []
+        read_tile_ids = tile_entry.get("id")
+        valid = True
+        if isinstance(read_tile_ids, list):
+            for tile_id in read_tile_ids:
+                valid &= self.check_id_valid(tile_id)
+                if tile_id and valid and tile_id not in all_tile_ids:
+                    all_tile_ids.append(tile_id)
+        else:
+            valid &= self.check_id_valid(read_tile_ids)
+            if read_tile_ids and valid and read_tile_ids not in all_tile_ids:
+                all_tile_ids.append(read_tile_ids)
+        if not valid:
+            return None, None
+        if not all_tile_ids:
+            return "background", ["background"]
+        #print("tile {}".format(all_tile_ids[0]))
+        return all_tile_ids[0], all_tile_ids
+
+    def parse_index(self, read_pngnums, all_pngnums, refs):
+        local_pngnums = []
+        if isinstance(read_pngnums, list):
+            for pngnum in read_pngnums:
+                if isinstance(pngnum, dict):
+                    sprite_ids = pngnum.get("sprite", -10)
+                    if isinstance(sprite_ids, list):
+                        for sprite_id in sprite_ids:
+                            if sprite_id < 0 or sprite_id in refs.delete_pngnums:
+                                continue
+                            if sprite_id not in all_pngnums:
+                                all_pngnums.append(sprite_id)
+                            if sprite_id not in local_pngnums:
+                                local_pngnums.append(sprite_id)
+                    else:
+                        if sprite_ids < 0 or sprite_ids in refs.delete_pngnums:
+                            continue
+                        if sprite_ids not in all_pngnums:
+                            all_pngnums.append(sprite_ids)
+                        if sprite_ids not in local_pngnums:
+                            local_pngnums.append(sprite_ids)
+                else:
+                    if pngnum < 0 or pngnum in refs.delete_pngnums:
+                        continue
+                    if pngnum not in all_pngnums:
+                        all_pngnums.append(pngnum)
+                    if pngnum not in local_pngnums:
+                        local_pngnums.append(pngnum)
+        elif read_pngnums >= 0 and read_pngnums not in refs.delete_pngnums:
+            if read_pngnums not in all_pngnums:
+                all_pngnums.append(read_pngnums)
+            if read_pngnums not in local_pngnums:
+                local_pngnums.append(read_pngnums)
+        return all_pngnums
+
+    def parse_png(self, tile_entry, refs):
+        all_pngnums = []
+        fg_id = tile_entry.get("fg", -10)
+        all_pngnums = self.parse_index(fg_id, all_pngnums, refs)
+
+        bg_id = tile_entry.get("bg", -10)
+        all_pngnums = self.parse_index(bg_id, all_pngnums, refs)
+
+        add_tile_entrys = tile_entry.get("additional_tiles", [])
+        for add_tile_entry in add_tile_entrys:
+            add_pngnums = self.parse_png(add_tile_entry, refs)
+            for add_pngnum in add_pngnums:
+                if add_pngnum not in all_pngnums:
+                    all_pngnums.append(add_pngnum)
+        # print("\tpngs: {}".format(all_pngnums))
+        return all_pngnums
+
+    def parse_tile_entry(self, tile_entry, refs):
+        if self.check_for_expansion(tile_entry):
+            return None
+        tile_id, all_tile_ids = self.parse_id(tile_entry)
+        if not tile_id:
+            # print("no id for {}".format(tile_entry))
+            return None
+        tile_id = tile_id.replace("/", "_")
+        all_pngnums = self.parse_png(tile_entry, refs)
+        offset = 0
+        for i in range(0, len(all_pngnums)):
+            pngnum = all_pngnums[i]
+            if pngnum in refs.pngnum_to_pngname:
+                continue
+            pngname = "{}_{}_{}".format(pngnum, tile_id, i + offset)
+            while pngname in refs.pngname_to_pngnum:
+                offset += 1
+                pngname = "{}_{}_{}".format(pngnum, tile_id, i + offset)
+            try:
+                refs.pngnum_to_pngname.setdefault(pngnum, pngname)
+                refs.pngname_to_pngnum.setdefault(pngname, pngnum)
+                refs.add_pngnum_to_tsfilepath(pngnum)
+            except TypeError:
+                print("failed to parse {}".format(json.dumps(tile_entry, indent=2)))
+                raise
+        return tile_id
+
+    def summarize(self, tile_info, refs):
+        #debug statement to verify pngnum_min and pngnum_max
+        #print("{} from {} to {}".format(self.ts_filename, self.pngnum_min, self.pngnum_max))
+        if self.fallback:
+            refs.ts_data[self.ts_filename] = self
+            ts_tile_info = {
+                "fallback": True
+            }
+            tile_info.append({self.ts_filename: ts_tile_info})
+            return
+        if self.pngnum_max > 0:
+            refs.ts_data[self.ts_filename] = self
+            ts_tile_info = {
+                "//": "indices {} to {}".format(self.pngnum_min, self.pngnum_max)
+            }
+            if self.write_dim:
+                ts_tile_info["sprite_offset_x"] = self.sprite_offset_x
+                ts_tile_info["sprite_offset_y"] = self.sprite_offset_y
+                ts_tile_info["sprite_width"] = self.sprite_width
+                ts_tile_info["sprite_height"] = self.sprite_height
+            #print("{}: {}".format(self.ts_filename, json.dumps(ts_tile_info, indent=2)))
+            tile_info.append({self.ts_filename: ts_tile_info})
+
+class ExtractionData(object):
+    def __init__(self, ts_filename, refs):
+        self.ts_data = refs.ts_data.get(ts_filename)
+        self.valid = False
+        if not self.ts_data.sprite_width or not self.ts_data.sprite_height:
+            return
+
+        self.valid = True
+
+        ts_base = ts_filename.split(".png")[0]
+        geometry_dim = "{}x{}".format(self.ts_data.sprite_width, self.ts_data.sprite_height)
+        pngs_dir = "/pngs_" +  ts_base + "_{}".format(geometry_dim)
+        self.ts_dir_pathname = refs.tileset_pathname + pngs_dir
+        find_or_make_dir(self.ts_dir_pathname)
+        self.tilenum_in_dir = 256
+        self.dir_count = 0
+        self.subdir_pathname = ""
+
+    def write_expansions(self):
+        for expand_entry in self.ts_data.expansions:
+            expansion_id = expand_entry.get("id", "expansion")
+            if not isinstance(expansion_id, str):
+                continue
+            expand_entry_pathname = self.ts_dir_pathname + "/" + expansion_id + ".json"
+            write_to_json(expand_entry_pathname, expand_entry)
+
+    def increment_dir(self):
+        if self.tilenum_in_dir > 255:
+            self.subdir_pathname = self.ts_dir_pathname + "/" + "images{}".format(self.dir_count)
+            find_or_make_dir(self.subdir_pathname)
+            self.tilenum_in_dir = 0
+            self.dir_count += 1
+        else:
+            self.tilenum_in_dir += 1
+        return self.subdir_pathname
+
+    def extract_image(self, png_index, refs):
+        if not png_index or refs.extracted_pngnums.get(png_index):
+            return
+        if png_index not in refs.pngnum_to_pngname:
+            return
+        pngname = refs.pngnum_to_pngname[png_index]
+        ts_pathname = refs.pngnum_to_tspathname[png_index]
+        ts_filename = refs.tspathname_to_tsfilename[ts_pathname]
+        self.increment_dir()
+        tile_data = refs.ts_data[ts_filename]
+        file_index = png_index - tile_data.pngnum_min
+        y_index = math.floor( file_index / tile_data.ts_tiles_per_row )
+        x_index = file_index - y_index * tile_data.ts_tiles_per_row
+        tile_off_x = max(0, tile_data.sprite_width * x_index)
+        tile_off_y = max(0, tile_data.sprite_height * y_index)
+        tile_image = tile_data.ts_image.extract_area(tile_off_x, tile_off_y,
+                                                     tile_data.sprite_width,
+                                                     tile_data.sprite_height)
+        tile_png_pathname = self.subdir_pathname + "/" + pngname + ".png"
+        tile_image.pngsave(tile_png_pathname)
+        refs.extracted_pngnums[png_index] = True
+
+    def write_images(self, refs):
+        for pngnum in range(self.ts_data.pngnum_min, self.ts_data.pngnum_max + 1):
+            out_data.extract_image(pngnum, refs)
+
+
+class PngRefs(object):
+    def __init__(self):
+        # dict of png absolute numbers to png names
+        self.pngnum_to_pngname = {}
+        # dict of pngnames to png numbers; used to control uniqueness
+        self.pngname_to_pngnum = {}
+        # dict of png absolute numbers to tilesheet paths, used to know where to extract images
+        self.pngnum_to_tspathname = {}
+        self.tspathname_to_tsfilename = {}
+        # list of pngs written out
+        self.extracted_pngnums = {}
+        # list of pngs to not use
+        self.delete_pngnums = []
+        # misc data
+        self.tileset_pathname = ""
+        self.default_width = 16
+        self.default_height = 16
+        self.last_pngnum = 0
+        self.ts_data = {}
+
+    def get_all_data(self, tileset_dirname, delete_pathname):
+        self.tileset_pathname = tileset_dirname
+        if not tileset_dirname.startswith("gfx/"):
+            self.tileset_pathname = "gfx/" + tileset_dirname
+
+        try:
+            os.stat(self.tileset_pathname)
+        except KeyError:
+            print("cannot find a directory {}".format(self.tileset_pathname))
+            exit -1
+
+        tileset_confname = refs.tileset_pathname + "/" + "tile_config.json"
+
+        try:
+            os.stat(tileset_confname)
+        except KeyError:
+            print("cannot find a directory {}".format(tileset_confname))
+            exit -1
+
+        if delete_pathname:
+            with open(delete_pathname) as del_file:
+                del_ranges = json.load(del_file)
+                for delete_range in del_ranges:
+                    if not isinstance(delete_range, list):
+                        contineu
+                    min_png = delete_range[0]
+                    max_png = min_png
+                    if len(delete_range) > 1:
+                        max_png = delete_range[1]
+                    for i in range(min_png, max_png + 1):
+                        self.delete_pngnums.append(i)
+
+        with open(tileset_confname) as conf_file:
+            return(json.load(conf_file))       
+
+    def add_pngnum_to_tsfilepath(self, pngnum):
+        if not isinstance(pngnum, int):
+            return
+        if pngnum in self.pngnum_to_tspathname:
+            return
+        for ts_filename, ts_data in self.ts_data.items():
+            if pngnum >= ts_data.pngnum_min and pngnum <= ts_data.pngnum_max:
+                self.pngnum_to_tspathname.setdefault(pngnum, ts_data.ts_pathname)
+                return
+        raise KeyError("index %s out of range", pngnum)
+
+    def convert_index(self, read_pngnums, new_index, new_id):
+        if isinstance(read_pngnums, list):
+            for pngnum in read_pngnums:
+                if isinstance(pngnum, dict):
+                    sprite_ids = pngnum.get("sprite", -10)
+                    if isinstance(sprite_ids, list):
+                        new_sprites = []
+                        for sprite_id in sprite_ids:
+                            if sprite_id >= 0 and sprite_id not in self.delete_pngnums:
+                                if not new_id:
+                                    new_id = self.pngnum_to_pngname[sprite_id]
+                                new_sprites.append(self.pngnum_to_pngname[sprite_id])
+                        pngnum["sprite"] = new_sprites
+                    else:
+                        if sprite_ids >= 0 and sprite_ids not in self.delete_pngnums:
+                            if not new_id:
+                                new_id = self.pngnum_to_pngname[sprite_ids]
+                            pngnum["sprite"] = self.pngnum_to_pngname[sprite_ids]
+                    new_index.append(pngnum)
+                elif pngnum >= 0 and pngnum not in self.delete_pngnums:
+                    if not new_id:
+                        new_id = self.pngnum_to_pngname[pngnum]
+                    new_index.append(self.pngnum_to_pngname[pngnum])
+        elif read_pngnums >= 0 and read_pngnums not in self.delete_pngnums:
+            if not new_id:
+                new_id = self.pngnum_to_pngname[read_pngnums]
+            new_index.append(self.pngnum_to_pngname[read_pngnums])
+        return new_id
+
+    def convert_pngnum_to_pngname(self, tile_entry):
+        new_fg = []
+        new_id = ""
+        fg_id = tile_entry.get("fg", -10)
+        new_id = self.convert_index(fg_id, new_fg, new_id)
+        bg_id = tile_entry.get("bg", -10)
+        new_bg = []
+        new_id = self.convert_index(bg_id, new_bg, new_id)
+        add_tile_entrys = tile_entry.get("additional_tiles", [])
+        for add_tile_entry in add_tile_entrys:
+            self.convert_pngnum_to_pngname(add_tile_entry)
+        tile_entry["fg"] = new_fg
+        tile_entry["bg"] = new_bg
+
+        return new_id, tile_entry
+
+    def report_missing(self):
+        for pngnum in self.pngnum_to_pngname:
+            if not self.extracted_pngnums.get(pngnum):
+                print("missing index {}, {}".format(pngnum, self.pngnum_to_pngname[pngnum]))
+
+
+args = argparse.ArgumentParser(description="Split a tileset's tile_config.json into a directory per tile containing the tile data and png.")
+args.add_argument("tileset_dir", action="store",
+                  help="local name of the tileset directory under gfx/")
+args.add_argument("--delete_file", dest="del_path", action="store",
+                  help="local name of file containing lists of ranges of indices to delete")
+argsDict = vars(args.parse_args())
+
+tileset_dirname = argsDict.get("tileset_dir", "")
+delete_pathname = argsDict.get("del_path", "")
+
+refs = PngRefs()
+all_tiles = refs.get_all_data(tileset_dirname, delete_pathname)
+
+all_tilesheet_data = all_tiles.get("tiles-new", [])
+tile_info = all_tiles.get("tile_info", {})
+if tile_info:
+    refs.default_width = tile_info[0].get("width")
+    refs.default_height = tile_info[0].get("height")
+
+overlay_ordering = all_tiles.get("overlay_ordering", [])
+ts_sequence = []
+for tilesheet_data in all_tilesheet_data:
+    ts_data = TileSheetData(tilesheet_data, refs)
+    ts_data.summarize(tile_info, refs)
+    ts_sequence.append(ts_data.ts_filename)
+
+for tilesheet_data in all_tilesheet_data:
+    ts_filename = tilesheet_data.get("file", "")
+    ts_data = refs.ts_data[ts_filename]
+    if ts_data.fallback:
+        continue
+    tile_id_to_tile_entrys = {}
+    all_tile_entry = tilesheet_data.get("tiles", [])
+    for tile_entry in all_tile_entry:
+        tile_id = ts_data.parse_tile_entry(tile_entry, refs)
+        if tile_id:
+            tile_id_to_tile_entrys.setdefault(tile_id, [])
+            tile_id_to_tile_entrys[tile_id].append(tile_entry)
+    ts_data.tile_id_to_tile_entrys = tile_id_to_tile_entrys
+
+#debug statements to verify pngnum_to_pngname and pngname_to_pngnum
+#print("pngnum_to_pngname: {}".format(json.dumps(refs.pngnum_to_pngname, sort_keys=True, indent=2)))
+#print("pngname_to_pngnum: {}".format(json.dumps(refs.pngname_to_pngnum, sort_keys=True, indent=2)))
+#print("{}".format(json.dumps(file_tile_id_to_tile_entrys, indent=2)))
+#print("{}".format(json.dumps(refs.pngnum_to_tspathname, indent=2)))
+
+for ts_filename in ts_sequence:
+    out_data = ExtractionData(ts_filename, refs)
+
+    if not out_data.valid:
+        continue
+    out_data.write_expansions()
+
+    for tile_id, tile_entrys in out_data.ts_data.tile_id_to_tile_entrys.items():
+        #print("tile id {} with {} entries".format(tile_id, len(tile_entrys)))
+        for tile_entry in tile_entrys:
+            subdir_pathname = out_data.increment_dir()
+            tile_entry_name, tile_entry = refs.convert_pngnum_to_pngname(tile_entry)
+            if not tile_entry_name:
+                continue
+            tile_entry_pathname = subdir_pathname + "/" + tile_entry_name + ".json"
+            write_to_json(tile_entry_pathname, tile_entry)
+    out_data.write_images(refs)
+
+if tile_info:
+    tile_info_pathname = refs.tileset_pathname + "/" + "tile_info.json"
+    write_to_json(tile_info_pathname, tile_info, True)
+
+refs.report_missing()