Linting, add freezers/glass freezers

The future shall belong to the cockroaches.
cataclysmbnteam · Nov 7, 2022 · 8e98eb8 · 8e98eb8
1 parent de8e536
commit 8e98eb8
Show file tree

Hide file tree

Showing 18 changed files with 94 additions and 30 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -176,7 +176,7 @@
     "coverage": 90,
     "required_str": 10,
     "flags": [ "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
-    "deconstruct": { "items": [  { "item": "glass_fridge", "count": 1 }] },
+    "deconstruct": { "items": [ { "item": "glass_fridge", "count": 1 } ] },
     "max_volume": "250 L",
     "bash": {
       "str_min": 12,
@@ -228,7 +228,11 @@
     "//": "Consumes more power due to worse insulation.",
     "active": [
       "steady_consumer",
-      { "power": 25, "consume_every": "600 s", "transform": { "id": "f_glass_fridge", "msg": "The fridge shuts down." } }
+      {
+        "power": 25,
+        "consume_every": "600 s",
+        "transform": { "id": "f_glass_fridge", "msg": "The fridge shuts down." }
+      }
     ]
   },
   {
@@ -265,7 +269,11 @@
     "deconstruct": { "items": [ { "item": "freezer", "count": 1 } ] },
     "active": [
       "steady_consumer",
-      { "power": 30, "consume_every": "600 s", "transform": { "id": "f_glass_freezer", "msg": "The freezer shuts down." } }
+      {
+        "power": 30,
+        "consume_every": "600 s",
+        "transform": { "id": "f_glass_freezer", "msg": "The freezer shuts down." }
+      }
     ]
   },
   {

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -730,6 +730,32 @@
       { "item": "icecream_candy", "prob": 3 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "kitchen_freezer",
+    "ammo": 75,
+    "magazine": 100,
+    "subtype": "distribution",
+    "entries": [
+      { "item": "sweet_sausage", "prob": 2 },
+      { "item": "bacon", "prob": 25 },
+      { "item": "fchicken", "prob": 25 },
+      { "item": "lunchmeat", "prob": 10 },
+      { "item": "bologna", "prob": 10 },
+      { "item": "pizza_veggy", "prob": 8 },
+      { "item": "pizza_meat", "prob": 8 },
+      { "item": "pizza_cheese", "prob": 8 },
+      { "item": "hotdogs_frozen", "prob": 8 },
+      { "item": "corndogs_frozen", "prob": 8 },
+      { "item": "meat_smoked", "prob": 8 },
+      { "item": "fish_smoked", "prob": 8 },
+      { "item": "bologna", "prob": 6 },
+      { "item": "sausage", "prob": 6 },
+      { "item": "bratwurst_sausage", "prob": 5 },
+      { "item": "lunchmeat", "prob": 10 },
+      { "item": "meat", "prob": 15 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "bedroom",

diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json
@@ -821,6 +821,19 @@
       [ "soup_meat", 10 ]
     ]
   },
+  {
+    "id": "restaur_freezer",
+    "type": "item_group",
+    "items": [
+      { "fish_smoked", 5 },
+      { "meat_smoked", 5 },
+      { "bologna", 5 },
+      { "sausage", 5 },
+      { "bratwurst_sausage", 5 },
+      { "lunchmeat", 5 },
+      { "meat", 10 }
+    ]
+  },
   {
     "id": "restaur_kitchen",
     "type": "item_group",

diff --git a/data/json/mapgen/bakery.json b/data/json/mapgen/bakery.json
@@ -75,7 +75,7 @@
         { "item": "groce_ingredient", "x": 12, "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 3 ] },
         { "item": "groce_ingredient", "x": [ 9, 11 ], "y": 21, "chance": 50, "repeat": [ 1, 3 ] },
         { "item": "groce_dairyegg", "x": [ 5, 6 ], "y": 16, "chance": 75 },
-        { "item": "frozen_baked_goods", "x": [ 7, 8 ], "y": 16, "chance": 75, "repeat": [ 1, 3] },
+        { "item": "frozen_baked_goods", "x": [ 7, 8 ], "y": 16, "chance": 75, "repeat": [ 1, 3 ] },
         { "item": "groce_bread", "x": 2, "y": 16, "chance": 50 },
         { "item": "groce_bread", "x": 2, "y": 14, "chance": 50 },
         { "item": "groce_bread", "x": 16, "y": 5, "chance": 50 },

diff --git a/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json b/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json
@@ -119,7 +119,7 @@
         "7": "f_rack",
         "9": "f_rack",
         "z": "f_cardboard_box",
-        "8": "f_freezer",
+        "8": "f_glass_freezer",
         "m": "f_glass_fridge",
         "0": "f_table"
       },

diff --git a/data/json/mapgen/homeimprovement_superstore.json b/data/json/mapgen/homeimprovement_superstore.json
@@ -92,13 +92,13 @@
     "object": {
       "rows": [
         "|rrrrrrr...........F|s..",
-        "|..................F|t..",
+        "|..................f|t..",
         "|rrrrrrr................",
         "|.......................",
         "|...................---.",
         "|..ccc.............O|CT.",
         "|..................O|s..",
-        "|..ccc.............O|t..",
+        "|..ccc.............f|t..",
         "|........|..............",
         "|..ccc...|.CT.CT........",
         "|........|$.......|.....",
@@ -146,6 +146,7 @@
         "r": "f_rack",
         "s": "f_sink",
         "O": "f_oven",
+        "f": "f_freezer",
         "F": "f_fridge",
         "t": "f_toilet"
       },

diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json
@@ -251,7 +251,7 @@
         "]": [ "f_bookcase", "f_filing_cabinet" ],
         "?": [ "f_toilet" ],
         ">": [ "f_vent_pipe" ],
-        ".": [ "f_oven", "f_counter", "f_fridge", "f_trashcan", "f_cupboard" ],
+        ".": [ "f_oven", "f_counter", "f_fridge", "f_freezer", "f_trashcan", "f_cupboard" ],
         "{": [ "f_washer", "f_dryer" ]
       },
       "computers": {

diff --git a/data/json/mapgen/mall/mall_second_floor.json b/data/json/mapgen/mall/mall_second_floor.json
@@ -399,7 +399,7 @@
         "...........|            ",
         "yFFy......yH            ",
         "#####.....YH            ",
-        "    #y..JmmH            ",
+        "    #y..J[[H            ",
         "    #F..J.BH            ",
         "    #F..J..H            ",
         "    #y..JJ.H            ",
@@ -418,6 +418,7 @@
         "^": "t_linoleum_white"
       },
       "furniture": { "%": [ "f_indoor_plant_y", "f_indoor_plant" ], "^": "f_sink", "!": "f_counter" },
+      "[": "f_glass_freezer",
       "items": {
         "u": [
           { "item": "vending_food_items", "chance": 20, "repeat": [ 4, 10 ] },
@@ -441,7 +442,7 @@
           { "item": "hatstore_accessories", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "shoestore_shoes", "chance": 10, "repeat": [ 1, 2 ] }
         ],
-        "m": { "item": "dessert", "chance": 50, "repeat": [ 1, 2 ] },
+        "[": { "item": "dessert", "chance": 50, "repeat": [ 1, 2 ] },
         "J": [
           { "item": "baked_goods", "chance": 40, "repeat": [ 1, 2 ] },
           { "item": "coffee_display_2", "chance": 50, "repeat": [ 1, 2 ] },

diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json
@@ -62,6 +62,7 @@
       "U": "f_cupboard",
       "x": "f_crate_o",
       "X": "f_crate_c",
+      "[": "f_glass_freezer",
       ":": "f_shredder"
     },
     "toilets": { "&": { "amount": [ 0, 50 ] } },
@@ -87,7 +88,8 @@
       "r": { "item": "pants", "chance": 65, "repeat": [ 1, 4 ] },
       "R": { "item": "jackets", "chance": 65, "repeat": [ 1, 4 ] },
       "x": { "item": "child_items", "chance": 65, "repeat": [ 1, 8 ] },
-      "X": { "item": "construction_worker", "chance": 65, "repeat": [ 1, 4 ] }
+      "X": { "item": "construction_worker", "chance": 65, "repeat": [ 1, 4 ] },
+      "[": { "item": "kitchen_freezer", "chance": 65, "repeat": [ 2, 6 ] }
     }
   },
   {
@@ -102,7 +104,8 @@
       "r": { "item": "hardware", "chance": 65, "repeat": [ 1, 4 ] },
       "R": { "item": "mischw", "chance": 65, "repeat": [ 1, 6 ] },
       "x": { "item": "shelter", "chance": 65, "repeat": [ 1, 4 ] },
-      "X": { "item": "cannedfood", "chance": 65, "repeat": [ 2, 10 ] }
+      "X": { "item": "cannedfood", "chance": 65, "repeat": [ 2, 10 ] },
+      "[": { "item": "kitchen_freezer", "chance": 65, "repeat": [ 2, 6 ] }
     }
   },
   {
@@ -117,7 +120,8 @@
       "r": { "item": "hardware", "chance": 65, "repeat": [ 1, 4 ] },
       "R": { "item": "cleaning", "chance": 65, "repeat": [ 1, 4 ] },
       "x": { "item": "shoes", "chance": 65, "repeat": [ 1, 8 ] },
-      "X": { "item": "dresser", "chance": 65, "repeat": [ 1, 4 ] }
+      "X": { "item": "dresser", "chance": 65, "repeat": [ 1, 4 ] },
+      "[": { "item": "kitchen_freezer", "chance": 65, "repeat": [ 2, 6 ] }
     }
   },
   {
@@ -492,7 +496,7 @@
         "RRRRRIRRRRR..RRRRRIRRRRR",
         "........................",
         "........................",
-        ".fffffffffff..FFFFFFFFF.",
+        ".[[[[[[[[[[[..FFFFFFFFF.",
         ".fffffffffff..FFFFFFFFF.",
         "........................"
       ],
@@ -921,8 +925,8 @@
         "..FFFFFFFF...KK..KK.....",
         "..FFFFFFFF...KK..KK.....",
         ".............KK..KK.....",
-        "..FFIFFFFF...KK..KI.....",
-        "..ffffffff...KK..KK.....",
+        "..[[I[[[[[...KK..KI.....",
+        "..[[[[[[[[...KK..KK.....",
         ".............KK..KK.....",
         "..ffffffff...KK..KK.....",
         "..ffffffff...KK..KK.....",
@@ -1119,7 +1123,7 @@
         "..fffIffffffffffffIfff..",
         "........................",
         "........................",
-        "..ffffffffffffffffffff..",
+        "..[[[[[[[[[[[[[[[[[[[[..",
         "..KKKKKKKKKKKKKKKKKKKK..",
         "........................"
       ],

diff --git a/data/json/mapgen/nested/retail_nested.json b/data/json/mapgen/nested/retail_nested.json
@@ -1247,7 +1247,7 @@
         "JJiRiJJ| ||   ",
         "F     n| |t   ",
         "F RRR l| *    ",
-        "F      * |    ",
+        "f      * |    ",
         "YPPQQSY| |j   "
       ],
       "terrain": { "?": "t_console_broken", "|": "t_brick_wall", "*": "t_door_c" },
@@ -1263,6 +1263,7 @@
         "Y": "f_trashcan",
         "A": "f_stool",
         "i": "f_oven",
+        "f": "f_freezer",
         "F": "f_fridge",
         "n": "f_sink",
         "l": "f_dishwasher",

diff --git a/data/json/mapgen/office_doctor.json b/data/json/mapgen/office_doctor.json
@@ -28,7 +28,7 @@
         "   #o......y#..###X###R ",
         "   ##+#######...y...5#R ",
         "   #C.+..#..+........;~ ",
-        "   #C<#s&#&s#y.eccScc#4 ",
+        "   #C<#s&#&s#yFeccScc#4 ",
         "   ###################  ",
         "                        "
       ],

diff --git a/data/json/mapgen/pizza_parlor.json b/data/json/mapgen/pizza_parlor.json
@@ -11,7 +11,7 @@
         "-||||||||||||||-        ",
         "-FwlwL-P#######-4      Y",
         "-Flwlw#..U.U.U.g        ",
-        "-#wlwl@........g        ",
+        "-fwlwl@........g        ",
         "-#lwlw#........g        ",
         "-#wlwl{........g        ",
         "-Olwlw{........g        ",
@@ -70,6 +70,7 @@
         "#": "f_counter",
         "B": "f_bench",
         "C": "f_trashcan",
+        "f": "f_freezer",
         "F": "f_fridge",
         "H": "f_chair",
         "L": "f_locker",
@@ -84,9 +85,10 @@
       "toilets": { "t": {  } },
       "place_items": [
         { "item": "pizza_display", "x": 6, "y": [ 5, 8 ], "chance": 65, "repeat": [ 3, 4 ] },
-        { "item": "pizza_kitchen", "x": 1, "y": [ 3, 5 ], "chance": 80, "repeat": [ 7, 10 ] },
+        { "item": "pizza_kitchen", "x": 1, "y": [ 4, 5 ], "chance": 80, "repeat": [ 7, 10 ] },
         { "item": "pizza_kitchen", "x": 1, "y": [ 8, 9 ], "chance": 82, "repeat": [ 7, 9 ] },
         { "item": "pizza_fridge", "x": 1, "y": [ 1, 2 ], "chance": 80, "repeat": [ 9, 10 ] },
+        { "item": "restaur_freezer", "x": 1, "y": 3, "chance": 80, "repeat": [ 5, 6 ] },
         { "item": "pizza_beer", "x": [ 9, 13 ], "y": 1, "chance": 70, "repeat": [ 2, 3 ] },
         { "item": "pizza_soda", "x": 6, "y": [ 9, 12 ], "chance": 70, "repeat": [ 2, 5 ] },
         { "item": "pizza_table", "x": [ 11, 12 ], "y": 11, "chance": 25 },

diff --git a/data/json/mapgen/restaurant.json b/data/json/mapgen/restaurant.json
@@ -173,7 +173,7 @@
         "ssssssssssssssssssssssss",
         "ssssssssssssssssssssssss",
         "ssss|-------------|sssss",
-        "____|&wlwF|.......|sssss",
+        "____|&wlfF|.......|sssss",
         "____DwlwlF|A...@2^gsssss",
         "____|lwlw#|.......+sssss",
         "____|#lwlS|A......+sssss",
@@ -233,6 +233,7 @@
         "&": "f_trashcan",
         "A": "f_statue",
         "B": "f_bench",
+        "f": "f_freezer",
         "F": "f_fridge",
         "O": "f_oven",
         "R": "f_woodstove",
@@ -253,6 +254,7 @@
         { "item": "restaur_bath", "x": [ 2, 3 ], "y": [ 3, 18 ], "chance": 25 },
         { "item": "restaur_trash", "x": 5, "y": 3, "chance": 75, "repeat": [ 1, 3 ] },
         { "item": "restaur_fridge", "x": 9, "y": [ 3, 4 ], "chance": 80, "repeat": [ 2, 8 ] },
+        { "item": "restaur_freezer", "x": 8, "y": 3, "chance": 80, "repeat": [ 2, 8 ] },
         { "item": "restaur_sink", "x": 9, "y": [ 6, 7 ], "chance": 75, "repeat": [ 2, 3 ] },
         { "item": "restaur_kitchen", "x": 9, "y": 5, "chance": 75, "repeat": [ 1, 8 ] },
         { "item": "restaur_kitchen", "x": 9, "y": [ 8, 9 ], "chance": 75, "repeat": [ 1, 8 ] },
@@ -356,7 +358,7 @@
         "=|         HtHHtH   tt|=",
         "=|         HtHHtH   HH|=",
         "=|-+-----  -----------|=",
-        "=|S T|< |  ###ffff|xxx|=",
+        "=|S T|< |  ###Ffff|xxx|=",
         "=|r -|L +         c  7|=",
         "=|S T|L |r ##GGGxx|xxx|=",
         "=|--------+-----------|=",
@@ -399,6 +401,7 @@
         "S": "f_sink",
         "Y": "f_rack_coat",
         "f": "f_fridge",
+        "F": "f_freezer",
         "L": "f_locker",
         "r": "f_trashcan",
         "t": "f_table"
@@ -422,7 +425,8 @@
         { "item": "soup_bar", "x": 10, "y": 10, "chance": 75, "repeat": [ 1, 6 ] },
         { "item": "soup_bar", "x": 11, "y": 10, "chance": 75, "repeat": [ 1, 6 ] },
         { "item": "coat_rack", "x": 6, "y": [ 17, 18 ], "chance": 60, "repeat": [ 2, 4 ] },
-        { "item": "restaur_fridge", "x": [ 14, 17 ], "y": 16, "chance": 60, "repeat": [ 1, 8 ] },
+        { "item": "restaur_fridge", "x": [ 15, 17 ], "y": 16, "chance": 60, "repeat": [ 1, 8 ] },
+        { "item": "restaur_freezer", "x": 14, "y": 16, "chance": 60, "repeat": [ 1, 8 ] },
         { "item": "restaur_kitchen", "x": [ 16, 17 ], "y": 18, "chance": 60, "repeat": [ 1, 8 ] }
       ],
       "place_monsters": [

diff --git a/data/json/mapgen/restaurant_fast.json b/data/json/mapgen/restaurant_fast.json
@@ -23,7 +23,7 @@
         ",_____ow=w=w=w+..|_____,",
         ",_____|ewccOwc|t-|_____,",
         ",_____|l=w=w=S|=S|_____,",
-        ",_____||eercwx|P||_____,",
+        ",_____||ffrcwx|P||_____,",
         ",_____#|----o---|4_____,",
         ",________,_____________,",
         ",________,_____________,",
@@ -73,6 +73,7 @@
         "c": "f_counter",
         "d": "f_dumpster",
         "e": "f_fridge",
+        "f": "f_freezer",
         "g": "f_trashcan",
         "l": "f_locker",
         "r": "f_oven"

diff --git a/data/json/mapgen/s_furniture.json b/data/json/mapgen/s_furniture.json
@@ -9,7 +9,7 @@
       "rows": [
         "                        ",
         " |ggggggggg++ggggggggg| ",
-        " |.CphpH.c....O.O.&.&.| ",
+        " |.CphpH.c....O.O.&F&.| ",
         " |B.....kc...........y| ",
         " |B....ccc...........f| ",
         " |v..........#.m..e..B| ",
@@ -60,6 +60,7 @@
         "h": "f_chair",
         "m": "f_sofa",
         "f": "f_filing_cabinet",
+        "F": "f_freezer",
         "o": "f_toilet",
         "p": "f_rack_coat",
         "q": "f_displaycase",

diff --git a/data/json/mapgen/s_grocery.json b/data/json/mapgen/s_grocery.json
@@ -26,7 +26,7 @@
         "|TS|^ A|r  r|t  t|r  r|_",
         "|ll+  A|r  r|t  t|r  r|_",
         "|--|-I--              |_",
-        "__4|**C|[[[[-[[[[-[[[[|_",
+        "__4|**C|              |_",
         "___|**C|]]]]]]]]]]]]]]|_",
         "___L***+**************|_",
         "___|------------------|_"
@@ -67,7 +67,7 @@
         "7": "f_bookcase",
         "C": "f_crate_c",
         "S": "f_sink",
-        "]": "f_rack",
+        "]": "f_glass_freezer",
         "^": "f_indoor_plant",
         "b": "f_stool",
         "f": "f_glass_fridge",