From 79850524cd12e041e7a47f9e780b12dc5fc823f8 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 12 Aug 2020 05:38:02 -0700 Subject: [PATCH] reworking underwater --- overworld/biomes/hot-ocean-cliffs.json | 150 ++--------- overworld/biomes/hot-ocean.json | 190 ++++++------- overworld/biomes/mushroom-ocean.json | 200 +++++++++----- overworld/biomes/rocky-ocean.json | 235 +++++++++------- overworld/biomes/swamp-ocean.json | 207 +++++++++----- overworld/biomes/temperate-ocean.json | 206 +++++++++----- .../biomes/tropical-coral-ocean-cliffs.json | 32 ++- overworld/biomes/tropical-coral-ocean.json | 10 +- overworld/biomes/tropical-ocean.json | 32 ++- overworld/biomes/tundra-ocean.json | 253 +++++++++--------- overworld/objects/ships/ship-1.iob | Bin 0 -> 30690 bytes overworld/objects/ships/ship-2.iob | Bin 0 -> 31276 bytes overworld/objects/ships/usd-ship-1.iob | Bin 0 -> 20748 bytes overworld/objects/ships/usd-ship-2.iob | Bin 0 -> 16300 bytes overworld/overworld.code-workspace | 14 + 15 files changed, 859 insertions(+), 670 deletions(-) create mode 100644 overworld/objects/ships/ship-1.iob create mode 100644 overworld/objects/ships/ship-2.iob create mode 100644 overworld/objects/ships/usd-ship-1.iob create mode 100644 overworld/objects/ships/usd-ship-2.iob diff --git a/overworld/biomes/hot-ocean-cliffs.json b/overworld/biomes/hot-ocean-cliffs.json index 326859fe..ebde102d 100644 --- a/overworld/biomes/hot-ocean-cliffs.json +++ b/overworld/biomes/hot-ocean-cliffs.json @@ -48,132 +48,30 @@ "objects":[ { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + } + ], "slab": { "dispersion": "SCATTER", diff --git a/overworld/biomes/hot-ocean.json b/overworld/biomes/hot-ocean.json index aa16970b..0eac73fd 100644 --- a/overworld/biomes/hot-ocean.json +++ b/overworld/biomes/hot-ocean.json @@ -68,8 +68,8 @@ "z":0 } }, - { - "chance": 0.1, + { + "chance": 0.01, "density": 1, "underwater": true, "rotation": { @@ -82,116 +82,13 @@ "enabled": true }, "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" ], "translate": { "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, + "y": -4, "z": 0 } } @@ -221,6 +118,81 @@ "children": [ "hot-ocean-cliffs" ], + "decorators": [ + { + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0009, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + } + ], "generators":[ { "generator": "plain", diff --git a/overworld/biomes/mushroom-ocean.json b/overworld/biomes/mushroom-ocean.json index c7ab64c5..2f573403 100644 --- a/overworld/biomes/mushroom-ocean.json +++ b/overworld/biomes/mushroom-ocean.json @@ -51,6 +51,119 @@ "partOf": "SEA_SURFACE", "dispersion": "SCATTER", "variance": "SCATTER" + }, + { + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "wall": @@ -77,66 +190,31 @@ ] }, "objects":[ - { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, + { "chance": 0.1, "density": 1, @@ -167,7 +245,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -201,7 +279,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } diff --git a/overworld/biomes/rocky-ocean.json b/overworld/biomes/rocky-ocean.json index abd2e4ad..293f1605 100644 --- a/overworld/biomes/rocky-ocean.json +++ b/overworld/biomes/rocky-ocean.json @@ -34,100 +34,30 @@ } ], "objects":[ - { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + }, { "chance": 0.1, "density": 1, @@ -158,7 +88,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } @@ -181,6 +111,123 @@ "AIR" ] }, + "decorators": [ + { + + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + } + + ], "generators":[ { "generator": "plain", diff --git a/overworld/biomes/swamp-ocean.json b/overworld/biomes/swamp-ocean.json index d332e5bc..bb90c24a 100644 --- a/overworld/biomes/swamp-ocean.json +++ b/overworld/biomes/swamp-ocean.json @@ -55,7 +55,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -89,78 +89,34 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.05, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + } ], "decorators":[ { @@ -181,6 +137,119 @@ "partOf": "SEA_SURFACE", "dispersion": "SCATTER", "variance": "SCATTER" + }, + { + "zoom": 20, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "wall": diff --git a/overworld/biomes/temperate-ocean.json b/overworld/biomes/temperate-ocean.json index c0cc9280..402a26ee 100644 --- a/overworld/biomes/temperate-ocean.json +++ b/overworld/biomes/temperate-ocean.json @@ -55,44 +55,11 @@ ], "translate": { "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, + "y": -3, "z": 0 } }, + { "chance": 0.1, "density": 1, @@ -123,44 +90,35 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.01, + "underwater": true, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -4, + "z": 0 + } + } + ], "generators":[ { @@ -172,12 +130,116 @@ "decorators":[ { "zoom": 20, - "chance": 0.2, + "chance": 0.07, "palette": [ "SEAGRASS" ], - "dispersion": "WISPY", - "variance": "WISPY" + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "slab": { diff --git a/overworld/biomes/tropical-coral-ocean-cliffs.json b/overworld/biomes/tropical-coral-ocean-cliffs.json index bb399d8c..ced1ce1f 100644 --- a/overworld/biomes/tropical-coral-ocean-cliffs.json +++ b/overworld/biomes/tropical-coral-ocean-cliffs.json @@ -81,7 +81,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -115,7 +115,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -149,7 +149,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -183,13 +183,37 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } ], "childShrinkFactor": 1.1, "decorators":[ + { + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, { "zoom": 1, "chance": 0.05, diff --git a/overworld/biomes/tropical-coral-ocean.json b/overworld/biomes/tropical-coral-ocean.json index 488199f9..84a46e96 100644 --- a/overworld/biomes/tropical-coral-ocean.json +++ b/overworld/biomes/tropical-coral-ocean.json @@ -61,7 +61,7 @@ "objects":[ { - "chance": 0.1, + "chance": 0.2, "density": 1, "underwater": true, "rotation": { @@ -86,7 +86,7 @@ } }, { - "chance": 0.1, + "chance": 0.2, "density": 1, "edit":[ { @@ -120,7 +120,7 @@ } }, { - "chance": 0.1, + "chance": 0.2, "density": 1, "edit":[ { @@ -154,7 +154,7 @@ } }, { - "chance": 0.1, + "chance": 0.2, "density": 1, "edit":[ { @@ -192,7 +192,7 @@ "decorators":[ { "zoom": 1, - "chance": 0.05, + "chance": 0.1, "stackMin": 1, "stackMax": 3, "palette": [ diff --git a/overworld/biomes/tropical-ocean.json b/overworld/biomes/tropical-ocean.json index 03018a47..9c123165 100644 --- a/overworld/biomes/tropical-ocean.json +++ b/overworld/biomes/tropical-ocean.json @@ -33,6 +33,30 @@ } ], "objects": [ + { + "chance": 0.01, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + }, { "chance": 0.1, "density": 1, @@ -54,7 +78,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -88,7 +112,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -122,7 +146,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } }, @@ -156,7 +180,7 @@ ], "translate": { "x": 0, - "y": 0, + "y": -3, "z": 0 } } diff --git a/overworld/biomes/tundra-ocean.json b/overworld/biomes/tundra-ocean.json index 3d9e581b..c57fe002 100644 --- a/overworld/biomes/tundra-ocean.json +++ b/overworld/biomes/tundra-ocean.json @@ -35,132 +35,29 @@ "objects":[ { - "chance": 0.1, - "density": 1, - "underwater": true, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"fire_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"brain_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"brain_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"bubble_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "chance": 0.1, - "density": 1, - "edit":[ - { - "find":"horn_coral_block", - "replace":"bubble_coral_block" - }, - { - "find":"tube_coral_block", - "replace":"fire_coral_block" - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "coral-rgb/coral-by-1", - "coral-rgb/coral-by-2", - "coral-rgb/coral-by-3", - "coral-rgb/coral-by-4" - ], - "translate": { - "x": 0, - "y": 0, - "z": 0 - } - } + "chance": 0.05, + "density": 1, + "underwater": true, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ships/swreck-1", + "ships/usd-ship-1", + "ships/usd-ship-2" + ], + "translate": { + "x": 0, + "y": -2, + "z": 0 + } + } ], "children": [ "rocky-ocean" @@ -193,6 +90,110 @@ ], "dispersion": "SCATTER", "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.0006, + "palette": [ + "SOUL_SAND", + "MAGMA_BLOCK" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 5, + "chance": 0.07, + "palette": [ + "SEAGRASS" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 24, + "stackMin": 2, + "chance": 0.013, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "WISPY", + "verticalZoom": 88, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "stackMax": 9, + "stackMin": 1, + "chance": 0.125, + "palette": [ + "KELP_PLANT" + ], + "verticalVarience": "SCATTER", + "verticalZoom": 20, + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "TUBE_CORAL", + "TUBE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BRAIN_CORAL", + "BRAIN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "BUBBLE_CORAL", + "BUBBLE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "FIRE_CORAL", + "FIRE_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.05, + "palette": [ + "HORN_CORAL", + "HORN_CORAL_FAN" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" + }, + { + "zoom": 1, + "chance": 0.001, + "palette": [ + "minecraft:sea_pickle[pickles=1,waterlogged=true]" + ], + "dispersion": "SCATTER", + "variance": "SCATTER" } ], "generators":[ diff --git a/overworld/objects/ships/ship-1.iob b/overworld/objects/ships/ship-1.iob new file mode 100644 index 0000000000000000000000000000000000000000..c3ca45a74a29643b9b96997f803d42d0a05618c8 GIT binary patch literal 30690 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 literal 0 HcmV?d00001 diff --git a/overworld/objects/ships/ship-2.iob b/overworld/objects/ships/ship-2.iob new file mode 100644 index 0000000000000000000000000000000000000000..91457d6bd2336e5fedd0e9d85b984a188f0e8c87 GIT binary patch literal 31276 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 literal 0 HcmV?d00001 diff --git a/overworld/objects/ships/usd-ship-1.iob b/overworld/objects/ships/usd-ship-1.iob new file mode 100644 index 0000000000000000000000000000000000000000..6062187272e0a3925af0f9ebabdf4fabd83166e5 GIT binary patch literal 20748 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 literal 0 HcmV?d00001 diff --git a/overworld/objects/ships/usd-ship-2.iob b/overworld/objects/ships/usd-ship-2.iob new file mode 100644 index 0000000000000000000000000000000000000000..e99622673df9f3095a330bf9d0e752b1a92bb561 GIT binary patch literal 16300 zcmcIr+in|23>{gLFUo6yw*O%C16ueCTC`}JhXRHXY+U(*I96aONYd}Fbz4c>b10{4 zC40ED!fb#5LJo&>A$iE*PC^LZh7bn$`&|f~zd|=0;P*FgZ|{ef582h^$5Hm?)w{dw z{>>PO#(JS6$8{a-z`;5Wc8J+R_1BFC0h=ZYQyR=tvB1 zCo#C4#Nc)kgWE|AF`_V7Ut$67igE5~m!1)Q+VF9;8mwgvOgX@(3kYmnfg&&PM`}Qb zVY`k1rZ_Z#m%Bc8HN3wZo-?$zVRL#vdYIfi{T`3r|Nr}|06XOoeU3FazccyAivp1Y z0XM$OBae!2(vdSKHVjUwo3kOO80mIIM3Gn(Mq*VM5rvUAJD%0ao1TENU?=<`tv-2p zKYTK}{fxIc$xy7@$WUR6+9ktko$#kzvhjOUN9E=aB%xPqyz?Ywx&q|Qjr0JGAzjOH z9R~{&;Y8**cVI*0Fkx19!hc8_5E_;1G`Ggw?Yn88#nY9N;Rqu`z zt1wcm!bq_SBgHDL4{llebk#KQSxdUsJu-n`zBsj=``ohtjw<*tAxPizITn10H%f+6 z=XzvV;%fx>R9e!KrC5z|RJYpW3UZXf<{C44>Ut;67KAGR90DopexpRSnT<`S>C&?Q zepeh)qMCMQn8Svo%awPKWIR`Zck)%Wd66JAM%q*3NNua+_h3?=nvv9}FjAkwNPP+; z^(l-zP1%*DTw;|dG@$aQl8-NMaDD&WTC+>vspYdVT5Wg3 z>XepzRb*FTI^#NpE#UG!5e&SP3e0#=VdO!D%`}FU1dP+Mk4Y&|Sqc;+6@`&h6gD-? zO+BU4#h1r8^q%j^O`9}*&`<814(6*7Ao1nNNs82$R~rRO(ijO$jU$06j0C1I5}3l+ zs#F-GM`0|56hX%dFx7Il;8bKiB#fQTwL15-nK$2)FAD{CUG zRg)0tLff3_M)?ESO<|}wyZEqEO>7GXTY@w7IE~GnaqJi>ov5fK#>!ZYV@6OIGeX~I zrPAMG3AmWHqLoFl+6NO!-*KE`3g7Cd4J(bEE5Pt~1(;{l`k0>-#=NF5-m8~> zY?b~I8(WAhp0ZmqHP?#bu8U4*H3!Zej1{aNr?D0Gp~mG7#y;Yq48x-ihTnS3kEr?Q%^Um zS6SLJZU-|kx7q<&J-v~qC}<9yRPd}vWIv<7h(c=zgrHIZn4Zk$3Xm2T)pUY1LCkge z(tV<7kwy8UrGg)?NTAzo0&hDH@vnN&M@z4>XF8SLkVx4<*LH&dQ}MzN?S_GY+Y(i# zHa8P`dab-sCfADQNDmRC&4MYr5YWk2VNAXX<0V63GY4boe&n00^nlpt4Bog-jv z?+P$?tNrjzlERqHT*b_0={L-e`eI3l!VP?)o!$f^eD0fX4{~K!V(ysFc*7MS3wQ!{ z^J&8jYnZ`pYL~|mm*_XB9bAWEy^?rNR^Z3-{6AgbXb&6#yjx?)yBZkx$G+q25%-MR zW5H~EXsR$4+v!)sr-{dY9&h|H7jJ0fE><7`wL`j*HV7=XHUT$p?qd+sTAgZg2U{BE z22#12*g#t01YDI(V{?r{+db5k2_&5}HJC^4ei~7Q8e6_!?RyoR~_TrH$ri zK1q}&i!BbULYzrXx2}mfB~~ z+v$W8L7D9GDvVuTg|W+fB2O6kgY54L@a4bK&en-Lm~4LHyG`k;v2MecnZ5>2XrTpDBfu9f>DR@# zF?wD9Ffn@qU_$2B^y^w6p$*dJR_4#dDw%c@t0cp>ahz>vCEsd?)HU0?H);tq?}$WQ&4iP{{h)us_Fm$ literal 0 HcmV?d00001 diff --git a/overworld/overworld.code-workspace b/overworld/overworld.code-workspace index cbacc978..5fd694fe 100644 --- a/overworld/overworld.code-workspace +++ b/overworld/overworld.code-workspace @@ -1465,6 +1465,7 @@ "ENTITY_PARROT_IMITATE_MAGMA_CUBE", "ENTITY_PARROT_IMITATE_PHANTOM", "ENTITY_PARROT_IMITATE_PIGLIN", + "ENTITY_PARROT_IMITATE_PIGLIN_BRUTE", "ENTITY_PARROT_IMITATE_PILLAGER", "ENTITY_PARROT_IMITATE_RAVAGER", "ENTITY_PARROT_IMITATE_SHULKER", @@ -1491,6 +1492,12 @@ "ENTITY_PIGLIN_ADMIRING_ITEM", "ENTITY_PIGLIN_AMBIENT", "ENTITY_PIGLIN_ANGRY", + "ENTITY_PIGLIN_BRUTE_AMBIENT", + "ENTITY_PIGLIN_BRUTE_ANGRY", + "ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED", + "ENTITY_PIGLIN_BRUTE_DEATH", + "ENTITY_PIGLIN_BRUTE_HURT", + "ENTITY_PIGLIN_BRUTE_STEP", "ENTITY_PIGLIN_CELEBRATE", "ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED", "ENTITY_PIGLIN_DEATH", @@ -3331,6 +3338,7 @@ "ENTITY_PARROT_IMITATE_MAGMA_CUBE", "ENTITY_PARROT_IMITATE_PHANTOM", "ENTITY_PARROT_IMITATE_PIGLIN", + "ENTITY_PARROT_IMITATE_PIGLIN_BRUTE", "ENTITY_PARROT_IMITATE_PILLAGER", "ENTITY_PARROT_IMITATE_RAVAGER", "ENTITY_PARROT_IMITATE_SHULKER", @@ -3357,6 +3365,12 @@ "ENTITY_PIGLIN_ADMIRING_ITEM", "ENTITY_PIGLIN_AMBIENT", "ENTITY_PIGLIN_ANGRY", + "ENTITY_PIGLIN_BRUTE_AMBIENT", + "ENTITY_PIGLIN_BRUTE_ANGRY", + "ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED", + "ENTITY_PIGLIN_BRUTE_DEATH", + "ENTITY_PIGLIN_BRUTE_HURT", + "ENTITY_PIGLIN_BRUTE_STEP", "ENTITY_PIGLIN_CELEBRATE", "ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED", "ENTITY_PIGLIN_DEATH",