Skip to content

Commit

Permalink
Merge pull request #4 from AlisW02/patch-5
Browse files Browse the repository at this point in the history 
Patch 5
  • Loading branch information
@BeastFolks
BeastFolks authored May 14, 2020
2 parents 4b7213c + 9688954 commit b155574
Show file tree
Hide file tree
Showing 13 changed files with 369 additions and 15 deletions.
8 changes: 4 additions & 4 deletions data/json/furniture_and_terrain/furniture-eggs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "furniture",
"id": "f_egg_sackbw",
"name": "spider egg sack",
"description": "Much too large, off-white egg sack. Kind of icky. Something IS moving in there.",
"description": "A sizable, off-white sac of large eggs. Upon watching closer, you can see them moving slightly. Gross.",
"symbol": "O",
"color": "white",
"move_cost_mod": 3,
Expand All @@ -16,7 +16,7 @@
"type": "furniture",
"id": "f_egg_sackcs",
"name": "spider egg sack",
"description": "Bulbous mass of spider eggs. More than kind of icky. Something IS moving in there.",
"description": "A bulbous mass of off-white spider eggs. Upon watching closer, you can see them moving a bit. Really gross.",
"symbol": "O",
"color": "white",
"move_cost_mod": 3,
Expand All @@ -29,7 +29,7 @@
"type": "furniture",
"id": "f_egg_sackws",
"name": "spider egg sack",
"description": "A horrifyingly oversized egg sack. Something IS moving in there. If you're seeing this, you're already too close to it.",
"description": "A gigantic sac of spider's eggs, each one larger than your fist. They're definitely moving around. Really gross, just seeing it makes your skin crawl.",
"symbol": "O",
"color": "yellow",
"move_cost_mod": 3,
Expand All @@ -42,7 +42,7 @@
"type": "furniture",
"id": "f_egg_sacke",
"name": "ruptured egg sack",
"description": "Super icky. Spider stuff's spilling out.",
"description": "A disgusting ruptured sac of giant spider eggs. The thought of all those massive baby spiders pouring out of it is almost terrifying on its own.",
"symbol": "X",
"color": "white",
"move_cost_mod": 3,
Expand Down
175 changes: 175 additions & 0 deletions data/json/mapgen/mall/mall_basement.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [
[
"mall_a_56_basement",
"mall_a_57_basement",
"mall_a_58_basement",
"mall_a_59_basement",
"mall_a_60_basement",
"mall_a_61_basement",
"mall_a_62_basement"
]
],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||#####||||||#####||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ",
" |................................................................#<6<#......#<6<#..............................................................| ",
" |................................................................#666########666#..............................................................| ",
" |......................................................###########6#+#(*FF*)#+#6###########....................................................| ",
" |||......................................................#EEEE#EEEE#H#***,*,****#H#EEEE#EEEE#....................................................| ",
" |........................................................#EEEE#EEEE#****,*,*,*,***#EEEE#EEEE#....................................................| ",
" |......................................................###H++H#H++H#*,*,*,*,*,*,**#H++H#H++H###..................................................| ",
" |......................................................#******Ŋ*******,*,*,*,*,*,******Ŋ******#..................................................| ",
" |......................................................#*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,**#..................................................| ",
" |......................................................#**,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*#..................................................| ",
" |......................................................#F,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*F#..................................................| ",
" |......................................................#F*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,F#..................................................| ",
" |......................................................#F,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*F#..................................................| ",
" |......................................................#**,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*#..................................................| ",
" |......................................................#Y()**,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*()Y#..................................................| ",
" |......................................................####*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,**####..................................................| ",
" |.........................................................#**,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*#.....................................................| ",
" |.........................................................#*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,**#.....................................................| ",
" |.........................................................#F*,*,*,*,*,*,*}*,{,*,*,*,*,*,*,F#.....................................................| ",
" |.........................................................#F,*,*,*,*,*,*,{,*}*,*,*,*,*,*,*F#.....................................................| ",
" |.........................................................#F*,*,*,*,*,*,*}*,{,*,*,*,*,*,*,F#.....................................................| ",
" |.........................................................#Y,*,*,*,*,*,*,{,*}*,*,*,*,*,*,*Y#.....................................................| ",
" |.........................................................#**,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*#.....................................................| ",
" |.........................................................#*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,**#.....................................................| "
],
"palettes": [ "mall_palette_basement" ],
"terrain": {
"#": "t_brick_wall",
"*": "t_linoleum_gray",
",": "t_linoleum_white",
"6": "t_carpet_red",
".": "t_rock",
"{": "t_linoleum_gray",
"Y": "t_linoleum_gray",
"}": "t_linoleum_white",
"(": "t_linoleum_gray",
")": "t_linoleum_gray",
"F": "t_linoleum_gray"
},
"furniture": { "{": "f_bench", "}": "f_bench", "Y": "f_trashcan" },
"vendingmachines": { "(": { "item_group": "vending_drink" }, ")": { "item_group": "vending_food" } },
"place_monsters": [ { "monster": "GROUP_MALL", "x": [ 72, 95 ], "y": [ 8, 23 ], "density": 0.4 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [
[
"mall_a_65_basement",
"mall_a_66_basement",
"mall_a_67_basement",
"mall_a_68_basement",
"mall_a_69_basement",
"mall_a_70_basement",
"mall_a_71_basement"
]
],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" |.........................................................#{*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,{#.....................................................| ",
" |.........................................................#{,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*{#.....................................................| ",
" |.........................................................#{*,*,*,*,*,*,*}*,{,*,*,*,*,*,*,{#.....................................................| ",
" |.........................................................#Y,*,*,*,*,*,*,{,*}*,*,*,*,*,*,*Y#.....................................................| ",
" |.........................................................#{*,*,*,*,*,*,*}*,{,*,*,*,*,*,*,{#.....................................................| ",
" |.........................................................#{,*,*,*,*,*,*,{,*}*,*,*,*,*,*,*{#.....................................................|||| ",
" |.........................................................#{*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,{#........................................................| ",
" |.........................................................#*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,**#........................................................| ",
" |.........................................................#**,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*#.....................................................|||| ",
" |.........................................................#*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,**#.....................................................| ",
" |.........................................................#>*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,>#.....................................................| ",
" |....................................|||||||||||||........#>***Ŋ**********************Ŋ***>#.....................................................| ",
" |....................................| |........##+++########################+++##.....................................................| ",
" |||||||||||||||||||||||||||||||||||||| |||||||||||ŊEE||||||||||||||||||||||||ŊEE|||||||||||||||||||||||||||||||||||||||||||||||||||||||| ",
" |EEE| |EEE| ",
" |EEE| |EEE| ",
" ||||| ||||| ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "mall_palette_basement" ],
"terrain": {
"#": "t_brick_wall",
"*": "t_linoleum_gray",
",": "t_linoleum_white",
".": "t_rock",
"{": "t_linoleum_gray",
"Y": "t_linoleum_gray",
"}": "t_linoleum_white"
},
"furniture": { "{": "f_bench", "}": "f_bench", "Y": "f_trashcan" },
"place_vehicles": [
{ "vehicle": "food_cart", "x": 75, "y": 3, "chance": 100, "rotation": 270 },
{ "vehicle": "ice_cream_cart", "x": 93, "y": 3, "chance": 100, "rotation": 180 }
],
"place_monsters": [ { "monster": "GROUP_MALL", "x": [ 72, 95 ], "y": [ 0, 9 ], "density": 0.5 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "mall_a_67_sub_basement", "mall_a_68_sub_basement", "mall_a_69_sub_basement" ] ],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ############ ",
" ########.{{.().{{.######## ",
" #####.,.,.,.,.,.,.,.,.,.,.,.,##### ",
" #<__#,.,.,.,.,.,.,.,.,.,.,.,.#__<# ",
" #<__θ.,.,.,.,.,.,.,.,.,.,.,.,θ__<# ",
" ######Ŋ,.,.,.,.,.,.,.,.,.,.Ŋ###### ",
" #EEŊ+..,.,.,.,.}{,.,.,.,.,.+ŊEE# ",
" #EEE+.,.,.,.,.,{}.,.,.,.,..+EEE# ",
" #EEE+..,.,.,.,.}{,.,.,.,.,.+EEE# ",
" #####.,.,.,.,.,.,.,.,.,.,..##### ",
" #.{{Y......................Y{{.# ",
" #______________________________# ",
" #______4%444%4;;;;4%444%4______# ",
" #__FF__-&---&-;;;;-&---&-__FF__# ",
" #__FF__4%444%4;;;;4%444%4__FF__# ",
" #__FF__-&---&-;;;;-&---&-__FF__# ",
" #______4%444%4;;;;4%444%4______# "
],
"palettes": [ "mall_palette_2" ],
"terrain": {
"&": "t_railroad_track",
" ": "t_rock",
"#": "t_brick_wall",
"%": "t_railroad_track_on_tie",
";": "t_rock_floor",
"4": "t_railroad_rubble",
"-": "t_railroad_tie_h",
"{": "t_linoleum_gray",
"Y": "t_linoleum_gray",
"}": "t_linoleum_white",
"(": "t_linoleum_gray",
")": "t_linoleum_gray"
},
"furniture": { "{": "f_bench", "}": "f_bench", "Y": "f_trashcan" },
"vendingmachines": { "(": { "item_group": "vending_drink" }, ")": { "item_group": "vending_food" } },
"place_monsters": [ { "monster": "GROUP_MALL", "x": [ 24, 47 ], "y": [ 10, 23 ], "density": 0.3 } ]
}
}
]
10 changes: 5 additions & 5 deletions data/json/mapgen/mall/mall_ground.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,10 +1416,10 @@
"fill_ter": "t_floor",
"rows": [
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯЯЯɱ|__|;^^^^^^^^^J^A~|MH.,,,,.^^^^±^^m|Q^^QQ^^QQ^^QQ^^QQ^^^J^^~|z___|||||666666|||||||=|",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯЯЯɱ|__|;;;;^^^;;^J^^~|^|.,,,,.^^^^±^^m|Q^^QQ^^QQ^^QQ^^±±^^^?^^~|U__S|UUU|666666|UUU|___j",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯЯϻɱ|__||||||=|||||||||^H.,,,,.H±^^±^^m|Q^^QQ^^±±^^±±^^±±^^^J^^~|U__P|___|||==|||___|_t_0",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯɱɱɱ|__|PP_______|PP_&|MH.,,,,.H±^^±^^m|Q^^QQ^^±±^^±±^^^^^^|||||||||||P|=|%....%|=|_|||||",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯɱ|||__θ_____B__S|__B&|dH.,,,,.H±^^^^^m|Q^^^^^^^^^^^^^^^^^±|EEEE|EEEE|||..........|||EEEE",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯЯЯɱ|__|;;;;^^^;;^J^^~|^|.,,,,.^^^^±^^m|Q^^QQ^^QQ^^QQ^^±±^^^?^^~|U__S|>6>|666666|>6>|___j",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯЯϻɱ|__||||||=|||||||||^H.,,,,.H±^^±^^m|Q^^QQ^^±±^^±±^^±±^^^J^^~|U__P|666|||==|||666|_t_0",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯɱɱɱ|__|PP_______|PP_&|MH.,,,,.H±^^±^^m|Q^^QQ^^±±^^±±^^^^^^|||||||||||6|+|%....%|+|6|||||",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯɱ|||__θ_____B__S|__B&|dH.,,,,.H±^^^^^m|Q^^^^^^^^^^^^^^^^^±|EEEE|EEEE|H|..........|H|EEEE",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯɱHy|__|U__a&&&_S|____θ^|%....%|^^mmm^^|Q^^^^^^^^^^^^±±±±±±|EEEE|EEEE|%............%|EEEE",
"ւГɔɔɔɔɔɔɔ˽˽˽˽˽˽˽˽˽˽˽˽ɔɔɔɔɔɔɔГГɱϻɱHdθ__|||||||||||||=||||HH^^HH||||||||||HHH|HHH^^^HHH|HHH||H++H|H++H|..............|H++H",
"ւГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽ГГɱЯɱHy|__θ^^^^^^^^J^^J^^^J^^^^^^^^yĦĦĦĦĦyH....FFF.....FFF.........Ŋ.......FFFF..FFFF.......",
Expand Down Expand Up @@ -1559,7 +1559,7 @@
"|EEEE|||||7|||||7ɄɄɄ77777ɄH.,,,,,,.HB^BB^BB9999999999999^`|ɱЯЯϻЯЯɱГГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽Гւ",
"|EEEE|ɄɄ7777ɄɄɄ|ɅɄɄɄɅ7777Ʉ|.,,,,,,%|^^^^^^^A```````````^^<|ɱЯЯЯЯЯɱГГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽Гւ",
"|H++H|HHH|||HHH||HHH|7777||.,,,,,,F||||||||||||||||||||=|||ɱЯЯЯЯЯɱГГɔɔɔɔɔɔɔ˽˽˽˽˽˽˽˽˽˽˽˽ɔɔɔɔɔɔɔГւ",
".........FFF................,,,,,,FFF%|.333Δ333*♥..*|I__zP|ɱЯЯϻЯЯɱГГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽Гւ",
"Ŋ........FFF................,,,,,,FFF%|.333Δ333*♥..*|I__zP|ɱЯЯϻЯЯɱГГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽Гւ",
",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.H.ŦŦŦ,ŦŦŦ.?,Ŧ.|I}_zP|ɱЯЯЯЯЯɱГГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽Гւ",
",,,,,,,,,,,,,,,,,,,,,,,,,...........,,+,,,,,,,,.♠..%|S___z|ɱЯЯЯЯЯɱГГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽Гւ",
"³³³³³{{,,,,,{{³³³³³³³³³{{.,,,,,,,,,.,.H.ŦŦŦ,ŦŦŦ.||=||||θ|||ɱЯЯϻЯЯɱГГ˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽˽Гւ",
Expand Down
22 changes: 22 additions & 0 deletions data/json/mapgen_palettes/mall_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,5 +248,27 @@
"§": "t_water_pool_shallow_outdoors"
},
"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" }
}
]
Loading

0 comments on commit b155574

Please sign in to comment.