diff --git a/kubejs/server_scripts/primitive_creatures/loot.js b/kubejs/server_scripts/primitive_creatures/loot.js index 1823e7f6e..39e3b334b 100644 --- a/kubejs/server_scripts/primitive_creatures/loot.js +++ b/kubejs/server_scripts/primitive_creatures/loot.js @@ -15,7 +15,7 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([2,4], ['gtceu:rich_raw_graphite']) - const CLOTHING_DROP_RATE = 0.05 + const CLOTHING_DROP_RATE = 0.1 // forager - light tan clothes, holds a stone axe event.addEntityLootModifier('primitive_creatures:iloger_1') @@ -34,9 +34,10 @@ function registerPrimitiveCreaturesLoots(event) { Item.of('tfc:food/strawberry', 4), Item.of('tfc:food/wintergreen_berry', 5)]) .addAlternativesLoot( + LootEntry.of('gtceu:cobalt_brass_hoe').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.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + 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('primitive_creatures:grh')) event.addEntityLootModifier('primitive_creatures:iloger_1') .randomChance(CLOTHING_DROP_RATE) @@ -49,12 +50,11 @@ function registerPrimitiveCreaturesLoots(event) { // herbalist - brown clothes with a mask that looks like a Creaking event.addEntityLootModifier('primitive_creatures:iloger_2') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([1,2], ['gtceu:tricalcium_phosphate_dust']) + .addWeightedLoot([3,4], ['gtceu:tricalcium_phosphate_dust']) .addAlternativesLoot( - LootEntry.of('tfc:plant/field_horsetail').when(c => c.randomChance(0.3)), - LootEntry.of('tfc:plant/foxglove').when(c => c.randomChance(0.5)), - LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('gtceu:cobalt_brass_mortar').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')) event.addEntityLootModifier('primitive_creatures:iloger_2') .randomChance(CLOTHING_DROP_RATE) @@ -70,8 +70,8 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([0,2], ['minecraft:flint']) .addWeightedLoot([1,3], ['minecraft:bone']) .addAlternativesLoot( - LootEntry.of('gtceu:stone_hammer').when(c => c.randomChance(0.2)), - LootEntry.of('minecraft:skeleton_skull').when(c => c.randomChance(0.1)), + LootEntry.of('gtceu:cobalt_brass_shovel').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') .randomChance(CLOTHING_DROP_RATE) @@ -84,11 +84,12 @@ function registerPrimitiveCreaturesLoots(event) { // ambusher - leaf on head, leafy clothes (like the swamp vanilla villager type), ranged with poison event.addEntityLootModifier('primitive_creatures:iloger_4') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([1,3], LootEntry.of('minecraft:tipped_arrow')).addPotion("poison") + .addWeightedLoot([8,12], LootEntry.of('minecraft:tipped_arrow')).addPotion("poison") + .addWeightedLoot([4,8], ['firmalife:food/nightshade_berry']) .addAlternativesLoot( - LootEntry.of('firmalife:food/nightshade_berry').when(c => c.randomChance(0.7)), - LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.1)), + LootEntry.of('minecraft:bow').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')) event.addEntityLootModifier('primitive_creatures:iloger_4') .randomChance(CLOTHING_DROP_RATE) @@ -101,12 +102,12 @@ function registerPrimitiveCreaturesLoots(event) { // hunter - wears brown and white fur, briefly disappears when hit, ranged with weakness event.addEntityLootModifier('primitive_creatures:iloger_5') .removeLoot(ItemFilter.ALWAYS_TRUE) - .addWeightedLoot([1,3], LootEntry.of('minecraft:tipped_arrow')).addPotion("weakness") + .addWeightedLoot([8,12], LootEntry.of('minecraft:tipped_arrow')).addPotion("weakness") .addAlternativesLoot( // placeholder for a blowpipe LootEntry.of('minecraft:bamboo').when(c => c.randomChance(0.5)), - LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + 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('sns:quiver')) // battered wool event.addEntityLootModifier('primitive_creatures:iloger_5') .randomChance(CLOTHING_DROP_RATE) @@ -122,8 +123,9 @@ function registerPrimitiveCreaturesLoots(event) { .addWeightedLoot([1,2], ['primitive_creatures:f_1']) // primitive explosives .addWeightedLoot([1,3], ['minecraft:gunpowder']) .addAlternativesLoot( - LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('gtceu:cobalt_brass_mortar').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 event.addEntityLootModifier('primitive_creatures:iloger_6') .randomChance(CLOTHING_DROP_RATE) @@ -138,8 +140,9 @@ function registerPrimitiveCreaturesLoots(event) { .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([0,2], ['primitive_creatures:grh']) // battered wool .addAlternativesLoot( - LootEntry.of('primitive_creatures:totem_0').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('gtceu:cobalt_brass_butchery_knife').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')) event.addEntityLootModifier('primitive_creatures:wiloger') .randomChance(CLOTHING_DROP_RATE) @@ -153,7 +156,7 @@ function registerPrimitiveCreaturesLoots(event) { event.addEntityLootModifier('primitive_creatures:piloger_9') .removeLoot(ItemFilter.ALWAYS_TRUE) .addAlternativesLoot( - LootEntry.of('primitive_creatures:yhgi').when(c => c.randomChance(0.2)), // flint club + LootEntry.of('primitive_creatures:yhgi').when(c => c.randomChance(0.8)), // flint club LootEntry.of('tfc:small_raw_hide').when(c => c.randomChance(0.4)), LootEntry.of('primitive_creatures:grh')) // battered wool event.addEntityLootModifier('primitive_creatures:piloger_9') @@ -169,9 +172,9 @@ function registerPrimitiveCreaturesLoots(event) { .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([1,2], ['minecraft:emerald']) .addAlternativesLoot( - LootEntry.of('gtceu:stone_knife').when(c => c.randomChance(0.3)), - LootEntry.of('primitive_creatures:totem_2').when(c => c.randomChance(0.1)), - LootEntry.of('primitive_creatures:totem_3').when(c => c.randomChance(0.1)), + LootEntry.of('gtceu:cobalt_brass_knife').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) event.addEntityLootModifier('primitive_creatures:viloger_10') .randomChance(CLOTHING_DROP_RATE) @@ -185,9 +188,9 @@ function registerPrimitiveCreaturesLoots(event) { event.addEntityLootModifier('primitive_creatures:nahida') .removeLoot(ItemFilter.ALWAYS_TRUE) .addWeightedLoot([ - Item.of('gtceu:cobalt_brass_butchery_knife'), - Item.of('gtceu:cobalt_brass_axe'), - Item.of('gtceu:cobalt_brass_pickaxe'), + Item.of('gtceu:cobalt_brass_spade'), + Item.of('gtceu:cobalt_brass_sickle'), + Item.of('gtceu:cobalt_brass_mining_hammer'), Item.of('gtceu:cobalt_brass_sword')]) event.addEntityLootModifier('primitive_creatures:nahida') .addWeightedLoot([ diff --git a/kubejs/server_scripts/tfg/recipes.medicine.js b/kubejs/server_scripts/tfg/recipes.medicine.js index 72bb7e4fc..ca7fa3492 100644 --- a/kubejs/server_scripts/tfg/recipes.medicine.js +++ b/kubejs/server_scripts/tfg/recipes.medicine.js @@ -85,6 +85,9 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Arrow + event.shapeless(Item.of('8x minecraft:tipped_arrow', '{Potion:"minecraft:poison"}'), + ['4x minecraft:arrow', 'tfg:poison_pill', '4x minecraft:arrow']) + event.recipes.gtceu.mixer(`tfg:gtceu/mixer/arrow/poison_1`) .circuit(4) .inputFluids(Fluid.of('gtceu:ethanol', 25)) @@ -141,6 +144,9 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Arrow + event.shapeless(Item.of('8x minecraft:tipped_arrow', '{Potion:"minecraft:regeneration"}'), + ['4x minecraft:arrow', 'tfg:regeneration_pill', '4x minecraft:arrow']) + event.recipes.gtceu.mixer(`tfg:gtceu/mixer/arrow/regeneration_1`) .circuit(4) .inputFluids(Fluid.of('gtceu:ethanol', 25)) @@ -197,6 +203,9 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Arrow + event.shapeless(Item.of('8x minecraft:tipped_arrow', '{Potion:"minecraft:swiftness"}'), + ['4x minecraft:arrow', 'tfg:speed_pill', '4x minecraft:arrow']) + event.recipes.gtceu.mixer(`tfg:gtceu/mixer/arrow/swiftness_1`) .circuit(4) .inputFluids(Fluid.of('gtceu:ethanol', 25)) @@ -253,6 +262,9 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Arrow + event.shapeless(Item.of('8x minecraft:tipped_arrow', '{Potion:"minecraft:slowness"}'), + ['4x minecraft:arrow', 'tfg:slowness_pill', '4x minecraft:arrow']) + event.recipes.gtceu.mixer(`tfg:gtceu/mixer/arrow/slowness_1`) .circuit(4) .inputFluids(Fluid.of('gtceu:ethanol', 25)) @@ -309,6 +321,9 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Arrow + event.shapeless(Item.of('8x minecraft:tipped_arrow', '{Potion:"minecraft:weakness"}'), + ['4x minecraft:arrow', 'tfg:weakness_pill', '4x minecraft:arrow']) + event.recipes.gtceu.mixer(`tfg:gtceu/mixer/arrow/weakness_1`) .circuit(4) .inputFluids(Fluid.of('gtceu:ethanol', 25)) @@ -405,6 +420,9 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Arrow + event.shapeless(Item.of('8x minecraft:tipped_arrow', '{Potion:"minecraft:water_breathing"}'), + ['4x minecraft:arrow', 'tfg:water_breathing_pill', '4x minecraft:arrow']) + event.recipes.gtceu.mixer(`tfg:gtceu/mixer/arrow/water_breathing_1`) .circuit(4) .inputFluids(Fluid.of('gtceu:ethanol', 25)) @@ -461,6 +479,9 @@ function registerTFGMedicineRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) // Arrow + event.shapeless(Item.of('8x minecraft:tipped_arrow', '{Potion:"minecraft:night_vision"}'), + ['4x minecraft:arrow', 'tfg:night_vision_pill', '4x minecraft:arrow']) + event.recipes.gtceu.mixer(`tfg:gtceu/mixer/arrow/night_vision_1`) .circuit(4) .inputFluids(Fluid.of('gtceu:ethanol', 25))