Merge pull request #3 from CleverRaven/master

Update
I-am-Erk · Feb 18, 2019 · c3f7250 · c3f7250
2 parents 5f33a68 + 9900d9c
commit c3f7250
Show file tree

Hide file tree

Showing 39 changed files with 1,000 additions and 445 deletions.
diff --git a/data/json/furniture.json b/data/json/furniture.json
@@ -1815,6 +1815,7 @@
     "max_volume": 1000,
     "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE" ],
     "open": "f_safe_o",
+    "examine_action": "open_safe",
     "bash": {
       "str_min": 40,
       "str_max": 200,

diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json
@@ -77,7 +77,7 @@
     "description": "Also known as 'Umble' pie, made with chopped organ meats.  Not half bad, and really good for you!",
     "price": 1350,
     "material": [ "wheat", "flesh" ],
-    "volume": 1,
+    "volume": "750ml",
     "weight": 249,
     "charges": 3,
     "flags": [ "EATEN_HOT" ],

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -1141,6 +1141,20 @@
     "use_action": { "type": "firestarter", "moves": 1000, "moves_slow": 30000, "need_sunlight": true },
     "flags": [ "FIRESTARTER" ]
   },
+  {
+    "type": "GENERIC",
+    "id": "lens_small",
+    "symbol": ".",
+    "color": "light_cyan",
+    "name": "small high-quality lens",
+    "name_plural": "small high-quality lenses",
+    "category": "spare_parts",
+    "description": "A small high-quality lens, useful for focusing or diffusing light.  Might be useful for crafting.",
+    "price": 6000,
+    "material": "glass",
+    "weight": 170,
+    "volume": 0
+  },
   {
     "type": "GENERIC",
     "id": "glass_tinted",

diff --git a/data/json/mapgen/bank.json b/data/json/mapgen/bank.json
@@ -81,8 +81,9 @@
             { "action": "alarm" }
           ]
         }
+      },
+       "place_monster": [ { "monster": "mon_secubot", "x": [ 7, 18 ], "y": [ 7, 18 ], "chance": 30, "repeat": 4 } ]
       }
-    }
   },
   {
     "type": "mapgen",
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,8 +81,9 @@ @@
                 { "action": "alarm" }
               ]
             }
+          },
+           "place_monster": [ { "monster": "mon_secubot", "x": [ 7, 18 ], "y": [ 7, 18 ], "chance": 30, "repeat": 4 } ]
           }
-        }
       },
       {
         "type": "mapgen",
@@ Expand Down @@