various legend loots

GenerationsMod · Oct 22, 2024 · 8f54ef2 · 8f54ef2
1 parent 7c7618b
commit 8f54ef2
Show file tree

Hide file tree

Showing 14 changed files with 106 additions and 12 deletions.
diff --git a/common/src/main/resources/data/generations_core/species_additions/generation2/hooh.json b/common/src/main/resources/data/generations_core/species_additions/generation2/hooh.json
@@ -1,11 +1,16 @@
 {
   "target": "cobblemon:hooh",
   "drops": {
-    "amount": 1,
+    "amount": 2,
     "entries": [
       {
         "item": "generations_core:hooh_doll",
         "percentage": 100.0
+      },
+      {
+        "item": "generations_core:rainbow_wing",
+        "percentage": 100.0,
+        "quantityRange": 6-6
       }
     ]
   }

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation3/regice.json b/common/src/main/resources/data/generations_core/species_additions/generation3/regice.json
@@ -1,11 +1,15 @@
 {
   "target": "cobblemon:regice",
   "drops": {
-    "amount": 1,
+    "amount": 2,
     "entries": [
       {
         "item": "generations_core:regice_doll",
         "percentage": 100.0
+      },
+      {
+        "item": "generations_core:regice_orb",
+        "percentage": 100.0
       }
     ]
   }

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation3/regirock.json b/common/src/main/resources/data/generations_core/species_additions/generation3/regirock.json
@@ -1,11 +1,15 @@
 {
   "target": "cobblemon:regirock",
   "drops": {
-    "amount": 1,
+    "amount": 2,
     "entries": [
       {
         "item": "generations_core:regirock_doll",
         "percentage": 100.0
+      },
+      {
+        "item": "generations_core:regirock_orb",
+        "percentage": 100.0
       }
     ]
   }

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation3/registeel.json b/common/src/main/resources/data/generations_core/species_additions/generation3/registeel.json
@@ -1,11 +1,15 @@
 {
   "target": "cobblemon:registeel",
   "drops": {
-    "amount": 1,
+    "amount": 2,
     "entries": [
       {
         "item": "generations_core:registeel_doll",
         "percentage": 100.0
+      },
+      {
+        "item": "generations_core:registeel_orb",
+        "percentage": 100.0
       }
     ]
   }

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation4/dialga.json b/common/src/main/resources/data/generations_core/species_additions/generation4/dialga.json
@@ -1,11 +1,15 @@
 {
   "target": "cobblemon:dialga",
   "drops": {
-    "amount": 1,
+    "amount": 2,
     "entries": [
       {
         "item": "generations_core:dialga_doll",
         "percentage": 100.0
+      },
+      {
+        "item": "generations_core:adamant_orb",
+        "percentage": 100.0
       }
     ]
   },

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation4/giratina.json b/common/src/main/resources/data/generations_core/species_additions/generation4/giratina.json
@@ -1,15 +1,19 @@
 {
   "target": "cobblemon:giratina",
   "drops": {
-    "amount": 2,
+    "amount": 3,
     "entries": [
       {
         "item": "generations_core:giratina_altered_doll",
-        "percentage": 1.0
+        "percentage": 100.0
       },
       {
         "item": "generations_core:giratina_origin_doll",
-        "percentage": 1.0
+        "percentage": 100.0
+      },
+      {
+        "item": "generations_core:griseous_orb",
+        "percentage": 100.0
       }
     ]
   },

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation4/palkia.json b/common/src/main/resources/data/generations_core/species_additions/generation4/palkia.json
@@ -1,11 +1,15 @@
 {
   "target": "cobblemon:palkia",
   "drops": {
-    "amount": 1,
+    "amount": 2,
     "entries": [
       {
         "item": "generations_core:palkia_doll",
         "percentage": 100.0
+      },
+      {
+        "item": "generations_core:lustrous_orb",
+        "percentage": 100.0
       }
     ]
   }

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation6/aegislash.json b/common/src/main/resources/data/generations_core/species_additions/generation6/aegislash.json
@@ -17,7 +17,7 @@
       },
       {
         "item": "generations_core:rusty_fragment",
-        "percentage": 1.0
+        "percentage": 3.0
       }
     ]
   }

diff --git a/common/src/main/resources/data/generations_core/species_additions/generation8/glastrier.json b/common/src/main/resources/data/generations_core/species_additions/generation8/glastrier.json
@@ -0,0 +1,12 @@
+{
+  "target": "cobblemon:glastrier",
+  "drops": {
+    "amount": 1,
+    "entries": [
+      {
+        "item": "generations_core:white_mane_hair",
+        "percentage": 100.0
+      }
+    ]
+  }
+}
diff --git a/common/src/main/resources/data/generations_core/species_additions/generation8/regidrago.json b/common/src/main/resources/data/generations_core/species_additions/generation8/regidrago.json
@@ -0,0 +1,12 @@
+{
+  "target": "cobblemon:regidrago",
+  "drops": {
+    "amount": 1,
+    "entries": [
+      {
+        "item": "generations_core:regidrago_orb",
+        "percentage": 100.0
+      }
+    ]
+  }
+}
diff --git a/common/src/main/resources/data/generations_core/species_additions/generation8/regieleki.json b/common/src/main/resources/data/generations_core/species_additions/generation8/regieleki.json
@@ -0,0 +1,12 @@
+{
+  "target": "cobblemon:regieleki",
+  "drops": {
+    "amount": 1,
+    "entries": [
+      {
+        "item": "generations_core:regieleki_orb",
+        "percentage": 100.0
+      }
+    ]
+  }
+}
diff --git a/common/src/main/resources/data/generations_core/species_additions/generation8/spectrier.json b/common/src/main/resources/data/generations_core/species_additions/generation8/spectrier.json
@@ -0,0 +1,12 @@
+{
+  "target": "cobblemon:spectrier",
+  "drops": {
+    "amount": 1,
+    "entries": [
+      {
+        "item": "generations_core:black_mane_hair",
+        "percentage": 100.0
+      }
+    ]
+  }
+}
diff --git a/common/src/main/resources/data/minecraft/loot_tables/fossils/rare/mew_fossil.json b/common/src/main/resources/data/minecraft/loot_tables/fossils/rare/mew_fossil.json
@@ -0,0 +1,17 @@
+{
+    "type": "minecraft:archaeology",
+    "pools": [
+        {
+            "bonus_rolls": 0.0,
+            "entries": [
+                {
+                    "type": "minecraft:item",
+                    "name": "generations_core:mew_fossil",
+                    "weight": 2
+                }
+            ],
+            "rolls": 1.0
+        }
+    ],
+    "random_sequence": "minecraft:fossils/rare/mew_fossil"
+}
diff --git a/.../generations/core/generationscore/forge/datagen/generators/loot/GenerationsChestLoot.java b/.../generations/core/generationscore/forge/datagen/generators/loot/GenerationsChestLoot.java
@@ -381,7 +381,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						POKEMON_CENTER_DISC, AZALEA_TOWN_DISC,
 						LILLIE_DISC, ROUTE_228_DISC,
 						JUBILIFE_VILLAGE_DISC, GOLDENROD_CITY_DISC,
-						ETERNA_CITY_DISC, VERMILION_CITY_DISC);
+						ETERNA_CITY_DISC, VERMILION_CITY_DISC, MEW_FOSSIL);
 
 		registerBallLootPoolUniform(output, GREAT_BALL, 1, 2,
 						POKE_BALL, MIRROR,
@@ -533,7 +533,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						STONE_PLATE, IRON_PLATE,
 						FRAGMENTED_DRAGO_KEY_1, FRAGMENTED_DRAGO_KEY_2,
 						FRAGMENTED_DRAGO_KEY_3, FRAGMENTED_DRAGO_KEY_4,
-						ROCK_CANDY, STEEL_CANDY,
+						ROCK_CANDY, STEEL_CANDY, MEW_FOSSIL,
 						TM_36, TM_51,
 						TM_76, TM_86,
 						TM_101, TM_116,
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
           },
           {
             "item": "generations_core:rusty_fragment",
-            "percentage": 1.0
+            "percentage": 3.0
           }
         ]
       }
@@ Expand Down @@