Merge pull request #4 from CleverRaven/master

Update #4

.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.

data/json/itemgroups/drugs.json

@@ -18,6 +18,7 @@
       [ "eyedrops", 10 ],
       [ "medical_gauze", 20 ],
       [ "medical_tape", 20 ],
+      [ "pepto", 20 ],
       [ "saline", 10 ],
       [ "weak_antibiotic", 30 ]
     ]

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 ],

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 }

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 ],

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,

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": [
         "........................",

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",

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" },
       {

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" ] }
     ]
   },
   {

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,

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 ] ] ],

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 ] ] ],

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 ] ] ],

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 ] ] ],

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 ] ] ],

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,

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",