Skip to content

Commit

Permalink
Add a dive shop location
Browse files Browse the repository at this point in the history 
Add a dive ship with two variations. One has an open class area and a
small pool in the back, as well as a spot for refilling SCUBA tanks.
The other has a larger separate classroom and more sales floor space.

This will provide another location for finding nepoprene and other SCUBA
related items.
  • Loading branch information
@ccaviness
ccaviness committed Feb 20, 2022
1 parent 27ab2a5 commit 0ce2776
Show file tree
Hide file tree
Showing 4 changed files with 235 additions and 0 deletions.
209 changes: 209 additions & 0 deletions data/json/mapgen/dive_shop.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
[
{
"id": "dive_shop_tanks",
"type": "item_group",
"subtype": "distribution",
"items": [
{ "item": "small_scuba_tank", "prob": 40, "charges": [ 5, 20 ] },
{ "item": "scuba_tank", "prob": 60, "charges": [ 10, 60 ] }
]
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_dive_shop" ],
"weight": 500,
"object": {
"fill_ter": "t_floor",
"rows": [
"____,____,____,____,____",
"____,____,____,____,____",
"____,____,____,____,____",
"____,____,____,____,____",
"____,____,____,____,____",
"FFFFFFFFFFFFFFFFFFFFFFFF",
"FFFFFFFFFFFFFFFFFFFFFFFF",
"|--OOOOOO--++--OOOOOO-|.",
"| |.",
"|W R R R RRRR RRRR |.",
"|W R R R |.",
"|W R R R #cDDDD#####$|.",
"|W R R R #L L |.",
"| |-----------|.",
"| hhhhhh | |S|.",
"| ZZZZZZ + ~~~~~~~ |S|.",
"| hhhhhh + ~~~~~~~ |+|.",
"| | ~~~~~~~ |.",
"|--------+| ~~~~~~~ |+|.",
"|B C | ~~~~~~~ | |.",
"|3 C | |t|.",
"|--------M-----M------|.",
".4......____________<...",
"........................"
],
"terrain": {
" ": "t_floor",
"+": "t_door_c",
",": "t_pavement_y",
"-": "t_wall_w",
".": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_underbrush", 10 ] ],
"F": "t_sidewalk",
"O": "t_window",
"_": "t_pavement",
"M": "t_door_metal_pickable",
"4": "t_gutter_downspout",
"<": "t_ladder_up",
"|": "t_wall_w",
"C": "t_chaingate_c",
"~": "t_water_pool"
},
"furniture": {
"#": "f_counter",
"$": "f_counter_gate_c",
"c": "f_console_broken",
"D": "f_displaycase",
"R": "f_rack",
"W": "f_wardrobe",
"L": "f_stool",
"t": "f_toilet",
"S": "f_shower",
"B": "f_workbench",
"3": "f_air_compressor",
"h": "f_chair",
"Z": "f_table"
},
"items": {
"R": { "item": "SUS_scuba_gear", "chance": 20 },
"D": { "item": "SUS_scuba_gear", "chance": 40 },
"W": { "item": "swimmer_wetsuit", "chance": 80, "repeat": [ 0, 3 ]}
},
"place_items": [
{ "item": "dive_shop_tanks", "x": [ 3, 6 ], "y": [ 19, 20 ], "chance": 90, "repeat": [ 2, 8 ] }
],
"place_monster": [ { "group": "GROUP_POOL_NOKIDS", "x": [ 12, 19 ], "y": [ 15, 19 ], "repeat": [ 2, 6 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_dive_shop" ],
"weight": 500,
"object": {
"fill_ter": "t_floor",
"rows": [
"____,____,____,____,____",
"____,____,____,____,____",
"____,____,____,____,____",
"____,____,____,____,____",
"____,____,____,____,____",
"FFFFFFFFFFFFFFFFFFFFFFFF",
"FFFFFFFFFFFFFFFFFFFFFFFF",
"|--OOOOOO--++--OOOOOO-|.",
"| |.",
"|W R R R R RRRR RRRR|.",
"|W R R R R |.",
"|W R R R R #c#DDDD$#|.",
"|W R R R R #L |.",
"| # |.",
"| -========|.",
"| : |.",
"|W R R R R : hhhhh |.",
"|W R R R R ) ZZZZZ |.",
"|W R R R R ) ZZZZZ |.",
"|W R R R R : hhhhh |.",
"| : |.",
"|--------------M------|.",
".4............._____<...",
"........................"
],
"terrain": {
" ": "t_floor",
"+": "t_door_glass_c",
",": "t_pavement_y",
"-": "t_wall_w",
".": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_underbrush", 10 ] ],
"F": "t_sidewalk",
"O": "t_window",
"_": "t_pavement",
"M": "t_door_metal_pickable",
"4": "t_gutter_downspout",
"<": "t_ladder_up",
"|": "t_wall_w",
"=": "t_wall_glass_h",
":": "t_wall_glass_v",
")": "t_door_glass_c"
},
"furniture": {
"#": "f_counter",
"$": "f_counter_gate_c",
"c": "f_console_broken",
"D": "f_displaycase",
"R": "f_rack",
"W": "f_wardrobe",
"L": "f_stool",
"h": "f_chair",
"Z": "f_table"
},
"items": {
"R": { "item": "SUS_scuba_gear", "chance": 10 },
"D": { "item": "SUS_scuba_gear", "chance": 40 },
"W": { "item": "swimmer_wetsuit", "chance": 80, "repeat": [ 0, 3 ]}
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_dive_shop_roof" ],
"weight": 500,
"object": {
"fill_ter": "t_tar_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
"|.....................3 ",
"|.c...................3 ",
"|.....................3 ",
"|.....................3 ",
"|.....................3 ",
"|.....................3 ",
"|.....................3 ",
"|.....................3 ",
"|.....................3 ",
"|.........&...........3 ",
"|.....................3 ",
"|.....................3 ",
"|.....................3 ",
"|.....................3 ",
"|5--------------------3 ",
" #>## ",
" "
],
"terrain": {
".": "t_tar_flat_roof",
" ": "t_open_air",
"|": "t_gutter_west",
"-": "t_gutter_south",
"3": "t_gutter_east",
"#": "t_grate",
">": "t_ladder_down",
"5": "t_gutter_drop"
},
"furniture": { "&": "f_roof_turbine_vent", "c": "f_cellphone_booster" },
"place_items": [ { "item": "roof_trash", "x": [ 4, 16 ], "y": [ 8, 15 ], "chance": 50, "repeat": [ 1, 3 ] } ],
"place_nested": [
{ "chunks": [ [ "roof_2x2_golf", 5 ], [ "null", 85 ], [ "roof_3x3_wine", 10 ] ], "x": [ 13, 20 ], "y": 15 },
{
"chunks": [ [ "null", 40 ], [ "roof_4x4_party", 5 ], [ "roof_4x4_utility", 50 ], [ "roof_4x4_holdout", 3 ] ],
"x": [ 4, 13 ],
"y": [ 8, 13 ]
}
]
}
}
]
9 changes: 9 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1508,6 +1508,15 @@
"locations": [ "land" ],
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_antique_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_antique_roof_north" } ]
},
{
"type": "city_building",
"id": "s_dive_shop",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "s_dive_shop_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_dive_shop_roof_north" }
]
},
{
"//": "All of those overmap specials that spawn also outside of town require a second declare as city_building.",
"type": "city_building",
Expand Down
16 changes: 16 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,22 @@
"sym": "A",
"color": "brown"
},
{
"type": "overmap_terrain",
"id": "s_dive_shop",
"name": "dive shop",
"copy-from": "generic_city_building",
"sym": "D",
"color": "blue"
},
{
"type": "overmap_terrain",
"id": "s_dive_shop_roof",
"name": "dive shop roof",
"copy-from": "generic_city_building",
"sym": "D",
"color": "blue"
},
{
"type": "overmap_terrain",
"id": "s_arcade",
Expand Down
1 change: 1 addition & 0 deletions data/json/regional_map_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,7 @@
"s_jewelry_shop": 200,
"s_antique": 200,
"s_gardening": 200,
"s_dive_shop": 300,
"museum": 100,
"s_music": 200,
"s_laundromat": 100,
Expand Down

0 comments on commit 0ce2776

Please sign in to comment.