diff --git a/data/json/construction.json b/data/json/construction.json index aa393aae1915..b86b13c97a5a 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -2380,6 +2380,45 @@ "pre_terrain": "t_concrete", "post_terrain": "t_support_s" }, + { + "type": "construction", + "id": "constr_flagpole", + "group": "build_flagpole", + "category": "FURN", + "required_skills": [ [ "fabrication", 3 ] ], + "time": "30 m", + "qualities": [ [ { "id": "DIG", "level": 2 } ] ], + "components": [ [ [ "wood_beam", 1 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ], + "pre_flags": "DIGGABLE", + "pre_special": "check_empty", + "post_furniture": "f_flagpole_wood" + }, + { + "type": "construction", + "id": "constr_us_flag_metal", + "//": "Metal flagpole", + "group": "hoist_us_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "american_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_us_flag_metal" + }, + { + "type": "construction", + "id": "constr_us_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_us_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "american_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_us_flag_wood" + }, { "type": "construction", "id": "constr_grass_white", diff --git a/data/json/construction_group.json b/data/json/construction_group.json index 07b5c5c29436..548e5e472a00 100644 --- a/data/json/construction_group.json +++ b/data/json/construction_group.json @@ -1139,6 +1139,16 @@ "id": "mine_upstair", "name": "Mine Upstair" }, + { + "type": "construction_group", + "id": "build_flagpole", + "name": "Build Wooden Flagpole" + }, + { + "type": "construction_group", + "id": "hoist_us_flag", + "name": "Hoist American Flag" + }, { "type": "construction_group", "id": "paint_grass_white", diff --git a/data/json/external_tileset/External_Tileset_DP_Tall.json b/data/json/external_tileset/External_Tileset_DP_Tall.json index 0ce4df598841..8dfee7fdde16 100644 --- a/data/json/external_tileset/External_Tileset_DP_Tall.json +++ b/data/json/external_tileset/External_Tileset_DP_Tall.json @@ -36,7 +36,11 @@ { "id": "t_tree_coca_harvested_season_summer", "fg": 17, "bg": 14, "rotates": false }, { "id": "t_tree_coca_harvested_season_winter", "fg": 17, "bg": 15, "rotates": false }, { "id": [ "f_grid_floodlight_off", "f_grid_floodlight" ], "fg": 18 }, - { "id": "f_grid_floodlight_on", "fg": 19 } + { "id": "f_grid_floodlight_on", "fg": 19 }, + { "id": "f_flagpole_metal", "fg": 20 }, + { "id": "f_flagpole_wood", "fg": 21 }, + { "id": "f_us_flag_metal", "fg": 22 }, + { "id": "f_us_flag_wood", "fg": 23 } ], "sprite_width": 64, "sprite_height": 80, diff --git a/data/json/external_tileset/External_Tileset_DP_Tall.png b/data/json/external_tileset/External_Tileset_DP_Tall.png index 929b0c1621d7..b8b6c7d872a2 100644 Binary files a/data/json/external_tileset/External_Tileset_DP_Tall.png and b/data/json/external_tileset/External_Tileset_DP_Tall.png differ diff --git a/data/json/furniture_and_terrain/furniture-graves.json b/data/json/furniture_and_terrain/furniture-graves.json index 94b620f777c8..7200a1678555 100644 --- a/data/json/furniture_and_terrain/furniture-graves.json +++ b/data/json/furniture_and_terrain/furniture-graves.json @@ -90,7 +90,7 @@ "type": "furniture", "id": "f_grave_monument", "name": "obelisk", - "description": "Monument to pride.", + "description": "A monument to the fallen, from a time when the dead weren't so restless.", "symbol": "$", "color": "black_white", "move_cost_mod": -1, diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index d4742b7cc15f..ad3afd7249eb 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -997,5 +997,109 @@ "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return", "ranged": { "reduction": [ 32, 64 ], "destroy_threshold": 64, "block_unaimed_chance": "50%" } } + }, + { + "type": "furniture", + "id": "f_flagpole_metal", + "name": "flagpole", + "looks_like": "f_dancing_pole", + "description": "An old metal flagpole, with no flag to fly. Don't lick it if it's cold out.", + "symbol": "i", + "color": "light_gray", + "move_cost_mod": -1, + "coverage": 40, + "required_str": -1, + "flags": [ "BASHABLE", "TRANSPARENT" ], + "deconstruct": { + "items": [ { "item": "pipe", "count": 8 }, { "item": "sheet_metal", "count": 2 }, { "item": "rope_30", "count": 1 } ] + }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_us_flag_metal", + "copy-from": "f_flagpole_metal", + "name": "flagpole with American flag", + "looks_like": "american_flag", + "description": "An old metal flagpole flying an American flag. A leftover from before the world ended, you could take it down if you need one for some reason.", + "symbol": "i", + "color": "light_red", + "extend": { "flags": [ "EASY_DECONSTRUCT" ] }, + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "american_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "american_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_flagpole_wood", + "name": "wooden flagpole", + "description": "A makeshift flagpole constructed from a wooden beam and rope.", + "symbol": "i", + "color": "brown", + "looks_like": "f_utility_pole", + "move_cost_mod": -1, + "coverage": 40, + "required_str": -1, + "flags": [ "BASHABLE", "TRANSPARENT" ], + "deconstruct": { "items": [ { "item": "wood_beam", "count": 1 }, { "item": "rope_makeshift_30", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_us_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with American flag", + "looks_like": "american_flag", + "description": "Someone's hoisted an old American flag from this makeshift flagpole.", + "symbol": "i", + "color": "light_red", + "extend": { "flags": [ "EASY_DECONSTRUCT" ] }, + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "american_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "american_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } } ] diff --git a/data/json/mapgen/bank.json b/data/json/mapgen/bank.json index e387be2f9f80..dee8c710681a 100644 --- a/data/json/mapgen/bank.json +++ b/data/json/mapgen/bank.json @@ -45,7 +45,7 @@ "6": "t_console", "A": "t_atm", "G": "t_door_glass_c", - "I": "t_column", + "I": "t_sidewalk", "M": "t_door_metal_locked", "R": "t_wall_metal", "S": "t_sidewalk", @@ -58,6 +58,7 @@ "'": "f_street_light", "C": "f_chair", "T": "f_table", + "I": [ "f_us_flag_metal", "f_flagpole_metal" ], "c": "f_counter", "l": "f_stool", "p": [ "f_indoor_plant", "f_null" ], @@ -65,7 +66,6 @@ "t": "f_toilet" }, "toilets": { "t": { } }, - "place_loot": [ { "item": "american_flag", "x": 20, "y": 0, "chance": 50 } ], "place_items": [ { "item": "office", "x": [ 4, 9 ], "y": 8, "chance": 30 }, { "item": "office", "x": [ 3, 5 ], "y": 12, "chance": 30 }, @@ -177,7 +177,7 @@ "6": "t_console", "A": "t_atm", "G": "t_door_glass_c", - "i": "t_column", + "i": "t_sidewalk", "M": "t_door_metal_locked", "R": "t_wall_metal", "S": "t_sidewalk", @@ -198,6 +198,7 @@ "C": "f_chair", "T": "f_table", "c": "f_counter", + "i": [ "f_us_flag_metal", "f_flagpole_metal" ], "l": "f_stool", "p": [ "f_indoor_plant", "f_null" ], "s": "f_sink", @@ -223,7 +224,6 @@ "failures": [ { "action": "alarm" }, { "action": "damage" }, { "action": "secubots" } ] } }, - "place_loot": [ { "item": "american_flag", "x": 21, "y": 0, "chance": 50 } ], "place_monster": [ { "monster": "mon_secubot", "x": [ 7, 18 ], "y": [ 7, 18 ], "chance": 30, "repeat": 4 } ] } }, diff --git a/data/json/mapgen/cs_public_space.json b/data/json/mapgen/cs_public_space.json index 3b948bd10ff7..c6c3c51973db 100644 --- a/data/json/mapgen/cs_public_space.json +++ b/data/json/mapgen/cs_public_space.json @@ -7,7 +7,7 @@ "object": { "rows": [ "...,....'''''''',...,,.!", - "..,...,,'I''''I',..,...,", + "..,...,,'I''''M',..,...,", "..,...,.''''''''.....,..", "...,fsfsfs,'',sfsfsf,.,.", ".,.f,,,,,,,'',,,,,,,f...", @@ -41,13 +41,22 @@ "S": "t_water_sh", "b": "t_sidewalk", "D": "t_sidewalk", - "I": "t_column", + "I": "t_sidewalk", + "M": "t_sidewalk", "N": "t_sidewalk", "f": "t_dirtmound" }, - "furniture": { "!": "f_street_light", "S": "f_statue", "b": "f_bench", "D": "f_dumpster", "N": "f_bulletin", "f": "f_bluebell" }, - "items": { "D": { "item": "trash_dumpster", "chance": 80 }, "b": { "item": "oa_discarded_news", "chance": 5 } }, - "place_loot": [ { "item": "american_flag", "x": 10, "y": 1, "chance": 25 } ] + "furniture": { + "!": "f_street_light", + "I": [ "f_us_flag_metal", [ "f_flagpole_metal", 3 ] ], + "S": "f_statue", + "b": "f_bench", + "D": "f_dumpster", + "M": "f_grave_monument", + "N": "f_bulletin", + "f": "f_bluebell" + }, + "items": { "D": { "item": "trash_dumpster", "chance": 80 }, "b": { "item": "oa_discarded_news", "chance": 5 } } } } ] diff --git a/data/json/mapgen/fema/FEMA.json b/data/json/mapgen/fema/FEMA.json index 5cd9b1f6dc81..d9e7e805ae50 100644 --- a/data/json/mapgen/fema/FEMA.json +++ b/data/json/mapgen/fema/FEMA.json @@ -96,7 +96,6 @@ ] }, "palettes": [ "FEMA_camp" ], - "place_loot": [ { "item": "american_flag", "x": 40, "y": 15, "chance": 75 } ], "nested": { "1": { "chunks": [ [ "fema_lodging", 80 ], [ "fema_corpse_pit", 20 ] ] }, "2": { "chunks": [ "fema_sanitary" ] }, diff --git a/data/json/mapgen/fema/FEMA_entrance_01.json b/data/json/mapgen/fema/FEMA_entrance_01.json index 6060f7c8aa4f..18ad79f196ed 100644 --- a/data/json/mapgen/fema/FEMA_entrance_01.json +++ b/data/json/mapgen/fema/FEMA_entrance_01.json @@ -36,7 +36,6 @@ "rotation": 2, "palettes": [ "FEMA_camp" ], "terrain": { "N": "t_dirt", "z": "t_dirt" }, - "place_loot": [ { "item": "american_flag", "x": 9, "y": 21, "chance": 75 } ], "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } } } } diff --git a/data/json/mapgen/fema/FEMA_entrance_02.json b/data/json/mapgen/fema/FEMA_entrance_02.json index a5398fa2e734..379ed7b62ff9 100644 --- a/data/json/mapgen/fema/FEMA_entrance_02.json +++ b/data/json/mapgen/fema/FEMA_entrance_02.json @@ -36,7 +36,6 @@ "rotation": 2, "palettes": [ "FEMA_camp" ], "terrain": { "N": "t_dirt" }, - "place_loot": [ { "item": "american_flag", "x": 9, "y": 0, "chance": 75 } ], "items": { "X": { "item": "mil_surplus", "chance": 60 } }, "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } } } diff --git a/data/json/mapgen/fema/FEMA_entrance_03.json b/data/json/mapgen/fema/FEMA_entrance_03.json index 47b676cd42ac..b1f0534f2104 100644 --- a/data/json/mapgen/fema/FEMA_entrance_03.json +++ b/data/json/mapgen/fema/FEMA_entrance_03.json @@ -36,7 +36,6 @@ "rotation": 2, "palettes": [ "FEMA_camp" ], "terrain": { "z": "t_dirt" }, - "place_loot": [ { "item": "american_flag", "x": 6, "y": 11, "chance": 75 } ], "items": { "X": { "item": "mil_surplus", "chance": 60 } }, "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } } } diff --git a/data/json/mapgen/fire_station.json b/data/json/mapgen/fire_station.json index f769db3f3e40..ed2a95b86678 100644 --- a/data/json/mapgen/fire_station.json +++ b/data/json/mapgen/fire_station.json @@ -52,7 +52,6 @@ { "item": "fireman_mask", "x": [ 18, 18 ], "y": [ 21, 21 ], "chance": 70 }, { "item": "fireman_gear", "x": [ 20, 20 ], "y": [ 21, 21 ], "chance": 70 } ], - "place_loot": [ { "item": "american_flag", "x": 23, "y": 5, "chance": 75 } ], "place_monsters": [ { "monster": "GROUP_FIRE", "x": [ 2, 21 ], "y": [ 9, 21 ], "chance": 1 } ], "place_vehicles": [ { "vehicle": "fire_engine", "x": 10, "y": 12, "chance": 30, "rotation": 270 } ] } @@ -183,7 +182,6 @@ { "item": "bed", "x": 21, "y": 19, "chance": 70 }, { "item": "bed", "x": 19, "y": 19, "chance": 70 } ], - "place_loot": [ { "item": "american_flag", "x": 20, "y": 4, "chance": 75 } ], "place_monsters": [ { "monster": "GROUP_FIRE", "x": 10, "y": 16, "chance": 1 } ], "place_vehicles": [ { "vehicle": "fire_truck", "x": 5, "y": 5, "rotation": 270, "chance": 20 }, diff --git a/data/json/mapgen/house/house_garage3.json b/data/json/mapgen/house/house_garage3.json index 01c29241e74e..fe4e9face956 100644 --- a/data/json/mapgen/house/house_garage3.json +++ b/data/json/mapgen/house/house_garage3.json @@ -12,7 +12,7 @@ "..............```````.%.", "...[.......[..```````.%.", "..............```````.%.", - ".......[......```````.%.", + "..../..[......```````.%.", "..............```````.%.", "..[.......[...```````.%.", "..............```````.%.", @@ -35,6 +35,7 @@ "palettes": [ "standard_domestic_palette" ], "terrain": { "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], + "/": "t_region_groundcover_urban", "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], "!": "t_region_groundcover_urban", "&": "t_column", @@ -45,10 +46,9 @@ "$": "t_screened_porch_wall", "]": "t_screen_door_c" }, - "furniture": { "!": "f_region_flower" }, + "furniture": { "/": [ [ "f_null", 8 ], "f_us_flag_metal", "f_flagpole_metal" ], "!": "f_region_flower" }, "place_loot": [ - { "group": "guns_pistol_common", "x": [ 15, 21 ], "y": [ 18, 21 ], "chance": 5, "ammo": 90, "magazine": 100 }, - { "item": "american_flag", "x": [ 4, 4 ], "y": [ 5, 5 ], "chance": 2 } + { "group": "guns_pistol_common", "x": [ 15, 21 ], "y": [ 18, 21 ], "chance": 5, "ammo": 90, "magazine": 100 } ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ], "place_vehicles": [ { "vehicle": "suburban_home", "x": 17, "y": 6, "chance": 10, "rotation": 270 } ] diff --git a/data/json/mapgen/house/house_quiverfull.json b/data/json/mapgen/house/house_quiverfull.json index bb1972cec720..ef132d5eddc1 100644 --- a/data/json/mapgen/house/house_quiverfull.json +++ b/data/json/mapgen/house/house_quiverfull.json @@ -19,7 +19,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - "....----p...........YYY.", + "....----p...../.....YYY.", ".####**####oo##########.", ".#sEL H|S Q| hffh 6#.", ".#E H|t B| hffh 6#.", @@ -46,13 +46,14 @@ ], "palettes": [ "standard_domestic_palette" ], "terrain": { + "/": "t_region_groundcover_urban", "Y": "t_region_groundcover_urban", "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], "#": "t_rock_wall" }, + "furniture": { "/": "f_us_flag_metal" }, "place_loot": [ - { "item": "american_flag", "x": [ 2, 2 ], "y": [ 5, 5 ], "chance": 100 }, - { "group": "book_house_quiverfull_bible", "x": [ 2, 2 ], "y": [ 6, 6 ], "chance": 100 }, + { "group": "book_house_quiverfull_bible", "x": [ 2, 2 ], "y": [ 5, 5 ], "chance": 100 }, { "item": "quiver_large", "x": [ 2, 2 ], "y": [ 7, 7 ], "chance": 100 } ], "place_monsters": [ diff --git a/data/json/mapgen/industrial_center.json b/data/json/mapgen/industrial_center.json index e7bb269fba98..1a7bd1800d9f 100644 --- a/data/json/mapgen/industrial_center.json +++ b/data/json/mapgen/industrial_center.json @@ -183,8 +183,7 @@ { "group": "tools_construction", "x": 75, "y": [ 90, 91 ], "chance": 60, "repeat": 4 }, { "group": "tools_earthworking", "x": 75, "y": 92, "chance": 80, "repeat": 2 }, { "group": "office_breakroom", "x": 73, "y": [ 78, 79 ], "chance": 40, "repeat": 3 }, - { "item": "microwave", "x": 76, "y": 79, "chance": 80 }, - { "item": "american_flag", "x": 90, "y": 91, "chance": 25 } + { "item": "microwave", "x": 76, "y": 79, "chance": 80 } ], "place_monsters": [ { "monster": "GROUP_INDUSTRIAL_CENTER", "x": [ 3, 21 ], "y": [ 3, 23 ], "density": 1 }, diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json index 8587693dbee0..4ac33aa8df60 100644 --- a/data/json/mapgen/military/mil_base/mil_base_z0.json +++ b/data/json/mapgen/military/mil_base/mil_base_z0.json @@ -274,10 +274,7 @@ "t": [ { "item": "trash_cart", "chance": 75, "repeat": [ 1, 10 ] } ], "3": [ { "item": "mil_base_tent_civilian", "chance": 30, "repeat": [ 1, 2 ] } ] }, - "place_loot": [ - { "group": "mil_base_hmg", "x": 73, "y": 43, "chance": 10, "magazine": 100 }, - { "item": "american_flag", "x": 4, "y": 38 } - ], + "place_loot": [ { "group": "mil_base_hmg", "x": 73, "y": 43, "chance": 10, "magazine": 100 } ], "place_monsters": [ { "monster": "GROUP_MIL_BASE_CIVILIAN", "x": [ 0, 23 ], "y": [ 1, 23 ], "repeat": [ 4, 5 ], "density": 0.1 }, { "monster": "GROUP_MIL_BASE_CIVILIAN", "x": [ 24, 47 ], "y": [ 1, 23 ], "repeat": [ 6, 8 ], "density": 0.1 }, @@ -425,7 +422,6 @@ { "group": "SUS_knife_drawer", "x": 35, "y": 39, "chance": 90 }, { "group": "SUS_appliances_cupboard", "x": 35, "y": 40, "chance": 90 }, { "group": "SUS_cookware", "x": 35, "y": 41, "chance": 90, "repeat": 3 }, - { "item": "american_flag", "x": 95, "y": 47 }, { "group": "clothing_soldier_shirt", "x": [ 57, 59 ], "y": 71, "chance": 75, "repeat": 25 }, { "group": "socks_unisex", "x": [ 54, 56 ], "y": 71, "chance": 75, "repeat": 25 }, { "group": "underwear_unisex", "x": [ 49, 53 ], "y": 71, "chance": 75, "repeat": 25 }, diff --git a/data/json/mapgen/park_state.json b/data/json/mapgen/park_state.json index c4eb2a468ce6..df5f9050aacb 100644 --- a/data/json/mapgen/park_state.json +++ b/data/json/mapgen/park_state.json @@ -170,7 +170,7 @@ "4": "t_tree_pine", "7": "t_tree_dead", "D": "t_door_o", - "I": "t_column", + "I": "t_sidewalk", "S": "t_shrub_strawberry", "_": "t_grass", "a": "t_floor", @@ -181,7 +181,7 @@ "s": "t_sidewalk", "|": "t_chainfence_v" }, - "furniture": { "a": "f_desk", "c": "f_chair" }, + "furniture": { "a": "f_desk", "c": "f_chair", "I": [ "f_us_flag_metal", [ "f_flagpole_metal", 3 ] ] }, "place_items": [ { "item": "magazines", "x": 11, "y": 3, "chance": 30 }, { "item": "pizza_trash", "x": 8, "y": 20, "chance": 30 }, @@ -189,7 +189,6 @@ { "item": "pizza_trash", "x": 3, "y": 6, "chance": 30 }, { "item": "pizza_trash", "x": 16, "y": 2, "chance": 30 } ], - "place_loot": [ { "item": "american_flag", "x": 11, "y": 6, "chance": 25 } ], "place_vehicles": [ { "vehicle": "car", "x": 18, "y": 12, "chance": 4 } ] } }, diff --git a/data/json/mapgen/police_station.json b/data/json/mapgen/police_station.json index 1c0d5542bb8b..070850b57fbe 100644 --- a/data/json/mapgen/police_station.json +++ b/data/json/mapgen/police_station.json @@ -43,13 +43,14 @@ "*": "t_door_locked", "+": "t_door_c", "=": "t_door_metal_locked", - "I": "t_column", + "I": "t_sidewalk", "w": "t_window", "4": "t_gutter_downspout", "#": "t_bars" }, "furniture": { "'": "f_street_light", + "I": [ [ "f_us_flag_metal", 3 ], "f_flagpole_metal" ], "c": "f_counter", "x": "f_counter", "1": "f_locker", @@ -70,7 +71,6 @@ "l": { "item": "cop_armory", "chance": 70, "repeat": [ 2, 4 ] }, "L": { "item": "cop_evidence", "chance": 60, "repeat": [ 2, 4 ] } }, - "place_loot": [ { "item": "american_flag", "x": 3, "y": 1, "chance": 75 } ], "toilets": { "&": { } }, "computers": { "5": { @@ -200,7 +200,7 @@ "^": "t_reinforced_door_glass_c", "+": "t_door_c", "=": "t_door_metal_locked", - "I": "t_column", + "I": "t_sidewalk", "w": "t_window", "<": "t_stairs_up", "9": "t_gutter_downspout", @@ -208,6 +208,7 @@ }, "furniture": { "'": "f_street_light", + "I": [ [ "f_us_flag_metal", 3 ], "f_flagpole_metal" ], "c": "f_counter", "x": "f_counter", "1": "f_locker", @@ -235,7 +236,6 @@ "N": { "item": "vending_food_items", "chance": 70, "repeat": [ 4, 12 ] }, "U": { "item": "vending_drink_items", "chance": 70, "repeat": [ 4, 12 ] } }, - "place_loot": [ { "item": "american_flag", "x": 3, "y": 1, "chance": 75 } ], "toilets": { "&": { } }, "computers": { "5": { @@ -484,7 +484,7 @@ "+": "t_door_c", "=": "t_door_metal_locked", "0": "t_door_glass_frosted_c", - "I": "t_column", + "I": "t_sidewalk", "w": "t_window", "<": "t_ladder_up", "4": "t_gutter_downspout", @@ -492,6 +492,7 @@ }, "furniture": { "'": "f_street_light", + "I": [ [ "f_us_flag_metal", 3 ], "f_flagpole_metal" ], "c": "f_counter", "x": "f_counter", "!": "f_safe_l", @@ -545,8 +546,7 @@ { "group": "fridge", "x": 12, "y": 13, "chance": 70, "repeat": [ 1, 3 ] }, { "group": "office", "x": [ 15, 16 ], "y": 3, "chance": 70, "repeat": [ 1, 3 ] }, { "item": "microwave", "x": 10, "y": 13, "chance": 85 }, - { "item": "laptop", "x": 17, "y": 3, "chance": 85 }, - { "item": "american_flag", "x": 16, "y": 14, "chance": 75 } + { "item": "laptop", "x": 17, "y": 3, "chance": 85 } ], "place_monsters": [ { "monster": "GROUP_POLICE", "x": [ 1, 22 ], "y": [ 0, 23 ], "repeat": 4 } ], "place_vehicles": [ { "chance": 30, "fuel": 15, "vehicle": "policecar", "x": 20, "y": 19, "rotation": 270 } ] diff --git a/data/json/mapgen/post_office.json b/data/json/mapgen/post_office.json index a4c679bca799..5e5413008a18 100644 --- a/data/json/mapgen/post_office.json +++ b/data/json/mapgen/post_office.json @@ -15,8 +15,8 @@ "gp____p____s|Y.......#|g", "gp____p____s+........2|g", "gp____p____s+........#|g", - "gsssssssssss|&.......#|g", - "8||w|||||||||v.......#|g", + "g8ssssssssss|&.......#|g", + "g||w|||||||||v.......#|g", "g|^IIIF|...&|......||||g", "g|..c.......|.......XX|g", "g|..........#........X|g", @@ -36,7 +36,7 @@ "+": "t_door_glass_c", "-": "t_wall_glass", ".": "t_floor", - "8": "t_column", + "8": "t_sidewalk", "D": "t_door_locked", "_": "t_pavement", "'": "t_sidewalk", @@ -52,6 +52,7 @@ }, "furniture": { "'": "f_street_light", + "8": [ [ "f_us_flag_metal", 9 ], "f_flagpole_metal" ], "#": "f_counter", "%": "f_counter", "&": "f_trashcan", @@ -101,7 +102,6 @@ { "item": "trash", "x": 11, "y": 10, "chance": 50 }, { "item": "trash", "x": 13, "y": 8, "chance": 50 } ], - "place_loot": [ { "item": "american_flag", "x": 0, "y": 8, "chance": 90 } ], "place_vehicles": [ { "vehicle": "beetle", "x": 3, "y": 3, "chance": 10, "fuel": 10, "rotation": 270 }, { "vehicle": "motorcycle_sidecart", "x": 8, "y": 4, "chance": 25, "fuel": 15, "rotation": 270 }, @@ -206,7 +206,7 @@ "4": "t_tree_pine", "7": "t_tree_apple", "D": "t_door_c", - "8": "t_column", + "8": "t_sidewalk", "S": "t_sidewalk", "W": "t_window", "a": "t_door_locked", @@ -223,6 +223,7 @@ }, "furniture": { "'": "f_street_light", + "8": [ [ "f_us_flag_metal", 9 ], "f_flagpole_metal" ], "#": "f_counter", "&": "f_trashcan", "C": "f_chair", @@ -266,8 +267,7 @@ { "item": "office", "x": 4, "y": 13, "chance": 55 }, { "item": "file_room", "x": 4, "y": 21, "chance": 75 }, { "item": "file_room", "x": 13, "y": 16, "chance": 75 } - ], - "place_loot": [ { "item": "american_flag", "x": 10, "y": 6, "chance": 90 } ] + ] } }, { diff --git a/data/json/mapgen/public_works.json b/data/json/mapgen/public_works.json index bb0458446e74..0bce61e64f30 100644 --- a/data/json/mapgen/public_works.json +++ b/data/json/mapgen/public_works.json @@ -53,7 +53,7 @@ " ____________,_____,_____sss|^..c...ddd|4 ", " ________________________sss|-www--www-| ", " ________________________ssssss ", - " ________________________ssssOs ", + " ________________________ssssIs ", "' ________________________!sssss " ], "terrain": { @@ -70,6 +70,7 @@ "D": "t_door_locked_alarm", "F": "t_chainfence_h", "G": "t_grate", + "I": "t_sidewalk", "O": "t_column", "_": "t_pavement", "f": "t_chainfence_v", @@ -92,6 +93,7 @@ "e": "f_fridge", "h": "f_chair", "H": "f_hydraulic_press", + "I": [ "f_us_flag_metal", [ "f_flagpole_metal", 3 ] ], "i": "f_filing_cabinet", "l": "f_locker", "L": "f_heavy_lathe", @@ -137,7 +139,6 @@ { "item": "log", "x": 27, "y": 2, "amount": [ 5, 20 ] }, { "item": "stepladder", "x": 2, "y": 2 } ], - "place_loot": [ { "item": "american_flag", "x": 31, "y": 46, "chance": 25 } ], "place_monsters": [ { "monster": "GROUP_PUBLICWORKERS", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.2 }, { "monster": "GROUP_PUBLICWORKERS", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.1 }, diff --git a/data/json/mapgen/school_1.json b/data/json/mapgen/school_1.json index ef14e1f33bd8..0ec3bf0f310e 100644 --- a/data/json/mapgen/school_1.json +++ b/data/json/mapgen/school_1.json @@ -86,7 +86,6 @@ ], "palettes": [ "school_palette" ], "place_items": [ ], - "place_item": [ { "item": "american_flag", "x": 36, "y": 58, "amount": 1 } ], "place_monster": [ { "monster": [ "mon_nursebot", "mon_nursebot_defective" ], "x": [ 27, 33 ], "y": [ 20, 23 ], "chance": 50 }, { "group": "GROUP_SCHOOL", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, @@ -437,7 +436,7 @@ "w": "t_window", "x": "t_console_broken", "|": "t_wall_y", - "I": "t_column", + "I": "t_sidewalk", ",": "t_floor_waxed", ":": "t_floor_waxed_y", "7": "t_backboard_in", @@ -478,6 +477,7 @@ "e": "f_fridge", "g": "f_locker", "h": "f_chair", + "I": "f_us_flag_metal", "M": "f_armchair", "k": "f_locker", "l": "f_locker", diff --git a/data/json/mapgen/vfw.json b/data/json/mapgen/vfw.json index ebda8b82511b..5dda19b12015 100644 --- a/data/json/mapgen/vfw.json +++ b/data/json/mapgen/vfw.json @@ -46,7 +46,7 @@ "3": "t_tree_young", "E": "t_dirtfloor", "G": "t_dirtfloor", - "i": "t_column", + "i": "t_sidewalk", "r": "t_pavement", "U": "t_pavement", "y": "t_pavement_y", @@ -63,6 +63,7 @@ "G": "f_locker", "H": "f_table", "I": "f_sofa", + "i": [ "f_us_flag_metal", "f_flagpole_metal" ], "X": "f_birdbath", "U": [ "f_dumpster", "f_recycle_bin" ], "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ], @@ -78,8 +79,7 @@ { "item": "vfw_books", "x": 13, "y": 14, "chance": 10, "repeat": [ 1, 2 ] }, { "item": "vfw_alcohol", "x": 16, "y": [ 17, 19 ], "chance": 35, "repeat": [ 1, 3 ] }, { "item": "vfw_alcohol", "x": 19, "y": [ 17, 19 ], "chance": 35, "repeat": [ 1, 3 ] } - ], - "place_loot": [ { "item": "american_flag", "x": 10, "y": 6, "chance": 50 } ] + ] } }, { @@ -130,7 +130,7 @@ "3": "t_tree_young", "E": "t_dirtfloor", "G": "t_dirtfloor", - "i": "t_column", + "i": "t_grass", "r": "t_pavement", "U": "t_pavement", "y": "t_pavement_y", @@ -147,6 +147,7 @@ "G": "f_locker", "H": "f_table", "I": "f_sofa", + "i": [ "f_us_flag_metal", "f_flagpole_metal" ], "X": "f_grave_monument", "U": [ "f_dumpster", "f_recycle_bin" ], "p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ], @@ -163,7 +164,6 @@ { "item": "vfw_alcohol", "x": 16, "y": [ 17, 19 ], "chance": 35, "repeat": [ 1, 3 ] }, { "item": "vfw_alcohol", "x": 19, "y": [ 17, 19 ], "chance": 35, "repeat": [ 1, 3 ] } ], - "place_loot": [ { "item": "american_flag", "x": 18, "y": 2, "chance": 50 } ], "place_vehicles": [ { "vehicle": "military_display_vehicles", "x": 19, "y": 7, "chance": 100, "rotation": 270 } ] } }, diff --git a/data/json/mapgen_palettes/fema.json b/data/json/mapgen_palettes/fema.json index 0d22e837e2b6..d7ca284d0956 100644 --- a/data/json/mapgen_palettes/fema.json +++ b/data/json/mapgen_palettes/fema.json @@ -24,7 +24,7 @@ "f": "t_chainfence_v", "F": "t_chaingate_l", "g": "t_wall_glass", - "I": "t_column", + "I": "t_sidewalk", "i": "t_sidewalk", "L": "t_floor", "P": "t_water_pump", @@ -46,6 +46,7 @@ "C": "f_counter", "d": "f_dresser", "D": "f_desk", + "I": [ [ "f_us_flag_metal", 3 ], "f_flagpole_metal" ], "l": "f_locker", "L": "f_rack", "n": "f_bench", diff --git a/data/json/mapgen_palettes/fire_station_palette.json b/data/json/mapgen_palettes/fire_station_palette.json index ec0e9e6175d9..103a201f6301 100644 --- a/data/json/mapgen_palettes/fire_station_palette.json +++ b/data/json/mapgen_palettes/fire_station_palette.json @@ -5,7 +5,7 @@ "terrain": { "-": "t_brick_wall", "+": "t_door_c", - "I": "t_column", + "I": "t_sidewalk", "M": "t_door_metal_locked", "x": "t_console_broken", "w": "t_gates_control_brick", @@ -24,6 +24,7 @@ "'": "f_street_light", "@": "f_bed", "#": "f_table", + "I": [ [ "f_us_flag_metal", 3 ], "f_flagpole_metal" ], "j": "f_counter", "c": "f_chair", "l": "f_locker", diff --git a/data/json/mapgen_palettes/helipad.json b/data/json/mapgen_palettes/helipad.json index 366a5811f3c5..74944d05d640 100644 --- a/data/json/mapgen_palettes/helipad.json +++ b/data/json/mapgen_palettes/helipad.json @@ -22,7 +22,7 @@ "_": "t_thconc_floor", "B": "t_thconc_floor", "C": "t_thconc_floor", - "i": "t_column", + "i": "t_sidewalk", "r": "t_thconc_floor", "l": "t_thconc_floor", "R": "t_thconc_floor", @@ -44,6 +44,7 @@ "<": "t_stairs_up" }, "furniture": { + "i": [ [ "f_us_flag_metal", 3 ], "f_flagpole_metal" ], "C": "f_crate_c", "r": "f_rack", "z": [ "f_indoor_plant_y", "f_indoor_plant" ], diff --git a/data/json/mapgen_palettes/industrial_center_palette.json b/data/json/mapgen_palettes/industrial_center_palette.json index 48f3f383ca32..9bc8461ca114 100644 --- a/data/json/mapgen_palettes/industrial_center_palette.json +++ b/data/json/mapgen_palettes/industrial_center_palette.json @@ -47,7 +47,7 @@ "F": "t_floor", "G": "t_generator_broken", "H": "t_thconc_floor", - "I": "t_column", + "I": "t_sidewalk", "J": "t_region_groundcover", "L": "t_gates_control_concrete_lab", "M": "t_door_metal_locked", @@ -96,6 +96,7 @@ "C": [ [ "f_crate_c", 3 ], "f_crate_o", "f_cardboard_box" ], "F": "f_fridge", "H": "f_hydraulic_press", + "I": [ "f_us_flag_metal", [ "f_flagpole_metal", 3 ] ], "J": "f_street_light", "P": "f_pool_table", "S": "f_shower", diff --git a/data/json/mapgen_palettes/military/mil_base_palette.json b/data/json/mapgen_palettes/military/mil_base_palette.json index 0d7645f72ec7..3ff35c8c2e86 100644 --- a/data/json/mapgen_palettes/military/mil_base_palette.json +++ b/data/json/mapgen_palettes/military/mil_base_palette.json @@ -27,7 +27,7 @@ "y": "t_pavement_y", "s": "t_sidewalk", "{": "t_sidewalk", - "I": "t_column", + "I": "t_pavement", "i": "t_elevator", "b": [ [ "t_brick_wall", 100 ], "t_pit_shallow" ], "F": "t_fence_barbed", @@ -72,6 +72,7 @@ "h": "f_chair", "$": "f_filing_cabinet", "`": "f_shredder", + "I": "f_us_flag_metal", "l": "f_locker", "c": "f_counter", "S": "f_sink", diff --git a/data/mods/No_Hope/Mapgen/house_quiverfull.json b/data/mods/No_Hope/Mapgen/house_quiverfull.json index 62830f88fc4a..d3c0f5535c8a 100644 --- a/data/mods/No_Hope/Mapgen/house_quiverfull.json +++ b/data/mods/No_Hope/Mapgen/house_quiverfull.json @@ -19,7 +19,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - "....----p...........YYY.", + "....----p....../....YYY.", ".####**####oo##########.", ".#sEL H|S Q| hffh 6#.", ".#E H|t B| hffh 6#.", @@ -46,13 +46,14 @@ ], "palettes": [ "standard_domestic_palette" ], "terrain": { + "/": "t_region_groundcover_urban", "Y": "t_region_groundcover_urban", "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], "#": "t_rock_wall" }, + "furniture": { "/": [ [ "f_us_flag_metal", 3 ], "f_flagpole_metal" ] }, "place_loot": [ - { "item": "american_flag", "x": [ 2, 2 ], "y": [ 5, 5 ], "chance": 100 }, - { "group": "book_house_quiverfull_bible", "x": [ 2, 2 ], "y": [ 6, 6 ], "chance": 100 }, + { "group": "book_house_quiverfull_bible", "x": [ 2, 2 ], "y": [ 5, 5 ], "chance": 100 }, { "item": "quiver_large", "x": [ 2, 2 ], "y": [ 7, 7 ], "chance": 100 } ], "place_monsters": [ diff --git a/data/mods/No_Hope/Mapgen/office_doctor.json b/data/mods/No_Hope/Mapgen/office_doctor.json deleted file mode 100644 index 24eb1561ac76..000000000000 --- a/data/mods/No_Hope/Mapgen/office_doctor.json +++ /dev/null @@ -1,808 +0,0 @@ -[ - { - "type": "palette", - "id": "standard_domestic_palette", - "//": "Intended as a palette for non-nested houses. Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", - "toilets": { "t": { } }, - "furniture": { - "a": "f_fireplace", - "b": "f_bigmirror", - "c": "f_statue", - "d": "f_dresser", - "e": "f_pool_table", - "f": "f_table", - "g": "f_water_heater", - "h": "f_chair", - "i": "f_bench", - "j": "f_bench", - "k": "f_woodstove", - "l": "f_coffee_table", - "m": "f_glass_fridge", - "n": "f_dishwasher", - "p": "f_mailbox", - "q": "f_rack", - "r": "f_desk", - "s": "f_table", - "u": "f_rotary_clothesline", - "v": [ "f_gun_safe_el", "f_safe_l" ], - "w": "f_rack_wood", - "x": "f_entertainment_center", - "y": [ "f_indoor_plant", "f_indoor_plant_y" ], - "z": "f_cardboard_box", - "A": "f_stool", - "B": "f_bathtub", - "C": "f_cupboard", - "D": "f_wardrobe", - "E": "f_armchair", - "F": "f_fridge", - "G": "f_camp_chair", - "H": "f_sofa", - "I": "f_desk", - "J": "f_counter", - "K": "f_tourist_table", - "L": "f_rack_coat", - "M": "f_displaycase", - "N": "f_workbench", - "O": "f_oven", - "P": "f_filing_cabinet", - "Q": "f_rack_wood", - "R": "f_bookcase", - "S": "f_sink", - "T": "f_floor_lamp", - "U": "f_utility_shelf", - "V": "f_glass_cabinet", - "W": "f_washer", - "X": "f_birdbath", - "Y": "f_trashcan", - "Z": "f_dryer", - "1": "f_cupboard", - "2": "f_cupboard", - "3": "f_cupboard", - "4": "f_cupboard", - "5": "f_sink", - "6": "f_rack_wood", - "7": "f_cupboard", - "8": "f_counter", - "9": "f_shower", - "@": "f_bed", - "₸": "f_deckchair", - "∞": "f_locker", - "≠": "f_locker", - "Ø": "f_pinball_machine", - "Æ": "f_arcade_machine", - "ʭ": "f_ladder", - "¤": "f_table" - }, - "terrain": { - "a": "t_thconc_floor", - "j": "t_region_groundcover_urban", - "p": "t_region_groundcover_urban", - "u": "t_region_groundcover_urban", - "X": "t_region_groundcover_urban", - ".": "t_region_groundcover_urban", - "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], - "*": [ - [ "t_door_b_peep", 20 ], - [ "t_door_o_peep", 70 ], - [ "t_door_frame", 10 ], - [ "t_door_locked_peep", 2 ], - "t_door_locked_alarm", - [ "t_door_locked", 5 ], - "t_door_c" - ], - "^": "t_gutter_downspout", - "|": "t_wall_w", - "#": "t_brick_wall", - "¶": "t_door_glass_c", - ":": "t_wall_glass", - "-": "t_sidewalk", - "o": [ - [ "t_window_frame", 70 ], - [ "t_window_empty", 20 ], - [ "t_window_domestic", 5 ], - "t_window_no_curtains", - "t_window_open", - "t_window_no_curtains_open", - [ "t_curtains", 5 ] - ], - "<": "t_wood_stairs_up", - ">": "t_wood_stairs_down" - }, - "liquids": { "g": { "liquid": "water", "amount": [ 0, 100 ] } }, - "items": { - "a": { "item": "fireplace_fill", "chance": 30, "repeat": [ 2, 5 ] }, - "d": [ - { "item": "SUS_dresser_mens", "chance": 50, "repeat": [ 1, 2 ] }, - { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 2 ] } - ], - "e": { "item": "pool_table", "chance": 30, "repeat": [ 1, 2 ] }, - "f": [ - { "item": "dishes_dining", "chance": 30 }, - { "item": "tea_dishes", "chance": 10, "repeat": [ 1, 2 ] }, - { "item": "baked_goods", "chance": 5 }, - { "item": "groce_condiment", "chance": 10, "repeat": [ 1, 2 ] }, - { "item": "dining", "chance": 10 } - ], - "k": { "item": "stash_wood", "chance": 30, "repeat": [ 2, 5 ] }, - "l": [ - { "item": "elecsto_persele", "chance": 10, "repeat": [ 1, 3 ] }, - { "item": "livingroom", "chance": 10, "repeat": [ 1, 3 ] } - ], - "s": [ - { "item": "consumer_electronics", "chance": 10, "repeat": [ 1, 3 ] }, - { "item": "livingroom", "chance": 10, "repeat": [ 1, 3 ] } - ], - "m": { "item": "SUS_fridge", "chance": 10 }, - "n": { "item": "SUS_dishwasher", "chance": 70 }, - "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, - "q": [ - { "item": "tools_home", "chance": 40 }, - { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "mechanics", "chance": 1, "repeat": [ 1, 2 ] }, - { "item": "camping", "chance": 10 }, - { "item": "tools_survival", "chance": 5, "repeat": [ 1, 2 ] } - ], - "r": [ { "item": "office_paper", "chance": 5 }, { "item": "office", "chance": 25 } ], - "t": { "item": "SUS_toilet", "chance": 10, "repeat": [ 1, 3 ] }, - "v": [ - { "item": "art", "chance": 5 }, - { "item": "home_display_case", "chance": 30 }, - { "item": "harddrugs", "chance": 10, "repeat": [ 1, 2 ] }, - { "item": "maps", "chance": 2 }, - { "item": "guns_pistol_common", "chance": 30, "ammo": 90, "magazine": 100 }, - { "item": "gemstones", "chance": 30, "repeat": [ 1, 2 ] } - ], - "w": [ - { "item": "shower", "chance": 20 }, - { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] } - ], - "x": { "item": "consumer_electronics", "chance": 10, "repeat": [ 1, 3 ] }, - "B": { "item": "shower", "chance": 10, "repeat": [ 1, 2 ] }, - "D": [ - { "item": "SUS_wardrobe_mens", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "SUS_wardrobe_womens", "chance": 20, "repeat": [ 1, 2 ] } - ], - "F": { "item": "SUS_fridge", "chance": 10 }, - "I": [ { "item": "SUS_desks_bedroom_unisex", "chance": 5 }, { "item": "office", "chance": 25 } ], - "J": { "item": "kitchen_counters", "chance": 5 }, - "L": { "item": "unisex_coat_rack", "chance": 30, "repeat": [ 1, 4 ] }, - "M": { "item": "home_display_case", "chance": 20 }, - "N": [ - { "item": "tools_common", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "hardware", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "cleaning", "chance": 10, "repeat": [ 1, 2 ] } - ], - "O": { "item": "SUS_oven", "chance": 50 }, - "P": { "item": "office_paper", "chance": 80 }, - "Q": [ - { "item": "shower", "chance": 20 }, - { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] } - ], - "R": [ { "item": "homebooks", "chance": 20, "repeat": [ 1, 4 ] } ], - "S": [ { "item": "SUS_bathroom_sink", "chance": 20 }, { "item": "SUS_bathroom_medicine", "chance": 20 } ], - "U": [ - { "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "cleaning", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "camping", "chance": 5, "repeat": [ 1, 2 ] } - ], - "V": { "item": "home_display_case", "chance": 50 }, - "Y": { "item": "trash", "chance": 30, "repeat": [ 1, 4 ] }, - "1": [ { "item": "SUS_dishes", "chance": 20 }, { "item": "SUS_silverware", "chance": 20 } ], - "2": { "item": "SUS_cookware", "chance": 20 }, - "3": [ { "item": "SUS_utensils", "chance": 20 }, { "item": "SUS_knife_drawer", "chance": 20 } ], - "4": { "item": "SUS_junk_drawer", "chance": 20 }, - "5": { "item": "SUS_kitchen_sink", "chance": 20 }, - "6": [ { "item": "SUS_pantry", "chance": 5 }, { "item": "cannedfood", "chance": 5, "repeat": [ 1, 2 ] } ], - "7": [ { "item": "SUS_breakfast_cupboard", "chance": 5 }, { "item": "SUS_coffee_cupboard", "chance": 5 } ], - "8": [ - { "item": "SUS_hair_drawer", "chance": 30 }, - { "item": "SUS_bathroom_cabinet", "chance": 30 }, - { "item": "SUS_bathroom_medicine", "chance": 20 }, - { "item": "harddrugs", "chance": 2 } - ], - "9": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] }, - "@": { "item": "bed", "chance": 20 }, - "Z": { "item": "laundry", "chance": 20 }, - "W": { "item": "laundry", "chance": 20 }, - "z": [ - { "item": "allsporting", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "chem_home", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "child_items", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "stash_drugs", "chance": 1 }, - { "item": "maps", "chance": 7 } - ], - "≠": [ - { "item": "toy_box", "chance": 80, "repeat": [ 1, 2 ] }, - { "item": "toy_store", "chance": 60, "repeat": [ 1, 2 ] }, - { "item": "allsporting", "chance": 5 } - ] - }, - "nested": { "ɸ": { "chunks": [ "NC_res_personal_items_1X1" ] } } - }, - { - "type": "palette", - "id": "house_w_foundation_palette", - "furniture": { - "A": "f_stool", - "B": "f_rotary_clothesline", - "D": "f_camp_chair", - "E": "f_rack_coat", - "F": "f_bench", - "G": "f_mailbox", - "H": "f_armchair", - "I": "f_desk", - "J": "f_counter", - "K": "f_cupboard", - "L": "f_table", - "N": "f_workbench", - "O": "f_wardrobe", - "P": "f_locker", - "Q": "f_rack", - "R": "f_bookcase", - "T": "f_bathtub", - "U": "f_utility_shelf", - "W": "f_washer", - "X": "f_birdbath", - "Y": "f_trashcan", - "Z": "f_dryer", - "a": [ "f_floor_lamp", "f_rack_coat" ], - "d": "f_shower", - "g": "f_water_heater", - "h": "f_fireplace", - "i": "f_oven", - "j": "f_sink", - "n": "f_sink", - "k": "f_woodstove", - "l": "f_fridge", - "m": "f_glass_fridge", - "p": "f_region_weed", - "r": "f_wood_keg", - "v": [ [ "f_safe_l", 25 ], [ "f_cardboard_box", 75 ] ], - "w": "f_rack_wood", - "y": [ "f_indoor_plant", "f_indoor_plant_y" ], - "z": "f_metal_butcher_rack" - }, - "terrain": { - ".": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub_decorative" ], - "-": "t_open_air", - "G": "t_region_groundcover_urban", - "p": "t_region_groundcover_urban", - "X": "t_region_groundcover_urban", - " ": "t_floor", - "|": "t_wall_w", - "<": "t_wood_stairs_up", - ">": "t_wood_stairs_down", - "o": [ - [ "t_window_frame", 70 ], - [ "t_window_empty", 20 ], - [ "t_window_domestic", 5 ], - "t_window_no_curtains", - "t_window_open", - "t_window_no_curtains_open", - [ "t_curtains", 5 ] - ], - "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_c", 5 ], [ "t_door_o", 70 ], [ "t_door_locked_interior", 3 ] ], - "*": [ - [ "t_door_b_peep", 20 ], - [ "t_door_o_peep", 70 ], - [ "t_door_frame", 10 ], - [ "t_door_locked_peep", 2 ], - "t_door_locked_alarm", - [ "t_door_locked", 5 ], - "t_door_c" - ], - "s": "t_concrete", - "~": "t_thconc_floor", - "u": "t_gates_mech_control", - "x": "t_door_metal_locked", - "C": "t_column", - "^": "t_gutter_downspout", - ",": "t_linoleum_white", - ";": "t_linoleum_gray", - "M": "t_region_shrub_decorative", - "$": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ] - }, - "toilets": { "t": { } }, - "liquids": { "g": { "liquid": "water", "amount": [ 0, 100 ] } }, - "items": { - "O": [ { "item": "SUS_wardrobe_mens", "chance": 20 }, { "item": "SUS_wardrobe_womens", "chance": 20, "repeat": [ 1, 2 ] } ], - "Q": [ - { "item": "preserved_food", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "dry_goods", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "pet_food", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "condiments", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "pantry_liquids", "chance": 10 } - ], - "K": [ - { "item": "dishes_utility", "chance": 30 }, - { "item": "condiments", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "SUS_knife_drawer", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "SUS_junk_drawer", "chance": 10, "repeat": [ 1, 2 ] }, - { "item": "SUS_cookware", "chance": 20 } - ], - "J": [ - { "item": "kitchen_counters", "chance": 20 }, - { "item": "fresh_produce", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "dry_goods", "chance": 20, "repeat": [ 1, 2 ] } - ], - "w": [ - { "item": "shower", "chance": 20 }, - { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] } - ], - "v": [ - { "item": "art", "chance": 5 }, - { "item": "drugdealer", "chance": 10, "repeat": [ 1, 2 ] }, - { "item": "maps", "chance": 2 }, - { "item": "college_sports", "chance": 30, "repeat": [ 1, 2 ] } - ], - "U": [ - { "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "mechanics", "chance": 10, "repeat": [ 1, 2 ] } - ], - "j": [ - { "item": "softdrugs", "chance": 25, "repeat": [ 1, 3 ] }, - { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, - { "item": "harddrugs", "chance": 5 } - ], - "T": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] }, - "n": { "item": "SUS_kitchen_sink", "chance": 10, "repeat": [ 1, 2 ] }, - "i": { "item": "oven", "chance": 20, "repeat": [ 1, 2 ] }, - "l": { "item": "fridge", "chance": 5, "repeat": [ 1, 2 ] }, - "Y": { "item": "trash", "chance": 30, "repeat": [ 1, 2 ] }, - "R": { "item": "homebooks", "chance": 20, "repeat": [ 3, 8 ] } - } - }, - { - "type": "palette", - "id": "bike_shop", - "terrain": { - " ": "t_region_groundcover_urban", - "*": [ [ "t_region_groundcover_urban", 4 ], "t_region_tree_shade" ], - "_": "t_sidewalk", - "'": "t_sidewalk", - ".": "t_floor", - "#": "t_wall_w", - "-": "t_wall_glass", - "|": "t_wall_glass", - "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], - ":": "t_door_glass_c", - ";": "t_door_locked", - "&": "t_floor", - "^": "t_floor", - "@": "t_sidewalk", - "C": "t_floor", - "D": "t_floor", - "F": "t_floor", - "S": "t_floor", - "T": "t_floor", - "c": "t_floor", - "d": "t_floor", - "f": "t_floor", - "h": "t_floor", - "i": "t_floor", - "l": "t_floor", - "r": "t_floor", - "s": "t_floor", - "t": "t_floor", - "q": "t_floor", - "B": "t_floor", - "<": "t_ladder_up", - "4": "t_gutter_downspout", - "%": "t_console_broken" - }, - "furniture": { - "'": "f_street_light", - "c": "f_counter", - "D": "f_vending_c", - "F": "f_vending_c", - "S": "f_sink", - "T": "f_toilet", - "h": "f_chair", - "d": "f_desk", - "f": "f_fridge", - "l": "f_locker", - "r": "f_rack", - "t": "f_table", - "q": "f_stool", - "B": "f_bench", - "&": "f_trashcan", - "@": "f_dumpster", - "^": "f_indoor_plant" - }, - "toilets": { "T": { } } - }, - { - "type": "palette", - "id": "hotel_tower_palette.json", - "furniture": { - "!": "f_street_light", - "B": "f_bed", - "c": "f_counter", - "m": "f_bench", - "d": "f_dresser", - "o": "f_counter", - "D": "f_dryer", - "Y": "f_rack_coat", - "^": [ "f_indoor_plant_y", "f_indoor_plant" ], - "h": "f_chair", - "r": "f_rack", - "t": "f_table", - "j": "f_sofa", - "S": "f_sink", - "&": "f_toilet", - "b": "f_bathtub", - "E": [ "f_exercise", "f_ergometer", "f_treadmill" ], - "e": "f_fridge", - "l": "f_locker", - "W": "f_washer", - "F": "f_vending_c", - "U": "f_vending_c" - }, - "terrain": { - ",": "t_pavement_y", - "1": "t_flat_roof", - "0": "t_glass_roof", - "*": "t_open_air", - "6": "t_wall_glass", - "_": "t_pavement", - "2": "t_carpet_green", - "!": "t_sidewalk", - "s": "t_sidewalk", - "'": [ [ "t_region_groundcover_urban", 5 ], "t_region_shrub_decorative" ], - "M": [ "t_region_shrub_decorative" ], - " ": [ [ "t_region_groundcover_urban", 5 ], "t_region_shrub" ], - "-": "t_wall_w", - "|": "t_wall_w", - "%": "t_adobe_brick_wall", - "T": "t_region_tree_shade", - "v": "t_pavement", - "w": "t_water_pool_shallow", - "9": "t_water_pool", - "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], - "G": "t_door_glass_c", - "=": "t_door_locked", - "7": "t_door_locked_interior", - "X": "t_column", - "H": "t_wall_glass", - "x": "t_elevator_control_off", - "8": "t_elevator", - "~": "t_thconc_floor", - "<": "t_stairs_up", - ">": "t_stairs_down", - "#": "t_rock", - "$": "t_sewage_pipe", - "4": "t_gutter_downspout", - "P": "t_sewage_pump" - } - }, - { - "type": "palette", - "id": "office_doctor", - "terrain": { - " ": "t_region_groundcover_urban", - "]": "t_region_groundcover_urban", - "!": "t_door_locked_interior", - "#": "t_wall_w", - "$": "t_floor", - "&": "t_floor", - "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], - ".": "t_floor", - "0": "t_window_alarm", - "D": "t_floor", - "9": [ - [ "t_window_frame", 70 ], - [ "t_window_empty", 20 ], - [ "t_window_domestic", 5 ], - "t_window_no_curtains", - "t_window_open", - "t_window_no_curtains_open", - [ "t_curtains", 5 ] - ], - ":": "t_door_glass_c", - ";": "t_door_locked", - "=": "t_door_locked_alarm", - "B": "t_floor", - "C": "t_floor", - "H": "t_floor", - "I": "t_floor", - "O": "t_floor", - "S": "t_floor", - "T": "t_floor", - "X": "t_door_metal_locked", - "b": "t_floor", - "c": "t_floor", - "d": "t_floor", - "e": "t_floor", - "h": "t_floor", - "l": "t_floor", - "o": "t_floor", - "r": "t_floor", - "R": "t_sidewalk", - "s": "t_floor", - "t": "t_floor", - "w": [ [ "t_window_frame", 70 ], [ "t_window_empty", 20 ], [ "t_window", 5 ] ], - "y": "t_floor", - "f": "t_floor", - "}": "t_floor", - "4": "t_gutter_downspout", - "<": "t_ladder_up", - "u": "t_stairs_up", - "~": "t_sidewalk", - "%": "t_console_broken", - "5": "t_console", - "6": "t_console" - }, - "furniture": { - "]": "f_street_light", - "$": "f_safe_l", - "&": "f_toilet", - "B": "f_bed", - "C": "f_locker", - "H": "f_locker", - "I": "f_locker", - "O": "f_locker", - "S": "f_sink", - "b": "f_bench", - "c": "f_counter", - "d": "f_desk", - "e": "f_fridge", - "h": "f_chair", - "l": "f_locker", - "o": "f_bookcase", - "r": "f_trashcan", - "R": "f_trashcan", - "s": "f_sink", - "t": "f_table", - "f": "f_filing_cabinet", - "y": [ "f_indoor_plant_y", "f_indoor_plant" ] - }, - "toilets": { "&": { } } - }, - { - "type": "palette", - "id": "shelter", - "terrain": { - " ": "t_region_groundcover_urban", - "!": "t_pavement", - "`": "t_pavement_y", - "&": "t_sidewalk", - "#": "t_rock", - "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], - "-": "t_wall_w", - "_": "t_linoleum_white", - ":": [ - [ "t_window_frame", 70 ], - [ "t_window_empty", 20 ], - [ "t_window_domestic", 5 ], - "t_window_no_curtains", - "t_window_open", - "t_window_no_curtains_open", - [ "t_curtains", 5 ] - ], - ">": "t_stairs_down", - "<": "t_stairs_up", - "|": "t_wall_w", - ";": "t_concrete_wall", - "*": "t_ladder_up", - "=": "t_door_locked_interior", - "4": "t_gutter_downspout", - "6": "t_console", - "x": "t_console_broken" - }, - "furniture": { - "b": "f_bench", - "c": "f_cupboard", - "l": "f_locker", - "S": "f_sink", - "%": "f_trashcan", - "C": "f_charger", - "B": "f_battery", - "$": "f_shower", - "A": "f_air_filter" - }, - "toilets": { "T": { } }, - "items": { - "l": { "item": "SUS_evac_shelter_locker", "chance": 80 }, - "c": { "item": "SUS_evac_shelter_cabinet", "chance": 60 }, - "S": { "item": "SUS_evac_shelter_sink", "chance": 70 } - } - }, - { - "type": "palette", - "id": "standard_building_palette", - "furniture": { "S": "f_sink" }, - "terrain": { - ".": [ [ "t_region_groundcover_urban", 20 ], "t_region_shrub_decorative" ], - " ": "t_floor", - "+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ], - "*": "t_door_glass_c", - "4": "t_gutter_downspout", - "|": "t_wall", - "#": "t_brick_wall", - ":": "t_wall_glass", - "-": "t_sidewalk", - "o": [ [ "t_window_frame", 70 ], [ "t_window_empty", 20 ], [ "t_window", 5 ] ], - "<": "t_stairs_up", - ">": "t_stairs_down" - }, - "toilets": { "t": { } } - }, - { - "type": "palette", - "id": "road", - "terrain": { - " ": [ [ "t_region_groundcover", 8 ], "t_region_shrub" ], - "_": "t_pavement", - "!": "t_pavement", - ".": "t_floor", - "#": "t_wall_w", - "+": "t_door_c", - "~": "t_door_locked", - "/": "t_door_glass_c", - "x": "t_wall_glass", - ":": "t_pavement_y", - "]": "t_sidewalk", - "*": "t_tree", - "A": "t_atm" - }, - "furniture": { - "&": "f_trashcan", - "{": "f_glass_fridge", - "1": [ "f_indoor_plant", "f_indoor_plant_y" ], - "C": "f_counter", - "H": "f_sofa", - "c": "f_chair", - "s": "f_stool", - "t": "f_table", - "r": "f_rack", - "l": "f_locker", - "f": "f_fridge", - "o": "f_oven", - "S": "f_sink", - "T": "f_toilet" - }, - "toilets": { "T": { } }, - "gaspumps": { "!": { "fuel": "gasoline", "amount": [ 0, 5000 ] } }, - "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } } - }, - { - "type": "palette", - "id": "mall_palette_2", - "furniture": { - "A": "f_stool", - "B": "f_chair", - "C": "f_armchair", - "D": "f_camp_chair", - "@": "f_sofa", - "F": "f_bench", - "G": "f_lab_bench", - "I": "f_desk", - "J": "f_counter", - "ƃ": "f_counter_gate_c", - "~": "f_cupboard", - "K": "f_table", - "L": "f_tourist_table", - "M": "f_displaycase", - "N": "f_workbench", - "O": "f_dresser", - "P": "f_locker", - "Q": "f_rack", - "R": "f_bookcase", - "S": "f_filing_cabinet", - "T": "f_wardrobe", - "U": "f_utility_shelf", - "V": "f_glass_cabinet", - "W": "f_rack_coat", - "X": "f_sign", - "Y": "f_trashcan", - "Z": "f_shredder", - "a": "f_floor_lamp", - "b": "f_bigmirror", - "c": "f_statue", - "d": "f_mannequin", - "e": "f_pool_table", - "g": "f_arcade_machine", - "h": "f_pinball_machine", - "i": "f_oven", - "j": "f_sink", - "k": "f_woodstove", - "l": "f_fridge", - "m": "f_glass_fridge", - "n": "f_dishwasher", - "r": "f_wood_keg", - "s": "f_metal_butcher_rack", - "u": [ "f_vending_c", "f_vending_reinforced" ], - "v": "f_gun_safe_el", - "w": "f_safe_l", - "Я": "f_flower_tulip", - "ǝ": "f_coffee_table", - "Ħ": "f_rack_wood", - "Ʉ": "f_bed", - "ȣ": "f_washer", - "ȝ": "f_dryer", - "Ʃ": "f_entertainment_center", - "y": [ "f_indoor_plant", "f_indoor_plant_y" ], - "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ] - }, - "terrain": { - "ɔ": "t_pavement_y", - "Г": "t_sidewalk", - "˽": "t_pavement", - "ɱ": "t_shrub_hydrangea", - "ϻ": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], - "Я": "t_region_groundcover_urban", - "ւ": "t_region_groundcover_urban", - "Ŋ": "t_elevator_control_off", - "ȴ": "t_gutter_downspout", - "ȸ": "t_gutter_drop", - "θ": "t_door_metal_pickable", - " ": "t_open_air", - "Ƨ": "t_open_air_rooved", - ".": "t_linoleum_gray", - ",": "t_linoleum_white", - "°": "t_linoleum_gray_no_roof", - "³": "t_linoleum_white_no_roof", - "_": "t_thconc_floor", - "^": "t_floor", - "E": "t_elevator", - "<": "t_stairs_up", - ">": "t_stairs_down", - "-": "t_brick_wall", - "|": "t_brick_wall", - "H": "t_laminated_glass", - "#": "t_glass_railing", - "+": "t_laminated_door_glass_c", - "=": [ "t_door_c", "t_door_locked" ], - "p": "t_column", - "2": "t_wall_g", - "5": "t_wall_wood", - "6": "t_carpet_red", - "7": "t_carpet_green", - "8": "t_carpet_purple", - "9": "t_carpet_yellow", - "§": "t_water_pool_shallow_outdoors", - "x": [ "t_machinery_light", "t_machinery_heavy", "t_machinery_old", "t_machinery_electronic" ], - "?": "t_console_broken" - }, - "toilets": { "t": { } } - }, - { - "type": "palette", - "id": "mall_palette_basement", - "terrain": { - ".": "t_thconc_floor", - "N": "t_chainfence", - "T": "t_chaingate_c", - "0": "t_door_metal_pickable", - "1": "t_door_metal_locked", - "=": [ "t_door_c", "t_door_locked" ], - "|": "t_concrete_wall", - " ": "t_rock", - "3": "t_gates_control_brick", - "E": "t_elevator", - "<": "t_stairs_up", - ">": "t_stairs_down", - "Ŋ": "t_elevator_control_off", - "H": "t_laminated_glass", - "+": "t_laminated_door_glass_c" - }, - "furniture": { "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ], "F": "f_bench" } - }, - { - "type": "palette", - "id": "standard_domestic_landscaping_palette", - "//": "Intended to be used in conjunction with standard_domestic_palette. Load the domestic palette first, then this one to use open symbols for landscaping.", - "terrain": { - "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], - "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], - "!": "t_region_groundcover_urban", - "_": "t_pavement", - "`": "t_concrete" - }, - "furniture": { "!": "f_region_flower" } - } -] diff --git a/data/mods/No_Hope/Mapgen/school_1.json b/data/mods/No_Hope/Mapgen/school_1.json index 76aad2fdff57..168392788f71 100644 --- a/data/mods/No_Hope/Mapgen/school_1.json +++ b/data/mods/No_Hope/Mapgen/school_1.json @@ -86,7 +86,6 @@ ], "palettes": [ "school_palette" ], "place_items": [ ], - "place_item": [ { "item": "american_flag", "x": 36, "y": 58, "amount": 1 } ], "place_monsters": [ { "monster": "GROUP_SCHOOL", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 1 ], "density": 0.1 }, { "monster": "GROUP_SCHOOL", "x": [ 25, 46 ], "y": [ 1, 22 ], "repeat": [ 1, 2 ], "density": 0.1 }, @@ -429,7 +428,7 @@ "`": "t_sidewalk", "w": "t_window", "|": "t_wall_y", - "I": "t_column", + "I": "t_sidewalk", ",": "t_floor_waxed", ":": "t_floor_waxed_y", "7": "t_backboard_in", @@ -459,6 +458,7 @@ "%": "f_curtain", "@": "f_bed", "#": "f_bench", + "I": "f_us_flag_metal", "b": "f_bench", "?": "f_sofa", "S": "f_sink", diff --git a/data/mods/pride_flags/Pride_tall.png b/data/mods/pride_flags/Pride_tall.png new file mode 100644 index 000000000000..ca46d989b729 Binary files /dev/null and b/data/mods/pride_flags/Pride_tall.png differ diff --git a/data/mods/pride_flags/construction.json b/data/mods/pride_flags/construction.json new file mode 100644 index 000000000000..d190138f7b98 --- /dev/null +++ b/data/mods/pride_flags/construction.json @@ -0,0 +1,314 @@ +[ + { + "type": "construction", + "id": "constr_trans_flag_metal", + "//": "Metal flagpole", + "group": "hoist_trans_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "trans_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_trans_flag_metal" + }, + { + "type": "construction", + "id": "constr_trans_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_trans_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "trans_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_trans_flag_wood" + }, + { + "type": "construction", + "id": "constr_rainbow_flag_metal", + "//": "Metal flagpole", + "group": "hoist_rainbow_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "rainbow_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_rainbow_flag_metal" + }, + { + "type": "construction", + "id": "constr_rainbow_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_rainbow_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "rainbow_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_rainbow_flag_wood" + }, + { + "type": "construction", + "id": "constr_aromantic_flag_metal", + "//": "Metal flagpole", + "group": "hoist_aromantic_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "aromantic_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_aromantic_flag_metal" + }, + { + "type": "construction", + "id": "constr_aromantic_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_aromantic_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "aromantic_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_aromantic_flag_wood" + }, + { + "type": "construction", + "id": "constr_asexual_flag_metal", + "//": "Metal flagpole", + "group": "hoist_asexual_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "asexual_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_asexual_flag_metal" + }, + { + "type": "construction", + "id": "constr_asexual_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_asexual_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "asexual_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_asexual_flag_wood" + }, + { + "type": "construction", + "id": "constr_bisexual_flag_metal", + "//": "Metal flagpole", + "group": "hoist_bisexual_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "bisexual_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_bisexual_flag_metal" + }, + { + "type": "construction", + "id": "constr_bisexual_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_bisexual_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "bisexual_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_bisexual_flag_wood" + }, + { + "type": "construction", + "id": "constr_intersex_flag_metal", + "//": "Metal flagpole", + "group": "hoist_intersex_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "intersex_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_intersex_flag_metal" + }, + { + "type": "construction", + "id": "constr_intersex_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_intersex_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "intersex_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_intersex_flag_wood" + }, + { + "type": "construction", + "id": "constr_lesbian_flag_metal", + "//": "Metal flagpole", + "group": "hoist_lesbian_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "lesbian_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_lesbian_flag_metal" + }, + { + "type": "construction", + "id": "constr_lesbian_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_lesbian_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "lesbian_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_lesbian_flag_wood" + }, + { + "type": "construction", + "id": "constr_enby_flag_metal", + "//": "Metal flagpole", + "group": "hoist_enby_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "enby_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_enby_flag_metal" + }, + { + "type": "construction", + "id": "constr_enby_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_enby_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "enby_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_enby_flag_wood" + }, + { + "type": "construction", + "id": "constr_pansexual_flag_metal", + "//": "Metal flagpole", + "group": "hoist_pansexual_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "pansexual_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_pansexual_flag_metal" + }, + { + "type": "construction", + "id": "constr_pansexual_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_pansexual_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "pansexual_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_pansexual_flag_wood" + }, + { + "type": "construction", + "id": "constr_gay_flag_metal", + "//": "Metal flagpole", + "group": "hoist_gay_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "gay_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_gay_flag_metal" + }, + { + "type": "construction", + "id": "constr_gay_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_gay_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "gay_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_gay_flag_wood" + }, + { + "type": "construction", + "id": "constr_genderfluid_flag_metal", + "//": "Metal flagpole", + "group": "hoist_genderfluid_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "genderfluid_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_genderfluid_flag_metal" + }, + { + "type": "construction", + "id": "constr_genderfluid_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_genderfluid_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "genderfluid_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_genderfluid_flag_wood" + }, + { + "type": "construction", + "id": "constr_autism_flag_metal", + "//": "Metal flagpole", + "group": "hoist_autism_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "autism_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_metal", + "post_furniture": "f_autism_flag_metal" + }, + { + "type": "construction", + "id": "constr_autism_flag_wood", + "//": "Wooden flagpole", + "group": "hoist_autism_flag", + "category": "DECORATE", + "required_skills": [ ], + "time": "1 m", + "components": [ [ [ "autism_flag", 1 ] ] ], + "pre_note": "Can be deconstructed without tools.", + "pre_furniture": "f_flagpole_wood", + "post_furniture": "f_autism_flag_wood" + } +] diff --git a/data/mods/pride_flags/construction_group.json b/data/mods/pride_flags/construction_group.json new file mode 100644 index 000000000000..ca8762fbe0ec --- /dev/null +++ b/data/mods/pride_flags/construction_group.json @@ -0,0 +1,62 @@ +[ + { + "type": "construction_group", + "id": "hoist_trans_flag", + "name": "Hoist Trans Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_rainbow_flag", + "name": "Hoist LGBTQ+ Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_aromantic_flag", + "name": "Hoist Aromantic Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_asexual_flag", + "name": "Hoist Asexual Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_bisexual_flag", + "name": "Hoist Bisexual Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_intersex_flag", + "name": "Hoist Intersex Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_lesbian_flag", + "name": "Hoist Lesbian Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_enby_flag", + "name": "Hoist Non-binary Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_pansexual_flag", + "name": "Hoist Pansexual Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_gay_flag", + "name": "Hoist Gay Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_genderfluid_flag", + "name": "Hoist Genderfluid Pride Flag" + }, + { + "type": "construction_group", + "id": "hoist_autism_flag", + "name": "Hoist Autism Pride Flag" + } +] diff --git a/data/mods/pride_flags/furniture.json b/data/mods/pride_flags/furniture.json new file mode 100644 index 000000000000..13c9c7720c7d --- /dev/null +++ b/data/mods/pride_flags/furniture.json @@ -0,0 +1,578 @@ +[ + { + "type": "furniture", + "id": "f_trans_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Trans pride flag", + "looks_like": "trans_flag", + "description": "An old metal flagpole, now flying the blue, pink, and white of a transgender pride flag.", + "symbol": "i", + "color": "light_blue", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "trans_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "trans_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_trans_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Trans pride flag", + "looks_like": "trans_flag", + "description": "This makeshift flagpole is currently flying the blue, pink, and white of a transgender pride flag.", + "symbol": "i", + "color": "light_blue", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "trans_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "trans_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_rainbow_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with LGBTQ+ pride flag", + "looks_like": "rainbow_flag", + "description": "An old metal flagpole, now flying the classic rainbow hues of an LGBTQ+ pride flag.", + "symbol": "i", + "color": "red", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "rainbow_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "rainbow_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_rainbow_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with LGBTQ+ pride flag", + "looks_like": "rainbow_flag", + "description": "This makeshift flagpole is currently flying the classic rainbow hues of an LGBTQ+ pride flag.", + "symbol": "i", + "color": "red", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "rainbow_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "rainbow_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_aromantic_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Aromantic pride flag", + "looks_like": "aromantic_flag", + "description": "An old metal flagpole, now flying an aromantic pride flag displaying greens, white, black and grey.", + "symbol": "i", + "color": "light_green", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "aromantic_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "aromantic_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_aromantic_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Aromantic pride flag", + "looks_like": "aromantic_flag", + "description": "This makeshift flagpole is currently flying an aromantic pride flag displaying greens, white, black and grey.", + "symbol": "i", + "color": "light_green", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "aromantic_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "aromantic_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_asexual_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Asexual pride flag", + "looks_like": "asexual_flag", + "description": "An old metal flagpole, now flying the black, grey, white and purple tones of an asexual pride flag.", + "symbol": "i", + "color": "light_gray", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "asexual_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "asexual_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_asexual_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Asexual pride flag", + "looks_like": "asexual_flag", + "description": "This makeshift flagpole is currently flying the black, grey, white and purple tones of an asexual pride flag.", + "symbol": "i", + "color": "light_gray", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "asexual_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "asexual_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_bisexual_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Bisexual pride flag", + "looks_like": "bisexual_flag", + "description": "An old metal flagpole, now flying a bisexual pride flag, showing blue and pink with purple in-between.", + "symbol": "i", + "color": "magenta", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "bisexual_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "bisexual_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_bisexual_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Bisexual pride flag", + "looks_like": "bisexual_flag", + "description": "This makeshift flagpole is currently flying a bisexual pride flag, showing blue and pink with purple in-between.", + "symbol": "i", + "color": "magenta", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "bisexual_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "bisexual_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_intersex_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Intersex pride flag", + "looks_like": "intersex_flag", + "description": "An old metal flagpole, now flying the intersex pride flag, a yellow field with a purple ring.", + "symbol": "i", + "color": "yellow", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "intersex_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "intersex_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_intersex_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Intersex pride flag", + "looks_like": "intersex_flag", + "description": "This makeshift flagpole is currently flying an intersex pride flag, a yellow field with a purple ring.", + "symbol": "i", + "color": "yellow", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "intersex_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "intersex_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_lesbian_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Lesbian pride flag", + "looks_like": "lesbian_flag", + "description": "An old metal flagpole, now flying the oranges, rosen shades, and white of a lesbian pride flag.", + "symbol": "i", + "color": "light_red", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "lesbian_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "lesbian_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_lesbian_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Lesbian pride flag", + "looks_like": "lesbian_flag", + "description": "This makeshift flagpole is currently flying the oranges, rosen shades, and white of a lesbian pride flag.", + "symbol": "i", + "color": "light_red", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "lesbian_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "lesbian_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_enby_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Non-binary pride flag", + "looks_like": "enby_flag", + "description": "An old metal flagpole, now flying a non-binary pride flag; yellow upon white, then purple, then black.", + "symbol": "i", + "color": "white", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "enby_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "enby_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_enby_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Non-binary pride flag", + "looks_like": "enby_flag", + "description": "This makeshift flagpole is currently flying a non-binary pride flag; yellow upon white, then purple, then black.", + "symbol": "i", + "color": "white", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "enby_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "enby_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_pansexual_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Pansexual pride flag", + "looks_like": "pansexual_flag", + "description": "An old metal flagpole, now flying the pink, blue, and yellow of a pansexual pride flag.", + "symbol": "i", + "color": "pink", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "pansexual_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "pansexual_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_pansexual_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Pansexual pride flag", + "looks_like": "pansexual_flag", + "description": "This makeshift flagpole is currently flying the pink, blue, and yellow of a pansexual pride flag.", + "symbol": "i", + "color": "pink", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "pansexual_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "pansexual_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_gay_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Gay pride flag", + "looks_like": "gay_flag", + "description": "An old metal flagpole, now flying a men's gay pride flag, with white in between shades of green and blue.", + "symbol": "i", + "color": "green", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "gay_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "gay_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_gay_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Gay pride flag", + "looks_like": "gay_flag", + "description": "This makeshift flagpole is currently flying a men's gay pride flag, with white in between shades of green and blue.", + "symbol": "i", + "color": "green", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "gay_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "gay_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_genderfluid_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Genderfluid pride flag", + "looks_like": "genderfluid_flag", + "description": "An old metal flagpole, now flying the pink, white, purple, black and blue genderfluid pride flag.", + "symbol": "i", + "color": "blue", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "genderfluid_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "genderfluid_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_genderfluid_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Genderfluid pride flag", + "looks_like": "genderfluid_flag", + "description": "This makeshift flagpole is currently flying the pink, white, purple, black and blue genderfluid pride flag.", + "symbol": "i", + "color": "blue", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "genderfluid_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "genderfluid_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_autism_flag_metal", + "copy-from": "f_us_flag_metal", + "name": "flagpole with Autism pride flag", + "looks_like": "autism_flag", + "description": "An old metal flagpole, now flying the infinity symbol upon an autism pride flag.", + "symbol": "i", + "color": "white", + "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "autism_flag", "count": 1 } ] }, + "bash": { + "str_min": 30, + "str_max": 100, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "pipe", "count": [ 1, 7 ] }, + { "item": "scrap", "count": [ 3, 12 ] }, + { "item": "rope_6", "count": [ 1, 3 ] }, + { "item": "autism_flag", "count": 1 } + ], + "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + }, + { + "type": "furniture", + "id": "f_autism_flag_wood", + "copy-from": "f_flagpole_wood", + "name": "wooden flagpole with Autism pride flag", + "looks_like": "autism_flag", + "description": "This makeshift flagpole is currently flying the infinity symbol upon an autism pride flag.", + "symbol": "i", + "color": "white", + "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "autism_flag", "count": 1 } ] }, + "bash": { + "str_min": 20, + "str_max": 100, + "sound": "crunch!", + "sound_fail": "whack!", + "items": [ + { "item": "log", "count": [ 1, 2 ] }, + { "item": "splinter", "count": [ 10, 20 ] }, + { "item": "rope_makeshift_6", "count": [ 1, 3 ] }, + { "item": "autism_flag", "count": 1 } + ], + "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" } + } + } +] diff --git a/data/mods/pride_flags/mod_tileset.json b/data/mods/pride_flags/mod_tileset.json index 96cc554b2c1d..1f59267e7ebd 100644 --- a/data/mods/pride_flags/mod_tileset.json +++ b/data/mods/pride_flags/mod_tileset.json @@ -50,5 +50,44 @@ "sprite_offset_y": 0 } ] + }, + { + "type": "mod_tileset", + "compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE", "MshockRealXotto", "MSX++DEAD_PEOPLE" ], + "tiles-new": [ + { + "file": "Pride_tall.png", + "tiles": [ + { "id": "f_trans_flag_metal", "fg": 0 }, + { "id": "f_trans_flag_wood", "fg": 1 }, + { "id": "f_rainbow_flag_metal", "fg": 2 }, + { "id": "f_rainbow_flag_wood", "fg": 3 }, + { "id": "f_aromantic_flag_metal", "fg": 4 }, + { "id": "f_aromantic_flag_wood", "fg": 5 }, + { "id": "f_asexual_flag_metal", "fg": 6 }, + { "id": "f_asexual_flag_wood", "fg": 7 }, + { "id": "f_bisexual_flag_metal", "fg": 8 }, + { "id": "f_bisexual_flag_wood", "fg": 9 }, + { "id": "f_intersex_flag_metal", "fg": 10 }, + { "id": "f_intersex_flag_wood", "fg": 11 }, + { "id": "f_lesbian_flag_metal", "fg": 12 }, + { "id": "f_lesbian_flag_wood", "fg": 13 }, + { "id": "f_enby_flag_metal", "fg": 14 }, + { "id": "f_enby_flag_wood", "fg": 15 }, + { "id": "f_pansexual_flag_metal", "fg": 16 }, + { "id": "f_pansexual_flag_wood", "fg": 17 }, + { "id": "f_gay_flag_metal", "fg": 18 }, + { "id": "f_gay_flag_wood", "fg": 19 }, + { "id": "f_genderfluid_flag_metal", "fg": 20 }, + { "id": "f_genderfluid_flag_wood", "fg": 21 }, + { "id": "f_autism_flag_metal", "fg": 22 }, + { "id": "f_autism_flag_wood", "fg": 23 } + ], + "sprite_width": 64, + "sprite_height": 80, + "sprite_offset_x": -16, + "sprite_offset_y": -48 + } + ] } ]