Merge branch 'master' into ruins

2026-01-03 22:16:20 +00:00 · 2021-08-16 13:57:48 +02:00
parent 23bab68039 7abc6445cb
commit fbe3b0c425
19 changed files with 34 additions and 23 deletions
--- a/biomes/.util/ruined_portals.json
+++ b/biomes/.util/ruined_portals.json
@@ -59,6 +59,7 @@
        {
            "name": "standard-underground",
            "chance": 0.2,
+            "mode": "VACUUM",
            "place": [
                "clutter/swordnp2",
                "clutter/swordnp1",
--- a/biomes/savanna/shore/beach.json
+++ b/biomes/savanna/shore/beach.json
@@ -4,13 +4,6 @@
    "rarity": 1,
    "color": "#DF9F39",
    "vanillaDerivative": "SAVANNA",
-    "customDerivitives": [{
-        "id": "savanna_beach",
-        "grassColor": "#E2EF3B",
-        "foliageColor": "#D6A513",
-        "waterColor": "#8DFFE8",
-        "downfallType": "none"
-    }],
    "generators": [{
        "min": 0,
        "max": 0,
--- a/biomes/tropical/rainforest-hills.json
+++ b/biomes/tropical/rainforest-hills.json
@@ -63,16 +63,14 @@
    }],
    "decorators": [
        {
-            "chance": 0.45,
-            "variance": {"style": "IRIS"},
+            "chance": 0.35,
+            "variance": {"style": "IRIS", "fracture": {"style": "STATIC", "multiplier": 3}},
            "zoom": 0.1,
            "palette": [
-                {"block": "minecraft:jungle_leaves"},
                {"block": "minecraft:tall_grass"},
                {"block": "minecraft:grass"},
                {"block": "minecraft:jungle_leaves"},
-                {"block": "minecraft:grass"},
-                {"block": "minecraft:jungle_leaves"}
+                {"block": "minecraft:fern"}
            ],
            "style": {
                "style": "FRACTAL_BILLOW_IRIS",
@@ -94,15 +92,34 @@
            "stackMin": 1
        },
        {
-            "chance": 1.0E-4,
+            "chance": 0.05,
            "verticalZoom": 88,
            "variance": {"style": "STATIC"},
            "stackMax": 1,
-            "zoom": 10,
            "palette": [{"block": "minecraft:jungle_sapling"}],
            "style": {"style": "STATIC"},
            "heightVariance": {"style": "STATIC"},
            "stackMin": 1
+        },
+        {
+            "chance": 0.1,
+            "verticalZoom": 88,
+            "variance": {"style": "STATIC"},
+            "stackMax": 1,
+            "palette": [{"block": "minecraft:fern"}],
+            "style": {"style": "STATIC"},
+            "heightVariance": {"style": "STATIC"},
+            "stackMin": 1
+        },
+        {
+            "chance": 0.1,
+            "verticalZoom": 88,
+            "variance": {"style": "STATIC"},
+            "stackMax": 1,
+            "palette": [{"block": "minecraft:dead_bush"}],
+            "style": {"style": "STATIC"},
+            "heightVariance": {"style": "STATIC"},
+            "stackMin": 1
        }
    ],
    "objects": [
@@ -147,7 +164,7 @@
            ],
            "translate": {
                "x": 0,
-                "y": -5,
+                "y": -1,
                "z": 0
            }
        },
@@ -178,7 +195,7 @@
            ],
            "translate": {
                "x": 0,
-                "y": -5,
+                "y": -1,
                "z": 0
            }
        },
@@ -235,7 +252,7 @@
            }
        },
        {
-            "chance": 0.008,
+            "chance": 0.01,
            "mode": "PAINT",
            "place": [
                "clutter/melons1",
--- a/objects/trees/jungle/cocogeneric2.iob
+++ b/objects/trees/jungle/cocogeneric2.iob
--- a/objects/trees/jungle/cocogeneric3.iob
+++ b/objects/trees/jungle/cocogeneric3.iob
--- a/objects/trees/jungle/cocogeneric4.iob
+++ b/objects/trees/jungle/cocogeneric4.iob
--- a/objects/trees/jungle/cocogeneric5.iob
+++ b/objects/trees/jungle/cocogeneric5.iob
--- a/objects/trees/jungle/lgeneric1.iob
+++ b/objects/trees/jungle/lgeneric1.iob
--- a/objects/trees/jungle/lgeneric3.iob
+++ b/objects/trees/jungle/lgeneric3.iob
--- a/objects/trees/jungle/lgeneric4.iob
+++ b/objects/trees/jungle/lgeneric4.iob
--- a/objects/trees/jungle/lgeneric5.iob
+++ b/objects/trees/jungle/lgeneric5.iob
--- a/objects/trees/jungle/lgeneric7.iob
+++ b/objects/trees/jungle/lgeneric7.iob
--- a/objects/trees/jungle/lgeneric9.iob
+++ b/objects/trees/jungle/lgeneric9.iob
--- a/regions/frozen.json
+++ b/regions/frozen.json
@@ -72,7 +72,7 @@
    ],
    "biomeImplosionRatio": 0.25,
    "riverRarity": 1,
-    "landBiomeZoom": 1.85,
+    "landBiomeZoom": 5,
    "shoreHeightMin": 2.2,
    "shoreHeightMax": 4.2,
    "loot": {
--- a/regions/mushroom.json
+++ b/regions/mushroom.json
@@ -282,7 +282,7 @@
        }
    ],
    "biomeImplosionRatio": 0.25,
-    "landBiomeZoom": 1.85,
+    "landBiomeZoom": 1.8,
    "effects": [
        {
            "particleAltX": 1.0E-5,
--- a/regions/swamp.json
+++ b/regions/swamp.json
@@ -182,7 +182,7 @@
            }
        }
    ],
-    "landBiomeZoom": 1.85,
+    "landBiomeZoom": 3,
    "shoreHeightMin": 0.02,
    "shoreHeightMax": 1.2,
    "loot": {
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -238,7 +238,7 @@
        }
    ],
    "riverRarity": 1,
-    "landBiomeZoom": 5,
+    "landBiomeZoom": 5.5,
    "riverStyle": {
        "style": "GLOB_IRIS_DOUBLE",
        "zoom": 4.925,
--- a/regions/tropical.json
+++ b/regions/tropical.json
@@ -61,7 +61,7 @@
        "tropical/land-cave",
        "tropical/beach"
    ],
-    "landBiomeZoom": 1.85,
+    "landBiomeZoom": 5.5,
    "shoreHeightMin": 3.2,
    "shoreHeightMax": 9.2,
    "loot": {
--- a/regions/tundra.json
+++ b/regions/tundra.json
@@ -55,7 +55,7 @@
        "varience": 2
    }],
    "riverRarity": 1,
-    "landBiomeZoom": 1.85,
+    "landBiomeZoom": 4.5,
    "riverStyle": {
        "style": "VASCULAR",
        "zoom": 4.77,