From 03e04ca832d25920b3fa00b1d6007ae5dbbdcc45 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 23 Jun 2021 15:40:14 -0700 Subject: [PATCH 01/14] Best i can do with the ores --- dimensions/overworld.json | 169 +++++++++++++++++++------------------- 1 file changed, 83 insertions(+), 86 deletions(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index fa5ed201..c429ecfb 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -83,11 +83,86 @@ "deposits": [ { "minHeight": 19, - "maxPerChunk": 12, + "maxPerChunk": 4, "maxHeight": 150, - "minPerChunk": 4, - "minSize": 22, - "maxSize": 32, + "minPerChunk": 1, + "minSize": 100, + "maxSize": 100, + "palette": [ + { + "block": "granite" + } + + ], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 100, + "maxSize": 100, + "palette": [ + { + "block": "andesite" + } + + ], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 100, + "maxSize": 100, + "palette": [ + { + "block": "diorite" + } + + ], + "varience": 2 + }, + { + "minHeight": 19, + "maxPerChunk": 4, + "maxHeight": 150, + "minPerChunk": 1, + "minSize": 100, + "maxSize": 100, + "palette": [ + { + "block": "gravel" + } + + ], + "varience": 2 + }, + { + "minHeight": 0, + "maxPerChunk": 4, + "maxHeight": 28, + "minPerChunk": 1, + "minSize": 100, + "maxSize": 100, + "palette": [ + { + "block": "deepslate" + } + + ], + "varience": 2 + }, + { + "minHeight": 0, + "maxPerChunk": 4, + "maxHeight": 28, + "minPerChunk": 1, + "minSize": 100, + "maxSize": 100, "palette": [ { "block": "dirt" @@ -95,64 +170,9 @@ { "block": "coarse_dirt" } + ], - "varience": 4 - }, - { - "minHeight": 45, - "maxPerChunk": 12, - "maxHeight": 140, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "gravel" - } - ], - "varience": 4 - }, - { - "minHeight": 25, - "maxPerChunk": 12, - "maxHeight": 95, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "andesite" - } - ], - "varience": 4 - }, - { - "minHeight": 35, - "maxPerChunk": 12, - "maxHeight": 100, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "granite" - } - ], - "varience": 4 - }, - { - "minHeight": 45, - "maxPerChunk": 12, - "maxHeight": 115, - "minPerChunk": 4, - "minSize": 19, - "maxSize": 24, - "palette": [ - { - "block": "diorite" - } - ], - "varience": 4 + "varience": 2 }, { "minHeight": 2, @@ -255,32 +275,9 @@ ], "varience": 9 } + ], - "rockPalette": { - "palette": [ - { - "weight": 10, - "block": "stone" - }, - { - "block": "granite" - }, - { - "block": "andesite" - }, - { - "block": "deepslate" - } - ], - "style": { - "style": "IRIS_THICK", - "zoom": 1.26, - "fracture": { - "style": "STATIC", - "multiplier": 3 - } - } - }, + "CAVES": "All settings in regards to caves. Contains a toggle and the cave carve layers.", "caves": true, From f59378d574f8088ab483f289c6586c350ad98008 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 23 Jun 2021 19:02:08 -0700 Subject: [PATCH 02/14] Added objects --- objects/deepslate/ds1.iob | Bin 0 -> 6289 bytes objects/deepslate/ds2.iob | Bin 0 -> 10153 bytes objects/deepslate/ds3.iob | Bin 0 -> 5009 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 objects/deepslate/ds1.iob create mode 100644 objects/deepslate/ds2.iob create mode 100644 objects/deepslate/ds3.iob diff --git a/objects/deepslate/ds1.iob b/objects/deepslate/ds1.iob new file mode 100644 index 0000000000000000000000000000000000000000..d960031a0171f9184da8322eaa146c9b58b453cc GIT binary patch literal 6289 zcmX}wyN)DT6$Q}fdRGlT2F`o~<{%urvG8yZMhhCLB|xL;G2p}N{YduO=Riu8t8Tn9 zGUA?nqUtz~UmwTuU4HJ4U;X&=*Kgnd>9^ni_{Tr|?)Y^4=AU2x_2sWWfByR~Km6^> zm!H1<*M;c z-jBz3d*r+IcD-4z*Q@n%y;#rJv-Q)uXMD=bC!Idl_w{XkU0>Gc^=W-vAJ+TvxZ5jn zyWXtV>!&rJ+|NI)AM5-2w!W?}>+|}wKCTbz{h0HZJ8`?-tk+|{e%GH~*O&EqeHe3` zxs$i+&3ZkaUe@Pbes`KXe!Jd`xjMZwIlJ+7eOaH^)6qMZ?Z)@@b$wZ%*M~9nHFr97 z)H{(nVt&St^?iL^Q)k^SbylC&hcU;UnUi|6{z$#mR6@5;z15HPeNFv!dFrpG{%Y#4 zKCO>y>e2Fi-ptU{VaKV%dbOq=JHA+xE*+;nYto^b+w=X$%(jkm*K6)-&E2Z0&zkzI zsn44Ftf^0`%bL2Zsmq$Wtf|YIx~!?on!8?eS8J|z&9|;OI=$D_Wldey)MZUw*3@N9 zUDniPOXkXaNuJba$EnYHjQPBdv-SACzOAX>9xwGTA^3V*48PHR@~B*Ql>i8c`~6u0-p@xU+}uD%}OTYt*->Z&BZ(zD0eD`c}+&CBdTp zMg5EV7xk}b{#X6VSihovMg5BU74<9XSJbblUs1n`>Y(aVmg`5=ei}1hk_e8o>Myh3sJ|HNFVtVC zzfgan{=&!6yf@BqNBzb4YQ0=9)>Kv3r)p|uc{NiUH+Qqf-aA%jmaDUxI;;AS<@ylyA?icahoX9_`jD|cM16?* z5cMJIL)3?u*-~>?YQ8-kz2?2@Lze49)Q6}KQ6Hi{M13f#yQ=>f>p#3&FV~Cpd_7w~ zt&;@KtNZ8ZqkiS{^egID)UT*tQNN;o71eXqr;PO(UaaS1KBvpGf1i|dyqf)I{P_R% zvz`9sbM!C1uJ5b<2QFjAf1O^hP>o>J!u-s2{}k1L_CV z52znd{?id-uJ7pS!C2l?-c#OF-c#OF-c#Pk<~-#*S})g&^?dZHw#&~bXN~17<*eh#RmxS$RmxS$ zRmxS$RmxS$Rk|WES8bH5#&VT%m2#DGm2#DGm2#Dy^JC7>F`VBhSB>Q=*}bK@+p%_Gn5SGlrk;&E*LST28N{V0Eo z<{|{#S*xe`x;D{Gs_1d*A84 g&-%CO`dRLJ&-&W?JKN3J{WmrrXnxq<{4vh!zi3GJFaQ7m literal 0 HcmV?d00001 diff --git a/objects/deepslate/ds2.iob b/objects/deepslate/ds2.iob new file mode 100644 index 0000000000000000000000000000000000000000..9df90fb840c1651c0cea39055dfd8203f8f87c77 GIT binary patch literal 10153 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 F@jsz>4YL3M literal 0 HcmV?d00001 From 64dfad6f139dcfda5dfd9d4195f5570f5cd508cf Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 23 Jun 2021 19:57:32 -0700 Subject: [PATCH 03/14] Added the deepslate to the regions I did not make it jigsaw for the sheer amount of deep-slate i needed to add --- dimensions/overworld.json | 30 +++++++++++++++--------------- regions/frozen.json | 22 ++++++++++++++++++++++ regions/hot.json | 21 +++++++++++++++++++++ regions/mesa.json | 23 +++++++++++++++++++++++ regions/mountain.json | 23 +++++++++++++++++++++++ regions/mushroom.json | 23 +++++++++++++++++++++++ regions/ocean.json | 23 +++++++++++++++++++++++ regions/savanna.json | 23 +++++++++++++++++++++++ regions/swamp.json | 23 +++++++++++++++++++++++ regions/temperate.json | 21 +++++++++++++++++++++ regions/tropical-mountain.json | 23 +++++++++++++++++++++++ regions/tropical.json | 22 ++++++++++++++++++++++ regions/tundra.json | 23 +++++++++++++++++++++++ 13 files changed, 285 insertions(+), 15 deletions(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index c429ecfb..a5466f0d 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -86,8 +86,8 @@ "maxPerChunk": 4, "maxHeight": 150, "minPerChunk": 1, - "minSize": 100, - "maxSize": 100, + "minSize": 25, + "maxSize": 25, "palette": [ { "block": "granite" @@ -101,8 +101,8 @@ "maxPerChunk": 4, "maxHeight": 150, "minPerChunk": 1, - "minSize": 100, - "maxSize": 100, + "minSize": 25, + "maxSize": 25, "palette": [ { "block": "andesite" @@ -116,8 +116,8 @@ "maxPerChunk": 4, "maxHeight": 150, "minPerChunk": 1, - "minSize": 100, - "maxSize": 100, + "minSize": 25, + "maxSize": 25, "palette": [ { "block": "diorite" @@ -131,8 +131,8 @@ "maxPerChunk": 4, "maxHeight": 150, "minPerChunk": 1, - "minSize": 100, - "maxSize": 100, + "minSize": 25, + "maxSize": 25, "palette": [ { "block": "gravel" @@ -143,11 +143,11 @@ }, { "minHeight": 0, - "maxPerChunk": 4, - "maxHeight": 28, - "minPerChunk": 1, - "minSize": 100, - "maxSize": 100, + "maxPerChunk": 2, + "maxHeight": 13, + "minPerChunk": 0, + "minSize": 5, + "maxSize": 10, "palette": [ { "block": "deepslate" @@ -161,8 +161,8 @@ "maxPerChunk": 4, "maxHeight": 28, "minPerChunk": 1, - "minSize": 100, - "maxSize": 100, + "minSize": 25, + "maxSize": 25, "palette": [ { "block": "dirt" diff --git a/regions/frozen.json b/regions/frozen.json index b20fd067..c564ebad 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -87,6 +87,27 @@ ] }, "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + }, { "name": "standard-surface-portals", "chance": 0.001, @@ -170,6 +191,7 @@ "mode": "VACUUM", "carvingSupport": "SURFACE_ONLY" } + ], "shoreHeightZoom": 1.14, "riverThickness": 0.006, diff --git a/regions/hot.json b/regions/hot.json index b99cb495..6273d6d8 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -153,6 +153,27 @@ } ], "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + }, { "name": "standard-surface-portals", "chance": 0.001, diff --git a/regions/mesa.json b/regions/mesa.json index a8738c9c..ab070898 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -48,6 +48,29 @@ "zoom": 5 } }, + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "deposits": [ { "minHeight": 8, diff --git a/regions/mountain.json b/regions/mountain.json index d858eb89..d5066c6e 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -59,6 +59,29 @@ "varience": 4 } ], + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "riverRarity": 200, "landBiomeZoom": 1.9, "lakes": false, diff --git a/regions/mushroom.json b/regions/mushroom.json index c0bf6875..f09866d0 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -64,6 +64,29 @@ "rarity": 31 } ], + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "biomeImplosionRatio": 0.25, "landBiomeZoom": 1.25, "effects": [ diff --git a/regions/ocean.json b/regions/ocean.json index 2594cef6..81c8d263 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -23,6 +23,29 @@ "riverBiomes": [ "ocean/ocean" ], + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "biomeImplosionRatio": 0.7, "rarity": 2, "effects": [ diff --git a/regions/savanna.json b/regions/savanna.json index f7207ae6..25aa97d4 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -37,6 +37,29 @@ } ], "biomeImplosionRatio": 0.25, + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "deposits": [ { "minHeight": 25, diff --git a/regions/swamp.json b/regions/swamp.json index d8e8efc8..bd552579 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -44,6 +44,29 @@ "varience": 4 } ], + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "landBiomeZoom": 1.25, "shoreHeightMin": 0.02, "shoreHeightMax": 1.2, diff --git a/regions/temperate.json b/regions/temperate.json index eefa747d..8c7279f8 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -58,6 +58,27 @@ } ], "objects":[ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + }, { "name":"standard-surface-portals", "chance":0.001, diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 20e05223..36aae54b 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -38,6 +38,29 @@ } ], "biomeImplosionRatio": 0.25, + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "deposits": [ { "minHeight": 15, diff --git a/regions/tropical.json b/regions/tropical.json index 04f992ce..3c8ecf6d 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -33,6 +33,7 @@ "zoom": 5 } }, + "spotBiomes": [ { "as": "SEA", @@ -81,6 +82,27 @@ ] }, "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + }, { "name": "standard-surface-portals", "chance": 0.001, diff --git a/regions/tundra.json b/regions/tundra.json index 9803deee..f74f58a9 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -62,6 +62,29 @@ "cold-treasure" ] }, + "objects": [ + { + "chance": 1, + "bottom": true, + "place": [ + "deepslate/ds1", + "deepslate/ds2", + "deepslate/ds3" + ], + "clamp": { + "maximumHeight": 7 + }, + "rotation": { + "enabled": true, + "xAxis": { + "interval": 15, + "max": 360, + "min": 0 + } + } + + } + ], "shoreHeightZoom": 1.14, "riverThickness": 0.025, "rarity": 4 From a80eddc07b77aac6e063ccb8909c48900ee0285a Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 23 Jun 2021 21:20:58 -0700 Subject: [PATCH 04/14] f --- regions/frozen.json | 6 ------ regions/hot.json | 9 +-------- regions/mesa.json | 6 +----- regions/mountain.json | 5 ----- regions/mushroom.json | 5 ----- regions/ocean.json | 5 ----- regions/savanna.json | 5 ----- regions/swamp.json | 7 +------ regions/temperate.json | 5 ----- regions/tropical-mountain.json | 7 +------ regions/tropical.json | 7 +------ regions/tundra.json | 6 ------ 12 files changed, 5 insertions(+), 68 deletions(-) diff --git a/regions/frozen.json b/regions/frozen.json index c564ebad..faa1c3d4 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -95,18 +95,12 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } - }, { "name": "standard-surface-portals", diff --git a/regions/hot.json b/regions/hot.json index 6273d6d8..23afb538 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -155,25 +155,18 @@ "objects": [ { "chance": 1, - "bottom": true, "place": [ "deepslate/ds1", "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } - - }, + }, { "name": "standard-surface-portals", "chance": 0.001, diff --git a/regions/mesa.json b/regions/mesa.json index ab070898..0e0e7c2d 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -57,17 +57,13 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } + } ], diff --git a/regions/mountain.json b/regions/mountain.json index d5066c6e..c5f2a463 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -68,17 +68,12 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } } ], diff --git a/regions/mushroom.json b/regions/mushroom.json index f09866d0..3b4dc4a4 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -73,17 +73,12 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } } ], diff --git a/regions/ocean.json b/regions/ocean.json index 81c8d263..bb7c4dd0 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -32,17 +32,12 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } } ], diff --git a/regions/savanna.json b/regions/savanna.json index 25aa97d4..82ab2eb4 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -46,17 +46,12 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } } ], diff --git a/regions/swamp.json b/regions/swamp.json index bd552579..d459ad24 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -53,19 +53,14 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } + } - } ], "landBiomeZoom": 1.25, "shoreHeightMin": 0.02, diff --git a/regions/temperate.json b/regions/temperate.json index 8c7279f8..02764f3e 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -66,17 +66,12 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } }, { diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 36aae54b..6b87e37c 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -47,19 +47,14 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } - } + ], "deposits": [ { diff --git a/regions/tropical.json b/regions/tropical.json index 3c8ecf6d..1f0ef2e6 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -90,19 +90,14 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } - }, + { "name": "standard-surface-portals", "chance": 0.001, diff --git a/regions/tundra.json b/regions/tundra.json index f74f58a9..abfa1d0d 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -71,18 +71,12 @@ "deepslate/ds2", "deepslate/ds3" ], - "clamp": { - "maximumHeight": 7 - }, - "rotation": { "enabled": true, "xAxis": { "interval": 15, "max": 360, "min": 0 } - } - } ], "shoreHeightZoom": 1.14, From 2702b50bfda9cd76ff26917b3679640741f50f97 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Wed, 23 Jun 2021 21:31:19 -0700 Subject: [PATCH 05/14] fff --- loot/beach-clutter.json | 4 ++-- loot/cactus-clutter.json | 4 ++-- loot/cave-clutter.json | 4 ++-- loot/cold-food.json | 4 ++-- loot/cold-treasure.json | 2 +- loot/forest-food.json | 6 ++++-- loot/frozen-clutter.json | 4 +++- loot/frozen-food.json | 3 ++- loot/global-clutter.json | 4 ++-- loot/global-tools.json | 2 +- loot/global-treasure.json | 2 +- loot/hot-food.json | 3 ++- loot/hot-treasure.json | 2 +- loot/mushroom-clutter.json | 5 +++-- loot/mushroom-food.json | 5 +++-- loot/ocean-clutter.json | 6 +++--- loot/snow-clutter.json | 3 ++- loot/swamp-clutter.json | 5 +++-- loot/swamp-food.json | 5 +++-- loot/temperate-clutter.json | 5 +++-- loot/temperate-food.json | 3 ++- loot/tropical-food.json | 5 +++-- loot/tropical-treasure.json | 4 ++-- 23 files changed, 52 insertions(+), 38 deletions(-) diff --git a/loot/beach-clutter.json b/loot/beach-clutter.json index 73d4b0b5..6d00078f 100644 --- a/loot/beach-clutter.json +++ b/loot/beach-clutter.json @@ -1,7 +1,7 @@ { "name": "Beach Clutter", - "rarity": 2, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/cactus-clutter.json b/loot/cactus-clutter.json index ca58cb4b..b0088cba 100644 --- a/loot/cactus-clutter.json +++ b/loot/cactus-clutter.json @@ -1,7 +1,7 @@ { "name": "Cactus Clutter", - "rarity": 5, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/cave-clutter.json b/loot/cave-clutter.json index 71c8aaaf..097623ca 100644 --- a/loot/cave-clutter.json +++ b/loot/cave-clutter.json @@ -1,7 +1,7 @@ { "name": "Cave Clutter", - "rarity": 2, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/cold-food.json b/loot/cold-food.json index ab4d0a47..5b94bd39 100644 --- a/loot/cold-food.json +++ b/loot/cold-food.json @@ -1,7 +1,7 @@ { "name": "Cold Food", - "rarity": 2, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/cold-treasure.json b/loot/cold-treasure.json index a162f258..5750aef1 100644 --- a/loot/cold-treasure.json +++ b/loot/cold-treasure.json @@ -1,7 +1,7 @@ { "name": "Cold Treasure", "rarity": 1, - "maxPicked": 3, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/forest-food.json b/loot/forest-food.json index db251962..614bdb3b 100644 --- a/loot/forest-food.json +++ b/loot/forest-food.json @@ -1,6 +1,8 @@ { "name": "Forest Food", - "rarity": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "apple", @@ -42,7 +44,7 @@ "rarity": 3, "slotTypes": "STORAGE" },{ - "type": "grass_path", + "type": "dirt_path", "maxAmount": 8, "rarity": 3, "slotTypes": "STORAGE" diff --git a/loot/frozen-clutter.json b/loot/frozen-clutter.json index 08309522..73fb5a68 100644 --- a/loot/frozen-clutter.json +++ b/loot/frozen-clutter.json @@ -1,6 +1,8 @@ { "name": "Frozen Clutter", - "rarity": 6, + "maxPicked": 2, + "minPicked": 1, + "rarity": 1, "loot": [ { "type": "blackstone", diff --git a/loot/frozen-food.json b/loot/frozen-food.json index ff547128..638dbb83 100644 --- a/loot/frozen-food.json +++ b/loot/frozen-food.json @@ -1,7 +1,8 @@ { "name": "Frozen Food", - "rarity": 2, + "rarity": 1, "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "spider_eye", diff --git a/loot/global-clutter.json b/loot/global-clutter.json index 9ab9bab4..06412140 100644 --- a/loot/global-clutter.json +++ b/loot/global-clutter.json @@ -1,7 +1,7 @@ { "name": "Global Clutter", - "rarity": 4, - "maxPicked": 4, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/global-tools.json b/loot/global-tools.json index c12d42f6..d94f0ae0 100644 --- a/loot/global-tools.json +++ b/loot/global-tools.json @@ -1,6 +1,6 @@ { "name": "Global Tools", - "rarity": 3, + "rarity": 1, "maxPicked": 2, "minPicked": 0, "loot": [ diff --git a/loot/global-treasure.json b/loot/global-treasure.json index c8f18fb9..7334b5a9 100644 --- a/loot/global-treasure.json +++ b/loot/global-treasure.json @@ -1,6 +1,6 @@ { "name": "Global Treasure", - "rarity": 2, + "rarity": 1, "maxPicked": 2, "minPicked": 1, "loot": [ diff --git a/loot/hot-food.json b/loot/hot-food.json index d939921b..1960ddcf 100644 --- a/loot/hot-food.json +++ b/loot/hot-food.json @@ -1,6 +1,7 @@ { "name": "Hot Food", - "rarity": 2, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/hot-treasure.json b/loot/hot-treasure.json index 01bfef59..870ca6dc 100644 --- a/loot/hot-treasure.json +++ b/loot/hot-treasure.json @@ -1,7 +1,7 @@ { "name": "Hot Treasure", "rarity": 1, - "maxPicked": 2, + "maxPicked": 3, "minPicked": 1, "loot": [ { diff --git a/loot/mushroom-clutter.json b/loot/mushroom-clutter.json index a9fba882..b63d01b9 100644 --- a/loot/mushroom-clutter.json +++ b/loot/mushroom-clutter.json @@ -1,7 +1,8 @@ { "name": "Mushroom Clutter", - "rarity": 4, - "maxPicked": 3, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "red_mushroom", diff --git a/loot/mushroom-food.json b/loot/mushroom-food.json index 49ef8541..3d743d74 100644 --- a/loot/mushroom-food.json +++ b/loot/mushroom-food.json @@ -1,7 +1,8 @@ { "name": "Mushroom Food", - "rarity": 2, - "maxPicked": 3, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "spider_eye", diff --git a/loot/ocean-clutter.json b/loot/ocean-clutter.json index a286c2b4..68327bb3 100644 --- a/loot/ocean-clutter.json +++ b/loot/ocean-clutter.json @@ -1,8 +1,8 @@ { "name": "Ocean Clutter", - "rarity": 3, - "maxPicked": 5, - "minPicked": 3, + "rarity": 1, + "maxPicked": 3, + "minPicked": 1, "loot": [ { "type": "wet_sponge", diff --git a/loot/snow-clutter.json b/loot/snow-clutter.json index cca0e1ee..e0d7f9f1 100644 --- a/loot/snow-clutter.json +++ b/loot/snow-clutter.json @@ -1,6 +1,7 @@ { "name": "Snow Clutter", - "rarity": 3, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/swamp-clutter.json b/loot/swamp-clutter.json index b085bbf8..32882b2a 100644 --- a/loot/swamp-clutter.json +++ b/loot/swamp-clutter.json @@ -1,7 +1,8 @@ { "name": "Swamp Clutter", - "rarity": 4, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "string", diff --git a/loot/swamp-food.json b/loot/swamp-food.json index 9f72bb82..9d80766c 100644 --- a/loot/swamp-food.json +++ b/loot/swamp-food.json @@ -1,7 +1,8 @@ { "name": "Swamp Food", - "rarity": 2, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "spider_eye", diff --git a/loot/temperate-clutter.json b/loot/temperate-clutter.json index c2b90c99..d50caa81 100644 --- a/loot/temperate-clutter.json +++ b/loot/temperate-clutter.json @@ -1,7 +1,8 @@ { "name": "Temperate Clutter", - "rarity": 4, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "oak_planks", diff --git a/loot/temperate-food.json b/loot/temperate-food.json index 35151a60..b3313c20 100644 --- a/loot/temperate-food.json +++ b/loot/temperate-food.json @@ -1,6 +1,7 @@ { "name": "Temperate Food", - "rarity": 2, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { diff --git a/loot/tropical-food.json b/loot/tropical-food.json index 5888cf46..d0fc8067 100644 --- a/loot/tropical-food.json +++ b/loot/tropical-food.json @@ -1,7 +1,8 @@ { "name": "Tropical Food", - "rarity": 2, - "minPicked": 2, + "rarity": 1, + "maxPicked": 2, + "minPicked": 1, "loot": [ { "type": "melon_slice", diff --git a/loot/tropical-treasure.json b/loot/tropical-treasure.json index af36eab4..569821f9 100644 --- a/loot/tropical-treasure.json +++ b/loot/tropical-treasure.json @@ -1,7 +1,7 @@ { "name": "Tropical Treasure", - "rarity": 5, - "maxPicked": 3, + "rarity": 1, + "maxPicked": 2, "minPicked": 1, "loot": [ { From 5d9bdeb0f234e35f1edca89bdc9bf1383c5b7fdf Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 24 Jun 2021 02:21:25 -0700 Subject: [PATCH 06/14] Addy the Ammy --- objects/amethyst/ame1.iob | Bin 0 -> 9772 bytes objects/amethyst/ame2.iob | Bin 0 -> 9641 bytes objects/amethyst/ame3.iob | Bin 0 -> 10446 bytes objects/amethyst/ame4.iob | Bin 0 -> 9964 bytes objects/amethyst/ame5.iob | Bin 0 -> 9872 bytes objects/amethyst/ame6.iob | Bin 0 -> 9788 bytes regions/frozen.json | 43 +++++++++++++++++++++++++++++++ regions/hot.json | 43 +++++++++++++++++++++++++++++++ regions/mesa.json | 43 +++++++++++++++++++++++++++++++ regions/mountain.json | 43 +++++++++++++++++++++++++++++++ regions/mushroom.json | 43 +++++++++++++++++++++++++++++++ regions/ocean.json | 43 +++++++++++++++++++++++++++++++ regions/savanna.json | 43 +++++++++++++++++++++++++++++++ regions/swamp.json | 45 ++++++++++++++++++++++++++++++++- regions/temperate.json | 42 ++++++++++++++++++++++++++++++ regions/tropical-mountain.json | 43 +++++++++++++++++++++++++++++++ regions/tropical.json | 42 ++++++++++++++++++++++++++++++ regions/tundra.json | 43 +++++++++++++++++++++++++++++++ 18 files changed, 515 insertions(+), 1 deletion(-) create mode 100644 objects/amethyst/ame1.iob create mode 100644 objects/amethyst/ame2.iob create mode 100644 objects/amethyst/ame3.iob create mode 100644 objects/amethyst/ame4.iob create mode 100644 objects/amethyst/ame5.iob create mode 100644 objects/amethyst/ame6.iob diff --git a/objects/amethyst/ame1.iob b/objects/amethyst/ame1.iob new file mode 100644 index 0000000000000000000000000000000000000000..3dbb6f55ffa92016ee79458b1bf34e13acedeebd GIT binary patch literal 9772 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 Ckh;$R literal 0 HcmV?d00001 diff --git a/objects/amethyst/ame2.iob b/objects/amethyst/ame2.iob new file mode 100644 index 0000000000000000000000000000000000000000..8d73f5f976a81d883190b95719f4572d48fb058e GIT binary patch literal 9641 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 bU~2aHLF*jbc*_jyC?7N4+B~849(4Z?^ZM5R literal 0 HcmV?d00001 diff --git a/objects/amethyst/ame3.iob b/objects/amethyst/ame3.iob new file mode 100644 index 0000000000000000000000000000000000000000..d05c4e2d6b401978e6ad041b55e4d49c1f4b455f GIT binary patch literal 10446 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 Bw#Wbg literal 0 HcmV?d00001 diff --git a/objects/amethyst/ame4.iob b/objects/amethyst/ame4.iob new file mode 100644 index 0000000000000000000000000000000000000000..f598a0be72007b9debcc1e83019b4ad0fc65d174 GIT binary patch literal 9964 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 E1;XYly8r+H literal 0 HcmV?d00001 diff --git a/objects/amethyst/ame5.iob b/objects/amethyst/ame5.iob new file mode 100644 index 0000000000000000000000000000000000000000..40cc688aa881c91887884468cb671c98a172382d GIT binary patch literal 9872 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 jZCCMuHI Date: Thu, 24 Jun 2021 03:21:28 -0700 Subject: [PATCH 07/14] LOOT OVERHAUL AGAIN! --- biomes/frozen/frozen-beach.json | 5 ++- biomes/frozen/frozen-hills.json | 7 +++ biomes/frozen/frozen-ice-cavern.json | 7 ++- biomes/frozen/frozen-mountain-cliffs.json | 7 +++ biomes/frozen/frozen-mountain-middle.json | 7 +++ biomes/frozen/frozen-mountain.json | 7 +++ biomes/frozen/frozen-mountains.json | 7 +++ biomes/frozen/frozen-ocean.json | 5 ++- biomes/frozen/frozen-peak.json | 7 +++ biomes/frozen/frozen-pine-hills.json | 7 +++ biomes/frozen/frozen-pine-plains.json | 7 +++ biomes/frozen/frozen-pines.json | 7 +++ biomes/frozen/frozen-plains.json | 7 +++ biomes/frozen/frozen-redwood-forest.json | 7 +++ biomes/frozen/frozen-river.json | 6 ++- biomes/frozen/frozen-spruce-hills.json | 7 +++ biomes/frozen/frozen-spruce-plains.json | 7 +++ biomes/frozen/frozen-vander.json | 7 +++ loot/beach-clutter.json | 6 +-- loot/cactus-clutter.json | 4 +- loot/cave-clutter.json | 4 +- loot/cold-food.json | 10 ++--- loot/cold-treasure.json | 12 ++--- loot/forest-food.json | 16 +++---- loot/frozen-clutter.json | 14 ++---- loot/frozen-food.json | 12 ++--- loot/global-clutter.json | 18 ++++---- loot/global-treasure.json | 14 +++--- loot/hot-food.json | 4 +- loot/hot-treasure.json | 10 ++--- loot/mushroom-clutter.json | 8 ++-- loot/mushroom-food.json | 4 +- loot/ocean-clutter.json | 12 ++--- loot/snow-clutter.json | 6 +-- loot/swamp-clutter.json | 14 +++--- loot/swamp-food.json | 4 +- loot/temperate-clutter.json | 6 +-- loot/temperate-food.json | 6 +-- loot/tropical-food.json | 6 +-- loot/tropical-treasure.json | 54 +++++++++++------------ regions/frozen.json | 1 + 41 files changed, 236 insertions(+), 130 deletions(-) diff --git a/biomes/frozen/frozen-beach.json b/biomes/frozen/frozen-beach.json index e292c3f3..d121215d 100644 --- a/biomes/frozen/frozen-beach.json +++ b/biomes/frozen/frozen-beach.json @@ -43,7 +43,10 @@ ], "loot": { "tables": [ - "beach-clutter" + "beach-clutter", + "cold-clutter", + "cold-treasure", + "cold-food" ] }, "seaLayers": [ diff --git a/biomes/frozen/frozen-hills.json b/biomes/frozen/frozen-hills.json index 589ce234..32563e7f 100644 --- a/biomes/frozen/frozen-hills.json +++ b/biomes/frozen/frozen-hills.json @@ -75,6 +75,13 @@ "structure": "igloo" } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "objects": [ { "chance": 0.1, diff --git a/biomes/frozen/frozen-ice-cavern.json b/biomes/frozen/frozen-ice-cavern.json index c82cb58d..ce0d3983 100644 --- a/biomes/frozen/frozen-ice-cavern.json +++ b/biomes/frozen/frozen-ice-cavern.json @@ -94,9 +94,12 @@ } } ], - "loot": { + "loot": { "tables": [ - "cave-clutter" + "cave-clutter", + "cold-clutter", + "cold-treasure", + "cold-food" ] }, "slab": { diff --git a/biomes/frozen/frozen-mountain-cliffs.json b/biomes/frozen/frozen-mountain-cliffs.json index 50bf2f2e..e5db7b41 100644 --- a/biomes/frozen/frozen-mountain-cliffs.json +++ b/biomes/frozen/frozen-mountain-cliffs.json @@ -50,6 +50,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "generators": [ { "min": 14, diff --git a/biomes/frozen/frozen-mountain-middle.json b/biomes/frozen/frozen-mountain-middle.json index 87aa1205..1f772394 100644 --- a/biomes/frozen/frozen-mountain-middle.json +++ b/biomes/frozen/frozen-mountain-middle.json @@ -126,6 +126,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "biomeScatter": [ "PLAINS", "FOREST" diff --git a/biomes/frozen/frozen-mountain.json b/biomes/frozen/frozen-mountain.json index e1f4d181..ee28962f 100644 --- a/biomes/frozen/frozen-mountain.json +++ b/biomes/frozen/frozen-mountain.json @@ -82,6 +82,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "generators": [ { "min": 70, diff --git a/biomes/frozen/frozen-mountains.json b/biomes/frozen/frozen-mountains.json index 6dbfaa86..3d66fadf 100644 --- a/biomes/frozen/frozen-mountains.json +++ b/biomes/frozen/frozen-mountains.json @@ -53,6 +53,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "generators": [ { "min": 3, diff --git a/biomes/frozen/frozen-ocean.json b/biomes/frozen/frozen-ocean.json index d2207d98..c83463bd 100644 --- a/biomes/frozen/frozen-ocean.json +++ b/biomes/frozen/frozen-ocean.json @@ -229,7 +229,10 @@ ], "loot": { "tables": [ - "ocean-clutter" + "cold-clutter", + "ocean-clutter", + "cold-treasure", + "cold-food" ] } } \ No newline at end of file diff --git a/biomes/frozen/frozen-peak.json b/biomes/frozen/frozen-peak.json index 1d66b783..c4f218e4 100644 --- a/biomes/frozen/frozen-peak.json +++ b/biomes/frozen/frozen-peak.json @@ -117,6 +117,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "generators": [ { "min": 14, diff --git a/biomes/frozen/frozen-pine-hills.json b/biomes/frozen/frozen-pine-hills.json index 514fa5d7..d5f53482 100644 --- a/biomes/frozen/frozen-pine-hills.json +++ b/biomes/frozen/frozen-pine-hills.json @@ -59,6 +59,13 @@ "min": 6 } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-pine-plains.json b/biomes/frozen/frozen-pine-plains.json index c5f35747..7abb1c0f 100644 --- a/biomes/frozen/frozen-pine-plains.json +++ b/biomes/frozen/frozen-pine-plains.json @@ -67,6 +67,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-pines.json b/biomes/frozen/frozen-pines.json index b3355b89..77a5223b 100644 --- a/biomes/frozen/frozen-pines.json +++ b/biomes/frozen/frozen-pines.json @@ -76,6 +76,13 @@ "generator": "mountain" } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen/frozen-plains.json b/biomes/frozen/frozen-plains.json index d1fa1398..6f0cadbc 100644 --- a/biomes/frozen/frozen-plains.json +++ b/biomes/frozen/frozen-plains.json @@ -67,6 +67,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-redwood-forest.json b/biomes/frozen/frozen-redwood-forest.json index 7a685150..3ebfa1cb 100644 --- a/biomes/frozen/frozen-redwood-forest.json +++ b/biomes/frozen/frozen-redwood-forest.json @@ -246,6 +246,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "wall": { "style": { "style": "STATIC" diff --git a/biomes/frozen/frozen-river.json b/biomes/frozen/frozen-river.json index 8708ccf9..dd512f1d 100644 --- a/biomes/frozen/frozen-river.json +++ b/biomes/frozen/frozen-river.json @@ -48,6 +48,7 @@ ] } ], + "generators": [ { "generator": "plain", @@ -161,7 +162,10 @@ ], "loot": { "tables": [ - "ocean-clutter" + "cold-clutter", + "ocean-treasure", + "cold-treasure", + "cold-food" ] } } \ No newline at end of file diff --git a/biomes/frozen/frozen-spruce-hills.json b/biomes/frozen/frozen-spruce-hills.json index 7a972f45..5a90d187 100644 --- a/biomes/frozen/frozen-spruce-hills.json +++ b/biomes/frozen/frozen-spruce-hills.json @@ -59,6 +59,13 @@ "min": 6 } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-spruce-plains.json b/biomes/frozen/frozen-spruce-plains.json index e42bf929..f1104f25 100644 --- a/biomes/frozen/frozen-spruce-plains.json +++ b/biomes/frozen/frozen-spruce-plains.json @@ -55,6 +55,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/frozen/frozen-vander.json b/biomes/frozen/frozen-vander.json index 4beecf53..c8747915 100644 --- a/biomes/frozen/frozen-vander.json +++ b/biomes/frozen/frozen-vander.json @@ -95,6 +95,13 @@ ] } ], + "loot": { + "tables": [ + "cold-clutter", + "cold-treasure", + "cold-food" + ] + }, "generators": [ { "min": 3, diff --git a/loot/beach-clutter.json b/loot/beach-clutter.json index 6d00078f..dd36a24e 100644 --- a/loot/beach-clutter.json +++ b/loot/beach-clutter.json @@ -7,20 +7,20 @@ { "type": "sugar_cane", "maxAmount": 12, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "fishing_rod", "maxAmount": 1, - "rarity": 11, + "rarity": 2, "minDurability": 0.5, "slotTypes": "STORAGE" }, { "type": "sugar", "maxAmount": 3, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cactus-clutter.json b/loot/cactus-clutter.json index b0088cba..03fa83a7 100644 --- a/loot/cactus-clutter.json +++ b/loot/cactus-clutter.json @@ -7,13 +7,13 @@ { "type": "cactus", "maxAmount": 3, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "green_dye", "maxAmount": 6, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cave-clutter.json b/loot/cave-clutter.json index 097623ca..e6766944 100644 --- a/loot/cave-clutter.json +++ b/loot/cave-clutter.json @@ -7,7 +7,7 @@ { "type": "torch", "maxAmount": 7, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { @@ -19,7 +19,7 @@ { "type": "lantern", "maxAmount": 1, - "rarity": 9, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cold-food.json b/loot/cold-food.json index 5b94bd39..b17f40d9 100644 --- a/loot/cold-food.json +++ b/loot/cold-food.json @@ -7,31 +7,31 @@ { "type": "rabbit_stew", "maxAmount": 1, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "potato", "maxAmount": 7, - "rarity": 1, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "wheat_seeds", "maxAmount": 7, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "poisonous_potato", "maxAmount": 1, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "sweet_berries", "maxAmount": 4, - "rarity": 1, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cold-treasure.json b/loot/cold-treasure.json index 5750aef1..bd3cc5de 100644 --- a/loot/cold-treasure.json +++ b/loot/cold-treasure.json @@ -8,37 +8,37 @@ "type": "iron_nugget", "maxAmount": 12, "minAmount": 3, - "rarity": 3, + "rarity": 4, "slotTypes": "STORAGE" }, { "type": "iron_ingot", "maxAmount": 5, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "emerald", "maxamount": 5, - "rarity": 6, + "rarity": 3, "slottypes": "STORAGE" }, { "type": "emerald_block", "maxamount": 1, - "rarity": 14, + "rarity": 6, "slottypes": "STORAGE" }, { "type": "iron_block", "maxamount": 3, - "rarity": 11, + "rarity": 4, "slottypes": "STORAGE" }, { "type": "leather_leggings", "maxAmount": 1, - "rarity": 97, + "rarity": 10, "minDurability": 0.93, "maxDurability": 1, "displayName": "Lucky Pyro Pants", diff --git a/loot/forest-food.json b/loot/forest-food.json index 614bdb3b..81a39e3c 100644 --- a/loot/forest-food.json +++ b/loot/forest-food.json @@ -7,46 +7,46 @@ { "type": "apple", "maxAmount": 8, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "oak_sapling", "maxAmount": 8, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "spruce_sapling", "maxAmount": 8, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dark_oak_sapling", "maxAmount": 8, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "oak_planks", "maxAmount": 19, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" },{ "type": "chest", "maxAmount": 8, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" },{ "type": "stone_axe", "maxAmount": 2, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" },{ "type": "dirt_path", "maxAmount": 8, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/frozen-clutter.json b/loot/frozen-clutter.json index 73fb5a68..31262c7e 100644 --- a/loot/frozen-clutter.json +++ b/loot/frozen-clutter.json @@ -7,31 +7,25 @@ { "type": "blackstone", "maxAmount": 12, - "rarity": 7, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_bricks", "maxAmount": 12, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "zombie_head", "maxAmount": 1, - "rarity": 20, + "rarity": 8, "slotTypes": "STORAGE" }, { "type": "wheat", "maxAmount": 6, - "rarity": 5, - "slotTypes": "STORAGE" - }, - { - "type": "zombie_head", - "maxAmount": 1, - "rarity": 20, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/frozen-food.json b/loot/frozen-food.json index 638dbb83..3cc3d150 100644 --- a/loot/frozen-food.json +++ b/loot/frozen-food.json @@ -7,37 +7,37 @@ { "type": "spider_eye", "maxAmount": 1, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "beetroot_soup", "maxAmount": 1, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cookie", "maxAmount": 4, - "rarity": 7, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "rabbit_stew", "maxAmount": 1, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "pumpkin_pie", "maxAmount": 1, - "rarity": 8, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "potato", "maxAmount": 11, - "rarity": 1, + "rarity": 2, "slotTypes": "STORAGE" }, { diff --git a/loot/global-clutter.json b/loot/global-clutter.json index 06412140..074d3396 100644 --- a/loot/global-clutter.json +++ b/loot/global-clutter.json @@ -7,55 +7,55 @@ { "type": "stone", "maxAmount": 12, - "rarity": 12, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stick", "maxAmount": 7, - "rarity": 7, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "flint", "maxAmount": 3, - "rarity": 14, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "leather", "maxAmount": 4, - "rarity": 10, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "book", "maxAmount": 2, - "rarity": 17, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "ladder", "maxAmount": 12, - "rarity": 10, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_axe", "maxAmount": 1, - "rarity": 10, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_pickaxe", "maxAmount": 1, - "rarity": 10, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_sword", "maxAmount": 1, - "rarity": 10, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/global-treasure.json b/loot/global-treasure.json index 7334b5a9..ca693dd2 100644 --- a/loot/global-treasure.json +++ b/loot/global-treasure.json @@ -7,37 +7,37 @@ { "type": "diamond", "maxamount": 2, - "rarity": 6, + "rarity": 2, "slottypes": "STORAGE" }, { "type": "ender_pearl", "maxamount": 3, - "rarity": 9, + "rarity": 2, "slottypes": "STORAGE" }, { "type": "name_tag", "maxamount": 1, - "rarity": 10, + "rarity": 2, "slottypes": "STORAGE" }, { "type": "obsidian", "maxamount": 1, - "rarity": 3, + "rarity": 2, "slottypes": "STORAGE" }, { "type": "iron_ingot", "maxamount": 5, - "rarity": 3, + "rarity": 2, "slottypes": "STORAGE" }, { "type": "iron_nugget", "maxamount": 7, - "rarity": 1, + "rarity": 2, "slottypes": "STORAGE" }, { @@ -50,7 +50,7 @@ "type": "redstone", "maxamount": 11, "minAmount": 4, - "rarity": 4, + "rarity": 2, "slottypes": "STORAGE" } ] diff --git a/loot/hot-food.json b/loot/hot-food.json index 1960ddcf..4d6eaa1b 100644 --- a/loot/hot-food.json +++ b/loot/hot-food.json @@ -7,13 +7,13 @@ { "type": "rotten_flesh", "maxAmount": 3, - "rarity": 1, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dried_kelp", "maxAmount": 6, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/hot-treasure.json b/loot/hot-treasure.json index 870ca6dc..dcbaf317 100644 --- a/loot/hot-treasure.json +++ b/loot/hot-treasure.json @@ -7,31 +7,31 @@ { "type": "lapis_lazuli", "maxAmount": 12, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "gold_ingot", "maxAmount": 5, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "gold_nugget", "maxAmount": 8, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "blaze_powder", "maxAmount": 1, - "rarity": 38, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "golden_boots", "maxAmount": 1, - "rarity": 85, + "rarity": 15, "minDurability": 0.93, "maxDurability": 1, "displayName": "Golden Dashers", diff --git a/loot/mushroom-clutter.json b/loot/mushroom-clutter.json index b63d01b9..9d47c97f 100644 --- a/loot/mushroom-clutter.json +++ b/loot/mushroom-clutter.json @@ -7,25 +7,25 @@ { "type": "red_mushroom", "maxAmount": 5, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "brown_mushroom", "maxAmount": 5, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "warped_fungus", "maxAmount": 3, - "rarity": 21, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "crimson_fungus", "maxAmount": 3, - "rarity": 21, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/mushroom-food.json b/loot/mushroom-food.json index 3d743d74..2c85ac46 100644 --- a/loot/mushroom-food.json +++ b/loot/mushroom-food.json @@ -7,7 +7,7 @@ { "type": "spider_eye", "maxAmount": 3, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { @@ -19,7 +19,7 @@ { "type": "mushroom_stew", "maxAmount": 1, - "rarity": 7, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/ocean-clutter.json b/loot/ocean-clutter.json index 68327bb3..22cd4f99 100644 --- a/loot/ocean-clutter.json +++ b/loot/ocean-clutter.json @@ -7,13 +7,13 @@ { "type": "wet_sponge", "maxAmount": 5, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "sponge", "maxAmount": 2, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { @@ -25,19 +25,19 @@ { "type": "fishing_rod", "maxAmount": 1, - "rarity": 11, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "pufferfish", "maxAmount": 2, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "turtle_helmet", "maxAmount": 1, - "rarity": 36, + "rarity": 2, "enchantments": [ { "enchantment": "OXYGEN", @@ -104,7 +104,7 @@ { "type": "trident", "maxAmount": 1, - "rarity": 36, + "rarity": 2, "enchantments": [ { "enchantment": "CHANNELING", diff --git a/loot/snow-clutter.json b/loot/snow-clutter.json index e0d7f9f1..4bdcadc3 100644 --- a/loot/snow-clutter.json +++ b/loot/snow-clutter.json @@ -7,19 +7,19 @@ { "type": "snowball", "maxAmount": 9, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "packed_ice", "maxAmount": 3, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "blue_ice", "maxAmount": 2, - "rarity": 9, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/swamp-clutter.json b/loot/swamp-clutter.json index 32882b2a..1b7e0a71 100644 --- a/loot/swamp-clutter.json +++ b/loot/swamp-clutter.json @@ -7,43 +7,43 @@ { "type": "string", "maxAmount": 5, - "rarity": 4, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "red_mushroom", "maxAmount": 2, - "rarity": 14, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "brown_mushroom", "maxAmount": 2, - "rarity": 14, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cobweb", "maxAmount": 2, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dark_prismarine", "maxAmount": 2, - "rarity": 10, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "diamond", "maxAmount": 2, - "rarity": 14, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "coal", "maxAmount": 16, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/swamp-food.json b/loot/swamp-food.json index 9d80766c..3ddca682 100644 --- a/loot/swamp-food.json +++ b/loot/swamp-food.json @@ -7,13 +7,13 @@ { "type": "spider_eye", "maxAmount": 3, - "rarity": 6, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "carrot", "maxAmount": 7, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { diff --git a/loot/temperate-clutter.json b/loot/temperate-clutter.json index d50caa81..6e081356 100644 --- a/loot/temperate-clutter.json +++ b/loot/temperate-clutter.json @@ -7,19 +7,19 @@ { "type": "oak_planks", "maxAmount": 3, - "rarity": 6, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stick", "maxAmount": 4, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "oak_wood", "maxAmount": 3, - "rarity": 12, + "rarity": 2, "slotTypes": "STORAGE" } diff --git a/loot/temperate-food.json b/loot/temperate-food.json index b3313c20..96bb7067 100644 --- a/loot/temperate-food.json +++ b/loot/temperate-food.json @@ -7,19 +7,19 @@ { "type": "bread", "maxAmount": 2, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "wheat", "maxAmount": 7, - "rarity": 1, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "carrot", "maxAmount": 7, - "rarity": 3, + "rarity": 2, "slotTypes": "STORAGE" }, { diff --git a/loot/tropical-food.json b/loot/tropical-food.json index d0fc8067..9e2f5769 100644 --- a/loot/tropical-food.json +++ b/loot/tropical-food.json @@ -13,19 +13,19 @@ { "type": "cookie", "maxAmount": 3, - "rarity": 5, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dried_kelp", "maxAmount": 3, - "rarity": 1, + "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cocoa_beans", "maxAmount": 3, - "rarity": 1, + "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/tropical-treasure.json b/loot/tropical-treasure.json index 569821f9..4b5ec6ca 100644 --- a/loot/tropical-treasure.json +++ b/loot/tropical-treasure.json @@ -7,7 +7,7 @@ { "type": "wooden_pickaxe", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -15,7 +15,7 @@ { "type": "flint_and_steel", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -23,7 +23,7 @@ ,{ "type": "shears", "maxamount": 1, - "rarity": 7, + "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -31,7 +31,7 @@ { "type": "bow", "maxamount": 1, - "rarity": 8, + "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -39,7 +39,7 @@ { "type": "arrow", "maxamount": 21, - "rarity": 8, + "rarity": 4, "slottypes": "STORAGE" }, { @@ -53,7 +53,7 @@ { "type": "iron_pickaxe", "maxamount": 1, - "rarity": 8, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -61,7 +61,7 @@ { "type": "diamond_pickaxe", "maxamount": 1, - "rarity": 12, + "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -69,7 +69,7 @@ { "type": "golden_pickaxe", "maxamount": 1, - "rarity": 13, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -77,7 +77,7 @@ { "type": "wooden_sword", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -93,7 +93,7 @@ { "type": "iron_sword", "maxamount": 1, - "rarity": 8, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -101,7 +101,7 @@ { "type": "diamond_sword", "maxamount": 1, - "rarity": 12, + "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -109,7 +109,7 @@ { "type": "golden_sword", "maxamount": 1, - "rarity": 13, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -117,7 +117,7 @@ { "type": "wooden_axe", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -125,7 +125,7 @@ { "type": "stone_axe", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -133,7 +133,7 @@ { "type": "iron_axe", "maxamount": 1, - "rarity": 8, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -141,7 +141,7 @@ { "type": "diamond_axe", "maxamount": 1, - "rarity": 12, + "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -149,7 +149,7 @@ { "type": "golden_axe", "maxamount": 1, - "rarity": 13, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -157,7 +157,7 @@ { "type": "wooden_hoe", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -165,7 +165,7 @@ { "type": "stone_hoe", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -173,7 +173,7 @@ { "type": "iron_hoe", "maxamount": 1, - "rarity": 8, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -181,7 +181,7 @@ { "type": "diamond_hoe", "maxamount": 1, - "rarity": 12, + "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -189,7 +189,7 @@ { "type": "golden_hoe", "maxamount": 1, - "rarity": 13, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -197,7 +197,7 @@ { "type": "wooden_shovel", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -205,7 +205,7 @@ { "type": "stone_shovel", "maxamount": 1, - "rarity": 5, + "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -213,7 +213,7 @@ { "type": "iron_shovel", "maxamount": 1, - "rarity": 8, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -221,7 +221,7 @@ { "type": "diamond_shovel", "maxamount": 1, - "rarity": 12, + "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -229,7 +229,7 @@ { "type": "golden_shovel", "maxamount": 1, - "rarity": 13, + "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" diff --git a/regions/frozen.json b/regions/frozen.json index 935532f8..c07dfaca 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -86,6 +86,7 @@ "frozen-clutter" ] }, + "objects": [ { "chance": 1, From 621abdb0fd9aa27bd977e32ae6282a71d63250ed Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 24 Jun 2021 13:51:14 -0700 Subject: [PATCH 08/14] fff --- regions/frozen.json | 4 ++-- regions/hot.json | 3 +-- regions/mesa.json | 4 ++-- regions/mountain.json | 4 ++-- regions/mushroom.json | 4 ++-- regions/ocean.json | 4 ++-- regions/savanna.json | 4 ++-- regions/swamp.json | 4 ++-- regions/temperate.json | 4 ++-- regions/tropical-mountain.json | 4 ++-- regions/tropical.json | 4 ++-- regions/tundra.json | 4 ++-- 12 files changed, 23 insertions(+), 24 deletions(-) diff --git a/regions/frozen.json b/regions/frozen.json index c07dfaca..81eb2522 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -91,6 +91,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -142,8 +143,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} }, { diff --git a/regions/hot.json b/regions/hot.json index d2d93297..1cb3c85f 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -206,8 +206,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} }, { diff --git a/regions/mesa.json b/regions/mesa.json index 32815e8f..32bfc94c 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -52,6 +52,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -105,8 +106,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } ], diff --git a/regions/mountain.json b/regions/mountain.json index 212e0779..37c31532 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -63,6 +63,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -115,8 +116,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } ], diff --git a/regions/mushroom.json b/regions/mushroom.json index 99837ae3..a1cc8624 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -68,6 +68,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -120,8 +121,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } ], diff --git a/regions/ocean.json b/regions/ocean.json index c66c037d..f061f8fa 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -27,6 +27,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -79,8 +80,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } ], diff --git a/regions/savanna.json b/regions/savanna.json index 964b5b97..57cb3501 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -41,6 +41,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -93,8 +94,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } ], diff --git a/regions/swamp.json b/regions/swamp.json index a74dd791..83563604 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -48,6 +48,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -99,8 +100,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } diff --git a/regions/temperate.json b/regions/temperate.json index 12a460f7..e621621a 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -61,6 +61,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -112,8 +113,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} }, { diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index f17c5149..2acabe27 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -42,6 +42,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -93,8 +94,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } diff --git a/regions/tropical.json b/regions/tropical.json index b3fcb94b..50819ed3 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -85,6 +85,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -136,8 +137,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} }, { diff --git a/regions/tundra.json b/regions/tundra.json index e9d1ab96..548526a8 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -66,6 +66,7 @@ { "chance": 1, "bottom": true, + "translate": {"yRandom": 8, "y": 4}, "place": [ "deepslate/ds1", "deepslate/ds2", @@ -117,8 +118,7 @@ "max": 360, "min": 0 }, - "translate": {"yRandom": 10, "y": 5}, - "bore": true + "translate": {"yRandom": 15, "y": 10} } ], From 357d12ea8c19912636613bfecc11f92e39bf84d6 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 24 Jun 2021 20:54:39 -0700 Subject: [PATCH 09/14] Removed all loot from ALLLL biomes / Added to regions --- biomes/frozen/frozen-beach.json | 9 +--- biomes/frozen/frozen-hills.json | 8 +--- biomes/frozen/frozen-ice-cavern.json | 9 +--- biomes/frozen/frozen-mountain-cliffs.json | 8 +--- biomes/frozen/frozen-mountain-middle.json | 8 +--- biomes/frozen/frozen-mountain.json | 8 +--- biomes/frozen/frozen-mountains.json | 8 +--- biomes/frozen/frozen-ocean.json | 11 +---- biomes/frozen/frozen-peak.json | 8 +--- biomes/frozen/frozen-pine-hills.json | 8 +--- biomes/frozen/frozen-pine-plains.json | 8 +--- biomes/frozen/frozen-pines.json | 8 +--- biomes/frozen/frozen-plains.json | 8 +--- biomes/frozen/frozen-redwood-forest.json | 8 +--- biomes/frozen/frozen-river.json | 10 +---- biomes/frozen/frozen-spruce-hills.json | 8 +--- biomes/frozen/frozen-spruce-plains.json | 8 +--- biomes/frozen/frozen-vander.json | 8 +--- biomes/hot/hot-desert.json | 6 +-- biomes/hot/hot-ocean-cliffs.json | 6 +-- biomes/hot/hot-ocean.json | 6 +-- biomes/hot/hot-river.json | 7 +-- biomes/hot/hot-sandy-cave.json | 7 +-- biomes/hot/hot-sandy-red-cave.json | 6 --- biomes/mountain/mountain-beach.json | 5 --- biomes/mountain/mountain-river-soft.json | 7 +-- biomes/mountain/mountain-river.json | 7 +-- biomes/mushroom/mushroom-ocean.json | 5 --- biomes/ocean/ocean-deep.json | 45 ++++++++++--------- biomes/savanna/savanna-beach.json | 6 +-- biomes/savanna/savanna-forest.json | 6 +-- biomes/swamp/swamp-beach.json | 7 +-- biomes/swamp/swamp-murky-cavern-gleaming.json | 5 --- biomes/swamp/swamp-murky-cavern.json | 6 +-- biomes/swamp/swamp-ocean-tree.json | 7 +-- biomes/swamp/swamp-ocean.json | 6 +-- biomes/temperate/temperate-beach.json | 6 +-- biomes/temperate/temperate-birch-denmyre.json | 6 +-- biomes/temperate/temperate-birch-forest.json | 6 +-- .../temperate/temperate-cracked-cavern.json | 6 +-- biomes/temperate/temperate-flower-forest.json | 6 +-- biomes/temperate/temperate-lit-cavern.json | 6 +-- biomes/temperate/temperate-oak-beach.json | 6 +-- biomes/temperate/temperate-oak-denmyre.json | 6 +-- biomes/temperate/temperate-oak-forest.json | 5 --- biomes/temperate/temperate-ocean-deep.json | 19 ++------ biomes/temperate/temperate-ocean.json | 6 +-- biomes/temperate/temperate-plateau.json | 6 +-- biomes/temperate/temperate-river.json | 7 +-- biomes/tropical/tropical-beach-bamboo.json | 5 --- biomes/tropical/tropical-beach-charred.json | 6 +-- biomes/tropical/tropical-beach.json | 6 +-- biomes/tropical/tropical-cavern-coral.json | 6 +-- biomes/tropical/tropical-cavern.json | 6 +-- .../tropical/tropical-coral-ocean-cliffs.json | 6 +-- biomes/tropical/tropical-coral-ocean.json | 5 --- biomes/tropical/tropical-island-beach.json | 6 +-- biomes/tropical/tropical-ocean.json | 6 +-- biomes/tropical/tropical-river-steep.json | 7 +-- .../tropical/tropical-submerged-volcanic.json | 6 +-- biomes/tundra/tundra-beach.json | 6 +-- biomes/tundra/tundra-cavern.json | 6 +-- biomes/tundra/tundra-river-rocky.json | 5 --- biomes/tundra/tundra-river.json | 6 +-- biomes/tundra/tundra-spiked-cavern.json | 6 +-- regions/frozen.json | 10 ++++- regions/hot.json | 7 ++- regions/mesa.json | 11 +++++ regions/mountain.json | 11 +++++ regions/mushroom.json | 11 +++-- regions/ocean.json | 8 ++++ regions/savanna.json | 8 +++- regions/swamp.json | 9 +++- regions/temperate.json | 15 +++++-- regions/tropical-mountain.json | 12 +++++ regions/tropical.json | 9 +++- regions/tundra.json | 9 +++- 77 files changed, 186 insertions(+), 420 deletions(-) diff --git a/biomes/frozen/frozen-beach.json b/biomes/frozen/frozen-beach.json index d121215d..92124c76 100644 --- a/biomes/frozen/frozen-beach.json +++ b/biomes/frozen/frozen-beach.json @@ -41,14 +41,7 @@ "generator": "plain" } ], - "loot": { - "tables": [ - "beach-clutter", - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "seaLayers": [ { "minHeight": 1, diff --git a/biomes/frozen/frozen-hills.json b/biomes/frozen/frozen-hills.json index 32563e7f..c67e639e 100644 --- a/biomes/frozen/frozen-hills.json +++ b/biomes/frozen/frozen-hills.json @@ -75,13 +75,7 @@ "structure": "igloo" } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "objects": [ { "chance": 0.1, diff --git a/biomes/frozen/frozen-ice-cavern.json b/biomes/frozen/frozen-ice-cavern.json index ce0d3983..3f33cb17 100644 --- a/biomes/frozen/frozen-ice-cavern.json +++ b/biomes/frozen/frozen-ice-cavern.json @@ -94,14 +94,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter", - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "slab": { "style": { "style": "IRIS" diff --git a/biomes/frozen/frozen-mountain-cliffs.json b/biomes/frozen/frozen-mountain-cliffs.json index e5db7b41..276ac4f4 100644 --- a/biomes/frozen/frozen-mountain-cliffs.json +++ b/biomes/frozen/frozen-mountain-cliffs.json @@ -50,13 +50,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "generators": [ { "min": 14, diff --git a/biomes/frozen/frozen-mountain-middle.json b/biomes/frozen/frozen-mountain-middle.json index 1f772394..4c6fda2e 100644 --- a/biomes/frozen/frozen-mountain-middle.json +++ b/biomes/frozen/frozen-mountain-middle.json @@ -126,13 +126,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "biomeScatter": [ "PLAINS", "FOREST" diff --git a/biomes/frozen/frozen-mountain.json b/biomes/frozen/frozen-mountain.json index ee28962f..57ca1e15 100644 --- a/biomes/frozen/frozen-mountain.json +++ b/biomes/frozen/frozen-mountain.json @@ -82,13 +82,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "generators": [ { "min": 70, diff --git a/biomes/frozen/frozen-mountains.json b/biomes/frozen/frozen-mountains.json index 3d66fadf..a60fd957 100644 --- a/biomes/frozen/frozen-mountains.json +++ b/biomes/frozen/frozen-mountains.json @@ -53,13 +53,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "generators": [ { "min": 3, diff --git a/biomes/frozen/frozen-ocean.json b/biomes/frozen/frozen-ocean.json index c83463bd..b71fdf89 100644 --- a/biomes/frozen/frozen-ocean.json +++ b/biomes/frozen/frozen-ocean.json @@ -226,13 +226,6 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "cold-clutter", - "ocean-clutter", - "cold-treasure", - "cold-food" - ] - } + ] + } \ No newline at end of file diff --git a/biomes/frozen/frozen-peak.json b/biomes/frozen/frozen-peak.json index c4f218e4..30f8f614 100644 --- a/biomes/frozen/frozen-peak.json +++ b/biomes/frozen/frozen-peak.json @@ -117,13 +117,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "generators": [ { "min": 14, diff --git a/biomes/frozen/frozen-pine-hills.json b/biomes/frozen/frozen-pine-hills.json index d5f53482..e52ecd12 100644 --- a/biomes/frozen/frozen-pine-hills.json +++ b/biomes/frozen/frozen-pine-hills.json @@ -59,13 +59,7 @@ "min": 6 } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-pine-plains.json b/biomes/frozen/frozen-pine-plains.json index 7abb1c0f..53d5ad3f 100644 --- a/biomes/frozen/frozen-pine-plains.json +++ b/biomes/frozen/frozen-pine-plains.json @@ -67,13 +67,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-pines.json b/biomes/frozen/frozen-pines.json index 77a5223b..ace65db9 100644 --- a/biomes/frozen/frozen-pines.json +++ b/biomes/frozen/frozen-pines.json @@ -76,13 +76,7 @@ "generator": "mountain" } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "biomeSkyScatter": [ "SNOWY_TAIGA", "SNOWY_MOUNTAINS" diff --git a/biomes/frozen/frozen-plains.json b/biomes/frozen/frozen-plains.json index 6f0cadbc..3ed7c62b 100644 --- a/biomes/frozen/frozen-plains.json +++ b/biomes/frozen/frozen-plains.json @@ -67,13 +67,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-redwood-forest.json b/biomes/frozen/frozen-redwood-forest.json index 3ebfa1cb..ebadf80a 100644 --- a/biomes/frozen/frozen-redwood-forest.json +++ b/biomes/frozen/frozen-redwood-forest.json @@ -246,13 +246,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/frozen/frozen-river.json b/biomes/frozen/frozen-river.json index dd512f1d..694cc471 100644 --- a/biomes/frozen/frozen-river.json +++ b/biomes/frozen/frozen-river.json @@ -159,13 +159,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "cold-clutter", - "ocean-treasure", - "cold-treasure", - "cold-food" - ] - } + ] } \ No newline at end of file diff --git a/biomes/frozen/frozen-spruce-hills.json b/biomes/frozen/frozen-spruce-hills.json index 5a90d187..f6d4e907 100644 --- a/biomes/frozen/frozen-spruce-hills.json +++ b/biomes/frozen/frozen-spruce-hills.json @@ -59,13 +59,7 @@ "min": 6 } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "decorators": [ { "chance": 1, diff --git a/biomes/frozen/frozen-spruce-plains.json b/biomes/frozen/frozen-spruce-plains.json index f1104f25..6d677380 100644 --- a/biomes/frozen/frozen-spruce-plains.json +++ b/biomes/frozen/frozen-spruce-plains.json @@ -55,13 +55,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/frozen/frozen-vander.json b/biomes/frozen/frozen-vander.json index c8747915..8a42ac0d 100644 --- a/biomes/frozen/frozen-vander.json +++ b/biomes/frozen/frozen-vander.json @@ -95,13 +95,7 @@ ] } ], - "loot": { - "tables": [ - "cold-clutter", - "cold-treasure", - "cold-food" - ] - }, + "generators": [ { "min": 3, diff --git a/biomes/hot/hot-desert.json b/biomes/hot/hot-desert.json index 678a24e8..3c4ecdcd 100644 --- a/biomes/hot/hot-desert.json +++ b/biomes/hot/hot-desert.json @@ -89,11 +89,7 @@ } } ], - "loot": { - "tables": [ - "cactus-clutter" - ] - }, + "decorators": [ { "verticalZoom": 5, diff --git a/biomes/hot/hot-ocean-cliffs.json b/biomes/hot/hot-ocean-cliffs.json index 1585e6a0..a500be49 100644 --- a/biomes/hot/hot-ocean-cliffs.json +++ b/biomes/hot/hot-ocean-cliffs.json @@ -200,11 +200,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "IRIS" diff --git a/biomes/hot/hot-ocean.json b/biomes/hot/hot-ocean.json index 9fd57f63..2f336b3c 100644 --- a/biomes/hot/hot-ocean.json +++ b/biomes/hot/hot-ocean.json @@ -228,11 +228,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "IRIS" diff --git a/biomes/hot/hot-river.json b/biomes/hot/hot-river.json index dc6d6a7c..2f13a403 100644 --- a/biomes/hot/hot-river.json +++ b/biomes/hot/hot-river.json @@ -43,10 +43,5 @@ } ] } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/hot/hot-sandy-cave.json b/biomes/hot/hot-sandy-cave.json index 54ae3b28..a4b586db 100644 --- a/biomes/hot/hot-sandy-cave.json +++ b/biomes/hot/hot-sandy-cave.json @@ -147,12 +147,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter", - "cactus-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/hot/hot-sandy-red-cave.json b/biomes/hot/hot-sandy-red-cave.json index 17e7c77d..e7deeb99 100644 --- a/biomes/hot/hot-sandy-red-cave.json +++ b/biomes/hot/hot-sandy-red-cave.json @@ -64,12 +64,6 @@ } } ], - "loot": { - "tables": [ - "cave-clutter", - "cactus-clutter" - ] - }, "slab": { "style": { "style": "STATIC" diff --git a/biomes/mountain/mountain-beach.json b/biomes/mountain/mountain-beach.json index 1a638dff..c32d9afb 100644 --- a/biomes/mountain/mountain-beach.json +++ b/biomes/mountain/mountain-beach.json @@ -67,10 +67,5 @@ "block": "air" } ] - }, - "loot": { - "tables": [ - "beach-clutter" - ] } } \ No newline at end of file diff --git a/biomes/mountain/mountain-river-soft.json b/biomes/mountain/mountain-river-soft.json index a95e8b13..63f908a5 100644 --- a/biomes/mountain/mountain-river-soft.json +++ b/biomes/mountain/mountain-river-soft.json @@ -112,10 +112,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/mountain/mountain-river.json b/biomes/mountain/mountain-river.json index fb74d930..8960e745 100644 --- a/biomes/mountain/mountain-river.json +++ b/biomes/mountain/mountain-river.json @@ -112,10 +112,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/mushroom/mushroom-ocean.json b/biomes/mushroom/mushroom-ocean.json index 2b1d9c43..03a4cd7f 100644 --- a/biomes/mushroom/mushroom-ocean.json +++ b/biomes/mushroom/mushroom-ocean.json @@ -269,11 +269,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "style": { "style": "IRIS" diff --git a/biomes/ocean/ocean-deep.json b/biomes/ocean/ocean-deep.json index 91963891..d1d6bb7d 100644 --- a/biomes/ocean/ocean-deep.json +++ b/biomes/ocean/ocean-deep.json @@ -5,7 +5,7 @@ "generators": [ { "generator": "smooth-dunes", - "max": -25, + "max": -30, "min": -50 } ], @@ -95,20 +95,32 @@ ] } ], - "loot": { - "tables": [ - "ocean-clutter", - "global-treasure", - "cold-food", - "tropical-treasure" - ] - }, "objects": [ + { + "underwater": true, + "waterloggable": true, + "chance": 0.008, + "mode": "FAST_MIN_HEIGHT", + "rotation": { + "enabled": true, + "yAxis": { + "enabled": true, + "interval": 90, + "min": -360, + "max": 360 + } + }, + "place": [ + "ships/gall-1", + "ships/gall-2", + "ships/gall-3" + ] + }, { "place": [ "ships/generic" ], - "chance": 0.01, + "chance": 0.001, "onwater": true, "translate": { "y": -1 @@ -118,7 +130,7 @@ { "underwater": true, "waterloggable": true, - "chance": 0.2, + "chance": 0.01, "mode": "FAST_MIN_HEIGHT", "rotation": { "enabled": true, @@ -151,17 +163,6 @@ "shipwreck/upsidedown-backhalf", "shipwreck/upsidedown-backhalf-degraded" ] - }, - { - "place": [ - "ships/generic" - ], - "chance": 0.005, - "onwater": true, - "translate": { - "y": -1 - }, - "waterloggable": true } ] } \ No newline at end of file diff --git a/biomes/savanna/savanna-beach.json b/biomes/savanna/savanna-beach.json index a07491a1..b44b03fc 100644 --- a/biomes/savanna/savanna-beach.json +++ b/biomes/savanna/savanna-beach.json @@ -58,11 +58,7 @@ ] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "entityInitialSpawns": [ { "entity": "cow", diff --git a/biomes/savanna/savanna-forest.json b/biomes/savanna/savanna-forest.json index 29de5593..04e3ee7a 100644 --- a/biomes/savanna/savanna-forest.json +++ b/biomes/savanna/savanna-forest.json @@ -335,11 +335,7 @@ } ], "biomeZoom": 20, - "loot": { - "tables": [ - "cactus-clutter" - ] - }, + "biomeStyle": { "style": "IRIS" }, diff --git a/biomes/swamp/swamp-beach.json b/biomes/swamp/swamp-beach.json index 3c27b5db..a86d9ad9 100644 --- a/biomes/swamp/swamp-beach.json +++ b/biomes/swamp/swamp-beach.json @@ -204,10 +204,5 @@ "y": -3 } } - ], - "loot": { - "tables": [ - "beach-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/swamp/swamp-murky-cavern-gleaming.json b/biomes/swamp/swamp-murky-cavern-gleaming.json index d1e99bc8..de19445a 100644 --- a/biomes/swamp/swamp-murky-cavern-gleaming.json +++ b/biomes/swamp/swamp-murky-cavern-gleaming.json @@ -326,11 +326,6 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, "slab": { "style": { "style": "STATIC" diff --git a/biomes/swamp/swamp-murky-cavern.json b/biomes/swamp/swamp-murky-cavern.json index 30cfb17a..c9c2da4e 100644 --- a/biomes/swamp/swamp-murky-cavern.json +++ b/biomes/swamp/swamp-murky-cavern.json @@ -166,11 +166,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/swamp/swamp-ocean-tree.json b/biomes/swamp/swamp-ocean-tree.json index 18c3e312..a7dcd2cd 100644 --- a/biomes/swamp/swamp-ocean-tree.json +++ b/biomes/swamp/swamp-ocean-tree.json @@ -219,7 +219,7 @@ } }, { - "mode": "STILT", + "mode": "FAST_MIN_HEIGHT", "place": [ "tree/jungle/1", "tree/jungle/2", @@ -307,11 +307,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "style": { "style": "IRIS" diff --git a/biomes/swamp/swamp-ocean.json b/biomes/swamp/swamp-ocean.json index 5b8fda51..75f0c916 100644 --- a/biomes/swamp/swamp-ocean.json +++ b/biomes/swamp/swamp-ocean.json @@ -219,11 +219,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "IRIS" diff --git a/biomes/temperate/temperate-beach.json b/biomes/temperate/temperate-beach.json index f78bc784..8725f1b6 100644 --- a/biomes/temperate/temperate-beach.json +++ b/biomes/temperate/temperate-beach.json @@ -134,11 +134,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-birch-denmyre.json b/biomes/temperate/temperate-birch-denmyre.json index c51ba8ce..9c7fc05a 100644 --- a/biomes/temperate/temperate-birch-denmyre.json +++ b/biomes/temperate/temperate-birch-denmyre.json @@ -391,11 +391,7 @@ "rarity": 7 } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-birch-forest.json b/biomes/temperate/temperate-birch-forest.json index fdd4ad09..797c584c 100644 --- a/biomes/temperate/temperate-birch-forest.json +++ b/biomes/temperate/temperate-birch-forest.json @@ -305,11 +305,7 @@ } } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-cracked-cavern.json b/biomes/temperate/temperate-cracked-cavern.json index 396ae4f2..5a47d810 100644 --- a/biomes/temperate/temperate-cracked-cavern.json +++ b/biomes/temperate/temperate-cracked-cavern.json @@ -136,11 +136,7 @@ "rarity": 7 } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-flower-forest.json b/biomes/temperate/temperate-flower-forest.json index 3a4fb1b5..75bab842 100644 --- a/biomes/temperate/temperate-flower-forest.json +++ b/biomes/temperate/temperate-flower-forest.json @@ -705,11 +705,7 @@ }] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-lit-cavern.json b/biomes/temperate/temperate-lit-cavern.json index bd7eb938..6e6587bd 100644 --- a/biomes/temperate/temperate-lit-cavern.json +++ b/biomes/temperate/temperate-lit-cavern.json @@ -130,11 +130,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-oak-beach.json b/biomes/temperate/temperate-oak-beach.json index 56b786ff..ae7d922c 100644 --- a/biomes/temperate/temperate-oak-beach.json +++ b/biomes/temperate/temperate-oak-beach.json @@ -174,11 +174,7 @@ } } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-oak-denmyre.json b/biomes/temperate/temperate-oak-denmyre.json index 4fe05752..c6b89370 100644 --- a/biomes/temperate/temperate-oak-denmyre.json +++ b/biomes/temperate/temperate-oak-denmyre.json @@ -401,11 +401,7 @@ } } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-oak-forest.json b/biomes/temperate/temperate-oak-forest.json index 9ad4bc01..2adcc434 100644 --- a/biomes/temperate/temperate-oak-forest.json +++ b/biomes/temperate/temperate-oak-forest.json @@ -459,11 +459,6 @@ ] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-ocean-deep.json b/biomes/temperate/temperate-ocean-deep.json index f9f3c672..385c319a 100644 --- a/biomes/temperate/temperate-ocean-deep.json +++ b/biomes/temperate/temperate-ocean-deep.json @@ -140,7 +140,7 @@ ], "objects": [ { - "chance": 0.01, + "chance": 0.001, "density": 1, "rotation": { "yAxis": { @@ -180,7 +180,7 @@ } }, { - "chance": 0.05, + "chance": 0.008, "density": 1, "rotation": { "yAxis": { @@ -196,15 +196,7 @@ "ships/gall-1", "ships/gall-2", "ships/gall-3" - ], - "clamp": { - "minimumHeight": 4 - }, - "translate": { - "x": 0, - "y": 0, - "z": 0 - } + ] }, { "chance": 0.01, @@ -232,11 +224,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-ocean.json b/biomes/temperate/temperate-ocean.json index 7e0bdb9b..1216fb07 100644 --- a/biomes/temperate/temperate-ocean.json +++ b/biomes/temperate/temperate-ocean.json @@ -234,11 +234,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-plateau.json b/biomes/temperate/temperate-plateau.json index aeb09ef5..15ca6666 100644 --- a/biomes/temperate/temperate-plateau.json +++ b/biomes/temperate/temperate-plateau.json @@ -437,11 +437,7 @@ ] } ], - "loot": { - "tables": [ - "forest-food" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/temperate/temperate-river.json b/biomes/temperate/temperate-river.json index 97758e09..d496ac2f 100644 --- a/biomes/temperate/temperate-river.json +++ b/biomes/temperate/temperate-river.json @@ -172,10 +172,5 @@ "z": 0 } } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/tropical/tropical-beach-bamboo.json b/biomes/tropical/tropical-beach-bamboo.json index 1d10250c..bba358de 100644 --- a/biomes/tropical/tropical-beach-bamboo.json +++ b/biomes/tropical/tropical-beach-bamboo.json @@ -197,11 +197,6 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-beach-charred.json b/biomes/tropical/tropical-beach-charred.json index 591afc77..7dba4fd8 100644 --- a/biomes/tropical/tropical-beach-charred.json +++ b/biomes/tropical/tropical-beach-charred.json @@ -126,11 +126,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-beach.json b/biomes/tropical/tropical-beach.json index 3f6061d5..17ef6a65 100644 --- a/biomes/tropical/tropical-beach.json +++ b/biomes/tropical/tropical-beach.json @@ -155,11 +155,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-cavern-coral.json b/biomes/tropical/tropical-cavern-coral.json index ee08e206..40eeee1a 100644 --- a/biomes/tropical/tropical-cavern-coral.json +++ b/biomes/tropical/tropical-cavern-coral.json @@ -234,11 +234,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical/tropical-cavern.json b/biomes/tropical/tropical-cavern.json index 33a7e960..1591dcb7 100644 --- a/biomes/tropical/tropical-cavern.json +++ b/biomes/tropical/tropical-cavern.json @@ -143,11 +143,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tropical/tropical-coral-ocean-cliffs.json b/biomes/tropical/tropical-coral-ocean-cliffs.json index 2be62633..8cb5accf 100644 --- a/biomes/tropical/tropical-coral-ocean-cliffs.json +++ b/biomes/tropical/tropical-coral-ocean-cliffs.json @@ -1719,11 +1719,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-coral-ocean.json b/biomes/tropical/tropical-coral-ocean.json index 67923fa2..91310d9f 100644 --- a/biomes/tropical/tropical-coral-ocean.json +++ b/biomes/tropical/tropical-coral-ocean.json @@ -1692,11 +1692,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-island-beach.json b/biomes/tropical/tropical-island-beach.json index 72d30466..cba4a0c8 100644 --- a/biomes/tropical/tropical-island-beach.json +++ b/biomes/tropical/tropical-island-beach.json @@ -153,11 +153,7 @@ } } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-ocean.json b/biomes/tropical/tropical-ocean.json index a8d02624..7d1aa7c5 100644 --- a/biomes/tropical/tropical-ocean.json +++ b/biomes/tropical/tropical-ocean.json @@ -353,11 +353,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "palette": [ { diff --git a/biomes/tropical/tropical-river-steep.json b/biomes/tropical/tropical-river-steep.json index cc2b5257..838708e8 100644 --- a/biomes/tropical/tropical-river-steep.json +++ b/biomes/tropical/tropical-river-steep.json @@ -189,10 +189,5 @@ }, "waterloggable": true } - ], - "loot": { - "tables": [ - "ocean-clutter" - ] - } + ] } \ No newline at end of file diff --git a/biomes/tropical/tropical-submerged-volcanic.json b/biomes/tropical/tropical-submerged-volcanic.json index 3c743037..b7c8bdeb 100644 --- a/biomes/tropical/tropical-submerged-volcanic.json +++ b/biomes/tropical/tropical-submerged-volcanic.json @@ -90,11 +90,7 @@ "particleCount": 0 } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tundra/tundra-beach.json b/biomes/tundra/tundra-beach.json index 10419817..e54c141b 100644 --- a/biomes/tundra/tundra-beach.json +++ b/biomes/tundra/tundra-beach.json @@ -201,11 +201,7 @@ "rarity": 7 } ], - "loot": { - "tables": [ - "beach-clutter" - ] - }, + "slab": { "style": { "style": "STATIC" diff --git a/biomes/tundra/tundra-cavern.json b/biomes/tundra/tundra-cavern.json index 309bf5e0..f68a4246 100644 --- a/biomes/tundra/tundra-cavern.json +++ b/biomes/tundra/tundra-cavern.json @@ -124,11 +124,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "IRIS" diff --git a/biomes/tundra/tundra-river-rocky.json b/biomes/tundra/tundra-river-rocky.json index 51545c30..a729e0d9 100644 --- a/biomes/tundra/tundra-river-rocky.json +++ b/biomes/tundra/tundra-river-rocky.json @@ -230,11 +230,6 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, "wall": { "style": { "style": "IRIS" diff --git a/biomes/tundra/tundra-river.json b/biomes/tundra/tundra-river.json index 43de040d..c5765898 100644 --- a/biomes/tundra/tundra-river.json +++ b/biomes/tundra/tundra-river.json @@ -191,11 +191,7 @@ } } ], - "loot": { - "tables": [ - "ocean-clutter" - ] - }, + "wall": { "style": { "style": "STATIC" diff --git a/biomes/tundra/tundra-spiked-cavern.json b/biomes/tundra/tundra-spiked-cavern.json index fb511014..e7b99170 100644 --- a/biomes/tundra/tundra-spiked-cavern.json +++ b/biomes/tundra/tundra-spiked-cavern.json @@ -196,11 +196,7 @@ } } ], - "loot": { - "tables": [ - "cave-clutter" - ] - }, + "slab": { "style": { "style": "IRIS" diff --git a/regions/frozen.json b/regions/frozen.json index 81eb2522..3900c222 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -79,11 +79,17 @@ "shoreHeightMin": 2.2, "shoreHeightMax": 4.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "frozen-clutter", "frozen-food", "snow-clutter", - "cold-treasure", - "frozen-clutter" + "cold-food", + "cold-treasure" ] }, diff --git a/regions/hot.json b/regions/hot.json index 1cb3c85f..1e70a347 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -296,10 +296,15 @@ "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ + "global-clutter", + "global-tools", + "global-treasure", "hot-food", "hot-treasure", - "global-tools" + "cactus-clutter" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/mesa.json b/regions/mesa.json index 32bfc94c..a5cbdb82 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -126,6 +126,17 @@ "varience": 4 } ], + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "hot-treasure", + "hot-food" + ] + }, "riverRarity": 1, "landBiomeZoom": 1.5, "shoreHeightMin": 4, diff --git a/regions/mountain.json b/regions/mountain.json index 37c31532..3848770d 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -137,6 +137,17 @@ "zoom": 1 } }, + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "cold-food", + "cold-treasure" + ] + }, "shoreHeightMin": 2.2, "shoreHeightMax": 1.2, "shoreHeightZoom": 1.14, diff --git a/regions/mushroom.json b/regions/mushroom.json index a1cc8624..8d1fecf7 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -143,10 +143,15 @@ ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, - "loot": { +"loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "mushroom-food", - "mushroom-clutter" + "global-clutter", + "global-tools", + "global-treasure", + "mushroom-clutter", + "mushroom-food" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/ocean.json b/regions/ocean.json index f061f8fa..749135ee 100644 --- a/regions/ocean.json +++ b/regions/ocean.json @@ -85,6 +85,14 @@ } ], "biomeImplosionRatio": 0.7, + "loot": { + "tables": [ + "beach-clutter", + "global-treasure", + "ocean-clutter", + "tropical-treasure" + ] + }, "rarity": 2, "effects": [ { diff --git a/regions/savanna.json b/regions/savanna.json index 57cb3501..1c9c7b6e 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -181,9 +181,15 @@ "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "hot-treasure", "hot-food", - "hot-treasure" + "cactus-clutter" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/swamp.json b/regions/swamp.json index 83563604..0f6982bc 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -109,9 +109,14 @@ "shoreHeightMin": 0.02, "shoreHeightMax": 1.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "swamp-food", - "swamp-clutter" + "global-clutter", + "global-tools", + "global-treasure", + "swamp-clutter", + "swamp-food" ] }, "shoreHeightZoom": 1.14, diff --git a/regions/temperate.json b/regions/temperate.json index e621621a..8cbec859 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -18,7 +18,8 @@ "temperate/temperate-oak-beach" ], "seaBiomes":[ - "temperate/temperate-river" + "temperate/temperate-river", + "ocean/ocean-deep" ], "caveBiomes":[ "temperate/temperate-old-cavern", @@ -209,10 +210,16 @@ }, "shoreHeightMin":1, "shoreHeightMax":5.2, - "loot":{ - "tables":[ + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "temperate-clutter", "temperate-food", - "global-tools" + "forest-food" ] }, "shoreHeightZoom":1.14, diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 2acabe27..3f1b8721 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -99,6 +99,18 @@ } ], + "loot": { + "mode": "ADD", + "multiplier": 1, + "tables": [ + "global-clutter", + "global-tools", + "global-treasure", + "tropical-treasure", + "tropical-food", + "forest-food" + ] + }, "deposits": [ { "minHeight": 15, diff --git a/regions/tropical.json b/regions/tropical.json index 50819ed3..bac9e76f 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -77,8 +77,15 @@ "shoreHeightMin": 3.2, "shoreHeightMax": 9.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "global-tools" + "global-clutter", + "global-tools", + "global-treasure", + "tropical-treasure", + "tropical-food", + "forest-food" ] }, "objects": [ diff --git a/regions/tundra.json b/regions/tundra.json index 548526a8..831a2abc 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -57,9 +57,14 @@ "shoreHeightMin": 2.2, "shoreHeightMax": 5.2, "loot": { + "mode": "ADD", + "multiplier": 1, "tables": [ - "cold-food", - "cold-treasure" + "global-clutter", + "global-tools", + "global-treasure", + "cold-treasure", + "cold-food" ] }, "objects": [ From a0b6a9e7cdb589238c2f4a1b9705ed42a214548c Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 24 Jun 2021 21:54:37 -0700 Subject: [PATCH 10/14] dwa --- dimensions/overworld.json | 6 +++--- loot/beach-clutter.json | 3 --- loot/cactus-clutter.json | 2 -- loot/cave-clutter.json | 3 --- loot/cold-food.json | 5 ----- loot/cold-treasure.json | 5 ----- loot/forest-food.json | 8 -------- loot/frozen-clutter.json | 4 ---- loot/frozen-food.json | 7 ------- loot/global-clutter.json | 9 --------- loot/global-tools.json | 29 ----------------------------- loot/global-treasure.json | 8 -------- loot/hot-food.json | 2 -- loot/hot-treasure.json | 5 ----- loot/mushroom-clutter.json | 4 ---- loot/mushroom-food.json | 3 --- loot/ocean-clutter.json | 6 ------ loot/snow-clutter.json | 3 --- loot/swamp-clutter.json | 7 ------- loot/swamp-food.json | 4 ---- loot/temperate-clutter.json | 3 --- loot/temperate-food.json | 4 ---- loot/tropical-food.json | 4 ---- loot/tropical-treasure.json | 29 ----------------------------- regions/hot.json | 3 ++- 25 files changed, 5 insertions(+), 161 deletions(-) diff --git a/dimensions/overworld.json b/dimensions/overworld.json index a5466f0d..e2bfbd13 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -249,11 +249,11 @@ }, { "minHeight": 1, - "maxPerChunk": 12, + "maxPerChunk": 13, "maxHeight": 64, - "minPerChunk": 4, + "minPerChunk": 5, "minSize": 4, - "maxSize": 8, + "maxSize": 9, "palette": [ { "block": "copper_ore" diff --git a/loot/beach-clutter.json b/loot/beach-clutter.json index dd36a24e..2c657717 100644 --- a/loot/beach-clutter.json +++ b/loot/beach-clutter.json @@ -7,20 +7,17 @@ { "type": "sugar_cane", "maxAmount": 12, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "fishing_rod", "maxAmount": 1, - "rarity": 2, "minDurability": 0.5, "slotTypes": "STORAGE" }, { "type": "sugar", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cactus-clutter.json b/loot/cactus-clutter.json index 03fa83a7..9c6213ba 100644 --- a/loot/cactus-clutter.json +++ b/loot/cactus-clutter.json @@ -7,13 +7,11 @@ { "type": "cactus", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "green_dye", "maxAmount": 6, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cave-clutter.json b/loot/cave-clutter.json index e6766944..5d54fe1b 100644 --- a/loot/cave-clutter.json +++ b/loot/cave-clutter.json @@ -7,19 +7,16 @@ { "type": "torch", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cobblestone", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "lantern", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cold-food.json b/loot/cold-food.json index b17f40d9..68c05785 100644 --- a/loot/cold-food.json +++ b/loot/cold-food.json @@ -7,31 +7,26 @@ { "type": "rabbit_stew", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "potato", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "wheat_seeds", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "poisonous_potato", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "sweet_berries", "maxAmount": 4, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/cold-treasure.json b/loot/cold-treasure.json index bd3cc5de..e04fe3c2 100644 --- a/loot/cold-treasure.json +++ b/loot/cold-treasure.json @@ -8,31 +8,26 @@ "type": "iron_nugget", "maxAmount": 12, "minAmount": 3, - "rarity": 4, "slotTypes": "STORAGE" }, { "type": "iron_ingot", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "emerald", "maxamount": 5, - "rarity": 3, "slottypes": "STORAGE" }, { "type": "emerald_block", "maxamount": 1, - "rarity": 6, "slottypes": "STORAGE" }, { "type": "iron_block", "maxamount": 3, - "rarity": 4, "slottypes": "STORAGE" }, { diff --git a/loot/forest-food.json b/loot/forest-food.json index 81a39e3c..dd34a35b 100644 --- a/loot/forest-food.json +++ b/loot/forest-food.json @@ -7,46 +7,38 @@ { "type": "apple", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "oak_sapling", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "spruce_sapling", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dark_oak_sapling", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "oak_planks", "maxAmount": 19, - "rarity": 2, "slotTypes": "STORAGE" },{ "type": "chest", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" },{ "type": "stone_axe", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" },{ "type": "dirt_path", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/frozen-clutter.json b/loot/frozen-clutter.json index 31262c7e..6234f0e8 100644 --- a/loot/frozen-clutter.json +++ b/loot/frozen-clutter.json @@ -7,25 +7,21 @@ { "type": "blackstone", "maxAmount": 12, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_bricks", "maxAmount": 12, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "zombie_head", "maxAmount": 1, - "rarity": 8, "slotTypes": "STORAGE" }, { "type": "wheat", "maxAmount": 6, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/frozen-food.json b/loot/frozen-food.json index 3cc3d150..e1f7429a 100644 --- a/loot/frozen-food.json +++ b/loot/frozen-food.json @@ -7,43 +7,36 @@ { "type": "spider_eye", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "beetroot_soup", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cookie", "maxAmount": 4, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "rabbit_stew", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "pumpkin_pie", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "potato", "maxAmount": 11, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "baked_potato", "maxAmount": 4, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/global-clutter.json b/loot/global-clutter.json index 074d3396..ee624739 100644 --- a/loot/global-clutter.json +++ b/loot/global-clutter.json @@ -7,55 +7,46 @@ { "type": "stone", "maxAmount": 12, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stick", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "flint", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "leather", "maxAmount": 4, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "book", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "ladder", "maxAmount": 12, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_axe", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_pickaxe", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stone_sword", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/global-tools.json b/loot/global-tools.json index d94f0ae0..aa9da541 100644 --- a/loot/global-tools.json +++ b/loot/global-tools.json @@ -7,7 +7,6 @@ { "type": "wooden_pickaxe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -15,7 +14,6 @@ { "type": "flint_and_steel", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -23,7 +21,6 @@ ,{ "type": "shears", "maxamount": 1, - "rarity": 7, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -31,7 +28,6 @@ { "type": "bow", "maxamount": 1, - "rarity": 8, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -39,13 +35,11 @@ { "type": "arrow", "maxamount": 21, - "rarity": 8, "slottypes": "STORAGE" }, { "type": "stone_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -53,7 +47,6 @@ { "type": "iron_pickaxe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -61,7 +54,6 @@ { "type": "diamond_pickaxe", "maxamount": 1, - "rarity": 30, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -69,7 +61,6 @@ { "type": "golden_pickaxe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -77,7 +68,6 @@ { "type": "wooden_sword", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -85,7 +75,6 @@ { "type": "stone_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -93,7 +82,6 @@ { "type": "iron_sword", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -101,7 +89,6 @@ { "type": "diamond_sword", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -109,7 +96,6 @@ { "type": "golden_sword", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -117,7 +103,6 @@ { "type": "wooden_axe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -125,7 +110,6 @@ { "type": "stone_axe", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -133,7 +117,6 @@ { "type": "iron_axe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -141,7 +124,6 @@ { "type": "diamond_axe", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -149,7 +131,6 @@ { "type": "golden_axe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -157,7 +138,6 @@ { "type": "wooden_hoe", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -165,7 +145,6 @@ { "type": "stone_hoe", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -173,7 +152,6 @@ { "type": "iron_hoe", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -181,7 +159,6 @@ { "type": "diamond_hoe", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -189,7 +166,6 @@ { "type": "golden_hoe", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -197,7 +173,6 @@ { "type": "wooden_shovel", "maxamount": 1, - "rarity": 5, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -205,7 +180,6 @@ { "type": "stone_shovel", "maxamount": 1, - "rarity": 5, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -213,7 +187,6 @@ { "type": "iron_shovel", "maxamount": 1, - "rarity": 8, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -221,7 +194,6 @@ { "type": "diamond_shovel", "maxamount": 1, - "rarity": 12, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -229,7 +201,6 @@ { "type": "golden_shovel", "maxamount": 1, - "rarity": 13, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" diff --git a/loot/global-treasure.json b/loot/global-treasure.json index ca693dd2..b582d47d 100644 --- a/loot/global-treasure.json +++ b/loot/global-treasure.json @@ -7,50 +7,42 @@ { "type": "diamond", "maxamount": 2, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "ender_pearl", "maxamount": 3, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "name_tag", "maxamount": 1, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "obsidian", "maxamount": 1, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "iron_ingot", "maxamount": 5, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "iron_nugget", "maxamount": 7, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "gold_nugget", "maxamount": 6, - "rarity": 2, "slottypes": "STORAGE" }, { "type": "redstone", "maxamount": 11, "minAmount": 4, - "rarity": 2, "slottypes": "STORAGE" } ] diff --git a/loot/hot-food.json b/loot/hot-food.json index 4d6eaa1b..9c0d3161 100644 --- a/loot/hot-food.json +++ b/loot/hot-food.json @@ -7,13 +7,11 @@ { "type": "rotten_flesh", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dried_kelp", "maxAmount": 6, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/hot-treasure.json b/loot/hot-treasure.json index dcbaf317..e7af2457 100644 --- a/loot/hot-treasure.json +++ b/loot/hot-treasure.json @@ -7,31 +7,26 @@ { "type": "lapis_lazuli", "maxAmount": 12, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "gold_ingot", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "gold_nugget", "maxAmount": 8, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "blaze_powder", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "golden_boots", "maxAmount": 1, - "rarity": 15, "minDurability": 0.93, "maxDurability": 1, "displayName": "Golden Dashers", diff --git a/loot/mushroom-clutter.json b/loot/mushroom-clutter.json index 9d47c97f..87bbadd3 100644 --- a/loot/mushroom-clutter.json +++ b/loot/mushroom-clutter.json @@ -7,25 +7,21 @@ { "type": "red_mushroom", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "brown_mushroom", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "warped_fungus", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "crimson_fungus", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/mushroom-food.json b/loot/mushroom-food.json index 2c85ac46..11d03f57 100644 --- a/loot/mushroom-food.json +++ b/loot/mushroom-food.json @@ -7,19 +7,16 @@ { "type": "spider_eye", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "beetroot", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "mushroom_stew", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/ocean-clutter.json b/loot/ocean-clutter.json index 22cd4f99..9a7e93d8 100644 --- a/loot/ocean-clutter.json +++ b/loot/ocean-clutter.json @@ -7,37 +7,31 @@ { "type": "wet_sponge", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "sponge", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "kelp", "maxAmount": 27, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "fishing_rod", "maxAmount": 1, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "pufferfish", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "turtle_helmet", "maxAmount": 1, - "rarity": 2, "enchantments": [ { "enchantment": "OXYGEN", diff --git a/loot/snow-clutter.json b/loot/snow-clutter.json index 4bdcadc3..74bfc7f3 100644 --- a/loot/snow-clutter.json +++ b/loot/snow-clutter.json @@ -7,19 +7,16 @@ { "type": "snowball", "maxAmount": 9, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "packed_ice", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "blue_ice", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/swamp-clutter.json b/loot/swamp-clutter.json index 1b7e0a71..846ed3e8 100644 --- a/loot/swamp-clutter.json +++ b/loot/swamp-clutter.json @@ -7,43 +7,36 @@ { "type": "string", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "red_mushroom", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "brown_mushroom", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cobweb", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dark_prismarine", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "diamond", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "coal", "maxAmount": 16, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/swamp-food.json b/loot/swamp-food.json index 3ddca682..114eccf4 100644 --- a/loot/swamp-food.json +++ b/loot/swamp-food.json @@ -7,25 +7,21 @@ { "type": "spider_eye", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "carrot", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "beetroot", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "poisonous_potato", "maxAmount": 5, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/temperate-clutter.json b/loot/temperate-clutter.json index 6e081356..f1518ccd 100644 --- a/loot/temperate-clutter.json +++ b/loot/temperate-clutter.json @@ -7,19 +7,16 @@ { "type": "oak_planks", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "stick", "maxAmount": 4, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "oak_wood", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" } diff --git a/loot/temperate-food.json b/loot/temperate-food.json index 96bb7067..1e2e1a3c 100644 --- a/loot/temperate-food.json +++ b/loot/temperate-food.json @@ -7,25 +7,21 @@ { "type": "bread", "maxAmount": 2, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "wheat", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "carrot", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "wheat_seeds", "maxAmount": 7, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/tropical-food.json b/loot/tropical-food.json index 9e2f5769..4fbdfeac 100644 --- a/loot/tropical-food.json +++ b/loot/tropical-food.json @@ -7,25 +7,21 @@ { "type": "melon_slice", "maxAmount": 9, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cookie", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "dried_kelp", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" }, { "type": "cocoa_beans", "maxAmount": 3, - "rarity": 2, "slotTypes": "STORAGE" } ] diff --git a/loot/tropical-treasure.json b/loot/tropical-treasure.json index 4b5ec6ca..d5b01fb5 100644 --- a/loot/tropical-treasure.json +++ b/loot/tropical-treasure.json @@ -7,7 +7,6 @@ { "type": "wooden_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -15,7 +14,6 @@ { "type": "flint_and_steel", "maxamount": 1, - "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -23,7 +21,6 @@ ,{ "type": "shears", "maxamount": 1, - "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -31,7 +28,6 @@ { "type": "bow", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -39,13 +35,11 @@ { "type": "arrow", "maxamount": 21, - "rarity": 4, "slottypes": "STORAGE" }, { "type": "stone_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -53,7 +47,6 @@ { "type": "iron_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -61,7 +54,6 @@ { "type": "diamond_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -69,7 +61,6 @@ { "type": "golden_pickaxe", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -77,7 +68,6 @@ { "type": "wooden_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -85,7 +75,6 @@ { "type": "stone_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -93,7 +82,6 @@ { "type": "iron_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -101,7 +89,6 @@ { "type": "diamond_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -109,7 +96,6 @@ { "type": "golden_sword", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -117,7 +103,6 @@ { "type": "wooden_axe", "maxamount": 1, - "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -125,7 +110,6 @@ { "type": "stone_axe", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -133,7 +117,6 @@ { "type": "iron_axe", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -141,7 +124,6 @@ { "type": "diamond_axe", "maxamount": 1, - "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -149,7 +131,6 @@ { "type": "golden_axe", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -157,7 +138,6 @@ { "type": "wooden_hoe", "maxamount": 1, - "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -165,7 +145,6 @@ { "type": "stone_hoe", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -173,7 +152,6 @@ { "type": "iron_hoe", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -181,7 +159,6 @@ { "type": "diamond_hoe", "maxamount": 1, - "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -189,7 +166,6 @@ { "type": "golden_hoe", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" @@ -197,7 +173,6 @@ { "type": "wooden_shovel", "maxamount": 1, - "rarity": 4, "mindurability": 0.2, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -205,7 +180,6 @@ { "type": "stone_shovel", "maxamount": 1, - "rarity": 4, "mindurability": 0.4, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -213,7 +187,6 @@ { "type": "iron_shovel", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -221,7 +194,6 @@ { "type": "diamond_shovel", "maxamount": 1, - "rarity": 4, "mindurability": 0.6, "maxdurability": 0.8, "slottypes": "STORAGE" @@ -229,7 +201,6 @@ { "type": "golden_shovel", "maxamount": 1, - "rarity": 4, "mindurability": 0.5, "maxdurability": 0.9, "slottypes": "STORAGE" diff --git a/regions/hot.json b/regions/hot.json index 1e70a347..44fffcc6 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -14,7 +14,8 @@ "hot/hot-ocean" ], "caveBiomes": [ - "hot/hot-sandy-cave" + "hot/hot-sandy-cave", + "hot/hot-sandy-red-cave" ], "riverStyle": { "style": "VASCULAR", From 78876681f8d0ef0f21ad01993e2ac1de9a61e224 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 24 Jun 2021 22:01:02 -0700 Subject: [PATCH 11/14] dwa --- biomes/frozen/frozen-hills.json | 8 +------- regions/frozen.json | 7 ++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/biomes/frozen/frozen-hills.json b/biomes/frozen/frozen-hills.json index c67e639e..d967024a 100644 --- a/biomes/frozen/frozen-hills.json +++ b/biomes/frozen/frozen-hills.json @@ -68,13 +68,7 @@ "max": 10, "min": 6 } - ], - "jigsawStructures": [ - { - "rarity": 1050, - "structure": "igloo" - } - ], + ] "objects": [ { diff --git a/regions/frozen.json b/regions/frozen.json index 3900c222..1404d9f2 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -92,7 +92,12 @@ "cold-treasure" ] }, - + "jigsawStructures": [ + { + "rarity": 1050, + "structure": "igloo" + } + ], "objects": [ { "chance": 1, From 71084e4dad4f4ae92260b1cff0e92165783e8892 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sun, 27 Jun 2021 11:20:48 -0700 Subject: [PATCH 12/14] Fixed all your garbage --- biomes/frozen/frozen-beach.json | 1 - biomes/frozen/frozen-hills.json | 3 +- biomes/mountain/mountain-hills.json | 51 ----------------------- objects/{ => zzz}/BarcoPirataGriffer.iob | Bin objects/{ => zzz}/FT_1.iob | Bin objects/{ => zzz}/cave1.iob | Bin objects/{ => zzz}/cave2.iob | Bin objects/{ => zzz}/grass.iob | Bin objects/{ => zzz}/grid.iob | Bin objects/{ => zzz}/mansion_roof.iob | Bin objects/{ => zzz}/mansion_vanilla_1.iob | Bin objects/{ => zzz}/mansion_vanilla_2.iob | Bin objects/{ => zzz}/mansion_vanilla_3.iob | Bin regions/frozen.json | 27 ++++++++++-- regions/hot.json | 27 +++++++++++- regions/mesa.json | 29 ++++++++++--- regions/mountain.json | 28 +++++++++++-- regions/mushroom.json | 28 +++++++++++-- regions/savanna.json | 28 +++++++++++-- regions/swamp.json | 32 +++++++++++--- regions/temperate.json | 27 ++++++++++-- regions/tropical-mountain.json | 28 +++++++++++-- regions/tropical.json | 27 ++++++++++-- regions/tundra.json | 27 ++++++++++-- 24 files changed, 268 insertions(+), 95 deletions(-) rename objects/{ => zzz}/BarcoPirataGriffer.iob (100%) rename objects/{ => zzz}/FT_1.iob (100%) rename objects/{ => zzz}/cave1.iob (100%) rename objects/{ => zzz}/cave2.iob (100%) rename objects/{ => zzz}/grass.iob (100%) rename objects/{ => zzz}/grid.iob (100%) rename objects/{ => zzz}/mansion_roof.iob (100%) rename objects/{ => zzz}/mansion_vanilla_1.iob (100%) rename objects/{ => zzz}/mansion_vanilla_2.iob (100%) rename objects/{ => zzz}/mansion_vanilla_3.iob (100%) diff --git a/biomes/frozen/frozen-beach.json b/biomes/frozen/frozen-beach.json index 92124c76..893d8208 100644 --- a/biomes/frozen/frozen-beach.json +++ b/biomes/frozen/frozen-beach.json @@ -65,7 +65,6 @@ } ], "objects": [ - { "chance": 0.001, "density": 3, diff --git a/biomes/frozen/frozen-hills.json b/biomes/frozen/frozen-hills.json index d967024a..fc3f1427 100644 --- a/biomes/frozen/frozen-hills.json +++ b/biomes/frozen/frozen-hills.json @@ -68,8 +68,7 @@ "max": 10, "min": 6 } - ] - + ], "objects": [ { "chance": 0.1, diff --git a/biomes/mountain/mountain-hills.json b/biomes/mountain/mountain-hills.json index fc574155..b3e3418f 100644 --- a/biomes/mountain/mountain-hills.json +++ b/biomes/mountain/mountain-hills.json @@ -328,57 +328,6 @@ "y": -1, "z": 0 } - }, - { - "chance": 0.004, - "edit": [ - { - "find": [ - { - "block": "glass" - } - ], - "replace": { - "palette": [ - { - "block": "void_air" - } - ] - } - }, - { - "find": [ - { - "block": "blue_wool" - } - ], - "replace": { - "palette": [ - { - "block": "water" - } - ] - } - } - ], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "cave2", - "cave1" - ], - "translate": { - "x": 0, - "y": -66, - "z": 0 - } } ] } \ No newline at end of file diff --git a/objects/BarcoPirataGriffer.iob b/objects/zzz/BarcoPirataGriffer.iob similarity index 100% rename from objects/BarcoPirataGriffer.iob rename to objects/zzz/BarcoPirataGriffer.iob diff --git a/objects/FT_1.iob b/objects/zzz/FT_1.iob similarity index 100% rename from objects/FT_1.iob rename to objects/zzz/FT_1.iob diff --git a/objects/cave1.iob b/objects/zzz/cave1.iob similarity index 100% rename from objects/cave1.iob rename to objects/zzz/cave1.iob diff --git a/objects/cave2.iob b/objects/zzz/cave2.iob similarity index 100% rename from objects/cave2.iob rename to objects/zzz/cave2.iob diff --git a/objects/grass.iob b/objects/zzz/grass.iob similarity index 100% rename from objects/grass.iob rename to objects/zzz/grass.iob diff --git a/objects/grid.iob b/objects/zzz/grid.iob similarity index 100% rename from objects/grid.iob rename to objects/zzz/grid.iob diff --git a/objects/mansion_roof.iob b/objects/zzz/mansion_roof.iob similarity index 100% rename from objects/mansion_roof.iob rename to objects/zzz/mansion_roof.iob diff --git a/objects/mansion_vanilla_1.iob b/objects/zzz/mansion_vanilla_1.iob similarity index 100% rename from objects/mansion_vanilla_1.iob rename to objects/zzz/mansion_vanilla_1.iob diff --git a/objects/mansion_vanilla_2.iob b/objects/zzz/mansion_vanilla_2.iob similarity index 100% rename from objects/mansion_vanilla_2.iob rename to objects/zzz/mansion_vanilla_2.iob diff --git a/objects/mansion_vanilla_3.iob b/objects/zzz/mansion_vanilla_3.iob similarity index 100% rename from objects/mansion_vanilla_3.iob rename to objects/zzz/mansion_vanilla_3.iob diff --git a/regions/frozen.json b/regions/frozen.json index 1404d9f2..6bb135d0 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -100,9 +100,22 @@ ], "objects": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -116,6 +129,14 @@ } }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/hot.json b/regions/hot.json index 44fffcc6..3cf80084 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -155,7 +155,22 @@ ], "objects": [ { - "chance": 1, + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ + { + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -167,8 +182,16 @@ "max": 360, "min": 0 } + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 }, - { "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/mesa.json b/regions/mesa.json index a5cbdb82..f2708d63 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -49,10 +49,23 @@ } }, "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -64,10 +77,16 @@ "max": 360, "min": 0 } - - }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/mountain.json b/regions/mountain.json index 3848770d..bf644563 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -60,10 +60,23 @@ } ], "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -75,9 +88,16 @@ "max": 360, "min": 0 } - }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/mushroom.json b/regions/mushroom.json index 8d1fecf7..cafbde0e 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -65,10 +65,23 @@ } ], "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -80,9 +93,16 @@ "max": 360, "min": 0 } - }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/savanna.json b/regions/savanna.json index 1c9c7b6e..9bdc6863 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -38,10 +38,23 @@ ], "biomeImplosionRatio": 0.25, "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -53,9 +66,16 @@ "max": 360, "min": 0 } - }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/swamp.json b/regions/swamp.json index 0f6982bc..1f6d8ab5 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -45,10 +45,23 @@ } ], "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -60,8 +73,16 @@ "max": 360, "min": 0 } - }, - { + }, + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, @@ -103,7 +124,6 @@ "translate": {"yRandom": 15, "y": 10} } - ], "landBiomeZoom": 1.25, "shoreHeightMin": 0.02, diff --git a/regions/temperate.json b/regions/temperate.json index 8cbec859..77a57b94 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -59,10 +59,23 @@ } ], "objects":[ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -76,6 +89,14 @@ } }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 3f1b8721..75df283f 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -39,10 +39,23 @@ ], "biomeImplosionRatio": 0.25, "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -56,6 +69,14 @@ } }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, @@ -97,7 +118,6 @@ "translate": {"yRandom": 15, "y": 10} } - ], "loot": { "mode": "ADD", diff --git a/regions/tropical.json b/regions/tropical.json index bac9e76f..e53642a9 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -89,10 +89,23 @@ ] }, "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -106,6 +119,14 @@ } }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, diff --git a/regions/tundra.json b/regions/tundra.json index 831a2abc..b8e97601 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -68,10 +68,23 @@ ] }, "objects": [ + { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 10 + }, + "offsetY": 10 + }, + "chance": 0.9, + "edit": [ { - "chance": 1, - "bottom": true, - "translate": {"yRandom": 8, "y": 4}, + "chance": 0.01, + "find": [{"block": "deepslate"}], + "replace": {"palette": [{"block": "deepslate_coal_ore"},{"block": "deepslate_copper_ore"},{"block": "deepslate_diamond_ore"},{"block": "deepslate_emerald_ore"},{"block": "deepslate_gold_ore"},{"block": "deepslate_iron_ore"},{"block": "deepslate_lapis_ore"},{"block": "deepslate_redstone_ore"}]} + } + ], "place": [ "deepslate/ds1", "deepslate/ds2", @@ -85,6 +98,14 @@ } }, { + "heightmap": { + "seed": 1337, + "style": { + "style": "SIMPLEX", + "multiplier": 15 + }, + "offsetY": 19 + }, "chance": 0.05, "bottom": true, "density": 1, From 42c95352240c7d90388be8cb2b5c84a70779a3dc Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sun, 27 Jun 2021 12:11:51 -0700 Subject: [PATCH 13/14] AHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH --- biomes/hot/hot-desert-dunes-red.json | 6 ------ biomes/hot/hot-desert-dunes.json | 7 +------ biomes/mesa/mesa-valleys.json | 6 ------ biomes/mesa/mesa-yellow.json | 6 ------ biomes/mountain/mountain-hills.json | 11 +--------- biomes/mountain/mountain-plains.json | 11 +--------- biomes/mushroom/mushroom-forest.json | 15 +------------- biomes/swamp/swamp-lake.json | 10 ---------- biomes/swamp/swamp-marsh.json | 10 ---------- biomes/swamp/swamp-roofed-forest.json | 10 ---------- biomes/swamp/swamp-roofed-wayward.json | 11 +--------- biomes/temperate/temperate-birch-denmyre.json | 10 ---------- biomes/temperate/temperate-birch-forest.json | 11 +--------- biomes/temperate/temperate-bonsai.json | 10 ---------- biomes/temperate/temperate-highlands.json | 6 ------ biomes/temperate/temperate-island.json | 11 +--------- biomes/temperate/temperate-oak-denmyre.json | 10 ---------- biomes/temperate/temperate-oak-forest.json | 10 ---------- biomes/temperate/temperate-plains.json | 10 ---------- biomes/temperate/temperate-wilds.json | 6 ------ biomes/tropical/tropical-highlands.json | 6 ------ .../tropical-rainforest-wicked-village.json | 10 ---------- biomes/tropical/tropical-wilds.json | 6 ------ biomes/tundra/tundra-bonsai-forest.json | 10 ---------- biomes/tundra/tundra-lake.json | 10 ---------- biomes/tundra/tundra-redwood-forest.json | 11 +--------- biomes/tundra/tundra-sequia-redwoods.json | 11 +--------- biomes/tundra/tundra-spiked-cavern.json | 10 ---------- biomes/tundra/tundra-spruce-denmyre.json | 11 +--------- biomes/tundra/tundra-taiga.json | 11 +--------- dimensions/overworld.json | 4 ++-- loot/cactus-clutter.json | 2 +- loot/cave-clutter.json | 10 ++++++++++ loot/cold-food.json | 2 +- loot/cold-treasure.json | 2 +- loot/forest-food.json | 2 +- loot/frozen-clutter.json | 1 + loot/frozen-food.json | 2 +- loot/global-tools.json | 2 +- loot/hot-food.json | 2 +- loot/hot-treasure.json | 4 ++-- loot/mushroom-food.json | 2 +- loot/swamp-food.json | 2 +- loot/temperate-food.json | 2 +- loot/tropical-food.json | 2 +- loot/tropical-treasure.json | 2 +- regions/frozen.json | 20 +++++++++++++------ regions/hot.json | 18 ++++++++++------- regions/mesa.json | 10 +++++----- regions/mountain.json | 20 ++++++++++++++----- regions/mushroom.json | 10 +++++----- regions/savanna.json | 10 +++++----- regions/swamp.json | 20 ++++++++++++++----- regions/temperate.json | 20 ++++++++++++++----- regions/tropical-mountain.json | 20 ++++++++++++++----- regions/tropical.json | 18 ++++++++++++----- regions/tundra.json | 20 ++++++++++++++----- 57 files changed, 166 insertions(+), 346 deletions(-) diff --git a/biomes/hot/hot-desert-dunes-red.json b/biomes/hot/hot-desert-dunes-red.json index 4e423863..3faa8aa6 100644 --- a/biomes/hot/hot-desert-dunes-red.json +++ b/biomes/hot/hot-desert-dunes-red.json @@ -2,12 +2,6 @@ "name": "Hot Desert Dunes Red", "derivative": "DESERT", "vanillaDerivative": "DESERT", - "jigsawStructures": [ - { - "rarity": 1500, - "structure": "desert-pyramid" - } - ], "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/hot/hot-desert-dunes.json b/biomes/hot/hot-desert-dunes.json index 91d42238..08dbeb65 100644 --- a/biomes/hot/hot-desert-dunes.json +++ b/biomes/hot/hot-desert-dunes.json @@ -2,12 +2,7 @@ "name": "Hot Desert Dunes", "derivative": "DESERT", "vanillaDerivative": "DESERT", - "jigsawStructures": [ - { - "rarity": 1500, - "structure": "desert-pyramid" - } - ], + "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/mesa/mesa-valleys.json b/biomes/mesa/mesa-valleys.json index 840e0549..4d2086c3 100644 --- a/biomes/mesa/mesa-valleys.json +++ b/biomes/mesa/mesa-valleys.json @@ -2,12 +2,6 @@ "name": "Mesa Valley", "derivative": "SAVANNA", "vanillaDerivative": "BADLANDS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 5, diff --git a/biomes/mesa/mesa-yellow.json b/biomes/mesa/mesa-yellow.json index 7a894837..869caba4 100644 --- a/biomes/mesa/mesa-yellow.json +++ b/biomes/mesa/mesa-yellow.json @@ -5,12 +5,6 @@ "children": [ "mesa/mesa-dark" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 9, diff --git a/biomes/mountain/mountain-hills.json b/biomes/mountain/mountain-hills.json index b3e3418f..b5c97ab0 100644 --- a/biomes/mountain/mountain-hills.json +++ b/biomes/mountain/mountain-hills.json @@ -12,16 +12,7 @@ "min": 5 } ], - "jigsawStructures": [ - { - "rarity":2300, - "structure": "pillager" - }, - { - "rarity": 950, - "structure": "village-tundra" - } - ], + "layers": [ { "minHeight": 1, diff --git a/biomes/mountain/mountain-plains.json b/biomes/mountain/mountain-plains.json index ada003f8..6a112892 100644 --- a/biomes/mountain/mountain-plains.json +++ b/biomes/mountain/mountain-plains.json @@ -5,16 +5,7 @@ "children": [ "mountain/mountain-lake" ], - "jigsawStructures": [ - { - "rarity": 2000, - "structure": "pillager" - }, - { - "rarity": 950, - "structure": "village-tundra" - } - ], + "generators": [ { "generator": "plain", diff --git a/biomes/mushroom/mushroom-forest.json b/biomes/mushroom/mushroom-forest.json index 52099411..e585f420 100644 --- a/biomes/mushroom/mushroom-forest.json +++ b/biomes/mushroom/mushroom-forest.json @@ -5,20 +5,7 @@ "children": [ "mushroom/mushroom-forest-hills" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "structure": "village-temperate", - "rarity": 1000 - }, - { - "structure": "village-tundra", - "rarity": 1000 - } - ], + "layers": [ { "minHeight": 3, diff --git a/biomes/swamp/swamp-lake.json b/biomes/swamp/swamp-lake.json index 0c97d3f6..3e3301d8 100644 --- a/biomes/swamp/swamp-lake.json +++ b/biomes/swamp/swamp-lake.json @@ -5,16 +5,6 @@ "children": [ "swamp/swamp-marsh" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], "generators": [ { "min": -8, diff --git a/biomes/swamp/swamp-marsh.json b/biomes/swamp/swamp-marsh.json index 5d6d7fe8..4c895282 100644 --- a/biomes/swamp/swamp-marsh.json +++ b/biomes/swamp/swamp-marsh.json @@ -5,16 +5,6 @@ "children": [ "swamp/swamp-marsh-rotten" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], "generators": [ { "min": 6, diff --git a/biomes/swamp/swamp-roofed-forest.json b/biomes/swamp/swamp-roofed-forest.json index 47d62374..13a36883 100644 --- a/biomes/swamp/swamp-roofed-forest.json +++ b/biomes/swamp/swamp-roofed-forest.json @@ -5,16 +5,6 @@ "children": [ "swamp/swamp-lake" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], "generators": [ { "min": 4, diff --git a/biomes/swamp/swamp-roofed-wayward.json b/biomes/swamp/swamp-roofed-wayward.json index c9c63e60..9999a1a6 100644 --- a/biomes/swamp/swamp-roofed-wayward.json +++ b/biomes/swamp/swamp-roofed-wayward.json @@ -5,16 +5,7 @@ "children": [ "swamp/swamp-lake" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], + "generators": [ { "min": -7, diff --git a/biomes/temperate/temperate-birch-denmyre.json b/biomes/temperate/temperate-birch-denmyre.json index 9c7fc05a..e9cff28d 100644 --- a/biomes/temperate/temperate-birch-denmyre.json +++ b/biomes/temperate/temperate-birch-denmyre.json @@ -55,16 +55,6 @@ ] } ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "decorators": [ { "chance": 0.01, diff --git a/biomes/temperate/temperate-birch-forest.json b/biomes/temperate/temperate-birch-forest.json index 797c584c..5a979598 100644 --- a/biomes/temperate/temperate-birch-forest.json +++ b/biomes/temperate/temperate-birch-forest.json @@ -5,16 +5,7 @@ "children": [ "temperate/temperate-birch-denmyre" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], + "generators": [ { "min": 4, diff --git a/biomes/temperate/temperate-bonsai.json b/biomes/temperate/temperate-bonsai.json index 903c6d0d..580b22ed 100644 --- a/biomes/temperate/temperate-bonsai.json +++ b/biomes/temperate/temperate-bonsai.json @@ -5,16 +5,6 @@ "children": [ "temperate/temperate-plain-hills" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "generator": "smooth-dunes", diff --git a/biomes/temperate/temperate-highlands.json b/biomes/temperate/temperate-highlands.json index 8bc046bb..d3c30c1b 100644 --- a/biomes/temperate/temperate-highlands.json +++ b/biomes/temperate/temperate-highlands.json @@ -2,12 +2,6 @@ "name": "Temperate Highlands", "derivative": "FOREST", "vanillaDerivative": "PLAINS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 12, diff --git a/biomes/temperate/temperate-island.json b/biomes/temperate/temperate-island.json index 2ef98d0b..8d07d147 100644 --- a/biomes/temperate/temperate-island.json +++ b/biomes/temperate/temperate-island.json @@ -5,16 +5,7 @@ "children": [ "temperate/temperate-wilds" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], + "generators": [ { "min": 28, diff --git a/biomes/temperate/temperate-oak-denmyre.json b/biomes/temperate/temperate-oak-denmyre.json index c6b89370..5df0aef5 100644 --- a/biomes/temperate/temperate-oak-denmyre.json +++ b/biomes/temperate/temperate-oak-denmyre.json @@ -2,16 +2,6 @@ "name": "Temperate Oak Denmyre", "derivative": "FOREST", "vanillaDerivative": "FOREST", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, diff --git a/biomes/temperate/temperate-oak-forest.json b/biomes/temperate/temperate-oak-forest.json index 2adcc434..ae7accd6 100644 --- a/biomes/temperate/temperate-oak-forest.json +++ b/biomes/temperate/temperate-oak-forest.json @@ -5,16 +5,6 @@ "children": [ "temperate/temperate-oak-denmyre" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, diff --git a/biomes/temperate/temperate-plains.json b/biomes/temperate/temperate-plains.json index 4e1471a1..17e001e9 100644 --- a/biomes/temperate/temperate-plains.json +++ b/biomes/temperate/temperate-plains.json @@ -6,16 +6,6 @@ "temperate/temperate-plain-hills", "temperate/temperate-wilds" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, diff --git a/biomes/temperate/temperate-wilds.json b/biomes/temperate/temperate-wilds.json index 4e5375a9..274c5fd0 100644 --- a/biomes/temperate/temperate-wilds.json +++ b/biomes/temperate/temperate-wilds.json @@ -5,12 +5,6 @@ "children": [ "temperate/temperate-highlands" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "decorators": [ { "chance": 0.22, diff --git a/biomes/tropical/tropical-highlands.json b/biomes/tropical/tropical-highlands.json index f025c8e5..b612a03c 100644 --- a/biomes/tropical/tropical-highlands.json +++ b/biomes/tropical/tropical-highlands.json @@ -2,12 +2,6 @@ "name": "Tropical Highlands", "derivative": "JUNGLE", "vanillaDerivative": "PLAINS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 22, diff --git a/biomes/tropical/tropical-rainforest-wicked-village.json b/biomes/tropical/tropical-rainforest-wicked-village.json index 618fd6fb..8248811a 100644 --- a/biomes/tropical/tropical-rainforest-wicked-village.json +++ b/biomes/tropical/tropical-rainforest-wicked-village.json @@ -2,16 +2,6 @@ "name": "Tropical Rainforest Wicked Village", "derivative": "MODIFIED_JUNGLE", "vanillaDerivative": "MODIFIED_JUNGLE_EDGE", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 50, - "structure": "village-temperate" - } - ], "generators": [ { "min": 3, diff --git a/biomes/tropical/tropical-wilds.json b/biomes/tropical/tropical-wilds.json index b1681973..1cd02603 100644 --- a/biomes/tropical/tropical-wilds.json +++ b/biomes/tropical/tropical-wilds.json @@ -5,12 +5,6 @@ "children": [ "tropical/tropical-highlands" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - } - ], "generators": [ { "min": 4, diff --git a/biomes/tundra/tundra-bonsai-forest.json b/biomes/tundra/tundra-bonsai-forest.json index a06b2275..a70a0a4f 100644 --- a/biomes/tundra/tundra-bonsai-forest.json +++ b/biomes/tundra/tundra-bonsai-forest.json @@ -6,16 +6,6 @@ "tundra/tundra-sequia-redwoods", "tundra/tundra-redwood-cliffs" ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 17, diff --git a/biomes/tundra/tundra-lake.json b/biomes/tundra/tundra-lake.json index 7efdbb87..3fdd40e8 100644 --- a/biomes/tundra/tundra-lake.json +++ b/biomes/tundra/tundra-lake.json @@ -2,16 +2,6 @@ "name": "Tundra Lake", "derivative": "SNOWY_TUNDRA", "vanillaDerivative": "WOODED_HILLS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": -30, diff --git a/biomes/tundra/tundra-redwood-forest.json b/biomes/tundra/tundra-redwood-forest.json index 820909a5..f34b6db6 100644 --- a/biomes/tundra/tundra-redwood-forest.json +++ b/biomes/tundra/tundra-redwood-forest.json @@ -75,16 +75,7 @@ {"entity": "sheep", "maxSpawns": 1, "minSpawns": 1, "rarity": 7}, {"entity": "wolf", "maxSpawns": 1, "minSpawns": 1, "rarity": 7} ], - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 650, - "structure": "village-tundra" - } - ], + "wall": { "style": { "style": "FRACTAL_WATER" diff --git a/biomes/tundra/tundra-sequia-redwoods.json b/biomes/tundra/tundra-sequia-redwoods.json index aa443ae5..9e3f0bdd 100644 --- a/biomes/tundra/tundra-sequia-redwoods.json +++ b/biomes/tundra/tundra-sequia-redwoods.json @@ -2,16 +2,7 @@ "name": "Tundra Sequoia Redwoods", "derivative": "TAIGA", "vanillaDerivative": "WOODED_HILLS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 650, - "structure": "village-tundra" - } - ], + "generators": [ { "min": 17, diff --git a/biomes/tundra/tundra-spiked-cavern.json b/biomes/tundra/tundra-spiked-cavern.json index e7b99170..6496a0b0 100644 --- a/biomes/tundra/tundra-spiked-cavern.json +++ b/biomes/tundra/tundra-spiked-cavern.json @@ -2,16 +2,6 @@ "name": "Tundra Spiked Cavern", "derivative": "FROZEN_OCEAN", "vanillaDerivative": "THE_VOID", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-temperate" - } - ], "generators": [ { "min": 4, diff --git a/biomes/tundra/tundra-spruce-denmyre.json b/biomes/tundra/tundra-spruce-denmyre.json index d88918ae..84357eb2 100644 --- a/biomes/tundra/tundra-spruce-denmyre.json +++ b/biomes/tundra/tundra-spruce-denmyre.json @@ -2,16 +2,7 @@ "name": "Tundra Spruce Denmyre", "derivative": "SNOWY_TUNDRA", "vanillaDerivative": "WOODED_HILLS", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 650, - "structure": "village-tundra" - } - ], + "generators": [ { "min": 4, diff --git a/biomes/tundra/tundra-taiga.json b/biomes/tundra/tundra-taiga.json index f4cd288a..5fdf689f 100644 --- a/biomes/tundra/tundra-taiga.json +++ b/biomes/tundra/tundra-taiga.json @@ -2,16 +2,7 @@ "name": "Tundra Taiga", "derivative": "GIANT_TREE_TAIGA", "vanillaDerivative": "TAIGA", - "jigsawStructures": [ - { - "rarity": 1000, - "structure": "pillager" - }, - { - "rarity": 350, - "structure": "village-tundra" - } - ], + "generators": [ { "min": 5, diff --git a/dimensions/overworld.json b/dimensions/overworld.json index e2bfbd13..c96949cc 100644 --- a/dimensions/overworld.json +++ b/dimensions/overworld.json @@ -249,9 +249,9 @@ }, { "minHeight": 1, - "maxPerChunk": 13, + "maxPerChunk": 10, "maxHeight": 64, - "minPerChunk": 5, + "minPerChunk": 8, "minSize": 4, "maxSize": 9, "palette": [ diff --git a/loot/cactus-clutter.json b/loot/cactus-clutter.json index 9c6213ba..0f8fd608 100644 --- a/loot/cactus-clutter.json +++ b/loot/cactus-clutter.json @@ -1,7 +1,7 @@ { "name": "Cactus Clutter", "rarity": 1, - "maxPicked": 2, + "maxPicked": 1, "minPicked": 1, "loot": [ { diff --git a/loot/cave-clutter.json b/loot/cave-clutter.json index 5d54fe1b..2a60129b 100644 --- a/loot/cave-clutter.json +++ b/loot/cave-clutter.json @@ -18,6 +18,16 @@ "type": "lantern", "maxAmount": 1, "slotTypes": "STORAGE" + }, + { + "type": "cobbled_deepslate", + "maxAmount": 16, + "slotTypes": "STORAGE" + }, + { + "type": "deepslate", + "maxAmount": 10, + "slotTypes": "STORAGE" } ] } \ No newline at end of file diff --git a/loot/cold-food.json b/loot/cold-food.json index 68c05785..70645d89 100644 --- a/loot/cold-food.json +++ b/loot/cold-food.json @@ -2,7 +2,7 @@ "name": "Cold Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "rabbit_stew", diff --git a/loot/cold-treasure.json b/loot/cold-treasure.json index e04fe3c2..8af1be2b 100644 --- a/loot/cold-treasure.json +++ b/loot/cold-treasure.json @@ -2,7 +2,7 @@ "name": "Cold Treasure", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "iron_nugget", diff --git a/loot/forest-food.json b/loot/forest-food.json index dd34a35b..9303bb50 100644 --- a/loot/forest-food.json +++ b/loot/forest-food.json @@ -2,7 +2,7 @@ "name": "Forest Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "apple", diff --git a/loot/frozen-clutter.json b/loot/frozen-clutter.json index 6234f0e8..9eb60690 100644 --- a/loot/frozen-clutter.json +++ b/loot/frozen-clutter.json @@ -16,6 +16,7 @@ }, { "type": "zombie_head", + "rarity": 3, "maxAmount": 1, "slotTypes": "STORAGE" }, diff --git a/loot/frozen-food.json b/loot/frozen-food.json index e1f7429a..5ca1141f 100644 --- a/loot/frozen-food.json +++ b/loot/frozen-food.json @@ -2,7 +2,7 @@ "name": "Frozen Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "spider_eye", diff --git a/loot/global-tools.json b/loot/global-tools.json index aa9da541..8c267521 100644 --- a/loot/global-tools.json +++ b/loot/global-tools.json @@ -1,6 +1,6 @@ { "name": "Global Tools", - "rarity": 1, + "rarity": 2, "maxPicked": 2, "minPicked": 0, "loot": [ diff --git a/loot/hot-food.json b/loot/hot-food.json index 9c0d3161..cb42379f 100644 --- a/loot/hot-food.json +++ b/loot/hot-food.json @@ -2,7 +2,7 @@ "name": "Hot Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "rotten_flesh", diff --git a/loot/hot-treasure.json b/loot/hot-treasure.json index e7af2457..1227d34f 100644 --- a/loot/hot-treasure.json +++ b/loot/hot-treasure.json @@ -1,8 +1,8 @@ { "name": "Hot Treasure", "rarity": 1, - "maxPicked": 3, - "minPicked": 1, + "maxPicked": 2, + "minPicked": 0, "loot": [ { "type": "lapis_lazuli", diff --git a/loot/mushroom-food.json b/loot/mushroom-food.json index 11d03f57..94139a98 100644 --- a/loot/mushroom-food.json +++ b/loot/mushroom-food.json @@ -2,7 +2,7 @@ "name": "Mushroom Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "spider_eye", diff --git a/loot/swamp-food.json b/loot/swamp-food.json index 114eccf4..4d08b17e 100644 --- a/loot/swamp-food.json +++ b/loot/swamp-food.json @@ -2,7 +2,7 @@ "name": "Swamp Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "spider_eye", diff --git a/loot/temperate-food.json b/loot/temperate-food.json index 1e2e1a3c..b8ebf434 100644 --- a/loot/temperate-food.json +++ b/loot/temperate-food.json @@ -2,7 +2,7 @@ "name": "Temperate Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "bread", diff --git a/loot/tropical-food.json b/loot/tropical-food.json index 4fbdfeac..25bef202 100644 --- a/loot/tropical-food.json +++ b/loot/tropical-food.json @@ -2,7 +2,7 @@ "name": "Tropical Food", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "melon_slice", diff --git a/loot/tropical-treasure.json b/loot/tropical-treasure.json index d5b01fb5..d9e0760d 100644 --- a/loot/tropical-treasure.json +++ b/loot/tropical-treasure.json @@ -2,7 +2,7 @@ "name": "Tropical Treasure", "rarity": 1, "maxPicked": 2, - "minPicked": 1, + "minPicked": 0, "loot": [ { "type": "wooden_pickaxe", diff --git a/regions/frozen.json b/regions/frozen.json index 6bb135d0..7987d7fa 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -94,19 +94,27 @@ }, "jigsawStructures": [ { - "rarity": 1050, + "rarity": 1000, "structure": "igloo" + }, + { + "rarity": 1000, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-snowy" } ], "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -133,9 +141,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/hot.json b/regions/hot.json index 3cf80084..e7525d54 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -28,12 +28,16 @@ }, "jigsawStructures": [ { - "rarity": 2000, + "rarity": 1000, "structure": "pillager" }, { - "rarity": 1050, + "rarity": 500, "structure": "village-hot" + }, + { + "rarity": 1500, + "structure": "desert-pyramid" } ], "biomeImplosionRatio": 0.25, @@ -155,13 +159,13 @@ ], "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -188,9 +192,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/mesa.json b/regions/mesa.json index f2708d63..60213592 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -50,13 +50,13 @@ }, "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -83,9 +83,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/mountain.json b/regions/mountain.json index bf644563..4dc09cb4 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -39,6 +39,16 @@ "zoom": 0.5 } ], + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-tundra" + } + ], "biomeImplosionRatio": 0.25, "deposits": [ { @@ -61,13 +71,13 @@ ], "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -94,9 +104,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/mushroom.json b/regions/mushroom.json index cafbde0e..21769dcb 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -66,13 +66,13 @@ ], "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -99,9 +99,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/savanna.json b/regions/savanna.json index 9bdc6863..c4bd6626 100644 --- a/regions/savanna.json +++ b/regions/savanna.json @@ -39,13 +39,13 @@ "biomeImplosionRatio": 0.25, "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -72,9 +72,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/swamp.json b/regions/swamp.json index 1f6d8ab5..23fa0f0c 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -27,6 +27,16 @@ "zoom": 5 } }, + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-tundra" + } + ], "biomeImplosionRatio": 0.26, "deposits": [ { @@ -46,13 +56,13 @@ ], "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -79,9 +89,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/temperate.json b/regions/temperate.json index 77a57b94..ee9bc0e4 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -38,6 +38,16 @@ "rarity":119 } ], + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-temperate" + } + ], "biomeImplosionRatio":0.25, "deposits":[ { @@ -60,13 +70,13 @@ ], "objects":[ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -93,9 +103,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 75df283f..7da4ccb7 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -37,16 +37,26 @@ "zoom": 0.5 } ], + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-temperate" + } + ], "biomeImplosionRatio": 0.25, "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -73,9 +83,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/tropical.json b/regions/tropical.json index e53642a9..9b783a22 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -52,6 +52,14 @@ } ], "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-tundra" + }, { "rarity": 650, "structure": "jungle-pyramid" @@ -90,13 +98,13 @@ }, "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -123,9 +131,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, diff --git a/regions/tundra.json b/regions/tundra.json index b8e97601..c9b6c105 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -43,6 +43,16 @@ "varience": 2 } ], + "jigsawStructures": [ + { + "rarity": 750, + "structure": "pillager" + }, + { + "rarity": 500, + "structure": "village-tundra" + } + ], "riverRarity": 1, "landBiomeZoom": 1.25, "riverStyle": { @@ -69,13 +79,13 @@ }, "objects": [ { - "heightmap": { + "heightmap": { "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 10 + "multiplier": 5 }, - "offsetY": 10 + "offsetY": 7 }, "chance": 0.9, "edit": [ @@ -102,9 +112,9 @@ "seed": 1337, "style": { "style": "SIMPLEX", - "multiplier": 15 + "multiplier": 10 }, - "offsetY": 19 + "offsetY": 12 }, "chance": 0.05, "bottom": true, From ae5ac057d10d60e46f8529d5315fbc435e6409e8 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sun, 27 Jun 2021 12:16:19 -0700 Subject: [PATCH 14/14] mineshaft, ruins, temples removed from structures They are nolonger possible in modern iris, so it should not be here anyway. This SHOULD however be added back --- regions/frozen.json | 9 --------- regions/mesa.json | 9 --------- regions/mountain.json | 17 +---------------- regions/tropical-mountain.json | 17 ----------------- 4 files changed, 1 insertion(+), 51 deletions(-) diff --git a/regions/frozen.json b/regions/frozen.json index 7987d7fa..806e1495 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -23,15 +23,6 @@ "riverBiomes": [ "frozen/frozen-river" ], - "structures": [ - { - "tileset": "soul-temple", - "height": 26, - "rarity": 3, - "ratio": 0.9, - "zoom": 1 - } - ], "spotBiomes": [ { "biome": "frozen/frozen-ocean", diff --git a/regions/mesa.json b/regions/mesa.json index 60213592..baa09fbb 100644 --- a/regions/mesa.json +++ b/regions/mesa.json @@ -20,15 +20,6 @@ "riverBiomes": [ "mesa/mesa-river" ], - "structures": [ - { - "tileset": "soul-temple", - "height": 26, - "rarity": 3, - "ratio": 0.9, - "zoom": 1 - } - ], "spotBiomes": [ { "biome": "hot/hot-ocean", diff --git a/regions/mountain.json b/regions/mountain.json index 4dc09cb4..98b6bdf3 100644 --- a/regions/mountain.json +++ b/regions/mountain.json @@ -23,22 +23,7 @@ "riverBiomes": [ "mountain/mountain-river" ], - "structures": [ - { - "tileset": "murky-stronghold", - "height": 26, - "rarity": 10, - "ratio": 0.9, - "zoom": 0.5 - }, - { - "tileset": "ruins", - "rarity": 25, - "shuffle": 22, - "ratio": 0.9, - "zoom": 0.5 - } - ], + "jigsawStructures": [ { "rarity": 750, diff --git a/regions/tropical-mountain.json b/regions/tropical-mountain.json index 7da4ccb7..6c99e115 100644 --- a/regions/tropical-mountain.json +++ b/regions/tropical-mountain.json @@ -20,23 +20,6 @@ "tropical/tropical-river-steep", "tropical/tropical-river-soft" ], - "structures": [ - { - "tileset": "murky-stronghold", - "height": 26, - "rarity": 10, - "ratio": 0.9, - "zoom": 0.5 - }, - { - - "tileset": "ruins", - "rarity": 25, - "shuffle": 22, - "ratio": 0.9, - "zoom": 0.5 - } - ], "jigsawStructures": [ { "rarity": 750,