Skip to content

Commit

Permalink
Add items to steel mill (#34347)
Browse files Browse the repository at this point in the history 
* Add items to steel mill

* Fiddle with the numbers
  • Loading branch information
@snipercup @ZhilkinSerg
snipercup authored and ZhilkinSerg committed Sep 30, 2019
1 parent f833882 commit 4de2067
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 60 deletions.
33 changes: 33 additions & 0 deletions data/json/itemgroups/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,39 @@
[ "scrap_copper", 50 ]
]
},
{
"type": "item_group",
"id": "steel_mill_mill",
"//": "for the steel mill in the well, steel mill",
"items": [
{ "item": "scrap", "prob": 50, "charges-min": 1, "charges-max": 3 },
{ "item": "steel_chunk", "prob": 50, "charges-min": 1, "charges-max": 2 },
{ "item": "steel_lump", "prob": 50, "charges-min": 1, "charges-max": 2 },
[ "chain", 35 ],
[ "rebar", 35 ],
[ "pipe", 40 ],
[ "wire", 40 ],
[ "sheet_metal", 25 ],
[ "sheet_metal_small", 25 ]
]
},
{
"type": "item_group",
"id": "steel_mill_foundry",
"//": "for the foundry in the steel mill",
"items": [
{ "item": "steel_lump", "prob": 5, "count": [ 1, 3 ] },
{ "item": "steel_chunk", "prob": 15, "count": [ 1, 5 ] },
{ "item": "scrap", "prob": 70, "count": [ 1, 10 ] },
[ "chain", 35 ],
[ "rebar", 35 ],
[ "pipe", 40 ],
[ "wire", 40 ],
{ "item": "sheet_metal", "prob": 5 },
{ "item": "sheet_metal_small", "prob": 5, "count": [ 2, 4 ] },
{ "item": "material_aluminium_ingot", "prob": 10, "count": [ 1, 5 ] }
]
},
{
"type": "item_group",
"id": "oa_ig_rd_glass_trash",
Expand Down
105 changes: 46 additions & 59 deletions data/json/mapgen/steel_mill/steel_mill_z1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"v....]xx]xx] # h # h # h 7]]]++]++]]]----_______________________________________________.v",
"v....] # S# S#77 T]h ]----_______________________________________,,,,,,,,.v",
"v....* #+####+#######+##]h ]----_______________,,,,,,,,,,,,,,,,,_______________.v",
"v....* + ]h CCCCcC]----_______________________,_______________________.v",
"v....]hTh DV + + C h *----_______________________,_______________________.v",
"v....* + ]h qqqqcq]----_______________________,_______________________.v",
"v....]hTh DV + + q h *----_______________________,_______________________.v",
"v....]###### ########### + *----_______________________,_______________________.v",
"v....]l l l# #C0C0C0C0C# ] 7777]----_______________________,_______________,,,,,,,,.v",
"v....]l l l# #q0q0q0q0q# ] 7777]----_______________________,_______________,,,,,,,,.v",
"v....]l l l# + # h]]]]]]]]]]]----_______________,,,,,,,,,,,,,,,,,_______________.v",
"v....]l l l# #+#+#+#+#+# h]--------------_______________________,_______________________.v",
"v....]l + #t#t#t#t#t# h]--------------_______________________,_______________________.v",
Expand All @@ -50,47 +50,47 @@
"v....]F x|||||||||| ] # #s ]] ____________..........v,_______________________.v",
"v....]F x|||||||||| <] + + ]] `____________..........v,_______________________.v",
"v....]FFFFE <] # #ss]] ____________..........v,_______________,,,,,,,,.v",
"v....]P P ee@]++]]]]]]]]]]] b `____________..........v,,,,,,,,,_______________.v",
"v....]P P << mc m eee] hTh hTh f]b ____________''''''''''vvvvvvvvvvvvvvvvvvvvvvvvvvv",
"v....]MMMMPPPPPPPME eee] C] b`____________''OOOOOOO'''''''''''''''''''''''''''v",
"v....]MEEMPPPPPPPEM ] DV C0CC] ____________''xoooooO'''''''''''''OOOOOOO'''''''v",
"v....]mccm << mPPm ]++]]]]]]]]]]] `____________''xoooooO'''''''''''''xoooooO'''''''v",
"v....] PP ] ;] ____________''OOOOOOO'''''''''''''xoooooO'''''''v",
"v....]##### <PP< x x `____________''''''''''''''''''''''OOOOOOO'''''''v",
"v....]<<A R <PP< x x ____________''OOOOOOO'''OOOOOOO'''''''''''''''''v",
"v....] R PP x x `____________''xoooooO'''xoooooO'''''''''''''''''v",
"v....]l # mPPm x x b ____________''xoooooO'''xoooooO'''''''''''''''''v",
"v....]l + /EMME x x `____________''OOOOOOO'''OOOOOOO'''''''''''''''''v",
"v....]##### EMME ]; ] ____________''''''''''''''''''''''''''''''''''''v",
"v....] m||m ]]]]+]xxxxx]]]b `______________________________________________,'v",
"v...-]] || ] ; ] ______________________________________________,'v",
"v...--+ m||m + + `______________________________________________,'v",
"v...-]] EppE + + ______________________________________________,'v",
"v...-] EppE ] m m ] `______________________________________________,'v",
"v....] m||m ]Mm|||| ]] ______________________________________________,'v",
"v....] || ]Mm|||| ]] `______________________________________________,'v",
"v....] mm||mm ]P mMMm ]] ______________________________________________,'v",
"v....] /MMME ]P || ]]______________________________________________,'v",
"v....] EMMMPP PPPPP || ]______________________________________________,'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 ] || ]____________ ] l] =H==H= =H==H= v",
"v....] || ] || ]____________ + l] ^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....]PPP ] bbbb]____________ OxxxO %% ^X^^X^ %% ^X^^X^ %%v",
"v....]8 8 ] b bbb]____________ OoooO ^X^^X^ ^X^^X^ v",
"v....]PPP ]]++]]]]]]]]]]]____________ OoooO =H==H= =H==H= v",
"v....]8 8 ] ]'''''''''____________ OoooO / ^X^^X^ ^X^^X^ v",
"v....] ] R'''''''''____________ OoooO ^X^^X^ ^X^^X^ v",
"v....]]]]] ] ]'''''''''____________ OoooO =H==H= =H==H= v",
"v........] ] R'''''''''____________ OOOOO %% ^X^^X^ %% ^X^^X^ %%v",
"v....]P P !!!!!!!!!!!!! ee@]++]]]]]]]]]]] b `____________..........v,,,,,,,,,_______________.v",
"v....]P P << mc m !! eee] hTh hTh f]b ____________''''''''''vvvvvvvvvvvvvvvvvvvvvvvvvvv",
"v....]MMMMPPPPPPPME !! eee] n] b`____________''OOOOOOO'''''''''''''''''''''''''''v",
"v....]MEEMPPPPPPPEM !!! ] DV n0nn] ____________''xoooooO'''''''''''''OOOOOOO'''''''v",
"v....]mccm << mPPm !!! ]++]]]]]]]]]]] `____________''xoooooO'''''''''''''xoooooO'''''''v",
"v....] PP !!!!! ] ;] ____________''OOOOOOO'''''''''''''xoooooO'''''''v",
"v....]##### <PP< !!!!! x x `____________''''''''''''''''''''''OOOOOOO'''''''v",
"v....]<<A R <PP< !!!!! x x ____________''OOOOOOO'''OOOOOOO'''''''''''''''''v",
"v....] R PP !!!!! x x `____________''xoooooO'''xoooooO'''''''''''''''''v",
"v....]l # mPPm !!!!! x x b ____________''xoooooO'''xoooooO'''''''''''''''''v",
"v....]l + /EMME !!!!! x x `____________''OOOOOOO'''OOOOOOO'''''''''''''''''v",
"v....]##### EMME !!!!! ]; ] ____________''''''''''''''''''''''''''''''''''''v",
"v....] m||m !!!!! ]]]]+]xxxxx]]]b `______________________________________________,'v",
"v...-]] !!! || !!!!! ] ; ] ______________________________________________,'v",
"v...--+ !!! m||m !!!!!!! + 111111 + `______________________________________________,'v",
"v...-]] !!! EppE !!!!!!! + 111111 + ______________________________________________,'v",
"v...-] !!!!! EppE !!!!!!! ] m m ] `______________________________________________,'v",
"v....] !!!!! m||m !!!!!!! ]Mm|||| ]] ______________________________________________,'v",
"v....] !!!!! || !!!!!!! ]Mm|||| ]] `______________________________________________,'v",
"v....] !!!!! mm||mm !!!!!!! ]P mMMm ]] ______________________________________________,'v",
"v....] !!!!! /MMME !!!!! ]P || 11 ]]______________________________________________,'v",
"v....] !! EMMMPP !!!!! PPPPP || 111 ]______________________________________________,'v",
"v....] ! mmm MMMM !!!!! ]8 mppm 1111 ]______________________________________________,'v",
"v....] ! EM||||||| !!!!!!!!!! + || 1111 ]______________________________________________,'v",
"v....] ! EM||||||| !!!!!!!!!! ] MMMMm 11 ]____________ v",
"v....] ! mmm m||m !!!!!!!!!! ] EEEEc 11 ]____________ ^^^^^^ ^^^^^^ v",
"v....] ! || || !!!!!!!!!! ] MMMMm 11 ]____________ ]]RR]]RR]] ^B^^B^ ^B^^B^ v",
"v....] !!!!!! m||m !!!!!!!!!! ] || 111 ]____________ ] l] =H==H= =H==H= v",
"v....] !!!!!! || !!!!!!!!!! ] || 111 ]____________ + l] ^X^^X^ ^X^^X^ v",
"v....] !!!!!! m||m m !!!!! ] m||m 111 ]____________ + ] ^X^^X^ ^X^^X^ v",
"v....] !!!!!! EMM|||||| !!!!! ] 11111111 ]____________ ] <] =H==H= =H==H= v",
"v....] !!!!!! m||m m !!!!!! + 1111111 ]____________ ]]RR]]RR]] ^X^^X^ ^X^^X^ v",
"v....] || !!!!!!!!!!! + 111111 b]____________ ^X^^X^ ^X^^X^ v",
"v....]8 8 !!!!!!!!!!!!!!!!!!!! ] 1111 bbb ]____________ %% =H==H= %% =H==H= %%v",
"v....]PPP !!!!!!!!!!!!!!!!!!!! ] 1111 bbbb]____________ OxxxO %% ^X^^X^ %% ^X^^X^ %%v",
"v....]8 8 !!!!!!!!!!!!!!!!!!!! ] b bbb]____________ OoooO ^X^^X^ ^X^^X^ v",
"v....]PPP !!!!!!!!!!!!!!!!!!!! ]]++]]]]]]]]]]]____________ OoooO =H==H= =H==H= v",
"v....]8 8 !!!!!!!!!!!!!!!!!!!! ] ]'''''''''____________ OoooO / ^X^^X^ ^X^^X^ v",
"v....] !!!!!!!!!!!!!!!!!!!! ] R'''''''''____________ OoooO ^X^^X^ ^X^^X^ v",
"v....]]]]] !!!!!!!!!!!!!!!!!!!! ] ]'''''''''____________ OoooO =H==H= =H==H= v",
"v........] !!!!!!!!!!!!!!!!!!!! ] R'''''''''____________ OOOOO %% ^X^^X^ %% ^X^^X^ %%v",
"v........] ] ]'''''''''____________ %% ^X^^X^ %% ^X^^X^ %%v",
"v........] ]]++]]'''''''''____________ =H==H= =H==H= v",
"v........]]] ` ` ` ` ` ` ` ` ]]]] ____________ OxxxO ^X^^X^ ^X^^X^ v",
Expand All @@ -116,7 +116,7 @@
"v...... ''] hTTTh + C] OoooO %% =H==H= %% =H==H= %%v",
"v...... ''] TTTh # C] OoooO %% ^X^^X^ %% ^X^^X^ %%v",
"v...... ''] hTTT #/ m|m CCCCCC] OoooO ^X^^X^ ^X^^X^ v",
"v...... ''] ss#@e | ] OoooO =H==H= =H==H= v",
"v...... ''] yy#@e | ] OoooO =H==H= =H==H= v",
"v...... ']]]]]]]]]]]ee mpm ] OOOOO ^X^^X^ ^X^^X^ v",
"v...... ] | ] ^X^^X^ ^X^^X^ v",
"v...... + mMm m FxFEFxF] =H==H= =H==H= v",
Expand All @@ -135,20 +135,7 @@
],
"terrain": { },
"furniture": { },
"palettes": [ "steel_mill_palette" ],
"place_items": [
{ "item": "homebooks", "x": 19, "y": 7, "chance": 70 },
{ "item": "homebooks", "x": 24, "y": 7, "chance": 70 },
{ "item": "homebooks", "x": 26, "y": 4, "chance": 70 },
{ "item": "homebooks", "x": 31, "y": 4, "chance": 70 },
{ "item": "snacks", "x": 31, "y": 7, "chance": 70 },
{ "item": "office_paper", "x": 31, "y": [ 5, 6 ], "chance": 70 },
{ "item": "office_paper", "x": [ 26, 27 ], "y": 7, "chance": 70 },
{ "item": "office", "x": [ 16, 18 ], "y": 5, "chance": 70 },
{ "item": "office", "x": [ 21, 22 ], "y": 5, "chance": 70 },
{ "item": "office", "x": 23, "y": 5, "chance": 70 },
{ "item": "office", "x": [ 27, 29 ], "y": 5, "chance": 70 }
]
"palettes": [ "steel_mill_palette" ]
}
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen/steel_mill/steel_mill_z2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
":::::* *rrrrrrrrrr:::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]hTh DV *rrrrrrrrrr:::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]###### #################]rrrrrrrrrr:::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]W sll# + CCCC]rrrrrrrrrr:::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]W sll# + yyyy]rrrrrrrrrr:::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]W # + h h h *rrrrrrrrrr:::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]W # # hTTTTTTTT *:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]w + #7 TTTTTTTTh ]:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
Expand Down
19 changes: 19 additions & 0 deletions data/json/mapgen_palettes/steel_mill_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
"b": [ "f_crate_c", "f_crate_c", "f_crate_o" ],
"0": [ "f_sink" ],
"C": [ "f_counter" ],
"n": [ "f_counter" ],
"q": [ "f_counter" ],
"y": [ "f_counter" ],
"W": [ "f_water_heater" ],
"w": [ "f_water_purifier" ],
"U": [ "f_home_furnace" ],
Expand All @@ -68,6 +71,22 @@
"V": [ "f_vending_c" ],
"7": [ "f_filing_cabinet" ]
},
"items": {
"T": { "item": "snacks", "chance": 30 },
"d": { "item": "office", "chance": 30 },
"y": { "item": "office", "chance": 30 },
"f": { "item": "fridge", "chance": 30 },
"n": { "item": "fast_table", "chance": 30 },
"|": { "item": "steel_mill_mill", "chance": 15 },
"s": { "item": "metal_workshop", "chance": 10 },
"C": { "item": "metal_workshop", "chance": 10 },
"b": { "item": "metal_workshop", "chance": 20 },
"!": { "item": "steel_mill_mill", "chance": 3 },
"1": { "item": "steel_mill_foundry", "chance": 5 },
"l": { "item": "clothing_work_set", "chance": 15 },
"S": { "item": "homebooks", "chance": 30 },
"7": { "item": "office_paper", "chance": 30 }
},
"toilets": { "t": { } },
"vendingmachines": { "D": { "itemgroup": "vending_drink" }, "V": { "itemgroup": "vending_food" } }
}
Expand Down

0 comments on commit 4de2067

Please sign in to comment.