Skip to content

Instantly share code, notes, and snippets.

@harakka

harakka/small_lighthouse.patch

Created June 24, 2024 20:41
Show Gist options
  • Save harakka/57af9e5d3ad23eae1fd18a56add6d21b to your computer and use it in GitHub Desktop.
Save harakka/57af9e5d3ad23eae1fd18a56add6d21b to your computer and use it in GitHub Desktop.
Download ZIP
Small lighthouse for Cataclysm: Dark Days Ahead 0.H (https://github.com/CleverRaven/Cataclysm-DDA/pull/74393/)
Raw
small_lighthouse.patch
diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json
index c168cc0cd0..85d9271eff 100644
--- a/data/json/furniture_and_terrain/furniture-decorative.json
+++ b/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",
diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json
index 7b7d24d595..76be3f1cb4 100644
--- a/data/json/furniture_and_terrain/terrain-doors.json
+++ b/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",
diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json
index 894e8e26c3..da051c8662 100644
--- a/data/json/furniture_and_terrain/terrain-floors-indoor.json
+++ b/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",
diff --git a/data/json/furniture_and_terrain/terrain-roofs.json b/data/json/furniture_and_terrain/terrain-roofs.json
index 0da5f5234c..f83962c438 100644
--- a/data/json/furniture_and_terrain/terrain-roofs.json
+++ b/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",
diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
index 9270ebf323..ac847376df 100644
--- a/data/json/furniture_and_terrain/terrain-walls.json
+++ b/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",
diff --git a/data/json/mapgen/lake_buildings/lighthouse_small.json b/data/json/mapgen/lake_buildings/lighthouse_small.json
new file mode 100644
index 0000000000..1f65458807
--- /dev/null
+++ b/data/json/mapgen/lake_buildings/lighthouse_small.json
@@ -0,0 +1,317 @@
+[
+ {
+ "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",
+ "om_terrain": "lighthouse_small_ground",
+ "object": {
+ "fill_ter": "t_floor",
+ "rows": [
+ "≈≈≈≈≈≈≈≈~~~~~~~~~~~~~≈≈≈",
+ "≈≈≈≈≈≈≈≈~~¢¢¢.....~~~~≈≈",
+ "≈dddddddd¢¢¢......`~~~~≈",
+ "≈dddddddd¢¢.....ñññ`~~~≈",
+ "≈≈≈≈~~~~~¢¢.....ñúñ`~~~≈",
+ "≈≈~~~~~¢¢¢......ñ/ñ..¨~~",
+ "~~~~~¢¢¢¢............~~~",
+ "~~¢¢¢¢......||/|||.....~",
+ "~¢¢¢........|f_ht|.....~",
+ "~~ñññññ.....w___Pw.....~",
+ "~.ñõæ_/.....|<__W|.....~",
+ "~.ñõõŵñ.....|____|.....~",
+ "~.ñññññ.....|l_XX|...`~~",
+ "~..........O||/|||...``~",
+ "~~.........||;;;||...``~",
+ "~.........||;;;;;||..¨~~",
+ "~.........|;;;;;;;|.`¨~~",
+ "~`........|;;;;;;;|..¨~≈",
+ "~`........|G;;Ɱɱ;;|..¨~≈",
+ "≈`........||;;<;¤||.`¨~≈",
+ "≈¨`........||;¤¤||..`¨¨≈",
+ "≈≈¨¨```¨¨```|||||¨¨¨¨¨¨≈",
+ "≈≈≈≈≈≈≈≈¨¨¨¨¨¨¨¨¨≈≈≈≈≈≈≈",
+ "≈≈≈≈≈≈≈≈≈≈≈≈¨¨≈≈≈≈≈≈≈≈≈≈"
+ ],
+ "palettes": [ "lighthouse_small_palette" ],
+ "place_vehicles": [ { "vehicle": "boat_motor_single", "x": 4, "y": 6, "rotation": 180, "chance": 100, "status": 0 } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": "lighthouse_small_z1",
+ "object": {
+ "fill_ter": "t_stone_masonry_floor",
+ "rows": [
+ " ",
+ " ",
+ " ",
+ " ëëë ",
+ " ëëë ",
+ " ëëë ",
+ " ",
+ " ||w||| ",
+ " |B_BB| ",
+ " ëëëëë |___B| ",
+ " ëëëëë |v___| ",
+ " ëëëëë |___B| ",
+ " ëëëëë |__Bß| ",
+ " |||||| ",
+ " ||;;;|| ",
+ " ||;;;;;|| ",
+ " |;;;;;;;| ",
+ " |;;;;;;;| ",
+ " |;;;m̌;;;| ",
+ " ||;;≤;;|| ",
+ " ||;;;|| ",
+ " ||||| ",
+ " ",
+ " "
+ ],
+ "palettes": [ "lighthouse_small_palette", "roof_palette" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": "lighthouse_small_z2",
+ "object": {
+ "fill_ter": "t_stone_masonry_floor",
+ "rows": [
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " -------- ",
+ " -^^^^^^- ",
+ " -^^^^^^- ",
+ " -^^^^^^- ",
+ " -^^^^^^- ",
+ " -^^^^^^- ",
+ " -^^^^^^- ",
+ " 5|||||^- ",
+ " ||;;;||- ",
+ " ||;;;;;|| ",
+ " |;;;;;;;| ",
+ " |;;;;;;;| ",
+ " |;;;m̌;;;| ",
+ " ||;;≤;;|| ",
+ " ||;;;|| ",
+ " ||||| ",
+ " ",
+ " "
+ ],
+ "palettes": [ "lighthouse_small_palette", "roof_palette" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": "lighthouse_small_z3",
+ "object": {
+ "fill_ter": "t_stone_masonry_floor",
+ "rows": [
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ||||| ",
+ " ||;;;|| ",
+ " ||;;;;;|| ",
+ " |;;;m;;;| ",
+ " |;;mmm;;| ",
+ " |;;;m̌;;;| ",
+ " ||;;≤;;|| ",
+ " ||;;;|| ",
+ " ||||| ",
+ " ",
+ " "
+ ],
+ "palettes": [ "lighthouse_small_palette", "roof_palette" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": "lighthouse_small_z4",
+ "object": {
+ "fill_ter": "t_stone_masonry_floor",
+ "rows": [
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " %%%%%%%%% ",
+ " %%;;;;;;;%% ",
+ " %;;ååååå;;% ",
+ " %;åå;;;åå;% ",
+ " %;å;@@@;å;% ",
+ " %;å;@*@;å;% ",
+ " %;å;@ö@;å;% ",
+ " %;åå;v;åå;% ",
+ " %;;åå!åå;;% ",
+ " %%;;<;;;;%% ",
+ " %%%%%%%%% ",
+ " "
+ ],
+ "palettes": [ "lighthouse_small_palette", "roof_palette" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": "lighthouse_small_roof",
+ "object": {
+ "fill_ter": "t_open_air",
+ "rows": [
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ^^^^^ ",
+ " ^^^^^^^ ",
+ " ^^^^^^^ ",
+ " ^^^^^^^ ",
+ " ^^^^^^^ ",
+ " ^^^^^^^ ",
+ " ^^^^^ ",
+ " v ",
+ " ",
+ " "
+ ],
+ "palettes": [ "lighthouse_small_palette", "roof_palette" ]
+ }
+ }
+]
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
index 4e4959b19f..78d425c04b 100644
--- a/data/json/overmap/overmap_special/specials.json
+++ b/data/json/overmap/overmap_special/specials.json
@@ -5220,6 +5220,46 @@
"occurrences": [ 0, 1 ],
"flags": [ "CLASSIC", "LAKE", "MAN_MADE", "WILDERNESS" ]
},
+ {
+ "type": "overmap_special",
+ "id": "lighthouse_island_small",
+ "overmaps": [
+ { "point": [ 0, 0, 0 ], "overmap": "lake_surface" },
+ { "point": [ 1, 0, 0 ], "overmap": "lake_surface" },
+ { "point": [ 2, 0, 0 ], "overmap": "lake_surface" },
+ { "point": [ 0, 1, 0 ], "overmap": "lake_surface" },
+ { "point": [ 1, 1, 0 ], "overmap": "lighthouse_small_ground_north" },
+ { "point": [ 1, 1, 1 ], "overmap": "lighthouse_small_z1_north" },
+ { "point": [ 1, 1, 2 ], "overmap": "lighthouse_small_z2_north" },
+ { "point": [ 1, 1, 3 ], "overmap": "lighthouse_small_z3_north" },
+ { "point": [ 1, 1, 4 ], "overmap": "lighthouse_small_z4_north" },
+ { "point": [ 1, 1, 5 ], "overmap": "lighthouse_small_roof_north" },
+ { "point": [ 2, 1, 0 ], "overmap": "lake_surface" },
+ { "point": [ 0, 2, 0 ], "overmap": "lake_surface" },
+ { "point": [ 1, 2, 0 ], "overmap": "lake_surface" },
+ { "point": [ 2, 2, 0 ], "overmap": "lake_surface" },
+ { "point": [ 1, 0, -1 ], "overmap": "solid_earth", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 1, -1 ], "overmap": "solid_earth", "locations": [ "lake_water_cube" ] },
+ { "point": [ 0, 2, -1 ], "overmap": "solid_earth", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 0, -2 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 1, -2 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 0, 2, -2 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 0, -3 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 1, -3 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 0, 2, -3 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 0, -4 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 1, -4 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 0, 2, -4 ], "overmap": "empty_rock", "locations": [ "lake_water_cube" ] },
+ { "point": [ 1, 0, -5 ], "overmap": "empty_rock", "locations": [ "lake_bed" ] },
+ { "point": [ 1, 1, -5 ], "overmap": "empty_rock", "locations": [ "lake_bed" ] },
+ { "point": [ 0, 2, -5 ], "overmap": "empty_rock", "locations": [ "lake_bed" ] }
+ ],
+ "locations": [ "lake_surface" ],
+ "city_distance": [ 3, -1 ],
+ "city_sizes": [ 4, 12 ],
+ "occurrences": [ 0, 1 ],
+ "flags": [ "CLASSIC", "LAKE", "MAN_MADE", "WILDERNESS" ]
+ },
{
"type": "overmap_special",
"id": "Lake Cabin",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json
index f08e7bd68a..eb1ec1e86e 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain.json
@@ -113,6 +113,24 @@
"name": "lighthouse",
"sym": "&",
"color": "yellow",
+ "see_cost": 5,
+ "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
+ },
+ {
+ "type": "overmap_terrain",
+ "id": "lighthouse_small_ground",
+ "name": "small lighthouse",
+ "sym": "0",
+ "color": "yellow",
+ "see_cost": 5,
+ "flags": [ "RISK_LOW", "SOURCE_SAFETY" ]
+ },
+ {
+ "type": "overmap_terrain",
+ "id": [ "lighthouse_small_z1", "lighthouse_small_z2", "lighthouse_small_z3", "lighthouse_small_z4", "lighthouse_small_roof" ],
+ "name": "small lighthouse",
+ "sym": "0",
+ "color": "yellow",
"see_cost": 5
},
{
diff --git a/data/json/scenarios.json b/data/json/scenarios.json
index af2b430f3e..1e06b75aec 100644
--- a/data/json/scenarios.json
+++ b/data/json/scenarios.json
@@ -152,6 +152,7 @@
"sloc_lmoe",
"sloc_horse_ranch",
"sloc_lighthouse_ground",
+ "sloc_lighthouse_small_ground",
"sloc_lodge_ground",
"sloc_light_industry_scen"
],
@@ -608,7 +609,8 @@
"sloc_campsite",
"sloc_campground",
"sloc_cabin_lake",
- "sloc_lighthouse_ground"
+ "sloc_lighthouse_ground",
+ "sloc_lighthouse_small_ground"
],
"start_name": "Outside Town",
"flags": [ "LONE_START" ],
diff --git a/data/json/start_locations.json b/data/json/start_locations.json
index 81a63aaa02..021009721b 100644
--- a/data/json/start_locations.json
+++ b/data/json/start_locations.json
@@ -665,6 +665,12 @@
"name": "Lighthouse Island",
"terrain": [ "lighthouse_ground" ]
},
+ {
+ "type": "start_location",
+ "id": "sloc_lighthouse_small_ground",
+ "name": "Small lighthouse island",
+ "terrain": [ "lighthouse_small_ground" ]
+ },
{
"type": "start_location",
"id": "sloc_military_base_warehouse",
diff --git a/data/mods/Aftershock/items/books.json b/data/mods/Aftershock/items/books.json
index ac6c86cf79..40b8d3cee0 100644
--- a/data/mods/Aftershock/items/books.json
+++ b/data/mods/Aftershock/items/books.json
@@ -325,6 +325,8 @@
"copy-from": "recipe_augs",
"name": { "str": "Augmentative Tech Review", "str_pl": "issues of Augmentative Tech Review" },
"description": "This annual publication covers the various ways in which people use technology to improve their bodies. There are a few in-depth and thoroughly illustrated articles on prosthetics, though they tend to use too much jargon.",
+ "weight": "400 g",
+ "volume": "500 ml",
"symbol": "?",
"color": "pink"
}
diff --git a/data/mods/Magiclysm/scenarios.json b/data/mods/Magiclysm/scenarios.json
index 526f29c125..b46e40fae4 100644
--- a/data/mods/Magiclysm/scenarios.json
+++ b/data/mods/Magiclysm/scenarios.json
@@ -76,7 +76,14 @@
"points": 1,
"description": "You are an exile, whether because of people shunning you because of who you are or from a personal choice. The dead aren't willing to leave you be.",
"start_name": "Exiled",
- "allowed_locs": [ "sloc_hermit_shack", "sloc_cabin", "sloc_lmoe", "sloc_lighthouse_ground", "sloc_cabin_lake" ],
+ "allowed_locs": [
+ "sloc_hermit_shack",
+ "sloc_cabin",
+ "sloc_lmoe",
+ "sloc_lighthouse_ground",
+ "sloc_lighthouse_small_ground",
+ "sloc_cabin_lake"
+ ],
"professions": [
"druid",
"novice_necromancer",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment