From fcdd4fe3deba558f29a43bb633e0a8d67743e542 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 14 Jan 2020 17:38:16 -0800 Subject: [PATCH 1/3] Create garden_house_2.json --- data/json/mapgen/house/garden_house_2.json | 117 +++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 data/json/mapgen/house/garden_house_2.json diff --git a/data/json/mapgen/house/garden_house_2.json b/data/json/mapgen/house/garden_house_2.json new file mode 100644 index 0000000000000..0cab9337e440a --- /dev/null +++ b/data/json/mapgen/house/garden_house_2.json @@ -0,0 +1,117 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": "garden_house_2_floor_1", + "object": { + "fill_ter": "t_floor", + "rows": [ + "....Gss.9.9.9.9.9.9.9.9.", + ".9...ss.................", + "...ssss#ooooo#......9.99", + "s####*## ##oo##oo#.9", + "s# cc #.9", + "s# cttc #.9", + "s# cc #.9", + "s# #.9", + "s# #.9", + "s#### #.9", + "s!.^#*########### #!.", + "s@ssssssssssssss* 7#!.", + ".!..ssssssssssss#6 4o!.", + ".!..ssssssssssss#1523#!.", + ".!..ssssssssssss##o###!.", + ".!9...9.......9.......!.", + ".!.......[..........9.!.", + ".!].............[.....!.", + ".!....................!.", + ".!....................!.", + ".!....................!.", + ".!....................!.", + ".!....................!.", + ".!!!!!!!!!!!!!!!!!!!!!!." + ], + "palettes": [ "house_w_foundation_palette" ], + "terrain": { + ".": "t_region_groundcover_urban", + "[": "t_region_groundcover_urban", + "]": "t_region_groundcover_urban", + "#": "t_brick_wall", + "!": "t_fence", + "@": "t_fencegate_c", + "1": "t_linoleum_white", + "2": "t_linoleum_white", + "3": "t_linoleum_white", + "4": "t_linoleum_white", + "5": "t_linoleum_white", + "6": "t_linoleum_white", + "7": "t_linoleum_white", + "8": "t_linoleum_white", + "9": [ + [ "t_region_groundcover_urban", 60 ], + "t_region_tree_shade", + [ "t_region_tree_fruit", 2 ], + [ "t_region_tree_nut", 2 ] + ], + "0": "t_water_pool_shallow_outdoors", + "c": "t_linoleum_white", + "i": "t_linoleum_white", + "j": "t_linoleum_white", + "l": "t_linoleum_white", + "t": "t_linoleum_white", + "Y": "t_linoleum_white" + }, + "furniture": { + "c": "f_cupboard", + "1": "f_cupboard", + "2": "f_cupboard", + "3": "f_cupboard", + "4": "f_cupboard", + "5": "f_sink", + "6": "f_cupboard", + "7": "f_cupboard", + "8": "f_counter" + }, + "items": { + "c": { "item": "kitchen_counters", "chance": 10 }, + "1": [ { "item": "SUS_dishes", "chance": 100 }, { "item": "SUS_silverware", "chance": 100 } ], + "2": { "item": "SUS_cookware", "chance": 100 }, + "3": [ { "item": "SUS_utensils", "chance": 50 }, { "item": "SUS_knife_drawer", "chance": 50 } ], + "4": { "item": "SUS_junk_drawer", "chance": 100 }, + "5": { "item": "SUS_kitchen_sink", "chance": 100 }, + "6": { "item": "SUS_pantry", "chance": 60 }, + "7": [ { "item": "SUS_breakfast_cupboard", "chance": 80 }, { "item": "SUS_coffee_cupboard", "chance": 70 } ], + "8": [ + { "item": "SUS_hair_drawer", "chance": 50 }, + { "item": "SUS_bathroom_cabinet", "chance": 50 }, + { "item": "softdrugs", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "harddrugs", "chance": 2 } + ] + }, + "nested": { + "[": { + "chunks": [ + [ "roof_6x6_garden_4", 5 ], + [ "roof_6x6_garden_1", 15 ], + [ "firepit_5x5_1", 10 ], + [ "firepit_5x5_2", 10 ], + [ "reflecting_pool_5x5_1", 10 ], + [ "reflecting_pool_5x5_2", 10 ], + [ "garden_3x3_1", 10 ], + [ "garden_3x3_2", 10 ] + ] + }, + "]": { + "chunks": [ + [ "shed_6x6_junk", 5 ], + [ "shed_6x6_junk", 5 ], + [ "greenhouse_6x6_herbal", 10 ], + [ "greenhouse_6x6_vegetable", 10 ], + [ "pond_6x6", 15 ], + [ "garden_3x3_3", 10 ] + ] + } + } + } + } +] From 39fc1684fcfb78eb1fcc8948e8334af3c579b77b Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Fri, 17 Jan 2020 10:58:04 -0800 Subject: [PATCH 2/3] Delete garden_house_2.json --- data/json/mapgen/house/garden_house_2.json | 117 --------------------- 1 file changed, 117 deletions(-) delete mode 100644 data/json/mapgen/house/garden_house_2.json diff --git a/data/json/mapgen/house/garden_house_2.json b/data/json/mapgen/house/garden_house_2.json deleted file mode 100644 index 0cab9337e440a..0000000000000 --- a/data/json/mapgen/house/garden_house_2.json +++ /dev/null @@ -1,117 +0,0 @@ -[ - { - "type": "mapgen", - "method": "json", - "om_terrain": "garden_house_2_floor_1", - "object": { - "fill_ter": "t_floor", - "rows": [ - "....Gss.9.9.9.9.9.9.9.9.", - ".9...ss.................", - "...ssss#ooooo#......9.99", - "s####*## ##oo##oo#.9", - "s# cc #.9", - "s# cttc #.9", - "s# cc #.9", - "s# #.9", - "s# #.9", - "s#### #.9", - "s!.^#*########### #!.", - "s@ssssssssssssss* 7#!.", - ".!..ssssssssssss#6 4o!.", - ".!..ssssssssssss#1523#!.", - ".!..ssssssssssss##o###!.", - ".!9...9.......9.......!.", - ".!.......[..........9.!.", - ".!].............[.....!.", - ".!....................!.", - ".!....................!.", - ".!....................!.", - ".!....................!.", - ".!....................!.", - ".!!!!!!!!!!!!!!!!!!!!!!." - ], - "palettes": [ "house_w_foundation_palette" ], - "terrain": { - ".": "t_region_groundcover_urban", - "[": "t_region_groundcover_urban", - "]": "t_region_groundcover_urban", - "#": "t_brick_wall", - "!": "t_fence", - "@": "t_fencegate_c", - "1": "t_linoleum_white", - "2": "t_linoleum_white", - "3": "t_linoleum_white", - "4": "t_linoleum_white", - "5": "t_linoleum_white", - "6": "t_linoleum_white", - "7": "t_linoleum_white", - "8": "t_linoleum_white", - "9": [ - [ "t_region_groundcover_urban", 60 ], - "t_region_tree_shade", - [ "t_region_tree_fruit", 2 ], - [ "t_region_tree_nut", 2 ] - ], - "0": "t_water_pool_shallow_outdoors", - "c": "t_linoleum_white", - "i": "t_linoleum_white", - "j": "t_linoleum_white", - "l": "t_linoleum_white", - "t": "t_linoleum_white", - "Y": "t_linoleum_white" - }, - "furniture": { - "c": "f_cupboard", - "1": "f_cupboard", - "2": "f_cupboard", - "3": "f_cupboard", - "4": "f_cupboard", - "5": "f_sink", - "6": "f_cupboard", - "7": "f_cupboard", - "8": "f_counter" - }, - "items": { - "c": { "item": "kitchen_counters", "chance": 10 }, - "1": [ { "item": "SUS_dishes", "chance": 100 }, { "item": "SUS_silverware", "chance": 100 } ], - "2": { "item": "SUS_cookware", "chance": 100 }, - "3": [ { "item": "SUS_utensils", "chance": 50 }, { "item": "SUS_knife_drawer", "chance": 50 } ], - "4": { "item": "SUS_junk_drawer", "chance": 100 }, - "5": { "item": "SUS_kitchen_sink", "chance": 100 }, - "6": { "item": "SUS_pantry", "chance": 60 }, - "7": [ { "item": "SUS_breakfast_cupboard", "chance": 80 }, { "item": "SUS_coffee_cupboard", "chance": 70 } ], - "8": [ - { "item": "SUS_hair_drawer", "chance": 50 }, - { "item": "SUS_bathroom_cabinet", "chance": 50 }, - { "item": "softdrugs", "chance": 20, "repeat": [ 1, 2 ] }, - { "item": "harddrugs", "chance": 2 } - ] - }, - "nested": { - "[": { - "chunks": [ - [ "roof_6x6_garden_4", 5 ], - [ "roof_6x6_garden_1", 15 ], - [ "firepit_5x5_1", 10 ], - [ "firepit_5x5_2", 10 ], - [ "reflecting_pool_5x5_1", 10 ], - [ "reflecting_pool_5x5_2", 10 ], - [ "garden_3x3_1", 10 ], - [ "garden_3x3_2", 10 ] - ] - }, - "]": { - "chunks": [ - [ "shed_6x6_junk", 5 ], - [ "shed_6x6_junk", 5 ], - [ "greenhouse_6x6_herbal", 10 ], - [ "greenhouse_6x6_vegetable", 10 ], - [ "pond_6x6", 15 ], - [ "garden_3x3_3", 10 ] - ] - } - } - } - } -] From e64525ce1b55fb1d0b54ce296430fe44b436c34e Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Tue, 28 Jan 2020 11:45:24 -0800 Subject: [PATCH 3/3] Update feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 1177174111711..cd9f1fff19e6f 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,14 +4,14 @@ about: Suggest an idea for this project --- -**Is your feature request related to a problem? Please describe.** +# Is your feature request related to a problem? Please describe. A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -**Describe the solution you'd like** +# Describe the solution you'd like A clear and concise description of what you want to happen. -**Describe alternatives you've considered** +# Describe alternatives you've considered A clear and concise description of any alternative solutions or features you've considered. -**Additional context** +# Additional context Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature request here.