Merge branch 'master' into master

cataclysmbnteam · Apr 3, 2020 · caf84dc · caf84dc
2 parents b467257 + b6cc66a
commit caf84dc
Show file tree

Hide file tree

Showing 45 changed files with 466 additions and 676 deletions.
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
@@ -400,7 +400,7 @@
     "type": "COMESTIBLE",
     "id": "marloss_seed",
     "category": "seeds",
-    "name": { "str": "marloss seed" },
+    "name": { "str": "Marloss seed" },
     "weight": "177 g",
     "color": "cyan",
     "addiction_type": "marloss_b",

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -787,7 +787,7 @@
     "name": { "str": "television" },
     "description": "A large LCD television, full of delicious electronics.",
     "price": 0,
-    "material": "plastic",
+    "material": [ "aluminum", "plastic" ],
     "weight": "15000 g",
     "volume": "20 L",
     "bashing": 5,

diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -548,7 +548,6 @@
       "shop_sigma": 50,
       "park_radius": 20,
       "park_sigma": 80,
-      "house_basement_chance": 5,
       "houses": {
         "house_w_1": 50,
         "house_two_story_basement": 50,
@@ -651,7 +650,6 @@
         "trailerpark_city": 15,
         "railroad_city": 10
       },
-      "basements": { "basement": 100, "basement_hidden_lab_stairs": 25 },
       "parks": {
         "park": 400,
         "pool": 20,

diff --git a/data/json/test_regions.json b/data/json/test_regions.json
@@ -110,9 +110,7 @@
       "shop_sigma": 50,
       "park_radius": 20,
       "park_sigma": 80,
-      "house_basement_chance": 1,
       "houses": { "house_w_1": 1, "duplex": 1 },
-      "basements": { "basement": 1 },
       "parks": { "park": 2, "pool": 1 },
       "shops": {
         "s_gas": 5,

diff --git a/data/mods/Aftershock/maps/regional_map_settings.json b/data/mods/Aftershock/maps/regional_map_settings.json
@@ -1,7 +1,6 @@
 [
   {
     "type": "region_overlay",
-    "regions": [ "all" ],
-    "city": { "basements": { "basement": 1000, "basement_hidden_lab_stairs": 100 } }
+    "regions": [ "all" ]
   }
 ]
diff --git a/data/mods/Dark-Skies-Above/overrides/locations/evac_center.json b/data/mods/Dark-Skies-Above/overrides/locations/evac_center.json
@@ -169,6 +169,7 @@
         "               c  6     ",
         "                        "
       ],
+      "palettes": [ "shelter" ],
       "terrain": { " ": "t_null", "6": "t_console" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "computers": {
@@ -215,6 +216,7 @@
         "    | =........c..x|    ",
         "    |||||:||+|:|||||    "
       ],
+      "palettes": [ "shelter" ],
       "terrain": { "x": "t_console_broken", "=": "t_door_locked_interior", "6": "t_console", ":": "t_window_domestic", "+": "t_door_c" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "computers": {
@@ -271,6 +273,7 @@
         "    | =........c..6|    ",
         "    |||||:||+|:|||||    "
       ],
+      "palettes": [ "shelter" ],
       "terrain": {
         ":": [ "t_window_frame", "t_window_no_curtains" ],
         "+": [ "t_door_c", "t_door_b" ],
@@ -319,6 +322,7 @@
         "                  l     ",
         "                        "
       ],
+      "palettes": [ "shelter" ],
       "terrain": { " ": "t_null", "6": "t_console" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } },
@@ -365,7 +369,9 @@
         "    |..........|..l|    ",
         "    |||||:||+|:|||||    "
       ],
+      "palettes": [ "shelter" ],
       "terrain": {
+        "-": "t_wall_w",
         "x": "t_console_broken",
         ":": [ "t_window_frame", "t_window" ],
         "+": [ "t_door_c", "t_door_b" ],
@@ -422,7 +428,9 @@
         "    |..........|..l|    ",
         "    |||||:||+|:|||||    "
       ],
+      "palettes": [ "shelter" ],
       "terrain": {
+        "-": "t_wall_w",
         ":": [ "t_window_frame", "t_window" ],
         "+": [ "t_door_c", "t_door_b" ],
         "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ],
@@ -470,6 +478,7 @@
         "                   c    ",
         "                        "
       ],
+      "palettes": [ "shelter" ],
       "terrain": { " ": "t_null" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } }
@@ -507,7 +516,8 @@
         "   ||||||||||......c|   ",
         "            ||:|+|:||   "
       ],
-      "terrain": { "x": "t_console_broken" },
+      "palettes": [ "shelter" ],
+      "terrain": { "-": "t_wall_w", "x": "t_console_broken" },
       "furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
       "computers": {
         "6": {
@@ -563,7 +573,9 @@
         "   ||||||||||......c|   ",
         "            ||:|+|:||   "
       ],
+      "palettes": [ "shelter" ],
       "terrain": {
+        "-": "t_wall_w",
         ":": [ "t_window_frame", "t_window" ],
         "+": [ "t_door_c", "t_door_b" ],
         "=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ],

diff --git a/data/mods/Dark-Skies-Above/overrides/region_settings.json b/data/mods/Dark-Skies-Above/overrides/region_settings.json
@@ -14,10 +14,7 @@
       "clear_whitelist": false,
       "whitelist": [  ]
     },
-    "city": {
-      "basements": { "basement": 1000, "basement_hidden_lab_stairs": 0 },
-      "shops": { "office_tower_hiddenlab": 0, "office_tower_collapsed": 0 }
-    },
+    "city": { "shops": { "office_tower_hiddenlab": 0, "office_tower_collapsed": 0 } },
     "map_extras": {
       "forest": { "extras": { "mx_portal": 0, "mx_portal_in": 0, "mx_anomaly": 0, "mx_spider": 0 } },
       "forest_thick": { "extras": { "mx_portal": 0, "mx_portal_in": 0, "mx_anomaly": 0, "mx_shia": 0, "mx_spider": 0, "mx_jabberwock": 0 } },

diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json
@@ -672,7 +672,7 @@
     "//": "Reagents you'd use in crafting a wide variety of things, including alchemy and rituals.",
     "type": "item_group",
     "subtype": "distribution",
-    "items": [ { "item": "mercury", "prob": 15, "charges_min": 50 } ]
+    "items": [ { "item": "mercury", "prob": 15, "charges-min": 50 } ]
   },
   {
     "id": "science",

diff --git a/data/mods/Magiclysm/items/metals.json b/data/mods/Magiclysm/items/metals.json
@@ -60,7 +60,6 @@
     "name": "liquid mercury",
     "ammo_type": "mercury",
     "description": "Elemental liquid mercury.  Known for its use in thermometers.",
-    "charges": 1,
     "volume": "1 ml",
     "phase": "liquid",
     "container": "flask_glass",

diff --git a/data/mods/Magiclysm/items/recipe_books.json b/data/mods/Magiclysm/items/recipe_books.json
@@ -131,7 +131,7 @@
     "max_level": 6,
     "intelligence": 9,
     "time": "20 m",
-    "fun": "-1"
+    "fun": -1
   },
   {
     "id": "magic_armormaking",

diff --git a/data/mods/Magiclysm/recipes/blacksmithing.json b/data/mods/Magiclysm/recipes/blacksmithing.json
@@ -36,7 +36,7 @@
     "book_learn": [ [ "metal_legends", 2 ] ],
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 } ],
     "tools": [ [ [ "con_mix", 50 ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ] ],
-    "components": [ [ [ "material_cement", 50 ] ], [ [ "material_sand", 150 ] ], [ "demon_chitin_piece", 10 ] ]
+    "components": [ [ [ "material_cement", 50 ] ], [ [ "material_sand", 150 ] ], [ [ "demon_chitin_piece", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -46,7 +46,7 @@
     "skill_used": "spellcraft",
     "difficulty": 3,
     "time": "16 m",
-    "autolearn": "true",
+    "autolearn": true,
     "qualities": [ { "id": "MANA_INFUSE", "level": 1 }, { "id": "COOK", "level": 3 }, { "id": "DISTILL", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
     "components": [ [ [ "charcoal", 50 ] ], [ [ "crystallized_mana", 10 ] ], [ [ "denat_alcohol", 10 ] ] ]

diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -92,11 +92,11 @@
       { "id": "CHISEL", "level": 2 },
       { "id": "MANA_INFUSE", "level": 2 },
       { "id": "HAMMER", "level": 2 },
-      { "id": "SMOOTHING", "level": 1 }
+      { "id": "SMOOTH", "level": 1 }
     ],
     "components": [
       [ [ "demon_chitin_plate", 24 ] ],
-      [ [ "fire_mortar", 30 ] ],
+      [ [ "fireproof_mortar", 30 ] ],
       [ [ "pilot_light", 1 ] ],
       [ [ "pipe", 3 ] ],
       [ [ "crystallized_mana", 80 ] ]

diff --git a/data/mods/desert_region/desert_regional_map_settings.json b/data/mods/desert_region/desert_regional_map_settings.json
@@ -536,7 +536,6 @@
       "shop_sigma": 50,
       "park_radius": 20,
       "park_sigma": 80,
-      "house_basement_chance": 5,
       "houses": {
         "house_two_story_basement": 1,
         "house_prepper": 30,
@@ -550,7 +549,6 @@
         "trailerpark_city": 15,
         "railroad_city": 10
       },
-      "basements": { "basement": 1000, "basement_hidden_lab_stairs": 25 },
       "parks": {
         "park": 400,
         "pool": 100,

diff --git a/data/mods/rural_biome/rural_regional_map_settings.json b/data/mods/rural_biome/rural_regional_map_settings.json
@@ -464,7 +464,6 @@
       "shop_sigma": 50,
       "park_radius": 60,
       "park_sigma": 80,
-      "house_basement_chance": 5,
       "houses": {
         "house_w_1": 50,
         "house_two_story_basement": 50,
@@ -539,7 +538,6 @@
         "motel_city": 5,
         "trailerpark_city": 15
       },
-      "basements": { "basement": 1000, "basement_hidden_lab_stairs": 25 },
       "parks": {
         "s_gas": 200,
         "s_gas_1": 200,

diff --git a/doc/REGION_SETTINGS.md b/doc/REGION_SETTINGS.md
@@ -406,9 +406,7 @@ relative placements of various classes of buildings.
 | `type`                  | City type identifier--currently unused.                            |
 | `shop_radius`           | Radial frequency of shop placement. Smaller number = more shops.   |
 | `park_radius`           | Radial frequency of park placement. Smaller number = more parks.   |
-| `house_basement_chance` | One in X chance that a house has a basement.                       |
 | `houses`                | Weighted list of overmap terrains and specials used for houses.    |
-| `basements`             | Weighted list of overmap terrains and specials used for basements. |
 | `parks`                 | Weighted list of overmap terrains and specials used for parks.     |
 | `shops`                 | Weighted list of overmap terrains and specials used for shops.     |
 
@@ -427,17 +425,12 @@ place the shop or park are based on the formula `rng( 0, 99 ) > X_radius * dista
 		"type": "town",
 		"shop_radius": 80,
 		"park_radius": 90,
-		"house_basement_chance": 5,
 		"houses": {
 			"house_two_story_basement": 1,
 			"house": 1000,
 			"house_base": 333,
 			"emptyresidentiallot": 20
 		},
-		"basements": {
-			"basement": 1000,
-			"basement_hidden_lab_stairs": 50
-		},
 		"parks": {
 			"park": 4,
 			"pool": 1