Move terrains to their own files, move palette to main file

data/json/furniture_and_terrain/furniture-decorative.json

@@ -232,6 +232,24 @@
       ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_lighthouse_light",
+    "name": "lighthouse light",
+    "description": "Very high power, modern lighthouse LED light source with attached heatsinks.",
+    "symbol": "%",
+    "color": "light_gray",
+    "required_str": -1,
+    "move_cost_mod": -1,
+    "deconstruct": { "items": [ { "item": "lightstrip_inactive" }, { "item": "material_aluminium_ingot", "count": 4 } ] },
+    "bash": {
+      "str_min": 18,
+      "str_max": 80,
+      "sound": "clang!",
+      "sound_fail": "ting.",
+      "items": [ { "item": "material_aluminium_ingot", "count": [ 1, 4 ] }, { "item": "e_scrap", "count": [ 1, 4 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_winter_wreath",

data/json/furniture_and_terrain/terrain-doors.json

@@ -1222,6 +1222,55 @@
       "items": [ { "item": "glass_shard", "count": [ 42, 84 ] } ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_door_lighthouse_lens_c",
+    "name": "closed lighthouse lens hinged section",
+    "description": "An intricate arrangement of glass, designed to focus light from within to be visible over long distances.  This section of the lens is on hinges and can be opened for maintenance.",
+    "symbol": "+",
+    "looks_like": "t_door_glass_c",
+    "color": "light_cyan",
+    "move_cost": 0,
+    "connect_groups": "WALL",
+    "connects_to": "WALL",
+    "rotates_to": "INDOORFLOOR",
+    "flags": [ "TRANSPARENT", "DOOR", "NOITEM", "BLOCK_WIND" ],
+    "open": "t_door_lighthouse_lens_o",
+    "bash": {
+      "str_min": 6,
+      "str_max": 20,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_null",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_door_lighthouse_lens_o",
+    "name": "open lighthouse lens hinged section",
+    "description": "An intricate arrangement of glass, designed to focus light from within to be visible over long distances.  This section of the lens is hinged and is currently open.",
+    "symbol": "'",
+    "looks_like": "t_door_glass_o",
+    "color": "light_cyan",
+    "move_cost": 2,
+    "connect_groups": "WALL",
+    "connects_to": "WALL",
+    "flags": [ "TRANSPARENT" ],
+    "close": "t_door_lighthouse_lens_c",
+    "bash": {
+      "str_min": 4,
+      "str_max": 20,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_null",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_door_c_peep",

data/json/furniture_and_terrain/terrain-floors-indoor.json

@@ -442,6 +442,20 @@
     "flags": [ "TRANSPARENT", "INDOORS", "COLLAPSES", "SUPPORTS_ROOF", "FLAT", "ROAD" ],
     "bash": { "ter_set": "t_null", "str_min": 75, "str_max": 400, "str_min_supported": 100, "bash_below": true }
   },
+  {
+    "type": "terrain",
+    "id": "t_stone_masonry_floor",
+    "name": "stone masonry floor",
+    "description": "A floor of carefully cut and laid stones, joined with mortar.",
+    "symbol": ".",
+    "color": "light_gray",
+    "looks_like": "t_rock_floor",
+    "connect_groups": "ROCKFLOOR",
+    "connects_to": "ROCKFLOOR",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
+    "bash": { "ter_set": "t_null", "str_min": 75, "str_max": 400, "str_min_supported": 100, "bash_below": true }
+  },
   {
     "type": "terrain",
     "id": "t_floor_warped",

data/json/furniture_and_terrain/terrain-roofs.json

@@ -307,6 +307,18 @@
     "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
     "bash": { "str_min": 200, "str_max": 500, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
   },
+  {
+    "type": "terrain",
+    "id": "t_metal_roof_red",
+    "name": "red metal roof",
+    "description": "A sturdy section of metallic rooftop, painted red for visibility and weather resistance.",
+    "symbol": ".",
+    "looks_like": "t_metal_roof",
+    "color": "red",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
+    "bash": { "str_min": 200, "str_max": 500, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_null", "bash_below": false }
+  },
   {
     "type": "terrain",
     "id": "t_log_sod_roof",

data/json/furniture_and_terrain/terrain-walls.json

@@ -1796,6 +1796,29 @@
       "items": [ { "item": "rock", "count": [ 8, 18 ] } ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_stone_masonry_wall_whitewashed",
+    "name": "whitewashed stone masonry wall",
+    "looks_like": "t_rock_wall",
+    "description": "A wall of carefully cut and laid stones, joined with mortar.  The exterior has been finished with plaster and whitewashed.",
+    "symbol": "LINE_OXOX",
+    "color": "light_gray",
+    "move_cost": 0,
+    "coverage": 100,
+    "roof": "t_rock_roof",
+    "connect_groups": "WALL",
+    "connects_to": "WALL",
+    "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "bash": {
+      "str_min": 80,
+      "str_max": 300,
+      "sound": "crash!",
+      "sound_fail": "whump!",
+      "ter_set": "t_null",
+      "items": [ { "item": "rock", "count": [ 8, 18 ] } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_rock_wall_half",
@@ -2771,6 +2794,30 @@
       "no_laser_destroy": true
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_wall_lighthouse_lens",
+    "name": "lighthouse lens",
+    "looks_like": "t_wall_glass",
+    "description": "An intricate arrangement of glass, designed to focus light from within to be visible over long distances.",
+    "symbol": "LINE_OXOX",
+    "color": "light_cyan",
+    "move_cost": 0,
+    "connect_groups": "WALL",
+    "connects_to": "WALL",
+    "flags": [ "TRANSPARENT", "NOITEM", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "BLOCK_WIND" ],
+    "rotates_to": "INDOORFLOOR",
+    "bash": {
+      "str_min": 4,
+      "str_max": 20,
+      "sound": "glass breaking!",
+      "sound_fail": "whack!",
+      "sound_vol": 16,
+      "sound_fail_vol": 10,
+      "ter_set": "t_null",
+      "items": [ { "item": "glass_shard", "count": [ 42, 84 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_bars",

data/json/mapgen/lake_buildings/lighthouse_small.json

@@ -1,4 +1,108 @@
 [
+  {
+    "type": "item_group",
+    "id": "lighthouse_rainwater",
+    "items": [ { "item": "water_clean", "charges": [ 50, 200 ], "container-item": "30gal_barrel" } ]
+  },
+  {
+    "type": "item_group",
+    "id": "lighthouse_fuel",
+    "items": [ { "item": "diesel", "charges": [ 0, 50000 ], "container-item": "30gal_drum" } ]
+  },
+  {
+    "type": "item_group",
+    "id": "lighthouse_food",
+    "subtype": "collection",
+    "container-item": "box_medium",
+    "entries": [
+      {
+        "distribution": [
+          { "item": "can_sardine", "count": [ 1, 10 ] },
+          { "item": "can_tomato", "count": [ 1, 10 ] },
+          { "item": "soup_veggy", "count": [ 1, 10 ] },
+          { "item": "soup_meat", "count": [ 1, 10 ] },
+          { "item": "soup_chicken", "count": [ 1, 10 ] },
+          { "item": "soup_mushroom", "count": [ 1, 10 ] },
+          { "item": "soup_tomato", "count": [ 1, 10 ] },
+          { "item": "soup_dumplings", "count": [ 1, 10 ] },
+          { "item": "curry_veggy", "count": [ 1, 10 ] },
+          { "item": "curry_meat", "count": [ 1, 10 ] },
+          { "item": "can_corn", "count": [ 1, 10 ] },
+          { "item": "noodles_fast", "count": [ 1, 10 ] }
+        ],
+        "prob": 90
+      },
+      { "item": "con_milk", "count": [ 0, 10 ], "prob": 25 },
+      { "item": "instant_coffee", "count": [ 0, 5 ], "prob": 50 }
+    ]
+  },
+  {
+    "type": "palette",
+    "id": "lighthouse_small_palette",
+    "terrain": {
+      "~": "t_water_sh",
+      "≈": "t_water_dp",
+      ".": "t_railroad_rubble",
+      "¨": "t_railroad_rubble",
+      "`": "t_railroad_rubble",
+      "O": "t_railroad_rubble",
+      "ú": "t_pit",
+      "¢": "t_sand",
+      "d": "t_dock",
+      ";": "t_stone_masonry_floor",
+      "¤": "t_stone_masonry_floor",
+      "ɱ": "t_stone_masonry_floor",
+      "Ɱ": "t_stone_masonry_floor",
+      "G": "t_stone_masonry_floor",
+      "m̌": "t_stone_masonry_floor",
+      "B": "t_floor",
+      "ß": "t_floor",
+      "|": "t_stone_masonry_wall_whitewashed",
+      "ñ": "t_wall_wood",
+      "å": "t_wall_glass",
+      "@": "t_wall_lighthouse_lens",
+      "w": "t_metal_grate_window",
+      "ö": "t_door_lighthouse_lens_c",
+      "/": "t_door_c",
+      "!": "t_door_glass_c",
+      "ë": "t_metal_flat_roof",
+      "^": "t_metal_roof_red",
+      "<": "t_ladder_up",
+      "≤": "t_ladder_up_down",
+      "%": "t_metal_railing"
+    },
+    "furniture": {
+      "¨": "f_boulder_large",
+      "`": "f_boulder_medium",
+      "h": "f_chair",
+      "X": "f_sofa",
+      "t": "f_table",
+      "P": "f_cupboard",
+      "f": "f_rack_coat",
+      "u": "f_stool",
+      "W": "f_woodstove",
+      "l": "f_locker",
+      "m": "f_machinery_old",
+      "*": "f_lighthouse_light",
+      "ɱ": "f_machinery_electronic",
+      "Ɱ": "f_electrical_conduit",
+      "m̌": "f_electrical_conduit",
+      "G": "f_generator_broken"
+    },
+    "items": {
+      "ß": { "item": "tools_workshop", "chance": 50 },
+      "_": { "item": "trash_domestic", "chance": 10 },
+      "P": { "item": "dishes_utility", "repeat": [ 1, 6 ] },
+      "O": { "item": "lighthouse_rainwater" },
+      "¤": { "item": "lighthouse_fuel", "chance": 50 },
+      "õ": { "item": "lighthouse_fuel", "chance": 50 },
+      "æ": { "item": "fuel_gasoline", "chance": 75 },
+      "B": { "item": "lighthouse_food", "chance": 50 },
+      "l": { "item": "fishing_items", "repeat": [ 1, 4 ] },
+      "ŵ": { "item": "stash_wood", "chance": 75, "repeat": [ 6, 15 ] },
+      "f": { "item": "jackets", "chance": 25 }
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",