Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds steel mill location #33383

Merged
merged 14 commits into from
Aug 25, 2019
Merged

Adds steel mill location #33383

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b6412c2
Create steel_foundry.json
Kanexan Aug 14, 2019
a8a31de
Steel Mill
Kanexan Aug 19, 2019
187465d
Update steel_mill_z2.json
Kanexan Aug 19, 2019
29cf190
format fixes
Kanexan Aug 19, 2019
5794d8a
overmap edits
Kanexan Aug 20, 2019
c6536b3
Update data/json/mapgen/steel_mill/steel_mill_z2.json
Kanexan Aug 22, 2019
7a4b27c
Update data/json/mapgen/steel_mill/steel_mill_z2.json
Kanexan Aug 22, 2019
f67fbd4
Overmap fixes and misc. edits.
Kanexan Aug 22, 2019
fc4a0c7
Merge branch 'Steel-Foundry' of https://github.com/Kanexan/Cataclysm-…
Kanexan Aug 22, 2019
b29c1e2
Typo in mapgen
Kanexan Aug 22, 2019
5242da2
Fixes and Updates
Kanexan Aug 23, 2019
db9bcd3
Update data/json/mapgen_palettes/steel_mill_palette.json
Kanexan Aug 24, 2019
ccdce5d
Update data/json/mapgen_palettes/steel_mill_palette.json
Kanexan Aug 24, 2019
50a88bd
Update data/json/mapgen_palettes/steel_mill_palette.json
Kanexan Aug 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 141 additions & 0 deletions data/json/mapgen/steel_mill/steel_mill_z1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [
[ "steel_mill_0_1", "steel_mill_0_2", "steel_mill_0_3" ],
[ "steel_mill_1_1", "steel_mill_1_2", "steel_mill_1_3" ],
[ "steel_mill_2_1", "steel_mill_2_2", "steel_mill_2_3", "steel_mill_2_4" ],
[ "steel_mill_3_1", "steel_mill_3_2", "steel_mill_3_3", "steel_mill_rail_1" ],
[ "steel_mill_4_1", "steel_mill_4_2", "steel_mill_4_3", "steel_mill_rail_2" ]
],
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv.____________.vvvvvv",
"v...................................................____________.......v",
"v..................................................____________........v",
"v....]]]]]]]]]]]]**]]]**]]**]]**].................____________.........v",
"v....]ee]ee]<< #ch #ch #Sch S]................____________..........v",
"v....]ee@ee]<< #ddd #ddd #Sddd ]...............____________...........v",
"v....]xx]xx] # h # h # h ]..----------..____________............v",
"v....] # S# S#ll T]..----------..____________............v",
"v....* #+####+#######+##]]]++]++]]]--.._______________,,,,,,,,.v",
"v....* + ] ]--.._______________________.v",
"v....]hTh DV + + *--.._______________________.v",
"v....]###### ########### + CCCCcC*--.._______________________.v",
"v....]l l# + C0C0C0C# ] h ]----_______________,,,,,,,,.v",
"v....]l l# # # h]]]]]]]]]]]----_______________________.v",
"v....]l l# #+#+#+#+#+# h]------------.._______________________.v",
"v....]l + #t#t#t#t#t# h]------------.._______________________.v",
"v....]l l# ########### *--___________________________,,,,,,,,.v",
"v....]l l# + *--___________________________________.v",
"v....]]]]]]]D + ]--___________________________________.v",
"v..........]]]]**]]]]**]]]++##++]--,,,,,,,,___________________________.v",
"v........................] ]--___________________________,,,,,,,,.v",
"v........................* *--___________________________________.v",
"v....]]]]]]]]]]]]]]].....* *--___________________________________.v",
"v....]MMMM <].....] ]--,,,,,,,,___________________________.v",
"v....]FFFFE ]]]]]]]++##++]----------___________________,,,,,,,,.v",
"v....]F x|||| ]lllll] ]..............____________............v",
"v....]F x|||| R + ]]]]]]]]]]]]]]]____________vvvvvvvvvvvvv",
"v....]FFFF || ]+]]]]]]]]]++#CCCCCCCCCCCCC]____________............v",
"v....]MMMM || DD DD ] # C C C C]____________.)))))))))).v",
"v....]FFFF || DD DD ] # C C C C]____________.) b bbb ).v",
"v....]F x|||| DD DD ] # C C C C]____________-+ b).v",
"v....]F x|||| DD DD ] + C]____________.) bbb bb).v",
"v....]FFFF || + ##############]____________.)b b bb).v",
"v....]MMMM || + #CCCCCC#sssss]]____________.)))))))))).v",
"v....]FFFF || ] #C #s s s]]____________............v",
"v....]F x|||||||||| ] # #s ]]'____________............v",
"v....]F x|||||||||| <] + + ]]''____________............v",
"v....]FFFFE <] # #ss]] ____________............v",
"v....]P P ee@]++]]]]]]]]]]] b ,____________............v",
"v....]P P << mc m eee] hTh hTh f]b ____________''''''''''''v",
"v....]MMMMPPPPPPPME eee] C] b,____________''OOOOOOO'''v",
"v....]MEEMPPPPPPPEM ] DV 0] ____________''xoooooO'''v",
"v....]mccm << mPPm ]++]]]]]]]]]]] ,____________''xoooooO'''v",
"v....] PP ] ;] ____________''OOOOOOO'''v",
"v....]##### <PP< x x ,____________''''''''''''v",
"v....]<<A R <PP< x x ____________''OOOOOOO'''v",
"v....] R PP x x ,____________''xoooooO'''v",
"v....]l # mPPm x x b ____________''xoooooO'''vvvvvvvvvvvvvvvvvvvvvvvvv",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No fence here, is that intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can see, all of those lines have fences? Regardless, I'm in the process of updating the map; I'll be editing the fencing a bit, so I'll try to catch this. Thanks for pointing it out!

"v....]l + /EMME x x ,____________''OOOOOOO'''''''''''''''''''''''''''v",
"v....]##### EMME ]; ] ____________''''''''''''''''''''''''''''''''''''v",
"v....] m||m ]]]]+]xxxxx]]]b ,_______________________________________________'v",
"v...-]] m|| ] ] _______________________________________________'v",
"v...--+ m||m + + ,_______________________________________________'v",
"v...-]] EppE + + _______________________________________________'v",
"v...-] EppE ] m m ] ,_______________________________________________'v",
"v....] m||m ]Mm|||| ]] _______________________________________________'v",
"v....] m|| ]Mm|||| ]] ,_______________________________________________'v",
"v....] mm||mm ]P mMMm ]] _______________________________________________'v",
"v....] /MMME ]P || ]]_______________________________________________'v",
"v....] EMMMPP PPP]P || ]_______________________________________________'v",
"v....] mmm MMMM ]8 mppm ]_______________________________________________'v",
"v....] EM||||||| + || ]_______________________________________________'v",
"v....] EM||||||| ] MMMMm ]____________ v",
"v....] mmm m||m ] EEEEc ]____________ ^^^^^^ ^^^^^^ v",
"v....] || || ] MMMMm ]____________ ]]RR]]RR]] ^B^^B^ ^B^^B^ v",
"v....] m||m ] || ]____________ ] ] =H==H= =H==H= v",
"v....] || ] || ]____________ + ] ^X^^X^ ^X^^X^ v",
"v....] m||m m ] m||m ]____________ + ] ^X^^X^ ^X^^X^ v",
"v....] EMM|||||| ] ]____________ ] <] =H==H= =H==H= v",
"v....] m||m m + ]____________ ]]RR]]RR]] ^X^^X^ ^X^^X^ v",
"v....] || + b]____________ ^X^^X^ ^X^^X^ v",
"v....]8 8 ] bbb ]____________ %% =H==H= %% =H==H= %%v",
"v....] ] bbbb]____________ OxxxxO %% ^X^^X^ %% ^X^^X^ %%v",
"v....]8 8 ] b bbb]____________ OooooO ^X^^X^ ^X^^X^ v",
"v....] ]]++]]]]]]]]]]]____________ OooooO =H==H= =H==H= v",
"v....]8 8 ] ]'''''''''____________ OooooO / ^X^^X^ ^X^^X^ v",
"v....] ] R'''''''''____________ OooooO ^X^^X^ ^X^^X^ v",
"v....]]]]] ] ]'''''''''____________ OooooO =H==H= =H==H= v",
"v........] ] R'''''''''____________ OOOOOO %% ^X^^X^ %% ^X^^X^ %%v",
"v........] ] ]'''''''''____________ %% ^X^^X^ %% ^X^^X^ %%v",
"v........] ]]++]]'''''''''____________ =H==H= =H==H= v",
"v........]]] ]]]] '''''''''____________ OxxxxO ^X^^X^ ^X^^X^ v",
"v...... '''''''''____________ OooooO ^X^^X^ ^X^^X^ v",
"v...... '''''''''____________ OooooO =H==H= =H==H= v",
"v...... ,_____________________________________________ OooooO ^X^^X^ ^X^^X^ v",
"v...... ,_____________________________________________ OooooO ^X^^X^ ^X^^X^ v",
"v...... ,_____________________________________________ OooooO =H==H= =H==H= v",
"v...... ,_____________________________________________ OOOOOO ^X^^X^ ^X^^X^ v",
"v...... ,_____________________________________________ ^X^^X^ ^X^^X^ v",
"v...... ,_____________________________________________ =H==H= =H==H= v",
"v...... ,_____________________________________________ , , ^X^^X^ ^X^^X^ v",
"v...... ,_____________________________________________ ^X^^X^ ^X^^X^ v",
"v...... ,_____________________________________________ , , =H==H= =H==H= v",
"v...... ,_____________________________________________ ^X^^X^ ^X^^X^ v",
"v...... ,_____________________________________________ , , %% ^X^^X^ %% ^X^^X^ %%v",
"v...... ,_____________________________________________ %% =H==H= %% =H==H= %%v",
"v...... , , ^X^^X^ ^X^^X^ v",
"v...... ^X^^X^ ^X^^X^ v",
"v...... ]]R]]++]]]]]]]]]]]]++]]xxxxxx]]]]] / =H==H= =H==H= v",
"v...... '] #sssssss CCC] OxxxxO ^X^^X^ ^X^^X^ v",
"v...... ''] TTT + C] OooooO ^X^^X^ ^X^^X^ v",
"v...... ''] hTTTh + C] OooooO %% =H==H= %% =H==H= %%v",
"v...... ''] TTTh # C] OooooO %% ^X^^X^ %% ^X^^X^ %%v",
"v...... ''] hTTT #/ m|m CCCCCC] OooooO ^X^^X^ ^X^^X^ v",
"v...... ''] ss#@e | ] OooooO =H==H= =H==H= v",
"v...... ']]]]]]]]]]]ee mpm ] OOOOOO ^X^^X^ ^X^^X^ v",
"v...... ] | ] ^X^^X^ ^X^^X^ v",
"v...... + mMm m FxFEFxF] =H==H= =H==H= v",
"v...... + ||||MPPF FPF F] , , ^X^^X^ ^X^^X^ v",
"v....... ]8888 m FFFMFFF] ^X^^X^ ^X^^X^ v",
"v........................]]]]]]]]]]]]]]]]]]]]]]]] , , =H==H= =H==H= v",
"v................................................ ^X^^X^ ^X^^X^ v",
"v................................................ , , ^X^^X^ ^X^^X^ v",
"v................................................ =H==H= =H==H= v",
"v................................................ , , ^X^^X^ ^X^^X^ v",
"v................................................ ^X^^X^ ^X^^X^ v",
"v................................................ =H==H= =H==H= v",
"v................................................ ^X^^X^ ^X^^X^ v",
"v................................................ ^X^^X^ ^X^^X^ v",
"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv =H==H= vvvvvv =H==H= vvv"
],
"terrain": { },
"furniture": { },
"palettes": [ "steel_mill_palette" ]
}
}
]
Loading