Adjust Spawn Rates and Chances

GenerationsMod · Nov 29, 2023 · 58c9f2b · 58c9f2b
1 parent 00f7b51
commit 58c9f2b
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 44 deletions.
diff --git a/...on/src/main/generated/resources/data/generations_structures/worldgen/structure/spike.json b/...on/src/main/generated/resources/data/generations_structures/worldgen/structure/spike.json
@@ -5,16 +5,9 @@
   "size": 1,
   "spawn_overrides": {},
   "start_height": {
-    "type": "minecraft:uniform",
-    "max_inclusive": {
-      "below_top": 120
-    },
-    "min_inclusive": {
-      "absolute": 0
-    }
+    "absolute": 10
   },
   "start_pool": "generations_structures:spike",
-  "step": "underground_decoration",
-  "terrain_adaptation": "beard_thin",
+  "step": "surface_structures",
   "use_expansion_hack": false
 }
diff --git a/...rc/main/generated/resources/data/generations_structures/worldgen/structure_set/comet.json b/...rc/main/generated/resources/data/generations_structures/worldgen/structure_set/comet.json
@@ -2,8 +2,8 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 1189082690,
-    "separation": 15,
-    "spacing": 25
+    "separation": 85,
+    "spacing": 150
   },
   "structures": [
     {

diff --git a/.../generated/resources/data/generations_structures/worldgen/structure_set/loot_balloon.json b/.../generated/resources/data/generations_structures/worldgen/structure_set/loot_balloon.json
@@ -2,33 +2,33 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 738478911,
-    "separation": 10,
-    "spacing": 20
+    "separation": 50,
+    "spacing": 100
   },
   "structures": [
     {
       "structure": "generations_structures:loot_balloon/great_balloon",
-      "weight": 1
+      "weight": 4
     },
     {
       "structure": "generations_structures:loot_balloon/master_balloon",
       "weight": 1
     },
     {
       "structure": "generations_structures:loot_balloon/ultra_balloon",
-      "weight": 1
+      "weight": 2
     },
     {
       "structure": "generations_structures:loot_balloon/beast_balloon",
-      "weight": 1
+      "weight": 2
     },
     {
       "structure": "generations_structures:loot_balloon/meowth_balloon",
-      "weight": 1
+      "weight": 3
     },
     {
       "structure": "generations_structures:loot_balloon/normal_balloon",
-      "weight": 1
+      "weight": 5
     }
   ]
 }
diff --git a/...ain/generated/resources/data/generations_structures/worldgen/structure_set/pokeshops.json b/...ain/generated/resources/data/generations_structures/worldgen/structure_set/pokeshops.json
@@ -2,8 +2,8 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 293756737,
-    "separation": 10,
-    "spacing": 15
+    "separation": 250,
+    "spacing": 500
   },
   "structures": [
     {

diff --git a/...rc/main/generated/resources/data/generations_structures/worldgen/structure_set/spike.json b/...rc/main/generated/resources/data/generations_structures/worldgen/structure_set/spike.json
@@ -2,8 +2,8 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 732790531,
-    "separation": 5,
-    "spacing": 10
+    "separation": 10,
+    "spacing": 20
   },
   "structures": [
     {

diff --git a/...generations/structures/generationsstructures/structures/GenerationsStructureSettings.java b/...generations/structures/generationsstructures/structures/GenerationsStructureSettings.java
@@ -30,13 +30,13 @@ public static void bootstrap(BootstapContext<Structure> context) {
         HolderGetter<Biome> biomeHolderGetter = context.lookup(Registries.BIOME);
         HolderGetter<StructureTemplatePool> poolHolderGetter = context.lookup(Registries.TEMPLATE_POOL);
 
-        registerJigsaw(context, GenerationsStructuresKeys.BEAST_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.BEAST_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
-        registerJigsaw(context, GenerationsStructuresKeys.GREAT_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.GREAT_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
-        registerJigsaw(context, GenerationsStructuresKeys.MASTER_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.MASTER_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
-        registerJigsaw(context, GenerationsStructuresKeys.NORMAL_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.NORMAL_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
-        registerJigsaw(context, GenerationsStructuresKeys.ULTRA_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.ULTRA_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
-        registerJigsaw(context, GenerationsStructuresKeys.MEOWTH_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.MEOWTH_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
-        registerJigsaw(context, GenerationsStructuresKeys.COMET, createJigsaw(
+        registerStructure(context, GenerationsStructuresKeys.BEAST_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.BEAST_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
+        registerStructure(context, GenerationsStructuresKeys.GREAT_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.GREAT_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
+        registerStructure(context, GenerationsStructuresKeys.MASTER_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.MASTER_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
+        registerStructure(context, GenerationsStructuresKeys.NORMAL_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.NORMAL_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
+        registerStructure(context, GenerationsStructuresKeys.ULTRA_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.ULTRA_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
+        registerStructure(context, GenerationsStructuresKeys.MEOWTH_BALLOON, balloonJigsawStructure(poolHolderGetter.getOrThrow(GenerationsTemplatePools.MEOWTH_BALLOON), biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_LOOT_BALLOON)));
+        registerStructure(context, GenerationsStructuresKeys.COMET, createJigsaw(
                 new Structure.StructureSettings(
                         biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_COMET),
                         Map.of(),
@@ -51,7 +51,7 @@ public static void bootstrap(BootstapContext<Structure> context) {
                 Optional.empty(),
                 80
         ));
-        registerJigsaw(context, GenerationsStructuresKeys.SCARLET_POKESHOP, createJigsaw(
+        registerStructure(context, GenerationsStructuresKeys.SCARLET_POKESHOP, createJigsaw(
                 new Structure.StructureSettings(
                         biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_SCARLET_POKESHOP),
                         Map.of(),
@@ -66,24 +66,24 @@ public static void bootstrap(BootstapContext<Structure> context) {
                 Optional.of(Heightmap.Types.WORLD_SURFACE_WG),
                 80
         ));
-        registerJigsaw(context, GenerationsStructuresKeys.SPIKE, createJigsaw(
+        registerStructure(context, GenerationsStructuresKeys.SPIKE, createJigsaw(
                 new Structure.StructureSettings(
                         biomeHolderGetter.getOrThrow(GenerationsBiomeTags.HAS_SPIKE),
                         Map.of(),
-                        GenerationStep.Decoration.UNDERGROUND_DECORATION,
-                        TerrainAdjustment.BEARD_THIN
+                        GenerationStep.Decoration.SURFACE_STRUCTURES,
+                        TerrainAdjustment.NONE
                 ),
                 poolHolderGetter.getOrThrow(GenerationsTemplatePools.SPIKE),
                 Optional.empty(),
                 1,
-                UniformHeight.of(VerticalAnchor.absolute(0), VerticalAnchor.belowTop(120)),
+                ConstantHeight.of(VerticalAnchor.absolute(10)),
                 false,
                 Optional.empty(),
                 75
         ));
     }
 
-    private static void registerJigsaw(BootstapContext<Structure> context, ResourceKey<Structure> structureResourceKey, Structure structure){
+    private static void registerStructure(BootstapContext<Structure> context, ResourceKey<Structure> structureResourceKey, Structure structure){
         context.register(structureResourceKey, structure);
     }
 

diff --git a/...ions/structures/generationsstructures/worldgen/structureset/GenerationsStructureSets.java b/...ions/structures/generationsstructures/worldgen/structureset/GenerationsStructureSets.java
@@ -31,24 +31,24 @@ public class GenerationsStructureSets {
      */
     public static void bootstrap(BootstapContext<StructureSet> context) {
         register(context, COMET, GenerationsStructuresKeys.COMET,
-                new RandomSpreadStructurePlacement(25, 15, RandomSpreadType.LINEAR, 1189082690));
+                new RandomSpreadStructurePlacement(150, 85, RandomSpreadType.LINEAR, 1189082690));
 
         register(context, POKESHOPS, GenerationsStructuresKeys.SCARLET_POKESHOP,
-                new RandomSpreadStructurePlacement(15, 10, RandomSpreadType.LINEAR, 293756737));
+                new RandomSpreadStructurePlacement(500, 250, RandomSpreadType.LINEAR, 293756737));
 
         register(context, SPIKE, GenerationsStructuresKeys.SPIKE,
-                new RandomSpreadStructurePlacement(10, 5, RandomSpreadType.LINEAR, 732790531));
+                new RandomSpreadStructurePlacement(20, 10, RandomSpreadType.LINEAR, 732790531));
 
         register(context,
           LOOT_BALLOON,
                 List.of(
-                        createStructureSelectionEntry(context, GenerationsStructuresKeys.GREAT_BALLOON, 1),
+                        createStructureSelectionEntry(context, GenerationsStructuresKeys.GREAT_BALLOON, 4),
                         createStructureSelectionEntry(context, GenerationsStructuresKeys.MASTER_BALLOON, 1),
-                        createStructureSelectionEntry(context, GenerationsStructuresKeys.ULTRA_BALLOON, 1),
-                        createStructureSelectionEntry(context, GenerationsStructuresKeys.BEAST_BALLOON, 1),
-                        createStructureSelectionEntry(context, GenerationsStructuresKeys.MEOWTH_BALLOON, 1),
-                        createStructureSelectionEntry(context, GenerationsStructuresKeys.NORMAL_BALLOON, 1)
-                ), new RandomSpreadStructurePlacement(20, 10, RandomSpreadType.LINEAR, 738478911)
+                        createStructureSelectionEntry(context, GenerationsStructuresKeys.ULTRA_BALLOON, 2),
+                        createStructureSelectionEntry(context, GenerationsStructuresKeys.BEAST_BALLOON, 2),
+                        createStructureSelectionEntry(context, GenerationsStructuresKeys.MEOWTH_BALLOON, 3),
+                        createStructureSelectionEntry(context, GenerationsStructuresKeys.NORMAL_BALLOON, 5)
+                ), new RandomSpreadStructurePlacement(100, 50, RandomSpreadType.LINEAR, 738478911)
         );
     }