diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 027cad63bfc64..81e50782ffda4 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -1218,6 +1218,26 @@ [ "tool_anfo_charge", 2 ] ] }, + { + "type": "item_group", + "id": "mine_materials", + "subtype": "collection", + "entries": [ + { "item": "coal_lump", "prob": 20, "count": [ 1, 10 ] }, + { "item": "rock", "prob": 40, "count": [ 1, 10 ] }, + { "item": "rock_large", "prob": 10, "count": [ 1, 10 ] }, + { "item": "rock_flaking", "prob": 20, "count": [ 1, 10 ] }, + { "item": "material_shrd_limestone", "prob": 40, "count": [ 1, 10 ] }, + { "item": "material_limestone", "prob": 40, "count": [ 1, 10 ] }, + { "item": "material_niter", "prob": 5, "count": [ 1, 10 ] }, + { "item": "material_sand", "prob": 50, "charges": 500, "container-item": "bag_canvas" }, + { "item": "material_soil", "prob": 50, "charges": 500, "container-item": "bag_canvas" }, + { "item": "chunk_sulfur", "prob": 5, "count": [ 1, 10 ] }, + { "item": "material_rocksalt", "prob": 5, "count": [ 1, 10 ] }, + { "item": "material_rhodonite", "prob": 5, "count": [ 1, 10 ] }, + { "item": "material_zincite", "prob": 5, "count": [ 1, 10 ] } + ] + }, { "type": "item_group", "id": "mine_equipment", diff --git a/data/json/mapgen/mine/mine_entrance.json b/data/json/mapgen/mine/mine_entrance.json index 71f2e6a6508c2..f6b517c69f266 100644 --- a/data/json/mapgen/mine/mine_entrance.json +++ b/data/json/mapgen/mine/mine_entrance.json @@ -2,33 +2,33 @@ { "type": "mapgen", "method": "json", - "om_terrain": "mine_entrance", + "om_terrain": [ [ "mine_entrance", "mine_entrance_loading_zone" ] ], "object": { "rows": [ - "fffffffffffФФfffffffffff", - "f v ,,,,,,,,,,,, !f", - "f/ ,,,,,,,,,,,,,,,,,f", - "|-000--000-0+0|00--00|,f", - "|dddrFFddcW..2|2..Fdd|,f", - "0dC.....Cc....?....dC|,f", - "0............a|b...d.|,f", - "0..C...|*-|-*-|b.....|,f", - "|rddd1p|.l|&_s|a36561|,f", - "|-000--|--|---|------|,f", - "f ,,,,,,,,,,,,,,,,,f", - "|----|+|----| ,,,,,,,/f", - "|I.hĎ|.|дh.I| ,|---%--|", - "0BB..+.+..BB0 ,|eEE~~4|", - "|----|.|----| ,|~EE~~4|", - "|I.hĎ|.|дh.I| ,|------|", - "0BB..+.+..BB0 ,|888888|", - "|----|.|----| ,?~~~~~8|", - "|I.hD|.|Дh.I| ,|888888|", - "0BB..+.+..BB0 ,|------|", - "|----|.|----| ,^`````@|", - "|&___+.+____| ,^``````|", - "|R__s|.|Й__7|/ №|999``$|", - "|----|0|----|fff|------|" + "fffffffffffФФfffffffffffffffФФФФФffffffФФФФФff ", + "f v ,,,,,,,,,,,, ! f ;;;;;;;;;;;;;;;; f ", + "f/ ,,,,,,,,,,,,,,,,, f ;;;;;;;;;;;;;;;; f ", + "|-000--000-0+0|00--00|, f ;;;;;;;;;;;;;;;; f ", + "|dddrFFddcW..2|2..Fdd|, f ;°°°;;;;;;;;;°;; f ", + "0dC.....Cc....?....dC|, f ;°°°;;;;;;;;°°°; f ", + "0............a|b...d.|, f ;°°°;;;;;;;°°°°° f ", + "0..C...|*-|-*-|b.....|, f °°°°°;;;;;;;°°°; f ", + "|rddd1p|.l|&_s|a36561|, f ;°°°;;;;;;;;°°°; f ", + "|-000--|--|---|------|, f ;;°;;;;;;;;;°°°; f ", + "f ,,,,,,,,,,,,,,,,,,,,,,;;;;;;;;;;;;;;;; f ", + "|----|+|----| ,,,,,,,,,,,,,;;;;;;;;;;;;;;;; f ", + "|I.hĎ|.|дh.I| ,|---%-------;;;;;;;;;;;;;;;; f ", + "0BB..+.+..BB0 ,|eEE~~~eEE®®;;;;;;Ø;;;;;;;;; f ", + "|----|.|----| ,|~EE~~~~EE==;;;;;;;;;;;;;;;; f ", + "|I.hĎ|.|дh.I| ,|------|EE=~;;;;;;;;;;;;;;;; f ", + "0BB..+.+..BB0 ,|TTogTr|~~=~;;;;;;;;;;;;;;;; f ", + "|----|.|----| ,0S....Ć|8~=~8| |````| f ", + "|I.hD|.|Дh.I| ,|a....Ĉ|8~=~8| |$``@| f ", + "0BB..+.+..BB0 ,|----+-|8~=~8| |````| f ", + "|----|.|----| ,|hth..h|8~=~8| |````| f ", + "|&___+.+____| ,+.....t|8~~~8| |````| f ", + "|R__s|.|Й__7|/ /|hth..h|88888|/ /|9999| f ", + "|----|0|----|fff|-0--0-|-----|fff|----|fffffff " ], "fill_ter": "t_floor", "terrain": { @@ -43,12 +43,15 @@ "?": "t_door_locked_alarm", "+": "t_door_locked", "%": "t_door_metal_c", - "^": "t_door_metal_locked", - "№": "t_gates_mech_control", ",": "t_sidewalk", + ";": "t_pavement", + "°": "t_pavement_y", + "Ø": "t_pavement", ".": "t_floor", "~": "t_thconc_floor", "`": "t_thconc_floor", + "®": "t_thconc_floor", + "=": "t_conveyor", "0": "t_metal_grate_window_with_curtain", "4": "t_thconc_floor", "8": "t_thconc_floor", @@ -66,6 +69,7 @@ "Ф": "t_chaingate_l" }, "furniture": { + "®": "f_machinery_heavy", "1": "f_shredder", "2": "f_rack_coat", "3": "f_server", @@ -79,18 +83,25 @@ "B": "f_bed", "b": "f_bookcase", "c": "f_counter", + "Ć": "f_cupboard", + "Ĉ": "f_cupboard", "C": "f_chair", "d": "f_desk", "D": "f_desk", "Ď": "f_desk", "F": "f_filing_cabinet", + "g": "f_fridge", "h": "f_chair", "I": "f_dresser", "l": "f_locker", + "o": "f_oven", "p": [ "f_indoor_plant", "f_indoor_plant_y" ], "R": "f_trashcan", "r": "f_trashcan", + "S": "f_sink", "s": "f_sink", + "T": "f_counter", + "t": "f_table", "v": "f_vent_pipe", "Д": "f_desk", "д": "f_desk", @@ -99,20 +110,33 @@ "toilets": { "&": { } }, "items": { "2": { "item": "coat_rack", "chance": 60, "repeat": 2 }, - "8": { "item": "mine_storage", "chance": 50, "repeat": 4 }, + "8": { "item": "mine_materials", "chance": 50, "repeat": 4 }, "9": { "item": "car_kit", "chance": 60, "repeat": 2 }, "B": { "item": "bed", "chance": 50 }, "b": { "item": "lab_bookshelves", "chance": 60, "repeat": 2 }, "c": { "item": "office_supplies", "chance": 60 }, + "Ć": [ + { "item": "SUS_silverware", "chance": 80 }, + { "item": "SUS_utensils", "chance": 80 }, + { "item": "SUS_knife_drawer", "chance": 80 }, + { "item": "SUS_dishes", "chance": 80 }, + { "item": "SUS_cookware", "chance": 80 } + ], + "Ĉ": { "item": "SUS_pantry", "chance": 80 }, "D": { "item": "SUS_junk_drawer_artsy", "chance": 90 }, "Ď": { "item": "SUS_junk_drawer_messy", "chance": 90 }, "d": { "item": "SUS_office_desk", "chance": 90 }, "F": { "item": "SUS_office_filing_cabinet", "chance": 90 }, + "g": { "item": "SUS_fridge", "chance": 80 }, "I": { "item": "SUS_dresser_mens", "chance": 60 }, "l": { "item": "SUS_janitors_closet", "chance": 85 }, + "o": { "item": "SUS_oven", "chance": 70 }, "R": { "item": "trash_cart", "chance": 50 }, "r": { "item": "trash_cart", "chance": 50 }, + "S": { "item": "SUS_kitchen_sink", "chance": 90 }, "s": { "item": "SUS_bathroom_sink", "chance": 70 }, + "T": { "item": "SUS_appliances_cupboard", "chance": 10 }, + "t": { "item": "dining", "chance": 45 }, "Д": { "item": "SUS_junk_drawer_handy", "chance": 90 }, "д": { "item": "SUS_junk_drawer_tidy", "chance": 90 } }, @@ -132,39 +156,40 @@ } }, "gaspumps": { "@": { "fuel": "gasoline", "amount": [ 10000, 50000 ] }, "$": { "fuel": "diesel", "amount": [ 10000, 50000 ] } }, + "vehicles": { "Ø": { "vehicle": "tatra_truck", "chance": 50, "fuel": 40 } }, "nested": { "`": { "chunks": [ [ "mechanical_fluid", 10 ], [ "gasoline_diesel_motor_oil", 80 ], [ "null", 80 ] ] } } } }, { "type": "mapgen", "method": "json", - "om_terrain": "mine_entrance_roof", + "om_terrain": [ [ "mine_entrance_roof", "mine_entrance_loading_zone_roof" ] ], "object": { "rows": [ - " ", - " ", - " ", - "Ю--------------------| ", - "|....................| ", - "|....................| ", - "|....................| ", - "|....................| ", - "|....................| ", - "|--------------------| ", - " ", - "|-----------| ", - "|...........| |------Ю", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|...........| |......|", - "|-----------Ю |------|" + " ", + " ", + " ", + "Ю--------------------| ", + "|....................| ", + "|....................| ", + "|....................| ", + "|....................| ", + "|....................| ", + "|--------------------| ", + " ", + "|-----------| ", + "|...........| |------------| ", + "|...........| |............| ", + "|...........| |............| ", + "|...........| |............| ", + "|...........| |............| ", + "|...........| |............| |----| ", + "|...........| |............| |....| ", + "|...........| |............| |....| ", + "|...........| |............| |....| ", + "|...........| |............| |....| ", + "|...........| |............| |....| ", + "|-----------Ю Ю------------Ю Ю----| " ], "terrain": { " ": "t_open_air", "|": "t_gutter_north", "-": "t_gutter_west", "Ю": "t_gutter_drop", ".": "t_flat_roof" } } diff --git a/data/json/mapgen/mine/mine_shaft.json b/data/json/mapgen/mine/mine_shaft.json index 674b1d3d59031..3d56375160457 100644 --- a/data/json/mapgen/mine/mine_shaft.json +++ b/data/json/mapgen/mine/mine_shaft.json @@ -6,21 +6,21 @@ "object": { "fill_ter": "t_rock", "rows": [ - " <# ", - " # ", - " # ", - " # ", - " # ", - " # ", - " # ", - " # ", - " # ", - " # ", - " # ", - " # ", - " # ", - " ....#># ", - " ....### ", + " <#", + " #", + " #", + " #", + " #", + " #", + " #", + " #", + " #", + " #", + " #", + " #", + " #>#", + " ....###", + " .... ", " ", " ", " ", @@ -37,34 +37,34 @@ { "type": "mapgen", "method": "json", - "om_terrain": "mine_shaft_lower", + "om_terrain": [ [ "mine_shaft_lower", "mine_shaft_lower_east" ] ], "object": { "fill_ter": "t_rock_floor", "rows": [ - "###### ## ########", - "####### ##########", - "######## ##########", - "######## ########", - " ###### #########", - " ## ##########", - "# ########## ", - " ###### ######### ", - "######## #### #", - "###### ", - "###### ######", - "##### ######", - "### |------| ######", - "# |!@@..<|-| ###", - " |.@@....S| ", - "### |---....S| #", - " +.......S| ", - " |.......S| ####", - "## |LLLLLL|-| ######", - "#### |------| ######", - "###### ######", - "####### ## #######", - "######## ## #######", - "######### # ########" + "###### ## #################### #######", + "###### ## ################### ########", + "###### ## ############# #### #########", + "####### ############### ### ##########", + "######## ############### ## ###########", + "######## ############## ############", + " ###### ################ ##########", + " ## ################# ###########", + "# ##### ###### ###########", + " #### ## ", + "###### ### #### #### ", + "###### |-| #### ##### ", + "###### |----|<|--| ", + "##### |!@@...!@@| #### #####", + "### |.@@....@@| ######### ######", + " +.......@@| ########## ######", + "*****************=========| # ######## ####", + " +.......®®| ####### ####", + " |.........| ######### ####", + "# |.........| ######### #", + "## |LLLL|SSSS| ######### #", + "#### |----|----| ######## #", + "###### ######### ", + "####### ## ####### ######## " ], "terrain": { "<": "t_ladder_up", @@ -75,14 +75,18 @@ "!": "t_elevator_control", "@": "t_elevator", "#": [ [ "t_rock", 4 ], [ "t_rock_floor", 1 ] ], + "=": "t_conveyor", + "*": "t_railroad_track_small", + "®": "t_thconc_floor", "L": "t_thconc_floor", "S": "t_thconc_floor" }, - "furniture": { "L": "f_locker", "S": "f_utility_shelf" }, + "furniture": { "®": "f_machinery_heavy", "L": "f_locker", "S": "f_utility_shelf" }, "items": { "L": [ { "item": "clothing_work_set", "chance": 50 }, { "item": "hardware_clothing", "chance": 50 } ], "S": { "item": "mine_equipment", "chance": 80 } - } + }, + "place_vehicles": [ { "vehicle": "trolley", "x": 10, "y": 16, "chance": 100, "status": 0 } ] } } ] diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 845aed0757c17..326b01007d486 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -1129,11 +1129,17 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_lot_north" }, { "point": [ 0, 1, 0 ], "overmap": "mine_entrance_north" }, + { "point": [ 1, 1, 0 ], "overmap": "mine_entrance_loading_zone_north" }, + { "point": [ 1, 0, 0 ], "overmap": "road_end_north" }, { "point": [ 0, 1, 1 ], "overmap": "mine_entrance_roof_north" }, { "point": [ 0, 1, -1 ], "overmap": "mine_shaft_middle_north" }, - { "point": [ 0, 1, -2 ], "overmap": "mine_shaft_lower_north" } + { "point": [ 0, 1, -2 ], "overmap": "mine_shaft_lower_north" }, + { "point": [ 1, 1, -2 ], "overmap": "mine_shaft_lower_east_north" } + ], + "connections": [ + { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, 0, 0 ] }, + { "point": [ 1, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 1, 0, 0 ] } ], - "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, 0, 0 ] } ], "locations": [ "wilderness" ], "city_distance": [ 10, 40 ], "city_sizes": [ 4, -1 ], diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json index 805072815c9a4..4b946bab6f2a4 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json @@ -360,7 +360,7 @@ }, { "type": "overmap_terrain", - "id": "mine_entrance", + "id": [ "mine_entrance", "mine_entrance_loading_zone" ], "name": "mine entrance", "sym": "M", "color": "magenta", @@ -369,12 +369,11 @@ }, { "type": "overmap_terrain", - "id": "mine_entrance_roof", + "id": [ "mine_entrance_roof", "mine_entrance_loading_zone_roof" ], "name": "mine entrance roof", "sym": "M", "color": "magenta", - "see_cost": 5, - "flags": [ "KNOWN_DOWN" ] + "see_cost": 5 }, { "type": "overmap_terrain", @@ -387,7 +386,7 @@ }, { "type": "overmap_terrain", - "id": "mine_shaft_lower", + "id": [ "mine_shaft_lower", "mine_shaft_lower_east" ], "name": "mine shaft", "sym": "O", "color": "dark_gray", diff --git a/data/json/vehicles/trains.json b/data/json/vehicles/trains.json index 21dcea76870b3..44aba2971a6a2 100644 --- a/data/json/vehicles/trains.json +++ b/data/json/vehicles/trains.json @@ -249,5 +249,12 @@ { "x": 0, "y": 0, "parts": [ "frame_vertical_2", "seat", "rail_wheel_small_pair", "controls" ] }, { "x": 0, "y": 0, "parts": [ { "part": "fuel_bunker", "fuel": "coal_lump" } ] } ] + }, + { + "id": "trolley", + "type": "vehicle", + "name": "Trolley", + "blueprint": [ "O" ], + "parts": [ { "x": 0, "y": 0, "parts": [ "frame_vertical", "cargo_space", "rail_wheel_small_pair" ] } ] } ]