Skip to content

Commit

Permalink
fix: use regional terrain and roof_palette for the arcade (#4752)
Browse files Browse the repository at this point in the history
* Update zombies.json

* Update arcade.json

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
0Monet and autofix-ci[bot] authored Jun 7, 2024
1 parent 94efdf2 commit de7b8a0
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 58 deletions.
92 changes: 34 additions & 58 deletions data/json/mapgen/arcade.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
[
{
"name": "GROUP_ARCADE",
"type": "monstergroup",
"default": "mon_null",
"monsters": [ { "monster": "mon_zombie_child", "freq": 600, "cost_multiplier": 1, "pack_size": [ 2, 5 ] } ]
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_arcade" ],
"weight": 250,
"object": {
"fill_ter": "t_floor",
"rows": [
Expand All @@ -21,35 +14,31 @@
".ssssssssssssssssssssss.",
".ssssssssssssssssssssss.",
".ssssssssssssssssssssss.",
".ssssssssssssssssssllss.",
".|---++-OOO-++----|---|.",
".sssssssssssssssssslLss.",
".||||++|OOO|++|||||||||.",
".|F |S %|.",
".|F |-+-|.",
".|F ||+||.",
".|F FF FF |.",
".|F FF F FF ## |.",
".|F FF F FF # T|.",
".|F FF FF # T|.",
".|F # T|.",
".|F x x x # T|.",
".|FFFFFx x xFFFF #B T|.",
".|--------------------|.",
".||||||||||||||||||||||.",
".....................4..",
"........................",
"........................",
"........................"
],
"terrain": {
" ": "t_floor",
"+": "t_door_c",
"-": "t_wall_r",
".": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_underbrush", 10 ] ],
".": "t_region_groundcover_urban",
"O": "t_window",
"S": "t_floor",
"B": "t_floor",
"%": "t_floor",
"_": "t_pavement",
"'": "t_dirt",
"'": "t_region_groundcover_urban",
"l": "t_sidewalk",
"L": "t_sidewalk",
"s": "t_sidewalk",
"4": "t_gutter_downspout",
"|": "t_wall_r"
Expand All @@ -61,60 +50,47 @@
"S": "f_sink",
"B": "f_stool",
"T": "f_locker",
"l": "f_vending_c",
"x": "f_pinball_machine"
},
"vendingmachines": { "l": { "item_group": "vending_drink" }, "L": { "item_group": "vending_food" } },
"toilets": { "%": { } },
"place_items": [
{ "item": "vending_drink", "x": 19, "y": 8, "chance": 75 },
{ "item": "vending_food", "x": 20, "y": 8, "chance": 75 },
{ "item": "arcade_prizes", "x": 21, "y": [ 14, 18 ], "chance": 95 }
],
"place_items": [ { "item": "arcade_prizes", "x": 21, "y": [ 14, 18 ], "chance": 95 } ],
"place_monsters": [ { "monster": "GROUP_ARCADE", "x": [ 3, 17 ], "y": [ 13, 15 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "s_arcade_roof",
"weight": 100,
"object": {
"fill_ter": "t_flat_roof",
"rows": [
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
".| 3.",
".| : A 3.",
".| 3.",
".| 3.",
".| 3.",
".| & 3.",
".| 3.",
".| 3.",
".| X 3.",
".| 3.",
".|222222222222222222253.",
"........................",
"........................",
"........................",
"........................"
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" -....................- ",
" -..:.N...............- ",
" -....................- ",
" -....................- ",
" -....................- ",
" -............&.......- ",
" -....................- ",
" -....................- ",
" -...............X....- ",
" -....................- ",
" --------------------5- ",
" ",
" ",
" ",
" "
],
"terrain": {
" ": "t_flat_roof",
".": "t_open_air",
"|": "t_gutter_west",
"3": "t_gutter_east",
"2": "t_gutter_south",
"5": "t_gutter_drop"
},
"furniture": { ":": "f_cellphone_booster", "X": "f_small_satelitte_dish", "&": "f_roof_turbine_vent", "A": "f_TV_antenna" },
"palettes": [ "roof_palette" ],
"place_items": [
{ "item": "roof_trash", "x": [ 3, 20 ], "y": [ 11, 18 ], "chance": 50, "repeat": [ 1, 3 ] },
{ "item": "child_items", "x": [ 3, 20 ], "y": [ 11, 18 ], "chance": 50, "repeat": [ 1, 3 ] }
Expand Down
6 changes: 6 additions & 0 deletions data/json/monstergroups/zombies.json
Original file line number Diff line number Diff line change
Expand Up @@ -758,5 +758,11 @@
{ "monster": "mon_zombie_technician", "freq": 250, "cost_multiplier": 3 },
{ "monster": "mon_zombie_electric", "freq": 150, "cost_multiplier": 5 }
]
},
{
"name": "GROUP_ARCADE",
"type": "monstergroup",
"default": "mon_null",
"monsters": [ { "monster": "mon_zombie_child", "freq": 600, "cost_multiplier": 1, "pack_size": [ 2, 5 ] } ]
}
]

0 comments on commit de7b8a0

Please sign in to comment.