diff --git a/data/json/furniture_and_terrain/terrain_nether_monster.json b/data/json/furniture_and_terrain/terrain_nether_monster.json index ec549874b3340..bcedbbc777844 100644 --- a/data/json/furniture_and_terrain/terrain_nether_monster.json +++ b/data/json/furniture_and_terrain/terrain_nether_monster.json @@ -7,6 +7,7 @@ "symbol": ".", "color": "magenta_white", "move_cost": 1, + "roof": "t_flat_roof", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT" ] }, { @@ -19,7 +20,7 @@ "move_cost": 0, "coverage": 100, "looks_like": "t_concrete_wall", - "roof": "t_nm_floor_bone", + "roof": "t_flat_roof", "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "BLOCK_WIND" ] }, { @@ -34,7 +35,7 @@ "move_cost": 0, "coverage": 100, "looks_like": "t_concrete_wall", - "roof": "t_nm_floor_bone", + "roof": "t_flat_roof", "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "BLOCK_WIND" ] }, { @@ -45,6 +46,7 @@ "symbol": ".", "color": "magenta_white", "move_cost": 1, + "roof": "t_flat_roof", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ], "looks_like": "t_thconc_floor_flesh" }, @@ -57,7 +59,7 @@ "color": "magenta_red", "move_cost": 0, "coverage": 100, - "roof": "t_nm_floor_flesh", + "roof": "t_flat_roof", "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ], "looks_like": "t_concrete_wall_flesh", "bash": { @@ -78,7 +80,7 @@ "color": "magenta", "move_cost": 0, "coverage": 100, - "roof": "t_nm_floor_flesh", + "roof": "t_flat_roof", "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ], "looks_like": "t_nm_wall_flesh", "bash": { "str_min": 15, "str_max": 25, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_nm_floor_flesh" } @@ -93,7 +95,7 @@ "color": "yellow_red", "move_cost": 0, "coverage": 100, - "roof": "t_nm_floor_flesh", + "roof": "t_flat_roof", "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ], "looks_like": "t_concrete_wall_flesh", "bash": { @@ -125,7 +127,7 @@ "symbol": "#", "color": "white", "move_cost": 0, - "roof": "t_nm_floor_flesh", + "roof": "t_flat_roof", "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "BLOCK_WIND", "NOITEM" ], "looks_like": "fd_web", "bash": { "sound": "Riiiiip!", "ter_set": "t_nm_floor_flesh", "str_min": 5, "str_max": 10 } @@ -139,7 +141,7 @@ "color": "magenta_red", "move_cost": 0, "coverage": 100, - "roof": "t_nm_floor_flesh", + "roof": "t_flat_roof", "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "MINEABLE", "BLOCK_WIND" ], "looks_like": "t_concrete_wall_flesh", "bash": { diff --git a/data/json/mapgen/nether_monster_corpse/monster_misc.json b/data/json/mapgen/nether_monster_corpse/monster_misc.json index 9044144433a99..0182b7e949429 100644 --- a/data/json/mapgen/nether_monster_corpse/monster_misc.json +++ b/data/json/mapgen/nether_monster_corpse/monster_misc.json @@ -17,12 +17,12 @@ "###### ######", "###### ######", "###### ######", - "###### >> ######", - "###### >> ######", "###### ######", "###### ######", - "######## ########", - "########## ##########", + "###### ######", + "###### ######", + "######>>>>>>>>>>>>######", + "########################", "########################", "########################", "########################", @@ -32,7 +32,7 @@ "########################" ], "palettes": [ "nether_monster_palette" ], - "terrain": { ">": "t_slope_up" }, + "terrain": { ">": "t_slope_up", "-": "t_region_groundcover_barren" }, "place_nested": [ { "chunks": [ "tentacle_bounds_h" ], "x": [ 4, 6 ], "y": 16 }, { "chunks": [ "tentacle_bounds_h" ], "x": [ 4, 6 ], "y": 15 }, @@ -67,23 +67,23 @@ " ", " ", " ", - " #### ", - " #####=### ", - " #####====##### ", - " ####=========#### ", - " ##======<<=====## ", - " @=======<<======@ ", - " @===============@ ", - " @@===============@@ ", - " T @@=============@@ T ", - " T T T===========T T T ", - " T T T=========T T T ", - " ", " ", " ", " ", " ", - " " + " --------####---------- ", + " ----#########------- ", + " --##############---- ", + " -#################- ", + " -##<<<<<<<<<<<<<##- ", + " -@===============@- ", + " -@===============@- ", + " @@===============@@ ", + " T @@=============@@ T ", + " T T-T===========T T T ", + " T T -T=========T--T T ", + " ----------- ", + " --------- " ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "palettes": [ "nether_monster_palette" ], diff --git a/data/json/overmap/overmap_mutable/nether_monster_corpse.json b/data/json/overmap/overmap_mutable/nether_monster_corpse.json index 137f88af06a86..f1dcd47e3f891 100644 --- a/data/json/overmap/overmap_mutable/nether_monster_corpse.json +++ b/data/json/overmap/overmap_mutable/nether_monster_corpse.json @@ -7,10 +7,10 @@ "city_distance": [ 20, 30 ], "city_sizes": [ 0, 20 ], "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ], "check_for_locations_area": [ - { "type": [ "land", "road" ], "from": [ 0, 0, 0 ], "to": [ 0, 0, 0 ] }, - { "type": [ "subterranean_empty" ], "from": [ -15, -7, -1 ], "to": [ 15, 7, -1 ] }, - { "type": [ "subterranean_empty" ], "from": [ -7, -15, -1 ], "to": [ 7, 15, -1 ] } + { "type": [ "subterranean_empty" ], "from": [ -11, -5, -1 ], "to": [ 11, 5, -1 ] }, + { "type": [ "subterranean_empty" ], "from": [ -5, -11, -1 ], "to": [ 5, 11, -1 ] } ], "check_for_locations": [ ], "joins": [ @@ -18,8 +18,10 @@ { "id": "bowels_edge_to_mid", "opposite": "bowels_mid_to_edge" }, { "id": "bowels_edge_to_tentacle", "opposite": "bowels_tentacle_to_edge" }, { "id": "bowels_tentacle_to_edge", "opposite": "bowels_edge_to_tentacle" }, + { "id": "tentacle_tee_to_tentacle", "opposite": "tentacle_to_tentacle_tee" }, + { "id": "tentacle_to_tentacle_tee", "opposite": "tentacle_tee_to_tentacle" }, { "id": "surface_to_tentacle", "opposite": "tentacle_to_surface" }, - { "id": "tentacle_to_surface", "opposite": "surface_to_tentacle", "into_locations": [ "land", "road" ] }, + { "id": "tentacle_to_surface", "opposite": "surface_to_tentacle", "into_locations": [ "land" ] }, "surface_to_bowels", "bowels_mid_to_mid", "bowels_edge_to_edge", @@ -30,7 +32,7 @@ "head_to_head" ], "overmaps": { - "surface": { "overmap": "corpse_surface_north", "below": "surface_to_bowels", "locations": [ "land", "road" ] }, + "surface": { "overmap": "corpse_surface_north", "below": "surface_to_bowels", "locations": [ "land" ] }, "bowels_center": { "overmap": "corpse_bowels_mid", "above": "surface_to_bowels", @@ -120,19 +122,35 @@ "corpse_head_neck_center": { "overmap": "corpse_head_neck_center_south", "north": "neck_to_neck_center", "south": "head_to_head" }, "tentacle_mid": { "overmap": "corpse_tentacle_ns", - "north": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge" ] }, + "north": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge", "tentacle_to_tentacle_tee" ] }, "south": "tentacle_to_tentacle" }, "tentacle_end": { "overmap": "corpse_tentacle_end_south", - "north": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge" ] } + "north": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge", "tentacle_to_tentacle_tee" ] } + }, + "tentacle_end_lcorner": { + "overmap": "corpse_tentacle_ne", + "north": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge", "tentacle_to_tentacle_tee" ] }, + "east": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge", "tentacle_to_tentacle_tee" ] } + }, + "tentacle_end_straight": { + "overmap": "corpse_tentacle_ns", + "north": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge", "tentacle_to_tentacle_tee" ] }, + "south": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge", "tentacle_to_tentacle_tee" ] } }, "tentacle_end_w_entry": { "overmap": "corpse_tentacle_entry_north", - "north": { "id": "tentacle_to_tentacle", "alternatives": [ "bowels_tentacle_to_edge" ] }, + "north": { "id": "tentacle_to_tentacle", "alternatives": [ "tentacle_to_tentacle_tee" ] }, "above": "tentacle_to_surface" }, - "corpse_entry_surface": { "overmap": "corpse_tentacle_surface_entry_north", "below": "surface_to_tentacle", "locations": [ "land", "road" ] }, + "corpse_entry_surface": { "overmap": "corpse_tentacle_surface_entry_north", "below": "surface_to_tentacle", "locations": [ "land" ] }, + "tentacle_tee": { + "overmap": "corpse_tentacle_nes", + "north": "tentacle_to_tentacle", + "east": "tentacle_tee_to_tentacle", + "south": "tentacle_tee_to_tentacle" + }, "tentacle_corner": { "overmap": "corpse_tentacle_ne", "north": "tentacle_to_tentacle", "east": "tentacle_to_tentacle" }, "tentacle_rcorner": { "overmap": "corpse_tentacle_wn", "north": "tentacle_to_tentacle", "west": "tentacle_to_tentacle" } }, @@ -185,28 +203,8 @@ ], [ { "overmap": "bowels_lcorner", "weight": 1 } ], [ { "overmap": "bowels_rcorner", "weight": 1 } ], - [ - { - "name": "neck_3x1", - "chunk": [ - { "overmap": "neck_side", "pos": [ -1, 0, 0 ] }, - { "overmap": "neck_center", "pos": [ 0, 0, 0 ] }, - { "overmap": "neck_side", "pos": [ 1, 0, 0 ] } - ], - "max": 1 - } - ], - [ - { - "name": "neck_3x1_extra", - "chunk": [ - { "overmap": "neck_side", "pos": [ -1, 0, 0 ] }, - { "overmap": "neck_center", "pos": [ 0, 0, 0 ] }, - { "overmap": "neck_side", "pos": [ 1, 0, 0 ] } - ], - "max": { "poisson": 1 } - } - ], + [ { "overmap": "neck_center", "max": 1 } ], + [ { "overmap": "neck_center", "max": { "poisson": 1.2 } } ], [ { "name": "head1", @@ -241,10 +239,22 @@ } ], [ { "overmap": "corpse_head_lcorner", "weight": 1 }, { "overmap": "corpse_head_rcorner", "weight": 1 } ], + [ { "overmap": "neck_side", "weight": 1 } ], + [ { "overmap": "tentacle_mid", "max": 12 } ], + [ + { "overmap": "tentacle_corner", "max": 25 }, + { "overmap": "tentacle_rcorner", "max": 25 }, + { "overmap": "tentacle_mid", "max": 8 } + ], + [ { "overmap": "tentacle_mid", "max": { "poisson": 8 } } ], [ { "overmap": "tentacle_end_w_entry", "max": 1 } ], [ { "overmap": "tentacle_end_w_entry", "max": { "poisson": 0.8 } } ], [ { "overmap": "corpse_entry_surface", "weight": 1 } ], - [ { "overmap": "tentacle_end", "weight": 1 } ] + [ + { "overmap": "tentacle_end", "weight": 1000 }, + { "overmap": "tentacle_end_lcorner", "weight": 1 }, + { "overmap": "tentacle_end_straight", "weight": 1 } + ] ] } ]