Merge pull request CleverRaven#31 from CleverRaven/master

catchup
John-Candlebury · Oct 10, 2020 · 37dc32f · 37dc32f
2 parents 1dd84e1 + 8302969
commit 37dc32f
Show file tree

Hide file tree

Showing 181 changed files with 2,878 additions and 1,368 deletions.
diff --git a/data/json/achievements.json b/data/json/achievements.json
@@ -1025,21 +1025,6 @@
     "requirements": [ { "event_statistic": "num_gains_unarmed_level_10", "is": ">=", "target": 1 } ],
     "hidden_by": [ "achievement_lvl_7_unarmed" ]
   },
-  {
-    "id": "achievement_lvl_7_lockpick",
-    "type": "achievement",
-    "name": "Burglar",
-    "description": "Crowbar?  Such a barbarity.",
-    "requirements": [ { "event_statistic": "num_gains_lockpick_level_7", "is": ">=", "target": 1 } ]
-  },
-  {
-    "id": "achievement_lvl_10_lockpick",
-    "type": "achievement",
-    "name": "Locksmith",
-    "description": "If there is a lock, there is a key.",
-    "requirements": [ { "event_statistic": "num_gains_lockpick_level_10", "is": ">=", "target": 1 } ],
-    "hidden_by": [ "achievement_lvl_7_lockpick" ]
-  },
   {
     "id": "achievement_lvl_7_chemistry",
     "type": "achievement",

diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -34,7 +34,7 @@
     "color": "red",
     "move_cost": 0,
     "coverage": 65,
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "LIQUIDCONT" ],
     "examine_action": "gaspump",
     "bash": {
       "str_min": 8,
@@ -56,7 +56,7 @@
     "color": "yellow_red",
     "move_cost": 0,
     "coverage": 65,
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "LIQUIDCONT" ],
     "examine_action": "gaspump"
   },
   {
@@ -94,7 +94,7 @@
     "looks_like": "t_gas_pump",
     "move_cost": 0,
     "coverage": 65,
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "LIQUIDCONT" ],
     "examine_action": "gaspump",
     "bash": {
       "str_min": 8,
@@ -116,7 +116,7 @@
     "looks_like": "t_gas_pump_a",
     "move_cost": 0,
     "coverage": 65,
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "LIQUIDCONT" ],
     "examine_action": "gaspump",
     "bash": {
       "str_min": 8,

diff --git a/data/json/generic_ascii.json b/data/json/generic_ascii.json
diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -13,7 +13,7 @@
       { "item": "lighter", "prob": 50, "charges-min": 0 },
       [ "joint", 10 ],
       { "item": "ref_lighter", "prob": 50, "charges-min": 0 },
-      [ "matches", 50 ],
+      { "item": "matches", "prob": 50, "charges": [ 0, 20 ] },
       { "group": "tobacco_products", "prob": 60 },
       { "item": "permanent_marker", "prob": 10, "charges-min": 0 },
       [ "dog_whistle", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -848,9 +848,9 @@
       [ "bottle_glass", 10 ],
       [ "can_drink", 10 ],
       [ "can_food", 10 ],
-      [ "lighter", 60 ],
-      [ "ref_lighter", 1 ],
-      [ "matches", 60 ],
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 1, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       [ "atomic_light", 1 ],
@@ -1134,9 +1134,9 @@
       { "item": "water_clean", "prob": 80, "charges-min": 1, "container-item": "bottle_plastic", "sealed": false },
       [ "salt", 80 ],
       [ "mag_porn", 20 ],
-      [ "lighter", 60 ],
-      [ "ref_lighter", 2 ],
-      [ "matches", 60 ],
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 2, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       [ "sewage", 60 ],
       [ "improvised_pipebomb", 4 ],
       [ "crack", 8 ],
@@ -1559,9 +1559,9 @@
       { "item": "glasses_reading", "prob": 90 },
       { "item": "glasses_bifocal", "prob": 90 },
       { "item": "child_book", "prob": 60 },
-      { "item": "lighter", "prob": 60 },
-      { "item": "ref_lighter", "prob": 4 },
-      { "item": "matches", "prob": 60 },
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 4, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "coat_rain", "prob": 50 },
       { "item": "hood_rain", "prob": 30 },
       { "item": "cane", "prob": 10 },
@@ -1713,9 +1713,9 @@
       [ "standard_template_construct", 5 ],
       { "item": "camera", "prob": 15, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 5, "charges": [ 0, 150 ] },
-      [ "lighter", 50 ],
-      [ "ref_lighter", 4 ],
-      [ "matches", 60 ],
+      { "item": "lighter", "prob": 50, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 4, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "sewing_kit", "prob": 47, "charges-min": 0 },
       { "item": "tailors_kit", "prob": 3, "charges-min": 0 },
       [ "thread", 40 ],
@@ -1955,9 +1955,9 @@
       [ "textbook_business", 12 ],
       [ "textbook_speech", 8 ],
       [ "recipe_caseless", 1 ],
-      [ "lighter", 60 ],
-      [ "ref_lighter", 5 ],
-      [ "matches", 60 ],
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 5, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "extinguisher", "prob": 20, "charges": 100 },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
@@ -2032,9 +2032,9 @@
       { "item": "hood_rain", "prob": 10 },
       { "item": "poncho", "prob": 15 },
       { "item": "folding_poncho", "prob": 5 },
-      { "item": "lighter", "prob": 60 },
-      { "item": "ref_lighter", "prob": 5 },
-      { "item": "matches", "prob": 60 },
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 5, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "extinguisher", "prob": 20, "charges": 100 },
       { "item": "mp3", "prob": 18, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
@@ -2229,9 +2229,9 @@
       { "group": "kids_books", "prob": 5 },
       { "group": "newspaper_old", "prob": 10 },
       [ "months_old_newspaper", 4 ],
-      [ "lighter", 60 ],
-      [ "ref_lighter", 5 ],
-      [ "matches", 60 ],
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 5, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "sewing_kit", "prob": 47, "charges-min": 0 },
       { "item": "tailors_kit", "prob": 3, "charges-min": 0 },
       [ "thread", 40 ],
@@ -2459,7 +2459,7 @@
       [ "child_book", 5 ],
       [ "fancy_sunglasses", 5 ],
       [ "flask_hip", 5 ],
-      [ "ref_lighter", 5 ],
+      { "item": "ref_lighter", "prob": 5, "charges": [ 0, 50 ] },
       { "group": "jewelry_accessories", "prob": 35 },
       [ "story_book", 5 ],
       [ "syringe", 3 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -16,9 +16,9 @@
       { "item": "vibrator", "prob": 3, "charges": [ 0, 100 ] },
       { "item": "condom", "prob": 5, "count": [ 1, 3 ] },
       { "item": "mag_porn", "prob": 20 },
-      { "item": "lighter", "prob": 60 },
-      { "item": "ref_lighter", "prob": 5 },
-      { "item": "matches", "prob": 60 },
+      { "item": "lighter", "prob": 60, "charges": [ 95, 100 ] },
+      { "item": "ref_lighter", "prob": 5, "charges": [ 40, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 19, 20 ] },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "extinguisher", "prob": 20, "charges": 100 },
       { "item": "tazer", "prob": 3, "charges": [ 0, 500 ] },
@@ -783,7 +783,7 @@
       { "item": "paper", "prob": 150 },
       { "item": "wrapper", "prob": 25 },
       { "item": "bubblewrap", "prob": 25 },
-      { "item": "permanent_marker", "prob": 50 },
+      { "item": "permanent_marker", "prob": 50, "charges": [ 0, 500 ] },
       { "item": "scissors", "prob": 25 },
       { "item": "roadmap", "prob": 10 },
       { "item": "trailmap", "prob": 20 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -84,9 +84,9 @@
       [ "suppressor", 15 ],
       [ "shot_suppressor", 1 ],
       [ "mag_porn", 20 ],
-      [ "lighter", 60 ],
-      [ "ref_lighter", 2 ],
-      [ "matches", 60 ],
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 2, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       [ "claw_bar", 3 ],
       [ "crowbar", 18 ],
       [ "improvised_pipebomb", 4 ],
@@ -146,9 +146,9 @@
       [ "glock_19", 5 ],
       [ "backpack", 100 ],
       [ "backpack_leather", 50 ],
-      [ "lighter", 100 ],
-      [ "ref_lighter", 20 ],
-      [ "matches", 50 ],
+      { "item": "lighter", "prob": 100, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 20, "charges": [ 0, 50 ] },
+      { "item": "matches", "prob": 50, "charges": [ 0, 20 ] },
       { "item": "flashlight", "prob": 100, "charges": [ 0, 300 ] },
       { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "rollmat", 60 ],

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -323,8 +323,8 @@
       { "group": "magazines", "prob": 170 },
       { "item": "manual_electronics", "prob": 20 },
       { "item": "cowboy_hat", "prob": 2 },
-      { "item": "lighter", "prob": 60 },
-      { "item": "ref_lighter", "prob": 1 },
+      { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
+      { "item": "ref_lighter", "prob": 1, "charges": [ 0, 50 ] },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "radio", "prob": 20, "charges": [ 0, 500 ] },
       { "item": "mp3", "prob": 18, "charges": [ 0, 500 ] },

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -804,9 +804,9 @@
       { "group": "fresh_produce", "count": [ 1, 8 ], "prob": 20 },
       {
         "distribution": [
-          { "item": "milk", "charges-min": 1, "prob": 94 },
-          { "item": "almond_milk", "charges-min": 1, "prob": 3 },
-          { "item": "soy_milk", "charges-min": 1, "prob": 3 }
+          { "item": "milk", "charges-min": 1, "prob": 94, "container-item": "jug_plastic", "sealed": false },
+          { "item": "almond_milk", "charges-min": 1, "prob": 3, "container-item": "jug_plastic", "sealed": false },
+          { "item": "soy_milk", "charges-min": 1, "prob": 3, "container-item": "jug_plastic", "sealed": false }
         ],
         "prob": 20
       },
@@ -864,113 +864,118 @@
             "distribution": [
               {
                 "collection": [
-                  { "item": "water_clean", "charges": 1, "container-item": "bottle_plastic", "prob": 50 },
-                  { "item": "water_clean", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "water_clean", "charges": 1, "container-item": "bottle_plastic", "prob": 50, "sealed": false },
+                  { "item": "water_clean", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 90
               },
               {
                 "collection": [
-                  { "item": "water_mineral", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "water_mineral", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "water_mineral", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "water_mineral", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 70
               },
               {
                 "collection": [
-                  { "item": "oj", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "oj", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "oj", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "oj", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 50
               },
               {
                 "collection": [
-                  { "item": "cranberry_juice", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "cranberry_juice", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "cranberry_juice", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  {
+                    "item": "cranberry_juice",
+                    "container-item": "bottle_plastic",
+                    "count": [ 1, 6 ],
+                    "sealed": false
+                  }
                 ],
                 "prob": 50
               },
               {
                 "collection": [
-                  { "item": "juice", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "juice", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "juice", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "juice", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 50
               },
               {
                 "collection": [
-                  { "item": "sports_drink", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "sports_drink", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "sports_drink", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "sports_drink", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 30
               },
               {
                 "collection": [
-                  { "item": "lemonade", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "lemonade", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "lemonade", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "lemonade", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 50
               },
               {
                 "collection": [
-                  { "item": "cola", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "cola", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "cola", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "cola", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 70
               },
               {
                 "collection": [
-                  { "item": "choc_drink", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "choc_drink", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "choc_drink", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "choc_drink", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 30
               },
               {
                 "collection": [
-                  { "item": "rootbeer", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "rootbeer", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "rootbeer", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "rootbeer", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 65
               },
               {
                 "collection": [
-                  { "item": "purple_drink", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "purple_drink", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "purple_drink", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "purple_drink", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 35
               },
               {
                 "collection": [
-                  { "item": "creamsoda", "container-item": "bottle_plastic", "charges": 1, "prob": 50 },
-                  { "item": "creamsoda", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "creamsoda", "container-item": "bottle_plastic", "charges": 1, "prob": 50, "sealed": false },
+                  { "item": "creamsoda", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 35
               },
               {
                 "collection": [
-                  { "item": "lemonlime", "charges": 1, "container-item": "bottle_plastic", "prob": 50 },
-                  { "item": "lemonlime", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "lemonlime", "charges": 1, "container-item": "bottle_plastic", "prob": 50, "sealed": false },
+                  { "item": "lemonlime", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 35
               },
               {
                 "collection": [
-                  { "item": "orangesoda", "charges": 1, "container-item": "bottle_plastic", "prob": 50 },
-                  { "item": "orangesoda", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "orangesoda", "charges": 1, "container-item": "bottle_plastic", "prob": 50, "sealed": false },
+                  { "item": "orangesoda", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 20
               },
               {
                 "collection": [
-                  { "item": "crispycran", "charges": 1, "container-item": "bottle_plastic", "prob": 50 },
-                  { "item": "crispycran", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "crispycran", "charges": 1, "container-item": "bottle_plastic", "prob": 50, "sealed": false },
+                  { "item": "crispycran", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 20
               },
               {
                 "collection": [
-                  { "item": "colamdew", "charges": 1, "container-item": "bottle_plastic", "prob": 50 },
-                  { "item": "colamdew", "container-item": "bottle_plastic", "count": [ 1, 6 ] }
+                  { "item": "colamdew", "charges": 1, "container-item": "bottle_plastic", "prob": 50, "sealed": false },
+                  { "item": "colamdew", "container-item": "bottle_plastic", "count": [ 1, 6 ], "sealed": false }
                 ],
                 "prob": 35
               }
@@ -1024,7 +1029,7 @@
       },
       {
         "distribution": [
-          { "item": "apple_cider", "charges-min": 1, "prob": 20 },
+          { "item": "apple_cider", "charges-min": 1, "prob": 20, "container-item": "bottle_plastic", "sealed": false },
           { "item": "fruit_wine", "charges-min": 1, "prob": 15 },
           { "item": "beer", "charges-min": 1, "prob": 35 },
           { "item": "european_pilsner", "charges-min": 1, "prob": 25 },