Skip to content

Commit

Permalink
Fix Urban Awakening
Browse files Browse the repository at this point in the history 
* Since generic basements are pretty much non-existent, tied them to the
newer arcanist houses and tweaked their appearance rate.
* Also cleaned up and tweaked arcanist houses to look nicer and be less
barren, since they'll be a scenario location now.

Closes #127
  • Loading branch information
@chaosvolt
chaosvolt committed Apr 2, 2020
1 parent 1b3a81f commit 21faaba
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 79 deletions.
162 changes: 88 additions & 74 deletions Arcana/overmap_and_mapgen/mapgen_variants.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -984,57 +984,93 @@
"object": {
"fill_ter": "t_floor",
"rows": [
".DDD...P..%%%%..____....",
".|---------vv----;;----.",
".| | | |.",
".| |B t| |.",
"%| |B | |.",
"%v | S| |.",
"%v |-+--| O|.",
"%| | | S|.",
".| | + |%",
".| + | v%",
".| | | v%",
".|-------- | |%",
"%| |---+---|.",
"%v |%",
"%v v%",
"%| |%",
".,,_____$......P.__.....",
".||&&&&&||.......__.....",
".|______$|.......__.....",
".|_______;_________.....",
"%|_______|%%%%...__.....",
"%w_______||ww||||;;||||.",
"%w_______-b T-n t|.",
"%|_______-b -O |.",
".|[_____g- t-F |%",
".|cc____g- s-S w%",
".|cc_____--+---C w%",
".|---+---- - hh |%",
"%| - heeh |.",
"%w + heeh |%",
"%w - hh w%",
"%| CCCCC- |%",
".|----+----------+----|.",
".| | |.",
".| | |.",
".| | |.",
".| | |.",
".| | |.",
".----vv---------vv-----.",
".|DD +W- |.",
".|h --- |.",
".| [-[ ]|.",
".|v --- ]|.",
".|BB ]]]->x ]|.",
".||||ww|||||||||ww|||||.",
"..4.%%%%.......%%%%....."
],
"terrain": {
"&": "t_door_metal_locked",
"$": "t_gates_control_brick",
">": "t_stairs_down",
"+": "t_door_c",
"-": "t_brick_wall",
"_": "t_sidewalk",
"-": "t_wall",
"_": "t_concrete",
".": "t_grass",
",": "t_dirt",
"%": "t_shrub",
";": "t_door_locked",
"4": "t_gutter_downspout",
"B": "t_floor",
"D": "t_dirt",
"O": "t_floor",
"P": "t_grass",
"S": "t_floor",
"v": "t_window_no_curtains_taped",
"|": "t_wall"
"c": "t_concrete",
"g": "t_concrete",
"w": "t_window_no_curtains_taped",
"x": "t_door_locked_interior",
"|": "t_brick_wall"
},
"furniture": { "B": "f_bathtub", "D": "f_trashcan", "O": "f_oven", "P": "f_mailbox", "S": "f_sink" },
"toilets": { "t": { } },
"furniture": {
"[": "f_locker",
"]": "f_bookcase",
",": "f_trashcan",
"B": "f_bed",
"C": "f_counter",
"D": "f_desk",
"F": "f_fridge",
"O": "f_oven",
"P": "f_mailbox",
"S": "f_sink",
"T": "f_toilet",
"W": "f_wardrobe",
"b": "f_bathtub",
"c": "f_crate_o",
"g": "f_workbench",
"e": "f_table",
"h": "f_chair",
"t": "f_trashcan",
"v": "f_woodstove"
},
"toilets": { "T": { } },
"place_nested": [
{
"chunks": [ [ "house_arcana_encounter_1", 50 ], [ "house_arcana_encounter_2", 25 ], [ "house_arcana_encounter_3", 25 ] ],
"x": [ 0, 0 ],
"y": [ 0, 0 ]
}
],
"items": { "A": { "item": "mail", "chance": 10, "repeat": [ 0, 3 ] }, "t": { "item": "stash_drugs", "chance": 10 } }
"place_loot": [ { "item": "matches", "x": 2, "y": 17, "chance": 50 }, { "group": "reading_lights", "x": 3, "y": 17, "chance": 90 } ],
"items": {
"[": { "item": "magic_crafting", "chance": 40, "repeat": 5 },
"]": { "item": "mansion_bookcase" },
"B": { "item": "bed", "chance": 90 },
"F": { "item": "fridge", "chance": 50, "repeat": 5 },
"O": { "item": "oven", "chance": 50, "repeat": 3 },
"P": { "item": "mail", "chance": 10, "repeat": 3 },
"T": { "item": "stash_drugs", "chance": 10 },
"W": { "item": "allclothes", "chance": 75, "repeat": 5 },
"c": { "item": "supplies_hardware", "chance": 50, "repeat": 10 },
"n": { "item": "cannedfood", "chance": 50, "repeat": 5 },
"t": { "item": "trash", "chance": 50, "repeat": 3 }
}
}
},
{
Expand Down Expand Up @@ -1081,21 +1117,6 @@
"//": "Formerly inhabited by a non-faction arcanist, one way or another they never came back...",
"object": {
"mapgensize": [ 24, 24 ],
"set": [
{ "line": "furniture", "id": "f_desk", "x": 8, "x2": 9, "y": 17, "y2": 17 },
{ "point": "furniture", "id": "f_chair", "x": 9, "y": 18 },
{ "line": "furniture", "id": "f_bed", "x": 3, "x2": 4, "y": 21, "y2": 21 },
{ "point": "furniture", "id": "f_woodstove", "x": 3, "y": 20 },
{ "line": "furniture", "id": "f_locker", "x": 2, "x2": 2, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_bookcase", "x": 8, "x2": 9, "y": 21, "y2": 21 }
],
"place_loot": [
{ "group": "bed", "x": [ 3, 4 ], "y": 21, "chance": 60, "repeat": 4 },
{ "item": "matches", "x": 8, "y": 17, "chance": 50 },
{ "group": "reading_lights", "x": 8, "y": 17, "chance": 90 },
{ "group": "magic_crafting", "x": 2, "y": [ 17, 18 ], "chance": 40, "repeat": 5 },
{ "group": "unaligned_arcanist_books", "x": [ 8, 9 ], "y": 21, "chance": 30, "repeat": 5 }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
}
},
Expand All @@ -1107,22 +1128,18 @@
"object": {
"mapgensize": [ 24, 24 ],
"set": [
{ "line": "furniture", "id": "f_makeshift_bed", "x": 7, "x2": 8, "y": 2, "y2": 2 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 2, "x2": 2, "y": 2, "y2": 3 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 7, "x2": 8, "y": 10, "y2": 10 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 2, "x2": 2, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 10, "x2": 10, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 12, "x2": 12, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 21, "x2": 21, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_candle_barrier", "x": 15, "x2": 18, "y": 18, "y2": 18 },
{ "line": "furniture", "id": "f_candle_barrier", "x": 15, "x2": 18, "y": 21, "y2": 21 },
{ "line": "furniture", "id": "f_candle_barrier", "x": 15, "x2": 15, "y": 19, "y2": 20 },
{ "line": "furniture", "id": "f_candle_barrier", "x": 18, "x2": 18, "y": 19, "y2": 20 },
{ "line": "furniture", "id": "f_counter", "x": 8, "x2": 15, "y": 15, "y2": 15 }
{ "line": "furniture", "id": "f_candle_barrier", "x": 18, "x2": 18, "y": 19, "y2": 20 }
],
"place_loot": [
{ "group": "cult_sacrifice", "x": 21, "y": 6 },
{ "group": "unaligned_arcanist_books", "x": [ 8, 15 ], "y": 15, "chance": 30, "repeat": 5 },
{ "group": "arcana_hunt_random", "x": [ 8, 15 ], "y": 15, "chance": 30, "repeat": 3 },
{ "group": "unaligned_arcanist_books", "x": [ 9, 13 ], "y": 15, "chance": 30, "repeat": 5 },
{ "group": "arcana_hunt_random", "x": [ 9, 13 ], "y": 15, "chance": 30, "repeat": 3 },
{ "item": "bowl_pewter", "x": [ 16, 17 ], "y": [ 19, 20 ] },
{ "item": "knife_butcher", "x": [ 16, 17 ], "y": [ 19, 20 ] },
{ "item": "lighter", "x": [ 16, 17 ], "y": [ 19, 20 ] },
Expand All @@ -1143,40 +1160,37 @@
"object": {
"mapgensize": [ 24, 24 ],
"set": [
{ "line": "terrain", "id": "t_door_frame", "x": 17, "x2": 18, "y": 1, "y2": 1 },
{ "point": "terrain", "id": "t_door_o", "x": 11, "y": 6 },
{ "point": "terrain", "id": "t_door_o", "x": 14, "y": 8 },
{ "point": "terrain", "id": "t_door_o", "x": 9, "y": 9 },
{ "point": "terrain", "id": "t_door_o", "x": 18, "y": 12 },
{ "line": "terrain", "id": "t_door_frame", "x": 17, "x2": 18, "y": 5, "y2": 5 },
{ "point": "terrain", "id": "t_door_frame", "x": 9, "y": 3 },
{ "point": "terrain", "id": "t_door_o", "x": 5, "y": 11 },
{ "point": "terrain", "id": "t_door_o", "x": 11, "y": 10 },
{ "point": "terrain", "id": "t_door_o", "x": 14, "y": 13 },
{ "point": "terrain", "id": "t_door_o", "x": 6, "y": 16 },
{ "point": "terrain", "id": "t_door_o", "x": 17, "y": 16 },
{ "line": "terrain", "id": "t_window_frame", "x": 11, "x2": 12, "y": 1, "y2": 1 },
{ "line": "terrain", "id": "t_window_frame", "x": 11, "x2": 12, "y": 5, "y2": 5 },
{ "line": "terrain", "id": "t_window_frame", "x": 1, "x2": 1, "y": 5, "y2": 6 },
{ "line": "terrain", "id": "t_window_frame", "x": 1, "x2": 1, "y": 13, "y2": 14 },
{ "line": "terrain", "id": "t_window_frame", "x": 22, "x2": 22, "y": 9, "y2": 10 },
{ "point": "terrain", "id": "t_window_frame", "x": 22, "y": 14 },
{ "line": "terrain", "id": "t_window_frame", "x": 5, "x2": 6, "y": 22, "y2": 22 },
{ "line": "terrain", "id": "t_window_frame", "x": 16, "x2": 17, "y": 22, "y2": 22 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 7, "x2": 8, "y": 2, "y2": 2 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 2, "x2": 2, "y": 2, "y2": 3 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 7, "x2": 8, "y": 10, "y2": 10 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 2, "x2": 2, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 10, "x2": 10, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 12, "x2": 12, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_makeshift_bed", "x": 21, "x2": 21, "y": 17, "y2": 18 },
{ "line": "furniture", "id": "f_counter", "x": 8, "x2": 15, "y": 15, "y2": 15 }
{ "line": "furniture", "id": "f_makeshift_bed", "x": 21, "x2": 21, "y": 17, "y2": 18 }
],
"place_loot": [
{ "item": "splinter", "x": [ 16, 19 ], "y": 2, "repeat": [ 10, 20 ] },
{ "item": "glass_shard", "x": [ 10, 13 ], "y": 2, "repeat": [ 20, 40 ] },
{ "item": "splinter", "x": [ 16, 19 ], "y": 6, "repeat": [ 15, 30 ] },
{ "item": "splinter", "x": 8, "y": [ 2, 4 ], "repeat": [ 10, 20 ] },
{ "item": "glass_shard", "x": [ 10, 13 ], "y": 6, "repeat": [ 20, 40 ] },
{ "item": "glass_shard", "x": 2, "y": [ 4, 7 ], "repeat": [ 20, 40 ] },
{ "item": "glass_shard", "x": 2, "y": [ 12, 15 ], "repeat": [ 20, 40 ] },
{ "item": "glass_shard", "x": 21, "y": [ 8, 11 ], "repeat": [ 20, 40 ] },
{ "item": "glass_shard", "x": 21, "y": [ 13, 15 ], "repeat": [ 10, 20 ] },
{ "item": "glass_shard", "x": [ 4, 7 ], "y": 21, "repeat": [ 20, 40 ] },
{ "item": "glass_shard", "x": [ 15, 18 ], "y": 21, "repeat": [ 20, 40 ] },
{ "group": "cult_sacrifice", "x": 21, "y": 6 },
{ "group": "unaligned_arcanist_books", "x": [ 8, 15 ], "y": 15, "chance": 25, "repeat": 2 },
{ "group": "arcana_hunt_random", "x": [ 8, 15 ], "y": 15, "chance": 25 },
{ "group": "cult_sacrifice", "x": 2, "y": 20 },
{ "group": "unaligned_arcanist_books", "x": [ 9, 13 ], "y": 15, "chance": 25, "repeat": 2 },
{ "group": "arcana_hunt_random", "x": [ 9, 13 ], "y": 15, "chance": 25 },
{ "group": "summoner_casualties_fresh", "x": [ 6, 7 ], "y": [ 8, 9 ], "chance": 90 },
{ "group": "ammo_casings", "x": [ 5, 8 ], "y": [ 7, 10 ], "chance": 50 },
{ "group": "summoner_casualties_fresh", "x": [ 16, 17 ], "y": [ 9, 10 ], "chance": 90 },
Expand All @@ -1189,7 +1203,7 @@
{ "group": "ammo_casings", "x": [ 3, 6 ], "y": [ 17, 20 ], "chance": 50 },
{ "group": "summoner_casualties_fresh", "x": [ 19, 20 ], "y": [ 18, 19 ], "chance": 90 },
{ "group": "ammo_casings", "x": [ 18, 21 ], "y": [ 17, 20 ], "chance": 50 },
{ "group": "cleansing_flame_casualty_specific", "x": [ 17, 18 ], "y": [ 4, 5 ], "chance": 50 }
{ "group": "cleansing_flame_casualty_specific", "x": [ 17, 18 ], "y": [ 7, 8 ], "chance": 75 }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ] } ]
}
Expand Down
3 changes: 1 addition & 2 deletions Arcana/overmap_and_mapgen/overmap_terrain.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@
{
"type": "overmap_terrain",
"id": "arcanist_basement",
"copy-from": "generic_city_house_basement",
"extend": { "flags": [ "NO_ROTATE" ] }
"copy-from": "generic_city_house_basement"
},
{
"type": "overmap_terrain",
Expand Down
6 changes: 3 additions & 3 deletions Arcana/overmap_and_mapgen/regional_overlay.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"type": "region_overlay",
"id": "arcana_overlay",
"regions": [ "all" ],
"city": { "houses": { "house_arcana": 50 }, "basements": { "arcanist_basement": 150 } }
"city": { "houses": { "house_arcana": 200 } }
},
{
"type": "city_building",
"id": "house_01",
"id": "house_arcana",
"locations": [ "land" ],
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_01_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_01_roof_north" } ]
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_arcana_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_arcana_roof_north" }, { "point": [ 0, 0, -1 ], "overmap": "arcanist_basement_north" } ]
}
]

0 comments on commit 21faaba

Please sign in to comment.