Skip to content

Commit

Permalink
feat(content,port): Implement t_ladder_up_down (#4494)
Browse files Browse the repository at this point in the history 
* initial commit

Co-Authored-By: John Bytheway <52664+jbytheway@users.noreply.github.com>

* style(autofix.ci): automated formatting

---------

Co-authored-by: John Bytheway <52664+jbytheway@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
@Zlorthishen @jbytheway @autofix-ci
3 people committed Apr 17, 2024
1 parent ee11dec commit 3bf6aa4
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 71 deletions.
12 changes: 6 additions & 6 deletions data/json/mapgen/bugs/wasp_tower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
" , , ",
" , , ",
" aaaa , ",
" a><a , ",
" a±,a , ",
" Raaa,R ",
" ",
" ",
Expand All @@ -141,7 +141,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "<": "t_stairs_up", ">": "t_stairs_down" }
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "±": "t_ladder_up_down" }
}
},
{
Expand All @@ -158,7 +158,7 @@
" :a,,,,,,a# ",
" X a,,::,,a ",
" XXXXXa,,::,,a ",
" XX_XXX,<>,XXaX ",
" XX_XXX,±,,XXaX ",
" X___XXR,,,XRXXXX ",
" XX____XXXXXX___XX ",
" XX______________XX ",
Expand Down Expand Up @@ -194,7 +194,7 @@
" XX,,,,,,X# ",
" XXXX,::XXXXX ",
" XXXX_aXXXXXXaXX ",
" X_ a,<>,,,a XX ",
" X_ a,±,,,,a XX ",
" X ..aR,,,,Ra X ",
" XX xxxxxxxxxxx. XX ",
" XX xOxOxOxOxOx. X ",
Expand Down Expand Up @@ -229,7 +229,7 @@
" , , ",
" XXX, , ",
" XXXXXXXXXa XXXX ",
" XXX X><XXXX XX ",
" XXX X±.XXXX XX ",
" XX RXXX,R X ",
" XX ....X.... XX ",
" X .......... X ",
Expand Down Expand Up @@ -265,7 +265,7 @@
" XX XX XX XXX ",
" XXXX , , X ",
" X #aaaa , XX ",
" X .a><a ,. X ",
" X .a±.a ,. X ",
" XX ....Raaa,R. XX ",
" X .....X...... X ",
" XX .X...8...X.. X ",
Expand Down
10 changes: 5 additions & 5 deletions data/json/mapgen/farm_2side.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
" ",
" ",
" ",
" <#> ",
" #± ",
" III ",
" III.III ",
" II...II ",
Expand All @@ -430,7 +430,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_open_air_rooved", "I": "t_wall_metal", ">": "t_ladder_down", "<": "t_ladder_up" }
"terrain": { ".": "t_open_air_rooved", "I": "t_wall_metal", "±": "t_ladder_up_down" }
}
},
{
Expand All @@ -454,7 +454,7 @@
" ",
" ",
" ",
" >#< ",
" #± ",
" III ",
" III.III ",
" II...II ",
Expand All @@ -467,7 +467,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_open_air_rooved", "I": "t_wall_metal", ">": "t_ladder_down", "<": "t_ladder_up" }
"terrain": { ".": "t_open_air_rooved", "I": "t_wall_metal", "±": "t_ladder_up_down" }
}
},
{
Expand All @@ -491,7 +491,7 @@
" ",
" ",
" ",
" ##> ",
" #> ",
" ... ",
" ....... ",
" ....... ",
Expand Down
20 changes: 10 additions & 10 deletions data/json/mapgen/farm_tiles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1003,10 +1003,10 @@
"*****2OOOOO2************",
"*****222O222************",
"*******222**************",
"*******<->**************",
"********-±**************",
"************************",
"************************",
"*******<->**************",
"********-±**************",
"*******222**************",
"*****222O222************",
"*****2OOOOO2************",
Expand Down Expand Up @@ -1040,10 +1040,10 @@
"*****2OOOOO2************",
"*****222O222************",
"*******222**************",
"*******>-<**************",
"********-***************",
"********-***************",
"*******>-<**************",
"********-±**************",
"********--**************",
"********--**************",
"********-±**************",
"*******222**************",
"*****222O222************",
"*****2OOOOO2************",
Expand Down Expand Up @@ -1077,10 +1077,10 @@
"*****zzzzzzz************",
"*****zzzzzzz************",
"*******zzz**************",
"*******-->**************",
"************************",
"************************",
"*******-->**************",
"********->**************",
"********-***************",
"********-***************",
"********->**************",
"*******zzz**************",
"*****zzzzzzz************",
"*****zzzzzzz************",
Expand Down
12 changes: 6 additions & 6 deletions data/json/mapgen/lake_buildings/freshwater_research_station.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@
"------------------------",
"------------------------",
"------------------------",
"----------||||----------",
"----------|<>|----------",
"----------||||----------",
"----------|||-----------",
"----------|±|-----------",
"----------|||-----------",
"------------------------",
"------------------------",
"------------------------",
Expand Down Expand Up @@ -137,9 +137,9 @@
"-------`````````--------",
"-------`````````--------",
"-------`````````--------",
"-------```||||``--------",
"-------```|><|``--------",
"-------```||||``--------",
"-------```|||```--------",
"-------```|±|```--------",
"-------```|||```--------",
"-------`````````--------",
"-------`````````--------",
"-------`````````--------",
Expand Down
23 changes: 8 additions & 15 deletions data/json/mapgen/radio_tower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
" , , ",
" , , ",
" aaaa , ",
" a><a , ",
" a±,a , ",
" Raaa,R ",
" ",
" ",
Expand All @@ -133,14 +133,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": {
"R": "t_radio_tower",
"a": "t_railing",
",": "t_metal_floor_no_roof",
"<": "t_stairs_up",
">": "t_stairs_down",
"&": "t_flat_roof"
}
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "±": "t_ladder_up_down", "&": "t_flat_roof" }
}
},
{
Expand All @@ -157,7 +150,7 @@
" :a,,,,,,aX ",
" a,,::,,a ",
" a,,::,,a ",
" :a,<>,,,aX ",
" :a,±,,,,aX ",
" aR,,,,Ra ",
" aaaaaaaa ",
" : ",
Expand All @@ -176,7 +169,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "<": "t_stairs_up", ">": "t_stairs_down" }
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "±": "t_ladder_up_down" }
}
},
{
Expand All @@ -193,7 +186,7 @@
" , , ",
" , , ",
" Xaaaa , ",
" Xa<>a ,: ",
" Xa±,a ,: ",
" XRaaa,R ",
" ",
" ",
Expand All @@ -212,7 +205,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "<": "t_stairs_up", ">": "t_stairs_down" }
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "±": "t_ladder_up_down" }
}
},
{
Expand All @@ -229,7 +222,7 @@
" , , ",
" , , ",
" Xaaaa , ",
" Xa><a ,: ",
" Xa±,a ,: ",
" XRaaa,R ",
" ",
" ",
Expand All @@ -248,7 +241,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "<": "t_stairs_up", ">": "t_stairs_down" }
"terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", "±": "t_ladder_up_down" }
}
},
{
Expand Down
17 changes: 5 additions & 12 deletions data/json/mapgen/ranch_camp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@
" ",
" ",
" ",
" >#< ",
" ±# ",
" 2222 ............ ",
" 222^^222............ ",
"22^^^^^^22........... ",
Expand All @@ -905,14 +905,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": {
".": "t_shingle_flat_roof",
"2": "t_wall_metal",
"<": "t_ladder_up",
">": "t_ladder_down",
"#": "t_grate",
"^": "t_open_air_rooved"
}
"terrain": { ".": "t_shingle_flat_roof", "2": "t_wall_metal", "±": "t_ladder_up_down", "#": "t_grate", "^": "t_open_air_rooved" }
}
},
{
Expand All @@ -925,7 +918,7 @@
" ",
" ",
" ",
" <#> ",
" ±# ",
" 2222 ",
" 222^^222 ",
"22^^^^^^22 ",
Expand All @@ -948,7 +941,7 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "2": "t_wall_metal", "<": "t_ladder_up", ">": "t_ladder_down", "#": "t_grate", "^": "t_open_air_rooved" }
"terrain": { "2": "t_wall_metal", "±": "t_ladder_up_down", "#": "t_grate", "^": "t_open_air_rooved" }
}
},
{
Expand All @@ -961,7 +954,7 @@
" ",
" ",
" ",
" >## ",
" ># ",
" .... ",
" ........ ",
".......... ",
Expand Down
27 changes: 10 additions & 17 deletions data/json/mapgen/ws_fire_lookout_tower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@
" XX XX ",
" ",
" XXXX ",
" X>>X ",
" X<<X ",
" X±±X ",
" X,,X ",
" XXXX ",
" ",
" XX XX ",
Expand All @@ -188,7 +188,7 @@
" ",
" "
],
"terrain": { "X": "t_concrete_wall", "<": "t_ladder_up", ">": "t_ladder_down" }
"terrain": { "X": "t_concrete_wall", ",": "t_floor", "±": "t_ladder_up_down" }
}
},
{
Expand All @@ -209,8 +209,8 @@
" XX XX ",
" ",
" XXXX ",
" X<<X ",
" X>>X ",
" X±±X ",
" X,,X ",
" XXXX ",
" ",
" XX XX ",
Expand All @@ -223,7 +223,7 @@
" ",
" "
],
"terrain": { "X": "t_concrete_wall", "<": "t_ladder_up", ">": "t_ladder_down" }
"terrain": { "X": "t_concrete_wall", ",": "t_floor", "±": "t_ladder_up_down" }
}
},
{
Expand All @@ -244,8 +244,8 @@
"....X XXXXt X....",
"....G D TXt G....",
"....G dXXXXO G....",
"....G HdX>>XS G....",
"....G dX<<XF G....",
"....G HdX±±XS G....",
"....G dX XF G....",
"....G cXDDX G....",
"....G G....",
"....X hhhh X....",
Expand All @@ -258,14 +258,7 @@
"........................",
"........................"
],
"terrain": {
".": "t_open_air",
"X": "t_wall_log",
"G": "t_wall_glass",
"D": "t_door_locked_interior",
"<": "t_ladder_up",
">": "t_ladder_down"
},
"terrain": { ".": "t_open_air", "X": "t_wall_log", "G": "t_wall_glass", "D": "t_door_locked_interior", "±": "t_ladder_up_down" },
"furniture": {
"S": "f_sink",
"B": "f_sofa",
Expand Down Expand Up @@ -325,8 +318,8 @@
"....|,s,,,,,,,,,,,,|....",
"....|,,,,,,,,,,,,,,|....",
"....|,,,,,XDDX,,,,,|....",
"....|,,,,,X++X,,,,,|....",
"....|,,,,,X>>X,,,,,|....",
"....|,,,,,X++X,,,,,|....",
"....|,,,,,XXXX,,,,,|....",
"....|,,,,,,gg,,,,,,|....",
"....|,,,,,,,,,,,,,,|....",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen_palettes/farm_lots.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"y": "t_palisade",
"3": "t_splitrail_fencegate_c",
"2": "t_wall_metal",
"±": "t_ladder_up_down",
"<": "t_ladder_up",
">": "t_ladder_down",
"-": "t_grate",
Expand Down
2 changes: 2 additions & 0 deletions data/json/mapgen_palettes/underwater_structures_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
".": "t_metal_floor",
"A": "t_metal_floor",
"#": "t_metal_pontoon_dp",
"±": "t_ladder_up_down",
">": "t_ladder_down",
"<": "t_ladder_up",
"|": "t_wall_bulkhead",
Expand Down Expand Up @@ -57,6 +58,7 @@
"_": "t_metal_flat_roof",
".": "t_flat_roof",
"#": "t_grate",
"±": "t_ladder_up_down",
">": "t_ladder_down",
"<": "t_ladder_up",
"|": "t_wall_bulkhead",
Expand Down
Loading

0 comments on commit 3bf6aa4

Please sign in to comment.