Merge remote-tracking branch 'origin/master'

entities/brian.json

@@ -0,0 +1,32 @@
+{
+    "type": "EVOKER",
+    "customName": "&dMagic Psychopath",
+    "attributes": [
+        {
+            "attribute": "GENERIC_ARMOR",
+            "maxAmount": 5,
+            "minAmount": 3,
+            "operation": "ADD_NUMBER",
+            "name": "5head"
+        },
+        {
+            "attribute": "GENERIC_MAX_HEALTH",
+            "maxAmount": 21,
+            "minAmount": 19,
+            "operation": "ADD_NUMBER",
+            "name": "6head"
+        }
+    ],
+    "helmet": {
+        "type": "DAMAGED_ANVIL",
+        "displayName": "&dCracked Mind"
+    },
+    "mainHand": {
+        "type": "BLAZE_ROD",
+        "displayName": "&dStrange Wand"
+    },
+    "offHand": {
+        "type": "BLAZE_ROD",
+        "displayName": "&dStrange Wand"
+    }
+}

entities/shroud.json

@@ -31,6 +31,14 @@
             "minAmount": 0.35,
             "name": "Speed of shroud",
             "operation": "MULTIPLY_SCALAR_1"
+        },
+        {
+            "attribute": "GENERIC_MAX_HEALTH",
+            "chance": 1,
+            "maxAmount": 15,
+            "minAmount": 12,
+            "name": "Health of shroud",
+            "operation": "ADD_NUMBER"
         }
     ],
     "helmet": {

regions/frozen.json

@@ -11,6 +11,14 @@
     ],
     "riverRarity": 1,
     "riverThickness": 0.006,
+    "structures": [
+        {
+            "tileset": "soul-temple",
+            "rarity": 12,
+            "zoom": 2,
+            "height": 36
+        }
+    ],
     "effects": [
         {
             "potionEffect": "SLOW_DIGGING",

regions/tundra.json

@@ -22,6 +22,13 @@
     "riverBiomes": [
         "tundra-river"
     ],
+    "structures": [
+        {
+            "tileset": "ruins",
+            "rarity": 87,
+            "zoom": 1
+        }
+    ],
     "riverRarity": 1,
     "riverStyle": {
         "style": "VASCULAR",

structures/ruins.json

@@ -0,0 +1,123 @@
+{
+    "gridHeight": 9,
+    "maxLayers": 1,
+    "bore": false,
+    "wallStyle": {
+        "multiplier": 1,
+        "style": "STATIC",
+        "zoom": 1,
+        "exponent": 1
+    },
+    "tiles": [
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "NEVER",
+            "entitySpawns": [],
+            "placeMode": "PAINT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "NEVER",
+            "objects": [
+                "structure/ruins/cross-1",
+                "structure/ruins/cross-2",
+                "structure/ruins/cross-3"
+            ],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "NEVER",
+            "entitySpawns": [],
+            "placeMode": "PAINT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": [
+                "structure/ruins/t-connect-1",
+                "structure/ruins/t-connect-2"
+            ],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "NEVER",
+            "entitySpawns": [],
+            "placeMode": "PAINT",
+            "south": "REQUIRED",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": [
+                "structure/ruins/hall-1",
+                "structure/ruins/hall-2"
+            ],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "REQUIRED",
+            "entitySpawns": [],
+            "placeMode": "PAINT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": ["structure/ruins/corner-1"],
+            "west": "NEVER",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        },
+        {
+            "ceiling": "AGNOSTIC",
+            "east": "REQUIRED",
+            "entitySpawns": [],
+            "placeMode": "PAINT",
+            "south": "NEVER",
+            "rareObjects": [],
+            "north": "REQUIRED",
+            "objects": ["structure/ruins/room-1"],
+            "west": "REQUIRED",
+            "loot": {
+                "mode": "ADD",
+                "tables": [],
+                "multiplier": 1
+            },
+            "floor": "REQUIRED"
+        }
+    ],
+    "entitySpawns": [],
+    "gridSize": 9,
+    "wallChance": 0.35,
+    "name": "Ruins",
+    "underwater": false,
+    "loot": {
+        "mode": "ADD",
+        "tables": [],
+        "multiplier": 1
+    },
+    "clamp": {
+        "minimumHeight": 0,
+        "maximumHeight": 255
+    },
+    "mergeEdges": false
+}

structures/soul-temple.json

@@ -126,6 +126,6 @@
         "minimumHeight": 0,
         "maximumHeight": 255
     },
-    "bore": true,
+    "bore": false,
     "mergeEdges": false
 }