Skip to content

Commit

Permalink
feat: add downspouts at the lumbermill, yard (cataclysmbnteam#4657)
Browse files Browse the repository at this point in the history
* Update lumberyard palette

* Update occupied_lumber_mill.json

* Update lumbermill.json

* Update lumberyard.json
  • Loading branch information
0Monet committed May 15, 2024
1 parent aecc419 commit ecb842b
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 29 deletions.
20 changes: 10 additions & 10 deletions data/json/mapgen/lumbermill.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@
"v * 2 ______ 7 2v",
"v ______ * 2 v",
"v*2 7 * * ______ * * v",
"v *###ww####ww### * ________ * ##ww#ww## v",
"v #xxxx..x.xxxx# __________ w.c...c.w *v",
"v ^###ww####ww### * ________ * ##ww#ww##^ v",
"v *#xxxx..x.xxxx# __________ w.c...c.w *v",
"v #xx,,,,,,..xx# _______________#ddX.Xdd#* v",
"v* wx,=======@.xw _______________+......i# * v",
"v w.,=,,,T,...xw* _______________#......&# v",
"v #x,=,,......x# _________ 2 * #ddX.Xdd#7 v",
"v 2#x,=M,.C....x# * _________ w.c....cw *v",
"v *#.,=,,.Cr..xx# __________* ######### v",
"v *#.,=,,.Cr..xx# __________* #########^ v",
"v #.,=P,.Rr..xx# 2 __________ * * * V",
"v #x,=,,.Cr..x6#6 *__________ 2############# v",
"v #x,=,,.Cr..x6#6 *__________ 2#############^v",
"v *#x,=J,.C.....;________________#&.bb.bb.C.f# v",
"v #.,=,,.......;________________+..nn.nn.C.f#*v",
"v* wx,=,,,B,....;________________#..bb.bb.C.D# v",
"v wx,=======O..;_____________ #..........F#7v",
"v #xx,,,,,,....;_____________ *#....nc###### v",
"v 7#xx.....x..xx# __________ * wbnb.nc#S.+t#*v",
"v^7#xx.....x..xx# __________ * wbnb.nc#S.+t#*v",
"#######+#########7 __________ 2wbnb...+..### v",
"#$.$#ll.ll#b.w *___________ #......#S.+t#*v",
"#$.$#.....#b.#__________________*###ww######## v",
"#$.$#.....#b.#__________________*###ww########^v",
"#$..+.bbb.+..+___________________________ * v",
"#$.$#.....#b.#______________________________ *v",
"#$.$#lllll#b.w _____________________________ v",
"############## _____________________________ v",
"v 2 ______________________________v",
"v^2 ______________________________v",
"v 1111 11111 ______________________________v",
"v * * ______________________________v",
"v 1111 11111 ______________________________v",
Expand All @@ -52,7 +52,7 @@
"v 1111111 1____ 7 wx....xxw ____ * v",
"v1 ____* #xx.x.xx# ____ *111111 v",
"v1 1111111____ 2 #########* ____ 2 7 v",
"v1 2 ____ * 2 ____ * *v",
"v1 2 ____ *^ 2 ^ ____ * *v",
"vvvvvvvvvv____vvvvvvvvvvvvvvvvvvvv____vvvvvvvvvv"
],
"palettes": [ "lumberyard" ],
Expand Down Expand Up @@ -90,7 +90,7 @@
" -............. ........- ",
" -............. ........- ",
" -............. ........- ",
" -............. ........- ",
" -............. ......:.- ",
" -............. ........- ",
" -............. --------5 ",
" -............. ",
Expand All @@ -104,7 +104,7 @@
"5---............. ............- ",
"-............. ............- ",
"-............. ------------5 ",
"-............. ",
"-.=........... ",
"-............. ",
"-............. ",
"5------------- ",
Expand Down
20 changes: 10 additions & 10 deletions data/json/mapgen/lumberyard.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@
"v 7 7 7 7 ______ 7 7 7 7 v",
"v ______ * v",
"v* ______ * v",
"v *###ww####ww### * ________ * ##ww#ww## v",
"v #xxx.......xx# __________ w.c...c.w *v",
"v ^###ww####ww### * ________ * ##ww#ww##^ v",
"v *#xxx.......xx# __________ w.c...c.w *v",
"v #x,,,,,,,....# _______________#ddX.Xdd#* v",
"v* w.,=======@..w _______________+......i# * v",
"v w.,=,,,T,....w _______________#......&# v",
"v #.,=,,......x# __________ * #ddX.Xdd# v",
"v #.,=M,.C...xx# __________ w.c....cw v",
"v *#.,=,,.Cr...x# __________ ######### v",
"v *#.,=,,.Cr...x# __________ #########^ v",
"v #.,=P,.Rr...x# __________ * * V",
"v #.,=,,.Cr...6#6 *__________ ############# v",
"v #.,=,,.Cr...6#6 *__________ #############^v",
"v #x,=J,.C.....;________________#&.bb.bb.C.f# v",
"v #x,=,,.......;________________+..nn.nn.C.f#*v",
"v* w.,=,,,B,....;________________#..bb.bb.C.D# v",
"v w.,=======O..;_____________ #..........F# v",
"v #.,,,,,,,....;_____________ #....nc###### v",
"v #xx.....x..xx# __________ * wbnb.nc#S.+t#*v",
"v^ #xx.....x..xx# __________ * wbnb.nc#S.+t#*v",
"#######+#########7 __________ wbnb...+..### v",
"#$.$#ll.ll#b.w *___________ #......#S.+t# v",
"#$.$#.....#b.#__________________ ###ww######## v",
"#$.$#.....#b.#__________________ ###ww########^v",
"#$..+.bbb.+..+___________________________ * v",
"#$.$#.....#b.#______________________________ *v",
"#$.$#ll.ll#b.w _____________________________ v",
"#######+#########_____________________________ v",
"v #xx....xxxxx6#6_____________________________v",
"v^ #xx....xxxxx6#6_____________________________v",
"v #xx.....x....;______________________________v",
"v* wxxx.........;______________________________v",
"v wxxx.........;______________________________v",
Expand All @@ -49,7 +49,7 @@
"v wxxxxxxxx..xxw *1 1 *1 1 1 1 v",
"v* wxxxxxxxxxxxxw 1 * 1111 1 1 1 1 1 1 *v",
"v #xxxxxxxxxxxx# 1 * 1 1 1 1 v",
"v ###ww####ww### 1 1111111 1 1 1 * v",
"v ^###ww####ww### 1 1111111 1 1 1 * v",
"v * 1 1 1 1 1 *111111 v",
"v 1 111111 1* 1 1 7 v",
"v * 1 1 1 1111 * *v",
Expand Down Expand Up @@ -97,7 +97,7 @@
" -............. ........- ",
" -............. ........- ",
" -............. ........- ",
" -............. ........- ",
" -............. ......:.- ",
" -............. ........- ",
" -............. --------5 ",
" -............. ",
Expand All @@ -111,7 +111,7 @@
"5---............. ............- ",
"-............. ............- ",
"-............. ------------5 ",
"-............. ",
"-.=........... ",
"-............. ",
"-............. ",
"5---............. ",
Expand Down
16 changes: 8 additions & 8 deletions data/json/mapgen/occupied_lumber_mill.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@
"v * 2 ______ 7 2v",
"v ______ * 2 v",
"v*2 7 * * ______ * * v",
"v *###ww####ww### * ________ * ##ww#ww## v",
"v #xxxx..x.xxxx# __________ w.c...c.w *v",
"v ^###ww####ww### * ________ * ##ww#ww##^ v",
"v *#xxxx..x.xxxx# __________ w.c...c.w *v",
"v #xx,,,,,,..xx# _______________#ddX.Xdd#* v",
"v* wx,=======@.xw _______________+......i# * v",
"v w.,=,,,T,...xw* _______________#.....0&# v",
"v #x,=,,......x#0 _________ 2 * #ddX.Xdd#7 v",
"v 2#x,=M,.C...0x# * _________ w.c....cw *v",
"v *#.,=,,.Cr..xx# __________* ######### v",
"v *#.,=,,.Cr..xx# __________* #########^ v",
"v #.,=P,.Rr..xx# 2 __________ * * * V",
"v #x,=,,.Cr..x6#6 *__________ 2############# v",
"v #x,=,,.Cr..x6#6 *__________ 2#############^v",
"v *#x,=J,.C.....;________________#&.bb.bb.C.f# v",
"v #.,=,,.......;________________+..nn.nn.C.f#*v",
"v* wx,=,,,B,....;________________#..bb.bb.C.D# v",
"v wx,=======O..;_____________ #..........F#7v",
"v #xx,,,,,,....;_____________ *#.0..nc###### v",
"v 7#xx....0x..xx# __________ * wbnb.nc#S.+t#*v",
"v^7#xx....0x..xx# __________ * wbnb.nc#S.+t#*v",
"#######+#########7 __________ 2wbnb...+..### v",
"#$.$#ll.ll#b.w *___________ 0#......#S.+t#*v",
"#$.$#.....#b0#__________________*###ww######## v",
"#$.$#.....#b0#__________________*###ww########^v",
"#$..+.bbb.+..+___________________________ * v",
"#$.$#.....#b.#______________________________ 0*v",
"#$.$#lllll#b.w _____________________________ v",
"##############0 _____________________________ v",
"v 2 ______________________________v",
"v^2 ______________________________v",
"v 1111 11111 ______________________________v",
"v * * ______________________________v",
"v 1111 11111 ______________________________v",
Expand All @@ -52,7 +52,7 @@
"v 1111111 1____ 7 wx..8..xw ____ * v",
"v1 ____* #xx.x.xx# ____ *111111 v",
"v1 1111111____ 2 #########* ____ 2 7 v",
"v1 2 0____6 * 2 0____6 * *v",
"v1 2 0____6 *^ 2 ^ 0____6 * *v",
"vvvvvvvvv#;;;;#vvvvvvvvvvvvvvvvvv#;;;;#vvvvvvvvv"
],
"palettes": [ "lumberyard" ],
Expand Down
3 changes: 2 additions & 1 deletion data/json/mapgen_palettes/lumberyard.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"v": "t_chainfence_v",
"V": "t_chaingate_l",
"x": "t_thconc_floor",
",": "t_thconc_floor"
",": "t_thconc_floor",
"^": "t_gutter_downspout"
},
"furniture": {
"'": "f_street_light",
Expand Down

0 comments on commit ecb842b

Please sign in to comment.