diff --git a/CHANGELOG.md b/CHANGELOG.md index e9425cb10..d95ad7435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Changes - Added new steam multiblocks for the alloy smelter, compressor, forge hammer, and thermal centrifuge @Pyritie - Reduced the Y level that ad astra considers "space" so rocket launches are faster @Pyritie +- Reduced the amount of loot vases in the newer illages, and reduced how much loot you get from them @Pyritie ### Bug fixes - Fixed missing crafting table recipes for greate gearboxes (#2577) @Pyritie ### Translation updates diff --git a/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json index 38ef47961..fd5632223 100644 --- a/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json +++ b/kubejs/data/tfg/loot_tables/chests/arabic_illager_basic.json @@ -249,7 +249,7 @@ { "type": "minecraft:item", "name": "tfc:powder/sulfur", - "weight": 50, + "weight": 80, "functions": [ { "add": false, @@ -329,7 +329,7 @@ { "type": "minecraft:item", "name": "minecraft:emerald", - "weight": 50, + "weight": 80, "functions": [ { "add": false, diff --git a/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json index 08f9b91fb..e119ad391 100644 --- a/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json +++ b/kubejs/data/tfg/loot_tables/chests/nordic_illager_basic.json @@ -249,7 +249,7 @@ { "type": "minecraft:item", "name": "tfc:powder/sulfur", - "weight": 50, + "weight": 80, "functions": [ { "add": false, @@ -329,7 +329,7 @@ { "type": "minecraft:item", "name": "minecraft:emerald", - "weight": 50, + "weight": 80, "functions": [ { "add": false, diff --git a/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json b/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json index eaef2a59f..1d5b919cf 100644 --- a/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json +++ b/kubejs/data/tfg/loot_tables/chests/yurts_illager_basic.json @@ -249,7 +249,7 @@ { "type": "minecraft:item", "name": "tfc:powder/sulfur", - "weight": 50, + "weight": 80, "functions": [ { "add": false, @@ -329,7 +329,7 @@ { "type": "minecraft:item", "name": "minecraft:emerald", - "weight": 50, + "weight": 80, "functions": [ { "add": false, diff --git a/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt b/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt index fa92c96a3..b651d20c2 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt and b/kubejs/data/tfg/structures/arabic/baseline/barracks.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house3.nbt b/kubejs/data/tfg/structures/arabic/baseline/house3.nbt index a162e5170..85f0d0916 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/house3.nbt and b/kubejs/data/tfg/structures/arabic/baseline/house3.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house4.nbt b/kubejs/data/tfg/structures/arabic/baseline/house4.nbt index 882a2cfc3..aa3064473 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/house4.nbt and b/kubejs/data/tfg/structures/arabic/baseline/house4.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt b/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt index dd23674e9..a4f675c91 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt and b/kubejs/data/tfg/structures/arabic/baseline/house_garden.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt b/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt index 1f3ab03b8..8d0153fd1 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt and b/kubejs/data/tfg/structures/arabic/baseline/smithy.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt index d4306cab8..62b0ffe17 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt and b/kubejs/data/tfg/structures/arabic/baseline/stall_gray.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt index 3d6a0581d..d8c4918b8 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt and b/kubejs/data/tfg/structures/arabic/baseline/stall_green.nbt differ diff --git a/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt b/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt index ff90623b8..9f23f5f58 100644 Binary files a/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt and b/kubejs/data/tfg/structures/arabic/baseline/stall_yellow.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house1.nbt b/kubejs/data/tfg/structures/yurts/baseline/house1.nbt index 8c7658d69..9c18c958f 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house1.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house1.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house2.nbt b/kubejs/data/tfg/structures/yurts/baseline/house2.nbt index 23dc63195..255d4faac 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house2.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house2.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/house3.nbt b/kubejs/data/tfg/structures/yurts/baseline/house3.nbt index 2474198ba..28d91a292 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/house3.nbt and b/kubejs/data/tfg/structures/yurts/baseline/house3.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/stable.nbt b/kubejs/data/tfg/structures/yurts/baseline/stable.nbt index 477a1b088..726767cf5 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/stable.nbt and b/kubejs/data/tfg/structures/yurts/baseline/stable.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt b/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt index 08933834b..95e355099 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt and b/kubejs/data/tfg/structures/yurts/baseline/throne_house.nbt differ diff --git a/kubejs/data/tfg/structures/yurts/baseline/tower.nbt b/kubejs/data/tfg/structures/yurts/baseline/tower.nbt index 9c267fa6e..65fd979d6 100644 Binary files a/kubejs/data/tfg/structures/yurts/baseline/tower.nbt and b/kubejs/data/tfg/structures/yurts/baseline/tower.nbt differ diff --git a/kubejs/server_scripts/primitive_creatures/loot.js b/kubejs/server_scripts/primitive_creatures/loot.js index e96ef7a91..bbb54d19f 100644 --- a/kubejs/server_scripts/primitive_creatures/loot.js +++ b/kubejs/server_scripts/primitive_creatures/loot.js @@ -35,7 +35,7 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc:food/strawberry', 4), Item.of('tfc:food/wintergreen_berry', 5)]) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_hoe').damage([0.3, 0.9]).when(c => c.randomChance(0.1)), + LootEntry.of('gtceu:cobalt_brass_hoe').damage([0.2, 0.5]).when(c => c.randomChance(0.1)), LootEntry.of('sns:straw_basket').when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), @@ -54,7 +54,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([3, 4], ['gtceu:tricalcium_phosphate_dust']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.3, 0.9]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('firmalife:beeswax')) @@ -73,7 +73,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([0, 2], ['minecraft:flint']) .addWeightedLoot([1, 3], ['minecraft:bone']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_shovel').damage([0.3, 0.9]).when(c => c.randomChance(0.5)), + LootEntry.of('gtceu:cobalt_brass_shovel').damage([0.2, 0.5]).when(c => c.randomChance(0.5)), LootEntry.of('minecraft:skeleton_skull').when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:grh')) // battered wool event.addEntityLootModifier('primitive_creatures:iloger_3') @@ -91,7 +91,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([4, 8], ['firmalife:food/nightshade_berry']) .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addAlternativesLoot( - LootEntry.of('minecraft:bow').damage([0.3, 0.9]).when(c => c.randomChance(0.5)), + LootEntry.of('minecraft:bow').damage([0.2, 0.5]).when(c => c.randomChance(0.5)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), LootEntry.of('sns:quiver')) @@ -129,7 +129,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([1, 2], ['primitive_creatures:f_1']) // primitive explosives .addWeightedLoot([2, 4], ['minecraft:gunpowder']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.5, 0.9]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_mortar').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:grh')) // battered wool @@ -147,7 +147,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([0, 2], ['primitive_creatures:grh']) // battered wool .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_butchery_knife').damage([0.3, 0.9]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_butchery_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('minecraft:lead')) @@ -181,7 +181,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([2, 3], ['tfg:food/raw_long_pig_filet']) .addWeightedLoot([2, 4], ['minecraft:emerald']) .addAlternativesLoot( - LootEntry.of('gtceu:cobalt_brass_knife').damage([0.3, 0.7]).when(c => c.randomChance(0.3)), + LootEntry.of('gtceu:cobalt_brass_knife').damage([0.2, 0.5]).when(c => c.randomChance(0.3)), LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.05)), LootEntry.of('primitive_creatures:grh')) // battered wool) diff --git a/kubejs/server_scripts/tfg/loot.js b/kubejs/server_scripts/tfg/loot.js index bde84e8cc..173f8e745 100644 --- a/kubejs/server_scripts/tfg/loot.js +++ b/kubejs/server_scripts/tfg/loot.js @@ -9,7 +9,7 @@ function registerTFGLoots(event) { .removeLoot(Ingredient.all) //ore .pool((pool) => { - pool.rolls([4, 6]); + pool.rolls([2, 4]); pool.addAlternativesLoot( LootEntry.of('tfc:ore/normal_bismuthinite').when((c) => c.randomChance(0.1)), LootEntry.of('tfc:ore/rich_bismuthinite').when((c) => c.randomChance(0.2)), @@ -39,7 +39,7 @@ function registerTFGLoots(event) { }) //seeds .pool((pool) => { - pool.rolls([2, 8]); + pool.rolls([2, 4]); pool.addAlternativesLoot( LootEntry.of('tfc:seeds/onion').when((c) => c.randomChance(0.2)), LootEntry.of('tfc:seeds/cabbage').when((c) => c.randomChance(0.2)),