remove a problematic catacombs piece & less sherds

FrozenBlock · Oct 13, 2024 · 8ba57ab · 8ba57ab
1 parent 0b8d846
commit 8ba57ab
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 53 deletions.
diff --git a/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_archery.json b/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_archery.json
@@ -721,7 +721,7 @@
         {
           "block_entity_modifier": {
             "type": "frozenlib:append_sherds",
-            "chance_per_slot": 1.0,
+            "chance_per_slot": 0.5,
             "default_to_brick": false,
             "sherds": [
               "minecraft:skull_pottery_sherd",
@@ -734,7 +734,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 1.0
+            "probability": 0.5
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"

diff --git a/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_corridor.json b/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_corridor.json
@@ -225,7 +225,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.35
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -238,7 +238,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -256,7 +256,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -696,7 +696,7 @@
         {
           "block_entity_modifier": {
             "type": "frozenlib:append_sherds",
-            "chance_per_slot": 1.0,
+            "chance_per_slot": 0.5,
             "default_to_brick": false,
             "sherds": [
               "minecraft:skull_pottery_sherd",
@@ -710,7 +710,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 1.0
+            "probability": 0.5
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"

diff --git a/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_corridor_rare.json b/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_corridor_rare.json
@@ -225,7 +225,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.35
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -238,7 +238,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -256,7 +256,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -696,7 +696,7 @@
         {
           "block_entity_modifier": {
             "type": "frozenlib:append_sherds",
-            "chance_per_slot": 1.0,
+            "chance_per_slot": 0.5,
             "default_to_brick": false,
             "sherds": [
               "minecraft:skull_pottery_sherd",
@@ -710,7 +710,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 1.0
+            "probability": 0.5
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"

diff --git a/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_king.json b/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_king.json
@@ -55,7 +55,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.35
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -68,7 +68,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -86,7 +86,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -718,7 +718,7 @@
         {
           "block_entity_modifier": {
             "type": "frozenlib:append_sherds",
-            "chance_per_slot": 1.0,
+            "chance_per_slot": 0.5,
             "default_to_brick": false,
             "sherds": [
               "minecraft:skull_pottery_sherd",
@@ -731,7 +731,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 1.0
+            "probability": 0.5
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"

diff --git a/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_lava_trap.json b/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_lava_trap.json
@@ -248,7 +248,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.35
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -261,7 +261,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -279,7 +279,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -739,7 +739,7 @@
         {
           "block_entity_modifier": {
             "type": "frozenlib:append_sherds",
-            "chance_per_slot": 1.0,
+            "chance_per_slot": 0.5,
             "default_to_brick": false,
             "sherds": [
               "minecraft:skull_pottery_sherd",
@@ -750,7 +750,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 1.0
+            "probability": 0.5
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"

diff --git a/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_small_room.json b/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_small_room.json
@@ -251,7 +251,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.35
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -264,7 +264,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -282,7 +282,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -722,7 +722,7 @@
         {
           "block_entity_modifier": {
             "type": "frozenlib:append_sherds",
-            "chance_per_slot": 1.0,
+            "chance_per_slot": 0.5,
             "default_to_brick": false,
             "sherds": [
               "minecraft:skull_pottery_sherd",
@@ -736,7 +736,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 1.0
+            "probability": 0.5
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"

diff --git a/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_tomb.json b/src/main/generated/data/trailiertales/worldgen/processor_list/catacombs_tomb.json
@@ -248,7 +248,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.35
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -261,7 +261,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -279,7 +279,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 0.25
+            "probability": 0.275
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
@@ -739,7 +739,7 @@
         {
           "block_entity_modifier": {
             "type": "frozenlib:append_sherds",
-            "chance_per_slot": 1.0,
+            "chance_per_slot": 0.5,
             "default_to_brick": false,
             "sherds": [
               "minecraft:skull_pottery_sherd",
@@ -753,7 +753,7 @@
           "input_predicate": {
             "block": "minecraft:decorated_pot",
             "predicate_type": "minecraft:random_block_match",
-            "probability": 1.0
+            "probability": 0.5
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json
@@ -1368,15 +1368,6 @@
       },
       "weight": 1
     },
-    {
-      "element": {
-        "element_type": "minecraft:single_pool_element",
-        "location": "trailiertales:catacombs/corridor/surveyor_timing",
-        "processors": "trailiertales:catacombs_corridor",
-        "projection": "rigid"
-      },
-      "weight": 1
-    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",

diff --git a/...ain/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java b/...ain/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java
@@ -328,7 +328,6 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("tomb/two_story"), tomb), 2),
 
 					Pair.of(StructurePoolElement.single(string("corridor/small_gallery"), corridor), 1),
-					Pair.of(StructurePoolElement.single(string("corridor/surveyor_timing"), corridor), 1),
 
 					Pair.of(StructurePoolElement.single(string("corridor/connector_dripstone_trap"), corridor), 4),
 					Pair.of(StructurePoolElement.single(string("corridor/connector_lava_trap"), corridor), 4)
@@ -658,15 +657,15 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 		final RuleProcessor potProcessor = new RuleProcessor(
 			ImmutableList.of(
 				new ProcessorRule(
-					new RandomBlockMatchTest(Blocks.DECORATED_POT, 0.25F),
+					new RandomBlockMatchTest(Blocks.DECORATED_POT, 0.35F),
 					AlwaysTrueTest.INSTANCE, Blocks.CAVE_AIR.defaultBlockState()
 				),
 				new ProcessorRule(
-					new RandomBlockMatchTest(Blocks.DECORATED_POT, 0.25F),
+					new RandomBlockMatchTest(Blocks.DECORATED_POT, 0.275F),
 					AlwaysTrueTest.INSTANCE, Blocks.CANDLE.defaultBlockState().setValue(BlockStateProperties.CANDLES, 4)
 				),
 				new ProcessorRule(
-					new RandomBlockMatchTest(Blocks.DECORATED_POT, 0.25F),
+					new RandomBlockMatchTest(Blocks.DECORATED_POT, 0.275F),
 					AlwaysTrueTest.INSTANCE, Blocks.POTTED_DEAD_BUSH.defaultBlockState()
 				),
 				new ProcessorRule(
@@ -793,7 +792,7 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 				corridorChests,
 				potLootProcessor,
 				TTStructures.decoratedPotSherdProcessor(
-					1F,
+					0.5F,
 					Items.SKULL_POTTERY_SHERD,
 					Items.SKULL_POTTERY_SHERD,
 					TTItems.OMEN_POTTERY_SHERD,
@@ -818,7 +817,7 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 				corridorChests,
 				potLootProcessor,
 				TTStructures.decoratedPotSherdProcessor(
-					1F,
+					0.5F,
 					Items.SKULL_POTTERY_SHERD,
 					Items.SKULL_POTTERY_SHERD,
 					TTItems.OMEN_POTTERY_SHERD,
@@ -845,7 +844,7 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 				rewardChests,
 				potLootProcessor,
 				TTStructures.decoratedPotSherdProcessor(
-					1F,
+					0.5F,
 					Items.SKULL_POTTERY_SHERD,
 					Items.SKULL_POTTERY_SHERD,
 					TTItems.OMEN_POTTERY_SHERD,
@@ -871,7 +870,7 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 				guaranteedRewardChests,
 				potLootProcessor,
 				TTStructures.decoratedPotSherdProcessor(
-					1F,
+					0.5F,
 					Items.SKULL_POTTERY_SHERD,
 					TTItems.OMEN_POTTERY_SHERD,
 					Items.PLENTY_POTTERY_SHERD,
@@ -913,7 +912,7 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 				rewardChests,
 				potLootProcessor,
 				TTStructures.decoratedPotSherdProcessor(
-					1F,
+					0.5F,
 					Items.SKULL_POTTERY_SHERD,
 					TTItems.BULLSEYE_POTTERY_SHERD,
 					TTItems.BULLSEYE_POTTERY_SHERD,
@@ -939,7 +938,7 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 				rewardChests,
 				potLootProcessor,
 				TTStructures.decoratedPotSherdProcessor(
-					1F,
+					0.5F,
 					Items.SKULL_POTTERY_SHERD,
 					TTItems.ESSENCE_POTTERY_SHERD,
 					TTItems.EYE_POTTERY_SHERD
@@ -962,7 +961,7 @@ public static void bootstrapProcessor(@NotNull BootstrapContext<StructureProcess
 				corridorChests,
 				potLootProcessor,
 				TTStructures.decoratedPotSherdProcessor(
-					1F,
+					0.5F,
 					Items.SKULL_POTTERY_SHERD,
 					Items.SKULL_POTTERY_SHERD,
 					TTItems.OMEN_POTTERY_SHERD,

diff --git a/src/main/resources/data/trailiertales/structure/catacombs/corridor/surveyor_timing.nbt b/src/main/resources/data/trailiertales/structure/catacombs/corridor/surveyor_timing.nbt