From ae3cdd5ba7e3eff5a771eeffd6f658effec471a6 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Thu, 23 May 2019 20:56:22 -0400 Subject: [PATCH] add roof to tire shop also move item groups --- data/json/itemgroups/locations.json | 84 ++++++++ data/json/mapgen/cs_tire_shop.json | 191 +++++++----------- .../overmap/multitile_city_buildings.json | 9 + data/json/overmap_terrain_commercial.json | 8 + data/json/vehicle_groups.json | 18 ++ 5 files changed, 195 insertions(+), 115 deletions(-) diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index 5896cb5581786..2674ec266255d 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -508,5 +508,89 @@ { "item": "gasoline", "prob": 30, "charges-min": 450, "charges-max": 4000, "container-item": "jerrycan" }, { "item": "gasoline", "prob": 10, "charges-min": 2650, "charges-max": 10000, "container-item": "jerrycan_big" } ] + }, + { + "type": "item_group", + "id": "oa_ig_ts_tables", + "//": "for cs_tire_shop", + "items": [ + [ "radio", 30 ], + [ "rag", 30 ], + [ "cell_phone", 20 ], + [ "mag_mechanics", 20 ], + [ "manual_mechanics", 10 ], + [ "jack", 60 ], + [ "jack_small", 60 ], + [ "jack_makeshift", 30 ], + [ "wrench", 50 ], + [ "gloves_work", 30 ], + [ "glasses_safety", 20 ] + ] + }, + { + "type": "item_group", + "id": "oa_ig_ts_lockers", + "//": "for cs_tire_shop", + "items": [ + { "group": "ammo_pocket_batteries_full", "prob": 10 }, + [ "radio", 10 ], + [ "rag", 30 ], + [ "jack", 20 ], + [ "jack_small", 30 ], + [ "flashlight", 20 ], + [ "heavy_flashlight", 10 ], + [ "jumper_cable", 20 ], + [ "jumper_cable_heavy", 10 ], + [ "pliers", 10 ], + [ "battery_motorbike", 10 ], + [ "battery_car", 10 ], + [ "stereo", 10 ], + [ "wrench", 10 ], + [ "gloves_work", 10 ], + [ "glasses_safety", 10 ], + [ "solar_cell", 10 ], + [ "screwdriver", 15 ], + [ "superglue", 5 ], + [ "polisher", 15 ], + [ "solar_panel", 15 ], + [ "spare_tire_carrier", 10 ], + [ "mounted_spare_tire", 10 ] + ] + }, + { + "type": "item_group", + "id": "oa_ig_ts_crates", + "//": "for cs_tire_shop", + "items": [ + { "group": "ammo_any_batteries_full", "prob": 10 }, + [ "radio", 10 ], + [ "rag", 30 ], + [ "jack", 20 ], + [ "jack_small", 30 ], + [ "flashlight", 20 ], + [ "heavy_flashlight", 10 ], + [ "jumper_cable", 20 ], + [ "jumper_cable_heavy", 10 ], + [ "pliers", 10 ], + [ "battery_motorbike", 10 ], + [ "battery_car", 10 ], + [ "stereo", 10 ], + [ "wrench", 10 ], + [ "gloves_work", 10 ], + [ "glasses_safety", 10 ], + [ "solar_cell", 10 ], + [ "screwdriver", 15 ], + [ "superglue", 5 ], + [ "polisher", 15 ], + [ "solar_panel", 15 ], + [ "spare_tire_carrier", 10 ], + [ "mounted_spare_tire", 10 ] + ] + }, + { + "type": "item_group", + "id": "oa_ig_ts_tires", + "//": "for cs_tire_shop", + "items": [ [ "wheel_small", 30 ], [ "wheel", 30 ], [ "wheel_wide", 20 ] ] } ] diff --git a/data/json/mapgen/cs_tire_shop.json b/data/json/mapgen/cs_tire_shop.json index 62f415699ca54..d43c267d81a9c 100644 --- a/data/json/mapgen/cs_tire_shop.json +++ b/data/json/mapgen/cs_tire_shop.json @@ -1,108 +1,11 @@ [ - { - "type": "vehicle_group", - "id": "oa_vg_ts_vehicles", - "vehicles": [ - [ "car", 2000 ], - [ "electric_car", 500 ], - [ "suv", 800 ], - [ "suv_electric", 200 ], - [ "car_mini", 800 ], - [ "beetle", 500 ], - [ "motorcycle", 200 ], - [ "motorcycle_sidecart", 100 ], - [ "scooter", 200 ], - [ "scooter_electric", 300 ], - [ "pickup", 800 ], - [ "hippie_van", 1000 ] - ] - }, - { - "type": "item_group", - "id": "oa_ig_ts_tables", - "items": [ - [ "radio", 30 ], - [ "rag", 30 ], - [ "cell_phone", 20 ], - [ "mag_mechanics", 20 ], - [ "manual_mechanics", 10 ], - [ "jack", 60 ], - [ "jack_small", 60 ], - [ "jack_makeshift", 30 ], - [ "wrench", 50 ], - [ "gloves_work", 30 ], - [ "glasses_safety", 20 ] - ] - }, - { - "type": "item_group", - "id": "oa_ig_ts_lockers", - "items": [ - { "group": "ammo_pocket_batteries_full", "prob": 10 }, - [ "radio", 10 ], - [ "rag", 30 ], - [ "jack", 20 ], - [ "jack_small", 30 ], - [ "flashlight", 20 ], - [ "heavy_flashlight", 10 ], - [ "jumper_cable", 20 ], - [ "jumper_cable_heavy", 10 ], - [ "pliers", 10 ], - [ "battery_motorbike", 10 ], - [ "battery_car", 10 ], - [ "stereo", 10 ], - [ "wrench", 10 ], - [ "gloves_work", 10 ], - [ "glasses_safety", 10 ], - [ "solar_cell", 10 ], - [ "screwdriver", 15 ], - [ "superglue", 5 ], - [ "polisher", 15 ], - [ "solar_panel", 15 ], - [ "spare_tire_carrier", 10 ], - [ "mounted_spare_tire", 10 ] - ] - }, - { - "type": "item_group", - "id": "oa_ig_ts_crates", - "items": [ - { "group": "ammo_any_batteries_full", "prob": 10 }, - [ "radio", 10 ], - [ "rag", 30 ], - [ "jack", 20 ], - [ "jack_small", 30 ], - [ "flashlight", 20 ], - [ "heavy_flashlight", 10 ], - [ "jumper_cable", 20 ], - [ "jumper_cable_heavy", 10 ], - [ "pliers", 10 ], - [ "battery_motorbike", 10 ], - [ "battery_car", 10 ], - [ "stereo", 10 ], - [ "wrench", 10 ], - [ "gloves_work", 10 ], - [ "glasses_safety", 10 ], - [ "solar_cell", 10 ], - [ "screwdriver", 15 ], - [ "superglue", 5 ], - [ "polisher", 15 ], - [ "solar_panel", 15 ], - [ "spare_tire_carrier", 10 ], - [ "mounted_spare_tire", 10 ] - ] - }, - { - "type": "item_group", - "id": "oa_ig_ts_tires", - "items": [ [ "wheel_small", 30 ], [ "wheel", 30 ], [ "wheel_wide", 20 ] ] - }, { "type": "mapgen", "om_terrain": [ "cs_tire_shop" ], "method": "json", "weight": 1000, "object": { + "fill_ter": "t_floor", "rows": [ ",..~~y''''y~~''''''~~.,,", ".,.~~y''''y~~''''''~~..,", @@ -124,37 +27,29 @@ ".,..| cc--l---- -- Sg..", "...,| ch|L C|Vv c| Sg,.", ".,..| |L C| c|-D-|..", - "..,.|rrr|L C|hhhh|T S|.,", + "..,.|rrr|L C|hhhh|T S|4,", "...,-ggg-----gggg-----..", - ".,..,..,...,..,....,...,", - "...,,....,.....,.....,.." + ".,..,..,.u## ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ">": "t_ladder_down" }, + "place_items": [ { "item": "roof_trash", "x": [ 7, 15 ], "y": [ 7, 18 ], "chance": 20, "repeat": [ 1, 3 ] } ], + "place_nested": [ + { + "chunks": [ + [ "null", 40 ], + [ "roof_2x2_utilities_b", 15 ], + [ "roof_2x2_utilities_c", 5 ], + [ "roof_2x2_utilities_d", 10 ], + [ "roof_2x2_utilities", 10 ], + [ "roof_2x2_golf", 5 ] + ], + "x": [ 7, 16 ], + "y": 17 + }, + { + "chunks": [ + [ "null", 50 ], + [ "roof_4x4_party", 5 ], + [ "roof_4x4_holdout", 5 ], + [ "roof_4x4_utility", 10 ], + [ "roof_4x4_utility_1", 10 ], + [ "roof_6x6_survivor", 10 ], + [ "roof_6x6_utility", 10 ] + ], + "x": [ 6, 15 ], + "y": [ 9, 12 ] + } + ] + } } ] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index abca0d04d00cf..f0b25aaa9ce27 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -59,6 +59,15 @@ { "point": [ 0, 0, 3 ], "overmap": "church_roof_1_north" } ] }, + { + "type": "city_building", + "id": "cs_tire_shop", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "cs_tire_shop_north" }, + { "point": [ 0, 0, 1 ], "overmap": "cs_tire_shop_roof_north" } + ] + }, { "type": "city_building", "id": "s_bookstore", diff --git a/data/json/overmap_terrain_commercial.json b/data/json/overmap_terrain_commercial.json index 1fb1af176f79f..70073bb45ef6e 100644 --- a/data/json/overmap_terrain_commercial.json +++ b/data/json/overmap_terrain_commercial.json @@ -1733,6 +1733,14 @@ "sym": "O", "color": "white" }, + { + "type": "overmap_terrain", + "id": "cs_tire_shop_roof", + "copy-from": "generic_city_building", + "name": "tire shop roof", + "sym": "O", + "color": "white" + }, { "type": "overmap_terrain", "id": "headshop", diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json index 6c21a32188c37..cea8a8ff3b919 100644 --- a/data/json/vehicle_groups.json +++ b/data/json/vehicle_groups.json @@ -499,5 +499,23 @@ "type": "vehicle_group", "id": "trains_draisine", "vehicles": [ [ "motorized_draisine_6seats", 500 ], [ "motorized_draisine_2seats", 2000 ] ] + }, + { + "type": "vehicle_group", + "id": "oa_vg_ts_vehicles", + "vehicles": [ + [ "car", 2000 ], + [ "electric_car", 500 ], + [ "suv", 800 ], + [ "suv_electric", 200 ], + [ "car_mini", 800 ], + [ "beetle", 500 ], + [ "motorcycle", 200 ], + [ "motorcycle_sidecart", 100 ], + [ "scooter", 200 ], + [ "scooter_electric", 300 ], + [ "pickup", 800 ], + [ "hippie_van", 1000 ] + ] } ]