diff --git a/biomes/beach.json b/biomes/beach.json index b4336de3..61b3036c 100644 --- a/biomes/beach.json +++ b/biomes/beach.json @@ -13,8 +13,15 @@ "CLAY", "GRAVEL" ], + "rock": [ + "SANDSTONE" + ], + "scatter":[ + "DEAD_BUSH=0.008" + ], "objects": [ - "tree/palm/medium=0.75", - "tree/palm/small=1.88" + "tree/palm/medium=0.5", + "tree/palm/small=0.4" + ] } \ No newline at end of file diff --git a/biomes/desert.json b/biomes/desert.json index 745268c4..b3050bad 100644 --- a/biomes/desert.json +++ b/biomes/desert.json @@ -17,10 +17,6 @@ "DEAD_BUSH=0.008" ], "objects": [ - "colossal/dead/massive=0.00023", - "bones/medium=0.005", - "tree/spruce/dead/medium=0.005", - "boulder/stone/medium=0.001", - "/colossal/dead/supermassive=0.0001" - ] + "tree/colossal/dead/massive=0.001", + "tree/colossal/dead/superlarge=0.001" ] } \ No newline at end of file diff --git a/biomes/desert_hills.json b/biomes/desert_hills.json index 46f5ad81..56955ff4 100644 --- a/biomes/desert_hills.json +++ b/biomes/desert_hills.json @@ -20,10 +20,8 @@ "DEAD_BUSH=0.005" ], "objects": [ - "colossal/dead/massive=0.00023", - "bones/medium=0.005", - "tree/spruce/dead/medium=0.005", - "boulder/stone/medium=0.001", - "/colossal/dead/supermassive=0.0001" + "tree/colossal/dead/massive=0.001", + "tree/colossal/dead/superlarge=0.001" + ] } \ No newline at end of file diff --git a/biomes/desert_red.json b/biomes/desert_red.json index 96dbc5e3..ee19cbb9 100644 --- a/biomes/desert_red.json +++ b/biomes/desert_red.json @@ -19,10 +19,7 @@ "DEAD_BUSH=0.008" ], "objects": [ - "colossal/dead/massive=0.00043", - "bones/medium=0.005", - "tree/spruce/dead/medium=0.005", - "boulder/stone/medium=0.001", - "/colossal/dead/supermassive=0.0001" + "tree/colossal/dead/massive=0.001", + "tree/colossal/dead/superlarge=0.001" ] } \ No newline at end of file diff --git a/biomes/forest.json b/biomes/forest.json index f49cea69..ac7cc8a4 100644 --- a/biomes/forest.json +++ b/biomes/forest.json @@ -9,12 +9,7 @@ "LONG_GRASS:2=0.13" ], "objects": [ - "tree/oak/medium=0.83", - "tree/oak/small=3.2", - "colossal/oak/massive=0.001", - "colossal/oak/superlarge=0.0004", - "colossal/oak/supermassive=0.0001", - "tree/fantasyoak/large=0.18", - "tree/fantasyoak/medium=0.18" + "tree/oak/medium=0.2", + "tree/oak/small=0.2" ] } \ No newline at end of file diff --git a/biomes/forest_birch.json b/biomes/forest_birch.json index 8e1987c9..d4c94c29 100644 --- a/biomes/forest_birch.json +++ b/biomes/forest_birch.json @@ -10,8 +10,9 @@ "LONG_GRASS:2=0.13" ], "objects": [ - "tree/birch/medium=0.63", - "tree/birch/large=0.32", - "tree/birch/small=3.2" + "tree/birch/large=0.2", + "tree/birch/medium=0.3", + "tree/birch/small=0.3", + "house/rustic/medium=0.005" ] } \ No newline at end of file diff --git a/biomes/forest_birch_hills.json b/biomes/forest_birch_hills.json index 9e0c136c..e8cb4721 100644 --- a/biomes/forest_birch_hills.json +++ b/biomes/forest_birch_hills.json @@ -12,8 +12,10 @@ "LONG_GRASS:2=0.13" ], "objects": [ - "tree/birch/medium=0.63", - "tree/birch/large=0.32", - "tree/birch/small=3.2" + "tree/birch/large=0.2", + "tree/birch/medium=0.3", + "tree/birch/small=0.3", + "house/rustic/medium=0.005" + ] } \ No newline at end of file diff --git a/biomes/forest_dark.json b/biomes/forest_dark.json index b1cf7fac..d61997c2 100644 --- a/biomes/forest_dark.json +++ b/biomes/forest_dark.json @@ -10,8 +10,8 @@ "LONG_GRASS:2=0.13" ], "objects":[ - "tree/darkoak/small=2.8", - "tree/darkoak/medium=0.8", - "tree/darkoak/large=0.1" + "tree/darkoak/small=0.2", + "tree/darkoak/medium=0.25", + "tree/darkoak/large=0.35" ] } \ No newline at end of file diff --git a/biomes/forest_haunted.json b/biomes/forest_haunted.json index e101b589..0c0911eb 100644 --- a/biomes/forest_haunted.json +++ b/biomes/forest_haunted.json @@ -26,11 +26,11 @@ ], "surfaceType": "simplex", "objects": [ - "colossal/dead/fallen/massive=0.0005", - "colossal/dead/massive=0.0007", - "colossal/dead/tainted/massive=0.0007", - "colossal/dead/superlarge=0.0006", - "colossal/dead/wilted/supermassive=0.0004", - "colossal/dead/supermassive=0.0005" + "house/norms/medium=0.007", + "tree/fantasyoak/large=0.02", + "tree/fantasyoak/medium=0.2", + "tree/darkoak/small=0.2", + "tree/darkoak/medium=0.25", + "tree/darkoak/large=0.35" ] } \ No newline at end of file diff --git a/biomes/forest_hills.json b/biomes/forest_hills.json index 1a2955af..4cbeffd9 100644 --- a/biomes/forest_hills.json +++ b/biomes/forest_hills.json @@ -12,12 +12,7 @@ "LONG_GRASS:2=0.13" ], "objects": [ - "tree/oak/medium=0.83", - "tree/oak/small=2.8", - "colossal/oak/massive=0.001", - "colossal/oak/superlarge=0.0004", - "colossal/oak/supermassive=0.0001", - "tree/fantasyoak/large=0.18", - "tree/fantasyoak/medium=0.18" + "tree/oak/medium=0.2", + "tree/oak/small=0.2" ] } \ No newline at end of file diff --git a/biomes/forest_mountains.json b/biomes/forest_mountains.json index 3d11c007..2ea2d1b2 100644 --- a/biomes/forest_mountains.json +++ b/biomes/forest_mountains.json @@ -17,8 +17,7 @@ "LONG_GRASS:2=0.13" ], "objects": [ - "tree/spruce/medium=0.67", - "tree/spruce/small=2.7", - "tree/spruce/dead/medium=0.09" + "tree/oak/medium=0.2", + "tree/oak/small=0.2" ] } \ No newline at end of file diff --git a/biomes/frozen_beach.json b/biomes/frozen_beach.json new file mode 100644 index 00000000..91253cd4 --- /dev/null +++ b/biomes/frozen_beach.json @@ -0,0 +1,17 @@ +{ + "name": "Frozen Beach", + "derivative": "COLD_BEACH", + "type": "FRONT", + "height": 0, + "snow": 0.5, + "surface": [ + "PACKED_ICE" + ], + "subSurface": [ + "SAND", + "SAND", + "SAND", + "CLAY", + "GRAVEL" + ] +} \ No newline at end of file diff --git a/biomes/ice_forest.json b/biomes/ice_forest.json index 3986ef9c..35ae9cd7 100644 --- a/biomes/ice_forest.json +++ b/biomes/ice_forest.json @@ -14,11 +14,8 @@ "PACKED_ICE" ], "objects": [ - "tree/spruce/medium=0.87", - "tree/spruce/small=3.7", - "tree/spruce/dead/medium=0.01", - "tree/evergreen/large=0.17", - "tree/evergreen/medium=0.22", - "mushroom/ice=0.03" + "tree/evergreen/large=0.2", + "tree/evergreen/medium=0.4", + "mushroom/ice=0.05" ] } \ No newline at end of file diff --git a/biomes/ice_mountains.json b/biomes/ice_mountains.json index e40df6fd..5bb9a004 100644 --- a/biomes/ice_mountains.json +++ b/biomes/ice_mountains.json @@ -24,11 +24,9 @@ "PACKED_ICE" ], "objects": [ - "tree/spruce/medium=0.57", - "tree/spruce/small=1.7", - "tree/spruce/dead/medium=0.01", - "tree/evergreen/large=0.07", - "tree/evergreen/medium=0.37", - "mushroom/ice=0.03" + "tree/evergreen/large=0.2", + "tree/evergreen/medium=0.4", + "mushroom/ice=0.05", + "spire/small=0.01" ] } \ No newline at end of file diff --git a/biomes/ice_plains.json b/biomes/ice_plains.json index ef73af9e..dbd34e9e 100644 --- a/biomes/ice_plains.json +++ b/biomes/ice_plains.json @@ -12,5 +12,10 @@ ], "subSurface": [ "PACKED_ICE" + ], + "objects": [ + "spire/small=0.07", + "spire/medium=0.07" + ] } \ No newline at end of file diff --git a/biomes/ice_plains_mushrooms.json b/biomes/ice_plains_mushrooms.json new file mode 100644 index 00000000..bccd6243 --- /dev/null +++ b/biomes/ice_plains_mushrooms.json @@ -0,0 +1,23 @@ +{ + "name": "Ice Plains Mushrooms", + "derivative": "ICE_FLATS", + "type": "LAND", + "region": "snowy", + "height": 0, + "rarity": 2, + "genAmplifier": 0.1, + "snow": 0.74, + "parent": "Ice Plains", + "surface": [ + "SNOW_BLOCK" + ], + "subSurface": [ + "PACKED_ICE" + ], + "objects": [ + "mushroom/ice=0.15", + "spire/small=0.07", + "spire/medium=0.07" + + ] +} \ No newline at end of file diff --git a/biomes/jungle.json b/biomes/jungle.json index 57ac6fd3..759fc91c 100644 --- a/biomes/jungle.json +++ b/biomes/jungle.json @@ -10,8 +10,7 @@ "LONG_GRASS:2=0.13" ], "objects": [ - "colossal/jungle/massive=0.0001", - "tree/jungle/medium=0.67", - "tree/palm/small=1.63" + "tree/jungle/medium=0.9", + "clutt=0.9" ] } \ No newline at end of file diff --git a/biomes/jungle_hills.json b/biomes/jungle_hills.json index e85ea6ea..82c4bc44 100644 --- a/biomes/jungle_hills.json +++ b/biomes/jungle_hills.json @@ -12,8 +12,7 @@ "LONG_GRASS:2=0.02" ], "objects": [ - "colossal/jungle/massive=0.0001", - "tree/jungle/medium=0.67", - "tree/palm/small=1.63" + "tree/jungle/medium=0.9", + "clutt=0.9" ] } \ No newline at end of file diff --git a/biomes/plains.json b/biomes/plains.json index 6e65cd8c..b5860e0d 100644 --- a/biomes/plains.json +++ b/biomes/plains.json @@ -10,9 +10,6 @@ "LONG_GRASS:2=0.09" ], "objects": [ - "colossal/blossom/massive=0.0008", - "colossal/blossom/supermassive=0.00011", - "colossal/blossom/superlarge=0.00054", - "house/rustic/medium=0.001" + ] } \ No newline at end of file diff --git a/biomes/redwood_forest.json b/biomes/redwood_forest.json index 1d2be832..f784f183 100644 --- a/biomes/redwood_forest.json +++ b/biomes/redwood_forest.json @@ -15,10 +15,6 @@ "LONG_GRASS:2=0.07" ], "objects": [ - "tree/spruce/medium=0.87", - "tree/spruce/small=3.7", - "tree/spruce/dead/medium=0.01", - "tree/evergreen/large=0.17", - "tree/evergreen/medium=0.22" + ] } \ No newline at end of file diff --git a/biomes/redwood_forest_hills.json b/biomes/redwood_forest_hills.json index 7eb23804..860ec2bd 100644 --- a/biomes/redwood_forest_hills.json +++ b/biomes/redwood_forest_hills.json @@ -17,10 +17,6 @@ "LONG_GRASS:2=0.07" ], "objects": [ - "tree/spruce/medium=0.87", - "tree/spruce/small=3.7", - "tree/spruce/dead/medium=0.01", - "tree/evergreen/large=0.27", - "tree/evergreen/medium=0.32" + ] } \ No newline at end of file diff --git a/biomes/sakura.json b/biomes/sakura.json index 11c4b28e..d1e3cec0 100644 --- a/biomes/sakura.json +++ b/biomes/sakura.json @@ -1,5 +1,5 @@ { - "name": "Sakura", + "name": "Serrulata", "region": "temperate", "derivative": "MUTATED_PLAINS", "type": "LAND", @@ -16,6 +16,6 @@ "tree/serrulata/nobleed/medium=0.09", "tree/serrulata/sakura/medium=0.09", "tree/serrulata/bleeding/large=0.09", - "house/rustic/Jap/medium=0.01" + "house/Jap/medium=0.01" ] } \ No newline at end of file diff --git a/biomes/savanna.json b/biomes/savanna.json index 3da97817..a57f349e 100644 --- a/biomes/savanna.json +++ b/biomes/savanna.json @@ -9,9 +9,6 @@ "LONG_GRASS:1=0.18" ], "objects":[ - "colossal/dead/massive=0.001", - "colossal/dead/superlarge=0.0005", - "colossal/dead/supermassive=0.0001", - "colossal/dead/fallen/massive=0.001" + ] } \ No newline at end of file diff --git a/biomes/savanna_hills.json b/biomes/savanna_hills.json index 65d0c3da..d4947090 100644 --- a/biomes/savanna_hills.json +++ b/biomes/savanna_hills.json @@ -9,5 +9,8 @@ "genScale": 1.25, "scatter":[ "LONG_GRASS:1=0.18" + ], + "objects": [ + ] } \ No newline at end of file diff --git a/biomes/swamp.json b/biomes/swamp.json index ed5a8bbb..2713ed3c 100644 --- a/biomes/swamp.json +++ b/biomes/swamp.json @@ -9,5 +9,8 @@ "scatter":[ "LONG_GRASS:1=0.04", "LONG_GRASS:2=0.03" + ], + "objects": [ + ] } \ No newline at end of file diff --git a/biomes/taiga.json b/biomes/taiga.json index b0cab09c..74e9eb60 100644 --- a/biomes/taiga.json +++ b/biomes/taiga.json @@ -8,8 +8,6 @@ "LONG_GRASS:2=0.07" ], "objects": [ - "tree/spruce/medium=0.27", - "tree/spruce/small=1.7", - "tree/spruce/dead/medium=0.39" + ] } \ No newline at end of file diff --git a/biomes/taiga_cold.json b/biomes/taiga_cold.json index f89d4f25..32ffbbc7 100644 --- a/biomes/taiga_cold.json +++ b/biomes/taiga_cold.json @@ -9,8 +9,8 @@ "LONG_GRASS:2=0.04" ], "objects": [ - "tree/spruce/medium=0.27", - "tree/spruce/small=1.7", - "tree/spruce/dead/medium=0.39" + ] -} \ No newline at end of file +} + + diff --git a/biomes/taiga_cold_hills.json b/biomes/taiga_cold_hills.json index 7878cd92..779f8c07 100644 --- a/biomes/taiga_cold_hills.json +++ b/biomes/taiga_cold_hills.json @@ -11,8 +11,6 @@ "LONG_GRASS:2=0.04" ], "objects": [ - "tree/spruce/medium=0.27", - "tree/spruce/small=1.7", - "tree/spruce/dead/medium=0.39" + ] } \ No newline at end of file diff --git a/dimensions/overworld.json b/dimensions/overworld.json index 3e96c410..2473e107 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -39,6 +39,8 @@ "ice_mountains", "redwood_forest", "redwood_forest_hills", + "ice_plains_mushrooms", + "frozen_beach", "beach", "sakura", "tourmaline" diff --git a/objects/clutt/JClutter1.ish b/objects/clutt/JClutter1.ish new file mode 100644 index 00000000..99a5abc5 Binary files /dev/null and b/objects/clutt/JClutter1.ish differ diff --git a/objects/clutt/JClutter10.ish b/objects/clutt/JClutter10.ish new file mode 100644 index 00000000..8e0005fd Binary files /dev/null and b/objects/clutt/JClutter10.ish differ diff --git a/objects/clutt/JClutter11.ish b/objects/clutt/JClutter11.ish new file mode 100644 index 00000000..1729fe1c Binary files /dev/null and b/objects/clutt/JClutter11.ish differ diff --git a/objects/clutt/JClutter12.ish b/objects/clutt/JClutter12.ish new file mode 100644 index 00000000..e1a06fb6 Binary files /dev/null and b/objects/clutt/JClutter12.ish differ diff --git a/objects/clutt/JClutter13.ish b/objects/clutt/JClutter13.ish new file mode 100644 index 00000000..93be5f2b Binary files /dev/null and b/objects/clutt/JClutter13.ish differ diff --git a/objects/clutt/JClutter2.ish b/objects/clutt/JClutter2.ish new file mode 100644 index 00000000..c35e589a Binary files /dev/null and b/objects/clutt/JClutter2.ish differ diff --git a/objects/clutt/JClutter3.ish b/objects/clutt/JClutter3.ish new file mode 100644 index 00000000..f2591183 Binary files /dev/null and b/objects/clutt/JClutter3.ish differ diff --git a/objects/clutt/JClutter4.ish b/objects/clutt/JClutter4.ish new file mode 100644 index 00000000..b308121b Binary files /dev/null and b/objects/clutt/JClutter4.ish differ diff --git a/objects/clutt/JClutter5.ish b/objects/clutt/JClutter5.ish new file mode 100644 index 00000000..ad820788 Binary files /dev/null and b/objects/clutt/JClutter5.ish differ diff --git a/objects/clutt/JClutter6.ish b/objects/clutt/JClutter6.ish new file mode 100644 index 00000000..da283e21 Binary files /dev/null and b/objects/clutt/JClutter6.ish differ diff --git a/objects/clutt/JClutter7.ish b/objects/clutt/JClutter7.ish new file mode 100644 index 00000000..dc480dbe Binary files /dev/null and b/objects/clutt/JClutter7.ish differ diff --git a/objects/clutt/JClutter8.ish b/objects/clutt/JClutter8.ish new file mode 100644 index 00000000..c2c35764 Binary files /dev/null and b/objects/clutt/JClutter8.ish differ diff --git a/objects/clutt/JClutter9.ish b/objects/clutt/JClutter9.ish new file mode 100644 index 00000000..e8876b1e Binary files /dev/null and b/objects/clutt/JClutter9.ish differ diff --git a/objects/clutt/Jstone1.ish b/objects/clutt/Jstone1.ish new file mode 100644 index 00000000..4f6ef90f Binary files /dev/null and b/objects/clutt/Jstone1.ish differ diff --git a/objects/clutt/Jstone2.ish b/objects/clutt/Jstone2.ish new file mode 100644 index 00000000..d03beb77 Binary files /dev/null and b/objects/clutt/Jstone2.ish differ diff --git a/objects/colossal/blossom/fallen/blossom1.ish b/objects/colossal/blossom/fallen/blossom1.ish deleted file mode 100644 index ca743657..00000000 Binary files a/objects/colossal/blossom/fallen/blossom1.ish and /dev/null differ diff --git a/objects/colossal/blossom/massive/blossom1.ish b/objects/colossal/blossom/massive/blossom1.ish deleted file mode 100644 index 15aff3e5..00000000 Binary files a/objects/colossal/blossom/massive/blossom1.ish and /dev/null differ diff --git a/objects/colossal/blossom/massive/blossom2.ish b/objects/colossal/blossom/massive/blossom2.ish deleted file mode 100644 index 3ccf0fa5..00000000 Binary files a/objects/colossal/blossom/massive/blossom2.ish and /dev/null differ diff --git a/objects/colossal/blossom/massive/blossom3.ish b/objects/colossal/blossom/massive/blossom3.ish deleted file mode 100644 index 5664865f..00000000 Binary files a/objects/colossal/blossom/massive/blossom3.ish and /dev/null differ diff --git a/objects/colossal/blossom/superlarge/blossom1.ish b/objects/colossal/blossom/superlarge/blossom1.ish deleted file mode 100644 index 56b17321..00000000 Binary files a/objects/colossal/blossom/superlarge/blossom1.ish and /dev/null differ diff --git a/objects/colossal/blossom/supermassive/blossom1.ish b/objects/colossal/blossom/supermassive/blossom1.ish deleted file mode 100644 index 62086dc6..00000000 Binary files a/objects/colossal/blossom/supermassive/blossom1.ish and /dev/null differ diff --git a/objects/colossal/blossom/tainted/blossom1.ish b/objects/colossal/blossom/tainted/blossom1.ish deleted file mode 100644 index f2b4e4fc..00000000 Binary files a/objects/colossal/blossom/tainted/blossom1.ish and /dev/null differ diff --git a/objects/colossal/blossom/wilted/supermassive/blossom1.ish b/objects/colossal/blossom/wilted/supermassive/blossom1.ish deleted file mode 100644 index 34cff1c7..00000000 Binary files a/objects/colossal/blossom/wilted/supermassive/blossom1.ish and /dev/null differ diff --git a/objects/colossal/bonsai/massive/bonsai1.ish b/objects/colossal/bonsai/massive/bonsai1.ish deleted file mode 100644 index a39c2ed0..00000000 Binary files a/objects/colossal/bonsai/massive/bonsai1.ish and /dev/null differ diff --git a/objects/colossal/bonsai/massive/bonsai2.ish b/objects/colossal/bonsai/massive/bonsai2.ish deleted file mode 100644 index 28f06ffb..00000000 Binary files a/objects/colossal/bonsai/massive/bonsai2.ish and /dev/null differ diff --git a/objects/colossal/bonsai/massive/bonsai3.ish b/objects/colossal/bonsai/massive/bonsai3.ish deleted file mode 100644 index 0b0e5b8d..00000000 Binary files a/objects/colossal/bonsai/massive/bonsai3.ish and /dev/null differ diff --git a/objects/colossal/dead/fallen/massive/dead1.ish b/objects/colossal/dead/fallen/massive/dead1.ish deleted file mode 100644 index 8fb4961d..00000000 Binary files a/objects/colossal/dead/fallen/massive/dead1.ish and /dev/null differ diff --git a/objects/colossal/dead/massive/flags.ifl b/objects/colossal/dead/massive/flags.ifl deleted file mode 100644 index 507d5593..00000000 --- a/objects/colossal/dead/massive/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 6 \ No newline at end of file diff --git a/objects/colossal/dead/superlarge/flags.ifl b/objects/colossal/dead/superlarge/flags.ifl deleted file mode 100644 index e34e6aae..00000000 --- a/objects/colossal/dead/superlarge/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 11 \ No newline at end of file diff --git a/objects/colossal/dead/supermassive/dead1.ish b/objects/colossal/dead/supermassive/dead1.ish deleted file mode 100644 index dd7cba7f..00000000 Binary files a/objects/colossal/dead/supermassive/dead1.ish and /dev/null differ diff --git a/objects/colossal/dead/supermassive/flags.ifl b/objects/colossal/dead/supermassive/flags.ifl deleted file mode 100644 index 458d5be4..00000000 --- a/objects/colossal/dead/supermassive/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 13 \ No newline at end of file diff --git a/objects/colossal/dead/tainted/massive/dead1.ish b/objects/colossal/dead/tainted/massive/dead1.ish deleted file mode 100644 index 44c91799..00000000 Binary files a/objects/colossal/dead/tainted/massive/dead1.ish and /dev/null differ diff --git a/objects/colossal/dead/tainted/massive/flags.ifl b/objects/colossal/dead/tainted/massive/flags.ifl deleted file mode 100644 index 507d5593..00000000 --- a/objects/colossal/dead/tainted/massive/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 6 \ No newline at end of file diff --git a/objects/colossal/dead/wilted/supermassive/dead1.ish b/objects/colossal/dead/wilted/supermassive/dead1.ish deleted file mode 100644 index bd44b090..00000000 Binary files a/objects/colossal/dead/wilted/supermassive/dead1.ish and /dev/null differ diff --git a/objects/colossal/dead/wilted/supermassive/flags.ifl b/objects/colossal/dead/wilted/supermassive/flags.ifl deleted file mode 100644 index 03b3c0f1..00000000 --- a/objects/colossal/dead/wilted/supermassive/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 9 \ No newline at end of file diff --git a/objects/colossal/jungle/massive/flags.ifl b/objects/colossal/jungle/massive/flags.ifl deleted file mode 100644 index 9d6d4a78..00000000 --- a/objects/colossal/jungle/massive/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 8 \ No newline at end of file diff --git a/objects/colossal/jungle/massive/jungle1.ish b/objects/colossal/jungle/massive/jungle1.ish deleted file mode 100644 index f940c511..00000000 Binary files a/objects/colossal/jungle/massive/jungle1.ish and /dev/null differ diff --git a/objects/colossal/oak/fallen/massive/oak1.ish b/objects/colossal/oak/fallen/massive/oak1.ish deleted file mode 100644 index ae992bbb..00000000 Binary files a/objects/colossal/oak/fallen/massive/oak1.ish and /dev/null differ diff --git a/objects/colossal/oak/massive/flags.ifl b/objects/colossal/oak/massive/flags.ifl deleted file mode 100644 index 507d5593..00000000 --- a/objects/colossal/oak/massive/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 6 \ No newline at end of file diff --git a/objects/colossal/oak/massive/oak1.ish b/objects/colossal/oak/massive/oak1.ish deleted file mode 100644 index 7b2b415f..00000000 Binary files a/objects/colossal/oak/massive/oak1.ish and /dev/null differ diff --git a/objects/colossal/oak/massive/oak2.ish b/objects/colossal/oak/massive/oak2.ish deleted file mode 100644 index 8b38cf27..00000000 Binary files a/objects/colossal/oak/massive/oak2.ish and /dev/null differ diff --git a/objects/colossal/oak/massive/oak3.ish b/objects/colossal/oak/massive/oak3.ish deleted file mode 100644 index 036a8960..00000000 Binary files a/objects/colossal/oak/massive/oak3.ish and /dev/null differ diff --git a/objects/colossal/oak/superlarge/flags.ifl b/objects/colossal/oak/superlarge/flags.ifl deleted file mode 100644 index 57d0909e..00000000 --- a/objects/colossal/oak/superlarge/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink=8 \ No newline at end of file diff --git a/objects/colossal/oak/superlarge/oak1.ish b/objects/colossal/oak/superlarge/oak1.ish deleted file mode 100644 index a4243483..00000000 Binary files a/objects/colossal/oak/superlarge/oak1.ish and /dev/null differ diff --git a/objects/colossal/oak/supermassive/flags.ifl b/objects/colossal/oak/supermassive/flags.ifl deleted file mode 100644 index f23ceb82..00000000 --- a/objects/colossal/oak/supermassive/flags.ifl +++ /dev/null @@ -1 +0,0 @@ -sink 10 \ No newline at end of file diff --git a/objects/colossal/oak/supermassive/oak1.ish b/objects/colossal/oak/supermassive/oak1.ish deleted file mode 100644 index 69c2301d..00000000 Binary files a/objects/colossal/oak/supermassive/oak1.ish and /dev/null differ diff --git a/objects/colossal/oak/tainted/massive/oak1.ish b/objects/colossal/oak/tainted/massive/oak1.ish deleted file mode 100644 index 52f56316..00000000 Binary files a/objects/colossal/oak/tainted/massive/oak1.ish and /dev/null differ diff --git a/objects/colossal/oak/wilted/supermassive/oak1.ish b/objects/colossal/oak/wilted/supermassive/oak1.ish deleted file mode 100644 index ed1ce405..00000000 Binary files a/objects/colossal/oak/wilted/supermassive/oak1.ish and /dev/null differ diff --git a/objects/colossal/sakura/fallen/supermassive/sakura1.ish b/objects/colossal/sakura/fallen/supermassive/sakura1.ish deleted file mode 100644 index 9aab7308..00000000 Binary files a/objects/colossal/sakura/fallen/supermassive/sakura1.ish and /dev/null differ diff --git a/objects/colossal/sakura/massive/sakura1.ish b/objects/colossal/sakura/massive/sakura1.ish deleted file mode 100644 index 78c16e0c..00000000 Binary files a/objects/colossal/sakura/massive/sakura1.ish and /dev/null differ diff --git a/objects/colossal/sakura/massive/sakura2.ish b/objects/colossal/sakura/massive/sakura2.ish deleted file mode 100644 index 669f283e..00000000 Binary files a/objects/colossal/sakura/massive/sakura2.ish and /dev/null differ diff --git a/objects/colossal/sakura/massive/sakura3.ish b/objects/colossal/sakura/massive/sakura3.ish deleted file mode 100644 index 88471f4a..00000000 Binary files a/objects/colossal/sakura/massive/sakura3.ish and /dev/null differ diff --git a/objects/colossal/sakura/superlarge/sakura1.ish b/objects/colossal/sakura/superlarge/sakura1.ish deleted file mode 100644 index a44e12c8..00000000 Binary files a/objects/colossal/sakura/superlarge/sakura1.ish and /dev/null differ diff --git a/objects/colossal/sakura/supermassive/sakura1.ish b/objects/colossal/sakura/supermassive/sakura1.ish deleted file mode 100644 index 409ee5ac..00000000 Binary files a/objects/colossal/sakura/supermassive/sakura1.ish and /dev/null differ diff --git a/objects/colossal/sakura/tainted/supermassive/sakura1.ish b/objects/colossal/sakura/tainted/supermassive/sakura1.ish deleted file mode 100644 index acc7032c..00000000 Binary files a/objects/colossal/sakura/tainted/supermassive/sakura1.ish and /dev/null differ diff --git a/objects/colossal/sakura/wilted/supermassive/sakura1.ish b/objects/colossal/sakura/wilted/supermassive/sakura1.ish deleted file mode 100644 index ee7ce811..00000000 Binary files a/objects/colossal/sakura/wilted/supermassive/sakura1.ish and /dev/null differ diff --git a/objects/colossal/willow/dead/supermassive/dead1.ish b/objects/colossal/willow/dead/supermassive/dead1.ish deleted file mode 100644 index b6e85412..00000000 Binary files a/objects/colossal/willow/dead/supermassive/dead1.ish and /dev/null differ diff --git a/objects/colossal/willow/dead/supermassive/dead2.ish b/objects/colossal/willow/dead/supermassive/dead2.ish deleted file mode 100644 index 292605b2..00000000 Binary files a/objects/colossal/willow/dead/supermassive/dead2.ish and /dev/null differ diff --git a/objects/colossal/willow/supermassive/willow1.ish b/objects/colossal/willow/supermassive/willow1.ish deleted file mode 100644 index 020ef101..00000000 Binary files a/objects/colossal/willow/supermassive/willow1.ish and /dev/null differ diff --git a/objects/colossal/willow/supermassive/willow2.ish b/objects/colossal/willow/supermassive/willow2.ish deleted file mode 100644 index a9b6813d..00000000 Binary files a/objects/colossal/willow/supermassive/willow2.ish and /dev/null differ diff --git a/objects/colossal/willow/supermassive/willow3.ish b/objects/colossal/willow/supermassive/willow3.ish deleted file mode 100644 index 416d827f..00000000 Binary files a/objects/colossal/willow/supermassive/willow3.ish and /dev/null differ diff --git a/objects/colossal/willow/supermassive/willow4.ish b/objects/colossal/willow/supermassive/willow4.ish deleted file mode 100644 index 5e3f1077..00000000 Binary files a/objects/colossal/willow/supermassive/willow4.ish and /dev/null differ diff --git a/objects/house/rustic/Jap/medium/MedJap1.ish b/objects/house/jap/medium/MedJap1.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap1.ish rename to objects/house/jap/medium/MedJap1.ish diff --git a/objects/house/rustic/Jap/medium/MedJap10.ish b/objects/house/jap/medium/MedJap10.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap10.ish rename to objects/house/jap/medium/MedJap10.ish diff --git a/objects/house/rustic/Jap/medium/MedJap2.ish b/objects/house/jap/medium/MedJap2.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap2.ish rename to objects/house/jap/medium/MedJap2.ish diff --git a/objects/house/rustic/Jap/medium/MedJap3.ish b/objects/house/jap/medium/MedJap3.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap3.ish rename to objects/house/jap/medium/MedJap3.ish diff --git a/objects/house/rustic/Jap/medium/MedJap4.ish b/objects/house/jap/medium/MedJap4.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap4.ish rename to objects/house/jap/medium/MedJap4.ish diff --git a/objects/house/rustic/Jap/medium/MedJap5.ish b/objects/house/jap/medium/MedJap5.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap5.ish rename to objects/house/jap/medium/MedJap5.ish diff --git a/objects/house/rustic/Jap/medium/MedJap6.ish b/objects/house/jap/medium/MedJap6.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap6.ish rename to objects/house/jap/medium/MedJap6.ish diff --git a/objects/house/rustic/Jap/medium/MedJap7.ish b/objects/house/jap/medium/MedJap7.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap7.ish rename to objects/house/jap/medium/MedJap7.ish diff --git a/objects/house/rustic/Jap/medium/MedJap8.ish b/objects/house/jap/medium/MedJap8.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap8.ish rename to objects/house/jap/medium/MedJap8.ish diff --git a/objects/house/rustic/Jap/medium/MedJap9.ish b/objects/house/jap/medium/MedJap9.ish similarity index 100% rename from objects/house/rustic/Jap/medium/MedJap9.ish rename to objects/house/jap/medium/MedJap9.ish diff --git a/objects/colossal/dead/fallen/massive/flags.ifl b/objects/house/jap/medium/flags.ifl similarity index 100% rename from objects/colossal/dead/fallen/massive/flags.ifl rename to objects/house/jap/medium/flags.ifl diff --git a/objects/house/rustic/Norms/medium/Med1.ish b/objects/house/norms/medium/Med1.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med1.ish rename to objects/house/norms/medium/Med1.ish diff --git a/objects/house/rustic/Norms/medium/Med10.ish b/objects/house/norms/medium/Med10.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med10.ish rename to objects/house/norms/medium/Med10.ish diff --git a/objects/house/rustic/Norms/medium/Med2.ish b/objects/house/norms/medium/Med2.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med2.ish rename to objects/house/norms/medium/Med2.ish diff --git a/objects/house/rustic/Norms/medium/Med3.ish b/objects/house/norms/medium/Med3.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med3.ish rename to objects/house/norms/medium/Med3.ish diff --git a/objects/house/rustic/Norms/medium/Med4.ish b/objects/house/norms/medium/Med4.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med4.ish rename to objects/house/norms/medium/Med4.ish diff --git a/objects/house/rustic/Norms/medium/Med5.ish b/objects/house/norms/medium/Med5.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med5.ish rename to objects/house/norms/medium/Med5.ish diff --git a/objects/house/rustic/Norms/medium/Med6.ish b/objects/house/norms/medium/Med6.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med6.ish rename to objects/house/norms/medium/Med6.ish diff --git a/objects/house/rustic/Norms/medium/Med7.ish b/objects/house/norms/medium/Med7.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med7.ish rename to objects/house/norms/medium/Med7.ish diff --git a/objects/house/rustic/Norms/medium/Med8.ish b/objects/house/norms/medium/Med8.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med8.ish rename to objects/house/norms/medium/Med8.ish diff --git a/objects/house/rustic/Norms/medium/Med9.ish b/objects/house/norms/medium/Med9.ish similarity index 100% rename from objects/house/rustic/Norms/medium/Med9.ish rename to objects/house/norms/medium/Med9.ish diff --git a/objects/house/norms/medium/flags.ifl b/objects/house/norms/medium/flags.ifl new file mode 100644 index 00000000..93667da8 --- /dev/null +++ b/objects/house/norms/medium/flags.ifl @@ -0,0 +1 @@ +sink 1 \ No newline at end of file diff --git a/objects/mushroom/black/flags.ifl b/objects/mushroom/black/flags.ifl new file mode 100644 index 00000000..1601289d --- /dev/null +++ b/objects/mushroom/black/flags.ifl @@ -0,0 +1 @@ +priority 100 \ No newline at end of file diff --git a/objects/mushroom/greay/flags.ifl b/objects/mushroom/greay/flags.ifl new file mode 100644 index 00000000..1601289d --- /dev/null +++ b/objects/mushroom/greay/flags.ifl @@ -0,0 +1 @@ +priority 100 \ No newline at end of file diff --git a/objects/mushroom/ice/flags.ifl b/objects/mushroom/ice/flags.ifl new file mode 100644 index 00000000..1601289d --- /dev/null +++ b/objects/mushroom/ice/flags.ifl @@ -0,0 +1 @@ +priority 100 \ No newline at end of file diff --git a/objects/mushroom/purple/flags.ifl b/objects/mushroom/purple/flags.ifl new file mode 100644 index 00000000..1601289d --- /dev/null +++ b/objects/mushroom/purple/flags.ifl @@ -0,0 +1 @@ +priority 100 \ No newline at end of file diff --git a/objects/mushroom/red/flags.ifl b/objects/mushroom/red/flags.ifl new file mode 100644 index 00000000..1601289d --- /dev/null +++ b/objects/mushroom/red/flags.ifl @@ -0,0 +1 @@ +priority 100 \ No newline at end of file diff --git a/objects/spire/medium/IceSpire4.ish b/objects/spire/medium/IceSpire4.ish new file mode 100644 index 00000000..655a4f2e Binary files /dev/null and b/objects/spire/medium/IceSpire4.ish differ diff --git a/objects/spire/medium/IceSpire5.ish b/objects/spire/medium/IceSpire5.ish new file mode 100644 index 00000000..6679c2b6 Binary files /dev/null and b/objects/spire/medium/IceSpire5.ish differ diff --git a/objects/spire/medium/IceSpire6.ish b/objects/spire/medium/IceSpire6.ish new file mode 100644 index 00000000..2ac3cfc4 Binary files /dev/null and b/objects/spire/medium/IceSpire6.ish differ diff --git a/objects/spire/medium/flags.ifl b/objects/spire/medium/flags.ifl new file mode 100644 index 00000000..ea51510f --- /dev/null +++ b/objects/spire/medium/flags.ifl @@ -0,0 +1 @@ +sink 3 \ No newline at end of file diff --git a/objects/spire/small/IceSpire1.ish b/objects/spire/small/IceSpire1.ish new file mode 100644 index 00000000..da62a698 Binary files /dev/null and b/objects/spire/small/IceSpire1.ish differ diff --git a/objects/spire/small/IceSpire2.ish b/objects/spire/small/IceSpire2.ish new file mode 100644 index 00000000..2edc76be Binary files /dev/null and b/objects/spire/small/IceSpire2.ish differ diff --git a/objects/spire/small/IceSpire3.ish b/objects/spire/small/IceSpire3.ish new file mode 100644 index 00000000..441b65ff Binary files /dev/null and b/objects/spire/small/IceSpire3.ish differ diff --git a/objects/spire/small/flags.ifl b/objects/spire/small/flags.ifl new file mode 100644 index 00000000..ea51510f --- /dev/null +++ b/objects/spire/small/flags.ifl @@ -0,0 +1 @@ +sink 3 \ No newline at end of file diff --git a/objects/colossal/dead/massive/dead1.ish b/objects/tree/colossal/dead/massive/dead1.ish similarity index 100% rename from objects/colossal/dead/massive/dead1.ish rename to objects/tree/colossal/dead/massive/dead1.ish diff --git a/objects/colossal/dead/massive/dead2.ish b/objects/tree/colossal/dead/massive/dead2.ish similarity index 100% rename from objects/colossal/dead/massive/dead2.ish rename to objects/tree/colossal/dead/massive/dead2.ish diff --git a/objects/colossal/dead/massive/dead3.ish b/objects/tree/colossal/dead/massive/dead3.ish similarity index 100% rename from objects/colossal/dead/massive/dead3.ish rename to objects/tree/colossal/dead/massive/dead3.ish diff --git a/objects/tree/colossal/dead/massive/flags.ifl b/objects/tree/colossal/dead/massive/flags.ifl new file mode 100644 index 00000000..c3cd1da4 --- /dev/null +++ b/objects/tree/colossal/dead/massive/flags.ifl @@ -0,0 +1,2 @@ +sink 6 +replace LOG:13 LOG_2:12 \ No newline at end of file diff --git a/objects/colossal/dead/superlarge/dead1.ish b/objects/tree/colossal/dead/superlarge/dead1.ish similarity index 100% rename from objects/colossal/dead/superlarge/dead1.ish rename to objects/tree/colossal/dead/superlarge/dead1.ish diff --git a/objects/colossal/dead/superlarge/dead2.ish b/objects/tree/colossal/dead/superlarge/dead2.ish similarity index 100% rename from objects/colossal/dead/superlarge/dead2.ish rename to objects/tree/colossal/dead/superlarge/dead2.ish diff --git a/objects/tree/colossal/dead/superlarge/flags.ifl b/objects/tree/colossal/dead/superlarge/flags.ifl new file mode 100644 index 00000000..c3cd1da4 --- /dev/null +++ b/objects/tree/colossal/dead/superlarge/flags.ifl @@ -0,0 +1,2 @@ +sink 6 +replace LOG:13 LOG_2:12 \ No newline at end of file diff --git a/objects/tree/darkoak/large/flags.ifl b/objects/tree/darkoak/large/flags.ifl index 93667da8..ea51510f 100644 --- a/objects/tree/darkoak/large/flags.ifl +++ b/objects/tree/darkoak/large/flags.ifl @@ -1 +1 @@ -sink 1 \ No newline at end of file +sink 3 \ No newline at end of file diff --git a/objects/tree/jungle/medium/J11.ish b/objects/tree/jungle/medium/J11.ish new file mode 100644 index 00000000..1c6baed5 Binary files /dev/null and b/objects/tree/jungle/medium/J11.ish differ diff --git a/objects/tree/jungle/medium/J12.ish b/objects/tree/jungle/medium/J12.ish new file mode 100644 index 00000000..6aad079b Binary files /dev/null and b/objects/tree/jungle/medium/J12.ish differ diff --git a/objects/tree/jungle/medium/J13.ish b/objects/tree/jungle/medium/J13.ish new file mode 100644 index 00000000..ab783695 Binary files /dev/null and b/objects/tree/jungle/medium/J13.ish differ diff --git a/objects/tree/jungle/medium/J4.ish b/objects/tree/jungle/medium/J4.ish new file mode 100644 index 00000000..7ed91ec9 Binary files /dev/null and b/objects/tree/jungle/medium/J4.ish differ diff --git a/objects/tree/jungle/medium/J5.ish b/objects/tree/jungle/medium/J5.ish new file mode 100644 index 00000000..b3606950 Binary files /dev/null and b/objects/tree/jungle/medium/J5.ish differ diff --git a/objects/tree/jungle/medium/J6.ish b/objects/tree/jungle/medium/J6.ish new file mode 100644 index 00000000..62f930aa Binary files /dev/null and b/objects/tree/jungle/medium/J6.ish differ diff --git a/objects/tree/jungle/medium/J7.ish b/objects/tree/jungle/medium/J7.ish new file mode 100644 index 00000000..f04e8399 Binary files /dev/null and b/objects/tree/jungle/medium/J7.ish differ diff --git a/objects/tree/jungle/medium/J8.ish b/objects/tree/jungle/medium/J8.ish new file mode 100644 index 00000000..a7673ca9 Binary files /dev/null and b/objects/tree/jungle/medium/J8.ish differ diff --git a/objects/tree/jungle/medium/J9.ish b/objects/tree/jungle/medium/J9.ish new file mode 100644 index 00000000..fc057a87 Binary files /dev/null and b/objects/tree/jungle/medium/J9.ish differ diff --git a/objects/tree/jungle/medium/flags.ifl b/objects/tree/jungle/medium/flags.ifl index cb329055..ea51510f 100644 --- a/objects/tree/jungle/medium/flags.ifl +++ b/objects/tree/jungle/medium/flags.ifl @@ -1 +1 @@ -sink 5 \ No newline at end of file +sink 3 \ No newline at end of file diff --git a/objects/tree/spruce/dead/medium/spruce_dead1.ish b/objects/tree/spruce/dead/medium/spruce_dead1.ish deleted file mode 100644 index 1f0649e5..00000000 Binary files a/objects/tree/spruce/dead/medium/spruce_dead1.ish and /dev/null differ diff --git a/objects/tree/spruce/dead/medium/spruce_dead2.ish b/objects/tree/spruce/dead/medium/spruce_dead2.ish deleted file mode 100644 index 5e3aea43..00000000 Binary files a/objects/tree/spruce/dead/medium/spruce_dead2.ish and /dev/null differ diff --git a/objects/tree/spruce/dead/medium/spruce_dead3.ish b/objects/tree/spruce/dead/medium/spruce_dead3.ish deleted file mode 100644 index b48e0ec2..00000000 Binary files a/objects/tree/spruce/dead/medium/spruce_dead3.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce1.ish b/objects/tree/spruce/medium/spruce1.ish deleted file mode 100644 index 1ccf75a2..00000000 Binary files a/objects/tree/spruce/medium/spruce1.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce10.ish b/objects/tree/spruce/medium/spruce10.ish deleted file mode 100644 index 685a0913..00000000 Binary files a/objects/tree/spruce/medium/spruce10.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce11.ish b/objects/tree/spruce/medium/spruce11.ish deleted file mode 100644 index f3110412..00000000 Binary files a/objects/tree/spruce/medium/spruce11.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce12.ish b/objects/tree/spruce/medium/spruce12.ish deleted file mode 100644 index aca7882a..00000000 Binary files a/objects/tree/spruce/medium/spruce12.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce13.ish b/objects/tree/spruce/medium/spruce13.ish deleted file mode 100644 index 7bf51cd8..00000000 Binary files a/objects/tree/spruce/medium/spruce13.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce14.ish b/objects/tree/spruce/medium/spruce14.ish deleted file mode 100644 index f5a1fc49..00000000 Binary files a/objects/tree/spruce/medium/spruce14.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce15.ish b/objects/tree/spruce/medium/spruce15.ish deleted file mode 100644 index 9760297d..00000000 Binary files a/objects/tree/spruce/medium/spruce15.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce16.ish b/objects/tree/spruce/medium/spruce16.ish deleted file mode 100644 index d4b9e0fa..00000000 Binary files a/objects/tree/spruce/medium/spruce16.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce17.ish b/objects/tree/spruce/medium/spruce17.ish deleted file mode 100644 index 92c56448..00000000 Binary files a/objects/tree/spruce/medium/spruce17.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce18.ish b/objects/tree/spruce/medium/spruce18.ish deleted file mode 100644 index 013f8915..00000000 Binary files a/objects/tree/spruce/medium/spruce18.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce19.ish b/objects/tree/spruce/medium/spruce19.ish deleted file mode 100644 index 7db95dd3..00000000 Binary files a/objects/tree/spruce/medium/spruce19.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce2.ish b/objects/tree/spruce/medium/spruce2.ish deleted file mode 100644 index b09c3be5..00000000 Binary files a/objects/tree/spruce/medium/spruce2.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce20.ish b/objects/tree/spruce/medium/spruce20.ish deleted file mode 100644 index b2e11c54..00000000 Binary files a/objects/tree/spruce/medium/spruce20.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce21.ish b/objects/tree/spruce/medium/spruce21.ish deleted file mode 100644 index 3d3ad5e9..00000000 Binary files a/objects/tree/spruce/medium/spruce21.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce22.ish b/objects/tree/spruce/medium/spruce22.ish deleted file mode 100644 index 46c20db2..00000000 Binary files a/objects/tree/spruce/medium/spruce22.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce23.ish b/objects/tree/spruce/medium/spruce23.ish deleted file mode 100644 index dd3f4424..00000000 Binary files a/objects/tree/spruce/medium/spruce23.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce24.ish b/objects/tree/spruce/medium/spruce24.ish deleted file mode 100644 index d2825bbe..00000000 Binary files a/objects/tree/spruce/medium/spruce24.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce25.ish b/objects/tree/spruce/medium/spruce25.ish deleted file mode 100644 index 86a5ecd2..00000000 Binary files a/objects/tree/spruce/medium/spruce25.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce26.ish b/objects/tree/spruce/medium/spruce26.ish deleted file mode 100644 index 9d3739ad..00000000 Binary files a/objects/tree/spruce/medium/spruce26.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce27.ish b/objects/tree/spruce/medium/spruce27.ish deleted file mode 100644 index 26b19022..00000000 Binary files a/objects/tree/spruce/medium/spruce27.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce28.ish b/objects/tree/spruce/medium/spruce28.ish deleted file mode 100644 index dad250d3..00000000 Binary files a/objects/tree/spruce/medium/spruce28.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce29.ish b/objects/tree/spruce/medium/spruce29.ish deleted file mode 100644 index c222eb3b..00000000 Binary files a/objects/tree/spruce/medium/spruce29.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce3.ish b/objects/tree/spruce/medium/spruce3.ish deleted file mode 100644 index 68b3a60c..00000000 Binary files a/objects/tree/spruce/medium/spruce3.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce30.ish b/objects/tree/spruce/medium/spruce30.ish deleted file mode 100644 index 7c081bcc..00000000 Binary files a/objects/tree/spruce/medium/spruce30.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce31.ish b/objects/tree/spruce/medium/spruce31.ish deleted file mode 100644 index edb9e039..00000000 Binary files a/objects/tree/spruce/medium/spruce31.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce32.ish b/objects/tree/spruce/medium/spruce32.ish deleted file mode 100644 index 899c811b..00000000 Binary files a/objects/tree/spruce/medium/spruce32.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce33.ish b/objects/tree/spruce/medium/spruce33.ish deleted file mode 100644 index 540b8fa3..00000000 Binary files a/objects/tree/spruce/medium/spruce33.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce34.ish b/objects/tree/spruce/medium/spruce34.ish deleted file mode 100644 index cc48de53..00000000 Binary files a/objects/tree/spruce/medium/spruce34.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce35.ish b/objects/tree/spruce/medium/spruce35.ish deleted file mode 100644 index 1f75da46..00000000 Binary files a/objects/tree/spruce/medium/spruce35.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce36.ish b/objects/tree/spruce/medium/spruce36.ish deleted file mode 100644 index 3fe7c7a3..00000000 Binary files a/objects/tree/spruce/medium/spruce36.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce37.ish b/objects/tree/spruce/medium/spruce37.ish deleted file mode 100644 index 061c7f6c..00000000 Binary files a/objects/tree/spruce/medium/spruce37.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce38.ish b/objects/tree/spruce/medium/spruce38.ish deleted file mode 100644 index a04136a4..00000000 Binary files a/objects/tree/spruce/medium/spruce38.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce39.ish b/objects/tree/spruce/medium/spruce39.ish deleted file mode 100644 index b59b87a7..00000000 Binary files a/objects/tree/spruce/medium/spruce39.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce4.ish b/objects/tree/spruce/medium/spruce4.ish deleted file mode 100644 index d2321efe..00000000 Binary files a/objects/tree/spruce/medium/spruce4.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce40.ish b/objects/tree/spruce/medium/spruce40.ish deleted file mode 100644 index df90878e..00000000 Binary files a/objects/tree/spruce/medium/spruce40.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce41.ish b/objects/tree/spruce/medium/spruce41.ish deleted file mode 100644 index fcb72718..00000000 Binary files a/objects/tree/spruce/medium/spruce41.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce42.ish b/objects/tree/spruce/medium/spruce42.ish deleted file mode 100644 index 76111974..00000000 Binary files a/objects/tree/spruce/medium/spruce42.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce43.ish b/objects/tree/spruce/medium/spruce43.ish deleted file mode 100644 index 061c7f6c..00000000 Binary files a/objects/tree/spruce/medium/spruce43.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce5.ish b/objects/tree/spruce/medium/spruce5.ish deleted file mode 100644 index 49049c92..00000000 Binary files a/objects/tree/spruce/medium/spruce5.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce6.ish b/objects/tree/spruce/medium/spruce6.ish deleted file mode 100644 index 8e802525..00000000 Binary files a/objects/tree/spruce/medium/spruce6.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce7.ish b/objects/tree/spruce/medium/spruce7.ish deleted file mode 100644 index ce7bc6b3..00000000 Binary files a/objects/tree/spruce/medium/spruce7.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce8.ish b/objects/tree/spruce/medium/spruce8.ish deleted file mode 100644 index ff440cdf..00000000 Binary files a/objects/tree/spruce/medium/spruce8.ish and /dev/null differ diff --git a/objects/tree/spruce/medium/spruce9.ish b/objects/tree/spruce/medium/spruce9.ish deleted file mode 100644 index 3af7f89b..00000000 Binary files a/objects/tree/spruce/medium/spruce9.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce1.ish b/objects/tree/spruce/small/spruce1.ish deleted file mode 100644 index f4bcf7ab..00000000 Binary files a/objects/tree/spruce/small/spruce1.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce10.ish b/objects/tree/spruce/small/spruce10.ish deleted file mode 100644 index 14fe2ff8..00000000 Binary files a/objects/tree/spruce/small/spruce10.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce11.ish b/objects/tree/spruce/small/spruce11.ish deleted file mode 100644 index ccfa712f..00000000 Binary files a/objects/tree/spruce/small/spruce11.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce12.ish b/objects/tree/spruce/small/spruce12.ish deleted file mode 100644 index 59b67b8a..00000000 Binary files a/objects/tree/spruce/small/spruce12.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce13.ish b/objects/tree/spruce/small/spruce13.ish deleted file mode 100644 index a235f039..00000000 Binary files a/objects/tree/spruce/small/spruce13.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce2.ish b/objects/tree/spruce/small/spruce2.ish deleted file mode 100644 index 2ac0969f..00000000 Binary files a/objects/tree/spruce/small/spruce2.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce3.ish b/objects/tree/spruce/small/spruce3.ish deleted file mode 100644 index 409fa7a8..00000000 Binary files a/objects/tree/spruce/small/spruce3.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce4.ish b/objects/tree/spruce/small/spruce4.ish deleted file mode 100644 index 7fa1e8ba..00000000 Binary files a/objects/tree/spruce/small/spruce4.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce5.ish b/objects/tree/spruce/small/spruce5.ish deleted file mode 100644 index 6c757ca6..00000000 Binary files a/objects/tree/spruce/small/spruce5.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce6.ish b/objects/tree/spruce/small/spruce6.ish deleted file mode 100644 index 26937cea..00000000 Binary files a/objects/tree/spruce/small/spruce6.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce7.ish b/objects/tree/spruce/small/spruce7.ish deleted file mode 100644 index ef502ece..00000000 Binary files a/objects/tree/spruce/small/spruce7.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce8.ish b/objects/tree/spruce/small/spruce8.ish deleted file mode 100644 index 6dab9c6d..00000000 Binary files a/objects/tree/spruce/small/spruce8.ish and /dev/null differ diff --git a/objects/tree/spruce/small/spruce9.ish b/objects/tree/spruce/small/spruce9.ish deleted file mode 100644 index c01f988e..00000000 Binary files a/objects/tree/spruce/small/spruce9.ish and /dev/null differ diff --git a/regions/snowy.json b/regions/snowy.json index 2d9efe5f..99d47f33 100644 --- a/regions/snowy.json +++ b/regions/snowy.json @@ -1,6 +1,6 @@ { "rarity": 1, - "beach": "cold_beach", + "beach": "frozen_beach", "name": "Snowy", "frozen": true } \ No newline at end of file