Skip to content

Commit 0c4da71

Browse files
authored
Spawnrate fixes, TM lootgen, Ultrite Templates lootgen, Lang updates (#100)
* Rks recipe spelling error fix * Add natural preset * Add natural preset * Add natural preset * Rotom rarer based on player feedback * Attempt #1 Ditto spawn rate bump based on player feedback * Revert "Attempt #1 Ditto spawn rate bump based on player feedback" This reverts commit 4f8d0d5. * Update 0175_togepi.json * Togepi line spawn rate bump based on player feedback * Togepi line spawn rate bump based on player feedback * Zygarde Cell spawn rate nerf Hopefully has enough conditions now to not trigger egregious spawn rates * Ditto spawn rate bump based on player feedback * Solosis evo line spawn rate fix based on player feedback * Solosis evo line spawn rate fixes based on player feedback * Solosis evo line spawn rate fixes based on player feedback * Solosis evo line spawn rate fixes based on player feedback * Gothita evo line spawn rate fixes based on player feedback * Gothita evo line spawn rate fixes based on player feedback * Gothita evo line spawn rate fixes based on player feedback * Bagon evo line spawn rate fixes based on player feedback * Bagon evo line spawn rate fixes based on player feedback * Unown spawn rate buff based on player feedback * Add Ultrite Smithing Template to End Cities, Ancient Cities, Beast Ball loot for now * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Add New TMs to Ball Loots * Compile error fix * zygarde cell collectibles rarity bucket -conno * an s * Update zh_cn.json * Update fr_fr.json
1 parent 9a58d15 commit 0c4da71

37 files changed

Lines changed: 169 additions & 99 deletions

common/src/main/generated/resources/assets/generations_core/lang/en_us.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2654,7 +2654,7 @@
26542654
"item.generations_core.ruby_hoe": "Ruby Hoe",
26552655
"item.generations_core.ruby_pickaxe": "Ruby Pickaxe",
26562656
"item.generations_core.ruby_rod": "Ruby Rod",
2657-
"item.generations_core.ruby_rod.fate_defied": "The Ruby Rod shatter as it resists its altered fate",
2657+
"item.generations_core.ruby_rod.fate_defied": "The Ruby Rod shatters as it resists its altered fate",
26582658
"item.generations_core.ruby_rod.tooltip": "§7HINT: Fish… Lake… Guardian…",
26592659
"item.generations_core.ruby_shovel": "Ruby Shovel",
26602660
"item.generations_core.ruby_sword": "Ruby Sword",
@@ -3419,4 +3419,4 @@
34193419
"painting.generations_core.town_map_sprite.author": "Pokemon",
34203420
"painting.generations_core.town_map_sprite.title": "Town Map Sprite",
34213421
"upgrade.minecraft.ultrite_upgrade": "Ultrite Upgrade Smithing Template"
3422-
}
3422+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/beast_ball.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,10 @@
331331
{
332332
"type": "minecraft:item",
333333
"name": "generations_core:mt_pyre_disc"
334+
},
335+
{
336+
"type": "minecraft:item",
337+
"name": "generations_core:ultrite_upgrade_smithing_template"
334338
}
335339
],
336340
"rolls": {
@@ -341,4 +345,4 @@
341345
}
342346
],
343347
"random_sequence": "generations_core:chests/beast_ball"
344-
}
348+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/dream_ball.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,10 @@
428428
"type": "minecraft:item",
429429
"name": "generations_core:tm_165"
430430
},
431+
{
432+
"type": "minecraft:item",
433+
"name": "generations_core:tm_232"
434+
},
431435
{
432436
"type": "minecraft:item",
433437
"name": "generations_core:tm_10"
@@ -496,6 +500,10 @@
496500
"type": "minecraft:item",
497501
"name": "generations_core:tm_161"
498502
},
503+
{
504+
"type": "minecraft:item",
505+
"name": "generations_core:tm_235"
506+
},
499507
{
500508
"type": "minecraft:item",
501509
"name": "generations_core:lugia_disc"
@@ -517,4 +525,4 @@
517525
}
518526
],
519527
"random_sequence": "generations_core:chests/dream_ball"
520-
}
528+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/jet_ball.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,14 @@
332332
"type": "minecraft:item",
333333
"name": "generations_core:tm_216"
334334
},
335+
{
336+
"type": "minecraft:item",
337+
"name": "generations_core:tm_230"
338+
},
339+
{
340+
"type": "minecraft:item",
341+
"name": "generations_core:tm_231"
342+
},
335343
{
336344
"type": "minecraft:item",
337345
"name": "generations_core:cascarrafa_city_disc"
@@ -381,4 +389,4 @@
381389
}
382390
],
383391
"random_sequence": "generations_core:chests/jet_ball"
384-
}
392+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/leaden_ball.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,10 @@
304304
"type": "minecraft:item",
305305
"name": "generations_core:tm_165"
306306
},
307+
{
308+
"type": "minecraft:item",
309+
"name": "generations_core:tm_232"
310+
},
307311
{
308312
"type": "minecraft:item",
309313
"name": "generations_core:tm_36"
@@ -393,4 +397,4 @@
393397
}
394398
],
395399
"random_sequence": "generations_core:chests/leaden_ball"
396-
}
400+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/level_ball.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,10 @@
496496
"type": "minecraft:item",
497497
"name": "generations_core:tm_206"
498498
},
499+
{
500+
"type": "minecraft:item",
501+
"name": "generations_core:tm_233"
502+
},
499503
{
500504
"type": "minecraft:item",
501505
"name": "generations_core:dynite_ore"
@@ -509,4 +513,4 @@
509513
}
510514
],
511515
"random_sequence": "generations_core:chests/level_ball"
512-
}
516+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/love_ball.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,10 @@
360360
"type": "minecraft:item",
361361
"name": "generations_core:tm_228"
362362
},
363+
{
364+
"type": "minecraft:item",
365+
"name": "generations_core:tm_235"
366+
},
363367
{
364368
"type": "minecraft:item",
365369
"name": "generations_core:tm_174"
@@ -433,4 +437,4 @@
433437
}
434438
],
435439
"random_sequence": "generations_core:chests/love_ball"
436-
}
440+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/luxury_ball.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,10 @@
344344
"type": "minecraft:item",
345345
"name": "generations_core:tm_228"
346346
},
347+
{
348+
"type": "minecraft:item",
349+
"name": "generations_core:tm_235"
350+
},
347351
{
348352
"type": "minecraft:item",
349353
"name": "generations_core:tm_174"
@@ -417,4 +421,4 @@
417421
}
418422
],
419423
"random_sequence": "generations_core:chests/luxury_ball"
420-
}
424+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/nest_ball.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,10 @@
328328
"type": "minecraft:item",
329329
"name": "generations_core:tm_206"
330330
},
331+
{
332+
"type": "minecraft:item",
333+
"name": "generations_core:tm_233"
334+
},
331335
{
332336
"type": "minecraft:item",
333337
"name": "generations_core:tm_131"
@@ -409,4 +413,4 @@
409413
}
410414
],
411415
"random_sequence": "generations_core:chests/nest_ball"
412-
}
416+
}

common/src/main/generated/resources/data/generations_core/loot_tables/chests/net_ball.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,10 @@
348348
"type": "minecraft:item",
349349
"name": "generations_core:tm_206"
350350
},
351+
{
352+
"type": "minecraft:item",
353+
"name": "generations_core:tm_233"
354+
},
351355
{
352356
"type": "minecraft:item",
353357
"name": "generations_core:tm_182"
@@ -409,4 +413,4 @@
409413
}
410414
],
411415
"random_sequence": "generations_core:chests/net_ball"
412-
}
416+
}

0 commit comments

Comments
 (0)