From 54c96fb6b003c881f0026ab194d755a33e55d99f Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 29 Dec 2023 20:48:44 +0000 Subject: [PATCH] Simplify generic mine mutable definition --- data/json/mapgen/mine/mine_generic.json | 6 +- .../overmap/overmap_mutable/mine_mutable.json | 130 +++++------------- 2 files changed, 34 insertions(+), 102 deletions(-) diff --git a/data/json/mapgen/mine/mine_generic.json b/data/json/mapgen/mine/mine_generic.json index eff5f45c558e2..c965f565a59c4 100644 --- a/data/json/mapgen/mine/mine_generic.json +++ b/data/json/mapgen/mine/mine_generic.json @@ -104,10 +104,8 @@ "@": { "chunks": [ [ "mine_lava", 1 ], [ "null", 15 ] ] } }, "place_nested": [ - { "chunks": [ "transition_down" ], "joins": { "below": "-2_to_-3" }, "x": 11, "y": 12 }, - { "chunks": [ "transition_up" ], "joins": { "above": "-2_to_-3" }, "x": 11, "y": 12 }, - { "chunks": [ "transition_down" ], "joins": { "below": "-3_to_-4" }, "x": 11, "y": 12 }, - { "chunks": [ "transition_up" ], "joins": { "above": "-3_to_-4" }, "x": 11, "y": 12 }, + { "chunks": [ "transition_down" ], "joins": { "below": "tunnel_ramp" }, "x": 11, "y": 12 }, + { "chunks": [ "transition_up" ], "joins": { "above": "tunnel_ramp" }, "x": 11, "y": 12 }, { "chunks": [ "mine_tunnel_bounds_h" ], "x": [ 4, 6 ], "y": 12 }, { "chunks": [ "mine_tunnel_bounds_h" ], "x": [ 4, 6 ], "y": 13 }, { "chunks": [ "mine_tunnel_bounds_h" ], "x": [ 4, 6 ], "y": 14 }, diff --git a/data/json/overmap/overmap_mutable/mine_mutable.json b/data/json/overmap/overmap_mutable/mine_mutable.json index 7360ae40eac50..b64f1a05e9e03 100644 --- a/data/json/overmap/overmap_mutable/mine_mutable.json +++ b/data/json/overmap/overmap_mutable/mine_mutable.json @@ -19,37 +19,22 @@ [ [ -1, 1, -2 ], [ "subterranean_empty" ] ], [ [ -2, 1, -2 ], [ "subterranean_empty" ] ] ], - "joins": [ - "parking_lot_to_entrance", - "surface_to_shaft", - "shaft_lower_to_shaft_middle", - "tunnel_entrance_to_tunnels", - "tunnel_to_tunnel", - "-2_to_-3", - "-3_tunnel_to_-3_tunnel", - "-3_to_-4", - "-4_tunnel_to_-4_tunnel", - "-4_tunnel_to_finale" - ], + "joins": [ "parking_lot_to_entrance", "tunnel_to_tunnel", "tunnel_ramp" ], "overmaps": { "parking_lot": { "overmap": "s_lot_no_sidewalk_east", "south": "parking_lot_to_entrance", "connections": { "east": { "connection": "local_road" } } }, - "mine_entrance": { "overmap": "mine_entrance_north", "north": "parking_lot_to_entrance", "below": "surface_to_shaft" }, + "mine_entrance": { "overmap": "mine_entrance_north", "north": "parking_lot_to_entrance" }, "mine_entrance_roof": { "overmap": "mine_entrance_roof_north" }, - "loading_zone": { - "overmap": "mine_entrance_loading_zone_north", - "below": "surface_to_shaft", - "connections": { "north": { "connection": "local_road" } } - }, + "loading_zone": { "overmap": "mine_entrance_loading_zone_north", "connections": { "north": { "connection": "local_road" } } }, "loading_zone_roof": { "overmap": "mine_entrance_loading_zone_roof_north" }, - "shaft_west": { "overmap": "mine_shaft_middle_north", "above": "surface_to_shaft", "below": "shaft_lower_to_shaft_middle" }, - "shaft_east": { "overmap": "mine_shaft_middle_east_north", "above": "surface_to_shaft", "below": "shaft_lower_to_shaft_middle" }, - "tunnels_west": { "overmap": "mine_shaft_lower_north", "above": "shaft_lower_to_shaft_middle", "west": "tunnel_entrance_to_tunnels" }, - "tunnels_east": { "overmap": "mine_shaft_lower_east_north", "above": "shaft_lower_to_shaft_middle" }, - "tunnel_entrance": { "overmap": "mine_tunnel_ew", "east": "tunnel_entrance_to_tunnels", "west": "tunnel_to_tunnel" }, + "shaft_west": { "overmap": "mine_shaft_middle_north" }, + "shaft_east": { "overmap": "mine_shaft_middle_east_north" }, + "tunnels_west": { "overmap": "mine_shaft_lower_north" }, + "tunnels_east": { "overmap": "mine_shaft_lower_east_north" }, + "tunnel_entrance": { "overmap": "mine_tunnel_ew", "west": "tunnel_to_tunnel" }, "tee": { "overmap": "mine_tunnel_nes", "north": "tunnel_to_tunnel", "east": "tunnel_to_tunnel", "south": "tunnel_to_tunnel" }, "cross": { "overmap": "mine_tunnel_nesw", @@ -61,44 +46,9 @@ "straight_tunnel": { "overmap": "mine_tunnel_ns", "north": "tunnel_to_tunnel", "south": "tunnel_to_tunnel" }, "corner": { "overmap": "mine_tunnel_ne", "north": "tunnel_to_tunnel", "east": "tunnel_to_tunnel" }, "dead_end": { "overmap": "mine_tunnel_end_south", "north": "tunnel_to_tunnel" }, - "slope_down_to_-3": { "overmap": "mine_tunnel_end_south", "north": "tunnel_to_tunnel", "below": "-2_to_-3" }, - "-3_tee": { - "overmap": "mine_tunnel_nes", - "north": "-3_tunnel_to_-3_tunnel", - "east": "-3_tunnel_to_-3_tunnel", - "south": "-3_tunnel_to_-3_tunnel" - }, - "-3_cross": { - "overmap": "mine_tunnel_nesw", - "north": "-3_tunnel_to_-3_tunnel", - "east": "-3_tunnel_to_-3_tunnel", - "south": "-3_tunnel_to_-3_tunnel", - "west": "-3_tunnel_to_-3_tunnel" - }, - "-3_straight_tunnel": { "overmap": "mine_tunnel_ns", "north": "-3_tunnel_to_-3_tunnel", "south": "-3_tunnel_to_-3_tunnel" }, - "-3_corner": { "overmap": "mine_tunnel_ne", "north": "-3_tunnel_to_-3_tunnel", "east": "-3_tunnel_to_-3_tunnel" }, - "-3_dead_end": { "overmap": "mine_tunnel_end_south", "north": "-3_tunnel_to_-3_tunnel" }, - "slope_up_to_-2": { "overmap": "mine_tunnel_end_south", "north": "-3_tunnel_to_-3_tunnel", "above": "-2_to_-3" }, - "slope_down_to_-4": { "overmap": "mine_tunnel_end_south", "north": "-3_tunnel_to_-3_tunnel", "below": "-3_to_-4" }, - "-4_tee": { - "overmap": "mine_tunnel_nes", - "north": "-4_tunnel_to_-4_tunnel", - "east": "-4_tunnel_to_-4_tunnel", - "south": "-4_tunnel_to_-4_tunnel" - }, - "-4_cross": { - "overmap": "mine_tunnel_nesw", - "north": "-4_tunnel_to_-4_tunnel", - "east": "-4_tunnel_to_-4_tunnel", - "south": "-4_tunnel_to_-4_tunnel", - "west": "-4_tunnel_to_-4_tunnel" - }, - "-4_straight_tunnel": { "overmap": "mine_tunnel_ns", "north": "-4_tunnel_to_-4_tunnel", "south": "-4_tunnel_to_-4_tunnel" }, - "-4_corner": { "overmap": "mine_tunnel_ne", "north": "-4_tunnel_to_-4_tunnel", "east": "-4_tunnel_to_-4_tunnel" }, - "-4_dead_end": { "overmap": "mine_tunnel_end_south", "north": "-4_tunnel_to_-4_tunnel" }, - "slope_up_to_-3": { "overmap": "mine_tunnel_end_south", "north": "-4_tunnel_to_-4_tunnel", "above": "-3_to_-4" }, - "tunnel_to_finale": { "overmap": "mine_tunnel_ns", "north": "-4_tunnel_to_finale", "south": "-4_tunnel_to_-4_tunnel" }, - "finale": { "overmap": "mine_finale_north", "south": "-4_tunnel_to_finale" } + "ramp_down": { "overmap": "mine_tunnel_end_south", "north": "tunnel_to_tunnel", "below": "tunnel_ramp" }, + "ramp_up": { "overmap": "mine_tunnel_end_south", "north": "tunnel_to_tunnel", "above": "tunnel_ramp" }, + "finale": { "overmap": "mine_finale_north", "south": "tunnel_to_tunnel" } }, "root": "parking_lot", "phases": [ @@ -124,13 +74,7 @@ { "overmap": "corner", "max": { "poisson": 5 } }, { "overmap": "tee", "max": { "poisson": 10 } } ], - [ - { - "name": "-2_to_-3", - "chunk": [ { "overmap": "slope_down_to_-3", "pos": [ 0, 0, -2 ] }, { "overmap": "slope_up_to_-2", "pos": [ 0, 0, -3 ] } ], - "max": 1 - } - ], + [ { "overmap": "ramp_down", "max": 1 } ], [ { "overmap": "dead_end", "weight": 2000 }, { "overmap": "straight_tunnel", "weight": 100 }, @@ -138,43 +82,33 @@ { "overmap": "tee", "weight": 10 }, { "overmap": "cross", "weight": 1 } ], + [ { "overmap": "ramp_up", "max": 1 } ], [ - { "overmap": "-3_straight_tunnel", "max": { "poisson": 20 } }, - { "overmap": "-3_corner", "max": { "poisson": 5 } }, - { "overmap": "-3_tee", "max": { "poisson": 10 } } - ], - [ - { - "name": "-3_to_-4", - "chunk": [ { "overmap": "slope_down_to_-4", "pos": [ 0, 0, -3 ] }, { "overmap": "slope_up_to_-3", "pos": [ 0, 0, -4 ] } ], - "max": 1 - } - ], - [ - { "overmap": "-3_dead_end", "weight": 2000 }, - { "overmap": "-3_straight_tunnel", "weight": 100 }, - { "overmap": "-3_corner", "weight": 100 }, - { "overmap": "-3_tee", "weight": 10 }, - { "overmap": "-3_cross", "weight": 1 } + { "overmap": "straight_tunnel", "max": { "poisson": 20 } }, + { "overmap": "corner", "max": { "poisson": 5 } }, + { "overmap": "tee", "max": { "poisson": 10 } } ], + [ { "overmap": "ramp_down", "max": 1 } ], [ - { "overmap": "-4_straight_tunnel", "max": { "poisson": 20 } }, - { "overmap": "-4_corner", "max": { "poisson": 5 } }, - { "overmap": "-4_tee", "max": { "poisson": 10 } } + { "overmap": "dead_end", "weight": 2000 }, + { "overmap": "straight_tunnel", "weight": 100 }, + { "overmap": "corner", "weight": 100 }, + { "overmap": "tee", "weight": 10 }, + { "overmap": "cross", "weight": 1 } ], + [ { "overmap": "ramp_up", "max": 1 } ], [ - { - "name": "finale", - "chunk": [ { "overmap": "tunnel_to_finale", "pos": [ 0, 0, -4 ] }, { "overmap": "finale", "pos": [ 0, -1, -4 ] } ], - "max": 1 - } + { "overmap": "straight_tunnel", "max": { "poisson": 20 } }, + { "overmap": "corner", "max": { "poisson": 5 } }, + { "overmap": "tee", "max": { "poisson": 10 } } ], + [ { "overmap": "finale", "max": 1 } ], [ - { "overmap": "-4_dead_end", "weight": 2000 }, - { "overmap": "-4_straight_tunnel", "weight": 100 }, - { "overmap": "-4_corner", "weight": 100 }, - { "overmap": "-4_tee", "weight": 10 }, - { "overmap": "-4_cross", "weight": 1 } + { "overmap": "dead_end", "weight": 2000 }, + { "overmap": "straight_tunnel", "weight": 100 }, + { "overmap": "corner", "weight": 100 }, + { "overmap": "tee", "weight": 10 }, + { "overmap": "cross", "weight": 1 } ] ] }