Skip to content

Commit

Permalink
Backporting CleverRaven#49596 Roof and general improvements for orcha…
Browse files Browse the repository at this point in the history 
…rd_apple
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg committed Aug 14, 2021
1 parent 4cc95c1 commit c0290c0
Show file tree
Hide file tree
Showing 5 changed files with 265 additions and 129 deletions.
40 changes: 40 additions & 0 deletions data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,45 @@
[ "straw_pile", 20 ],
[ "survnote", 1 ]
]
},
{
"type": "item_group",
"id": "orchard_supplies",
"subtype": "distribution",
"items": [
[ "fertilizer_liquid", 10 ],
[ "fertilizer_commercial", 10 ],
[ "insecticide", 10 ],
[ "pot_canning", 5 ],
{ "item": "jar_3l_glass_sealed", "prob": 25, "count": [ 2, 10 ] },
{ "item": "wooden_barrel", "prob": 20, "count": [ 2, 4 ] }
]
},
{
"type": "item_group",
"id": "orchard_tools",
"subtype": "collection",
"items": [
[ "shovel", 5 ],
{ "item": "trimmer_off", "prob": 5, "charges": [ 0, 600 ] },
[ "bucket", 5 ],
[ "rake", 15 ],
[ "rake_plastic", 5 ],
[ "stepladder", 15 ],
{ "item": "pointy_stick", "prob": 20, "count": [ 3, 10 ] },
[ "hammer", 10 ],
[ "rope_makeshift_6", 20 ]
]
},
{
"type": "item_group",
"id": "stored_pulp",
"ammo": 100,
"magazine": 100,
"subtype": "distribution",
"entries": [
{ "item": "wooden_barrel", "prob": 100, "sealed": true },
{ "item": "juice_pulp", "prob": 100, "charges": [ 7, 77 ], "container-item": "wooden_barrel" }
]
}
]
269 changes: 141 additions & 128 deletions data/json/mapgen/orchard_apple.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,33 @@
"q q",
"q q",
"q $$$$$$$$$$$$$$$$$$$$ q",
"q $------------------$ q",
"q $-,,C-.........OOX-$ q",
"q $-Ck,o.OcccO....OX-$ q",
"q $--ox-.........OXX-$ q",
"q $-.........--++----$ q",
"q $-..O......-T...XX-$ q",
"q $-f.c......+....XX-$ q",
"q $-f.c......+.....X-$ q",
"q $-f.c......-....XX-$ q",
"q $-..O......-.....X-$ q",
"q $-.........-....|X-$ q",
"q $------++---====---$ q",
"q $]]$]''''''] q",
"q 7$$7 $]]$]''''''] q",
"q $]]$]''''''] q",
"'''''''''''''''''''' q",
"'''''''''''''''''''' q",
"'''''''''''''''''''' q",
"'''''''''''''''''''' q"
"q $MMMMMMMMMMMMMMMMMM$ q",
"q $M,,CMmmmmmmmmmOOYM$ q",
"q $MCk,omEcccEmmmmOYM$ q",
"q $MMx+MmmmmmmmmmOYYM$ q",
"q $MmmmmmmmmmMM&&MMMM$ q",
"q $MmmEmmmmmmMzmmmXXM$ q",
"q $Mfmcmmmmmm&mmmmXXM$ q",
"q $Mfmcmmmmmm&mmmmmXM$ q",
"q $MfmcmmmmmmMmmmmXXM$ q",
"q $MmmEmmmmmmMmmmmmXM$ q",
"q $MmmmmmmmmmMmmmmGXM$ q",
"q $MMMMMM&&MMM====MMM$ q",
"q ^$]]$]......] q",
"q 7$$7 $]]$]......] q",
"]]]]]]]]]]]]]......] q",
"]...........]......] q",
"]...........]......] q",
"]...........]......] q",
"]...........]......] q"
],
"terrain": {
" ": [ "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass" ],
"$": [ "t_shrub", "t_shrub", "t_shrub", "t_shrub", "t_shrub", "t_underbrush" ],
"'": "t_pavement",
"+": "t_door_metal_c",
",": "t_floor",
"-": "t_wall_metal",
".": "t_metal_floor",
"7": "t_tree",
"=": "t_door_metal_locked",
"C": "t_floor",
"]": "t_sidewalk",
"k": "t_floor",
"o": "t_window",
"x": "t_door_c",
"|": "t_gates_control_metal",
"Q": "t_fence_v",
"q": "t_fence_h"
"palettes": [ "orchard_buildings" ],
"terrain": { " ": [ [ "t_grass", 5 ], "t_dirt" ] },
"items": {
"O": { "item": "orchard_tools", "chance": 25, "repeat": [ 0, 1 ] },
"X": { "item": "orchard_tools", "chance": 25, "repeat": [ 0, 1 ] },
"Y": [ { "item": "orchard_tools", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "orchard_supplies", "chance": 50 } ]
},
"furniture": { "C": "f_chair", "O": "f_crate_o", "T": "f_table", "X": "f_crate_c", "c": "f_counter", "f": "f_rack", "k": "f_desk" },
"place_items": [
{ "item": "office", "x": 7, "y": 7, "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "office", "x": 16, "y": 10, "chance": 50 },
Expand All @@ -63,10 +50,9 @@
{ "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 45 }
],
"place_vehicles": [
{ "vehicle": "suburban_home", "x": 2, "y": 21, "chance": 45, "rotation": -90 },
{ "vehicle": "suburban_home", "x": 7, "y": 21, "chance": 45, "rotation": -90 },
{ "vehicle": "suburban_home", "x": 12, "y": 21, "chance": 45, "rotation": -90 },
{ "vehicle": "highway", "x": 16, "y": 21, "chance": 45 }
{ "vehicle": "suburban_home", "x": [ 3, 8 ], "y": 22, "chance": 45, "rotation": 180 },
{ "vehicle": "highway", "x": 15, "y": 20, "chance": 60, "rotation": -90 },
{ "vehicle": "forklift", "x": 16, "y": 12, "chance": 20, "rotation": 90 }
]
}
},
Expand All @@ -78,80 +64,50 @@
"object": {
"fill_ter": "t_floor",
"rows": [
".................... q",
".................... q",
".................... q",
".................... q",
"....................****",
"....................****",
"...................*****",
"...................* q",
"...................* q",
"..................** q",
".................** q",
"..............**** q",
"q**********************q",
"q******bbb**-------+--$q",
"q******ttt**-cT{xxS,s-$q",
"q******bbb**oc,D,,,,F-$q",
"q***********oc,,,,,,F-$q",
"q***********-POOk,,TF-$q",
"q ********* -----++---$q",
"q7 ****btb 7-XOO,,,ff-$q",
"q ****btb -XO,,,,,|-$q",
"q7 ****btb 7---=====--$q",
"q ********* |*****dd q",
"].y.y.y.y.y.]......] q",
"...................] q",
"...................] q",
"...................] q",
"...................]****",
"..................]]****",
"..................]*****",
"..................]* q",
".................]]* q",
"................]]** q",
".............]]]]** q",
"]]]]]]]]]]]]]]**** q",
"q************^*********q",
"q******bbb**WWWWWWW+WW$q",
"q******ttt**WcT{vvS,sW$q",
"q******bbb**oc,D,,,,FW$q",
"q***********oc,,,,,,FW$q",
"q***********WPOOa,,TFW$q",
"q ********* WWWWW++WWW$q",
"q7 ****btb 7WXOO,,,ffW$q",
"q ****btb WXO,,,,,gW$q",
"q7 ****btb 7WWW=====WW$q",
"q ********* g*****dd q",
"QQQQ***QQQQQQQQQQ***QQQQ"
],
"terrain": {
" ": [ "t_dirt", "t_grass_long", "t_grass", "t_grass", "t_grass", "t_grass" ],
"$": "t_shrub",
"*": "t_dirt",
"+": "t_door_c",
",": "t_floor",
"-": "t_wall_wood",
".": "t_pavement",
"7": "t_tree",
"=": "t_door_metal_locked",
"b": "t_dirt",
"o": "t_window_empty",
"t": "t_dirt",
"|": "t_barndoor",
"Q": "t_fence_v",
"q": "t_fence_h"
},
"furniture": {
"D": "f_trashcan",
"F": "f_fridge",
"O": "f_crate_o",
"P": "f_sign",
"S": "f_smoking_rack",
"T": "f_table",
"X": "f_crate_c",
"b": "f_bench",
"c": "f_counter",
"d": "f_dumpster",
"f": "f_rack",
"k": "f_wood_keg",
"s": "f_safe_o",
"t": "f_table",
"x": "f_oven",
"{": "f_sink"
},
"palettes": [ "orchard_buildings" ],
"terrain": { " ": [ [ "t_grass", 4 ], "t_grass_long", "t_dirt" ] },
"place_signs": [ { "signage": "Get Apples n Ciders!", "x": 13, "y": 17 } ],
"place_items": [
{ "item": "fridge", "x": 20, "y": [ 15, 17 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "farming_tools", "x": [ 19, 20 ], "y": 19, "chance": 50, "repeat": [ 1, 2 ] },
{ "item": "fridge", "x": 20, "y": [ 15, 17 ], "chance": 25, "repeat": [ 1, 3 ] },
{ "item": "orchard_tools", "x": [ 19, 20 ], "y": 19, "chance": 50, "repeat": [ 1, 2 ] },
{ "item": "trash", "x": 22, "y": [ 15, 16 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "item": "trash", "x": 11, "y": 12, "chance": 75 }
{ "item": "trash", "x": 11, "y": 12, "chance": 75 },
{ "item": "stored_pulp", "x": [ 13, 14 ], "y": [ 19, 20 ], "chance": 75 }
],
"place_item": [ { "item": "apple", "x": 20, "y": [ 15, 17 ], "chance": 100, "repeat": [ 5, 15 ] } ],
"liquids": { "k": { "liquid": "apple_cider", "amount": [ 10, 100 ] } },
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 30 },
{ "monster": "GROUP_SAFE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 30 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 40 },
{ "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 45 }
],
"place_vehicles": [ { "vehicle": "suburban_home", "x": 4, "y": 17, "chance": 50, "rotation": -90 } ]
"place_vehicles": [ { "vehicle": "suburban_home", "x": 5, "y": 10, "chance": 45 } ]
}
},
{
Expand Down Expand Up @@ -187,12 +143,7 @@
" $ *** $ *** $$ ",
" *** $$ *** $"
],
"terrain": {
" ": [ "t_dirt", "t_grass_long", "t_grass_long", "t_grass", "t_grass", "t_grass", "t_grass" ],
"*": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
"$": [ "t_shrub", "t_shrub", "t_underbrush", "t_grass", "t_dirt" ],
"7": [ "t_tree_apple", "t_tree_apple", "t_tree_dead" ]
},
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 60 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 40 },
Expand Down Expand Up @@ -234,12 +185,7 @@
" $ *** $ *** $$ ",
" *** $$ *** $"
],
"terrain": {
" ": [ "t_dirt", "t_grass_long", "t_grass_long", "t_grass", "t_grass", "t_grass", "t_grass" ],
"*": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
"$": [ "t_shrub", "t_shrub", "t_underbrush", "t_grass", "t_dirt" ],
"7": [ "t_tree_apple", "t_tree_apple", "t_tree_dead" ]
},
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 60 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 40 },
Expand Down Expand Up @@ -281,12 +227,7 @@
"$ *** $ *** $$ ",
" $*** $$ *** $"
],
"terrain": {
" ": [ "t_dirt", "t_grass_long", "t_grass_long", "t_grass", "t_grass", "t_grass", "t_grass" ],
"*": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
"$": [ "t_shrub", "t_shrub", "t_underbrush", "t_grass", "t_dirt" ],
"7": [ "t_tree_apple", "t_tree_apple", "t_tree_dead" ]
},
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 60 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 50 },
Expand Down Expand Up @@ -328,18 +269,90 @@
"$ *** $ $ $$ ",
" $*** $$ $ $"
],
"terrain": {
" ": [ "t_dirt", "t_grass_long", "t_grass_long", "t_grass", "t_grass", "t_grass", "t_grass" ],
"*": [ "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_grass" ],
"$": [ "t_shrub", "t_shrub", "t_underbrush", "t_grass", "t_dirt" ],
"7": [ "t_tree_apple", "t_tree_apple", "t_tree_dead" ]
},
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 60 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 50 },
{ "monster": "GROUP_SAFE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 20 },
{ "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 25 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "orchard_processing_roof" ],
"object": {
"fill_ter": "t_tile_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" |22222222222222223 ",
" |................3 ",
" |.:...........7..3 ",
" |................3 ",
" |..6......###....3 ",
" |.........#z#....3 ",
" |.........###....3 ",
" |................3 ",
" |................3 ",
" |................3 ",
" |................3 ",
" |---5------------3 ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { "z": "t_ladder_down" },
"nested": {
"6": { "chunks": [ [ "null", 20 ], [ "roof_6x6_garden_3", 80 ] ] },
"7": { "chunks": [ [ "null", 20 ], [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 40 ] ] }
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "orchard_stall_roof" ],
"weight": 500,
"object": {
"fill_ter": "t_tile_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" |5222222223 ",
" |.........3 ",
" |.......6.3 ",
" |.........3 ",
" |.......6.3 ",
" |.........3 ",
" |.........3 ",
" |.........3 ",
" ----------3 ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"nested": { "6": { "chunks": [ [ "null", 30 ], [ "roof_2x2_utilities", 30 ], [ "roof_2x2_utilities_c", 40 ] ] } }
}
}
]
Loading

0 comments on commit c0290c0

Please sign in to comment.