From e71274317b719a070bd2be69be714ec41984f58e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Dec 2017 19:51:36 -0600 Subject: [PATCH] Flatten ancient wills --- .../api/item/IAncientWillContainer.java | 12 ++++- .../java/vazkii/botania/common/Botania.java | 2 + .../common/core/BotaniaCreativeTab.java | 7 ++- .../crafting/recipe/AncientWillRecipe.java | 7 +-- .../botania/common/fixers/AttachedWills.java | 36 +++++++++++++++ .../botania/common/fixers/FlattenItems.java | 6 +++ .../botania/common/item/ItemAncientWill.java | 38 +++------------- .../vazkii/botania/common/item/ModItems.java | 15 ++++++- .../armor/terrasteel/ItemTerrasteelHelm.java | 44 ++++++++----------- .../botania/common/lib/LibItemNames.java | 2 +- .../resources/assets/botania/lang/en_us.lang | 36 +++++++-------- .../resources/assets/botania/lang/es_es.lang | 36 +++++++-------- .../resources/assets/botania/lang/fr_fr.lang | 36 +++++++-------- .../resources/assets/botania/lang/ja_jp.lang | 12 ++--- .../resources/assets/botania/lang/ko_kr.lang | 36 +++++++-------- .../resources/assets/botania/lang/nl_nl.lang | 36 +++++++-------- .../resources/assets/botania/lang/pt_br.lang | 36 +++++++-------- .../resources/assets/botania/lang/zh_cn.lang | 36 +++++++-------- .../resources/assets/botania/lang/zh_tw.lang | 36 +++++++-------- .../botania/loot_tables/gaia_guardian_2.json | 31 ++++++++++--- ...ientwill0.json => ancient_will_ahrim.json} | 0 ...entwill1.json => ancient_will_dharok.json} | 0 ...entwill2.json => ancient_will_guthan.json} | 0 ...ientwill5.json => ancient_will_karil.json} | 0 ...ientwill3.json => ancient_will_torag.json} | 0 ...ientwill4.json => ancient_will_verac.json} | 0 26 files changed, 280 insertions(+), 220 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/fixers/AttachedWills.java rename src/main/resources/assets/botania/models/item/{ancientwill0.json => ancient_will_ahrim.json} (100%) rename src/main/resources/assets/botania/models/item/{ancientwill1.json => ancient_will_dharok.json} (100%) rename src/main/resources/assets/botania/models/item/{ancientwill2.json => ancient_will_guthan.json} (100%) rename src/main/resources/assets/botania/models/item/{ancientwill5.json => ancient_will_karil.json} (100%) rename src/main/resources/assets/botania/models/item/{ancientwill3.json => ancient_will_torag.json} (100%) rename src/main/resources/assets/botania/models/item/{ancientwill4.json => ancient_will_verac.json} (100%) diff --git a/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java b/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java index 1096430ed..fbe7f5511 100644 --- a/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java +++ b/src/main/java/vazkii/botania/api/item/IAncientWillContainer.java @@ -17,9 +17,17 @@ import net.minecraft.item.ItemStack; * crafted onto it. */ public interface IAncientWillContainer { + enum AncientWillType { + AHRIM, + DHAROK, + GUTHAN, + TORAG, + VERAC, + KARIL + } - public void addAncientWill(ItemStack stack, int will); + public void addAncientWill(ItemStack stack, AncientWillType will); - public boolean hasAncientWill(ItemStack stack, int will); + public boolean hasAncientWill(ItemStack stack, AncientWillType will); } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index fb687b77f..6f5feb53a 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -86,6 +86,7 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; +import vazkii.botania.common.fixers.AttachedWills; import vazkii.botania.common.fixers.FlattenItems; import vazkii.botania.common.fixers.FlattenNBT; import vazkii.botania.common.lexicon.LexiconData; @@ -141,6 +142,7 @@ public class Botania { fixer = FMLCommonHandler.instance().getDataFixer().init(LibMisc.MOD_ID, LibMisc.DATA_VERSION); fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenItems()); fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenNBT()); + fixer.registerFix(FixTypes.ITEM_INSTANCE, new AttachedWills()); if(Botania.gardenOfGlassLoaded) new WorldTypeSkyblock(); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index a0dd858f8..f6cd0005a 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -241,7 +241,12 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.cacophonium); addItem(ModItems.recordGaia1); addItem(ModItems.recordGaia2); - addItem(ModItems.ancientWill); + addItem(ModItems.ancientWillAhrim); + addItem(ModItems.ancientWillDharok); + addItem(ModItems.ancientWillGuthan); + addItem(ModItems.ancientWillTorag); + addItem(ModItems.ancientWillVerac); + addItem(ModItems.ancientWillKaril); addItem(ModItems.pinkinator); addItem(ModItems.gaiaHead); if(ConfigHandler.relicsEnabled) { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index a767ada85..8583a374f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.IAncientWillContainer; +import vazkii.botania.common.item.ItemAncientWill; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; @@ -35,7 +36,7 @@ public class AncientWillRecipe extends IForgeRegistryEntry.Impl impleme for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(!stack.isEmpty()) { - if(stack.getItem() == ModItems.ancientWill && !foundWill) + if(stack.getItem() instanceof ItemAncientWill && !foundWill) foundWill = true; else if(!foundItem) { if(stack.getItem() instanceof IAncientWillContainer) @@ -52,14 +53,14 @@ public class AncientWillRecipe extends IForgeRegistryEntry.Impl impleme @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { ItemStack item = ItemStack.EMPTY; - int will = -1; + IAncientWillContainer.AncientWillType will = null; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(!stack.isEmpty()) { if(stack.getItem() instanceof IAncientWillContainer && item.isEmpty()) item = stack; - else will = stack.getItemDamage(); + else will = ((ItemAncientWill) stack.getItem()).type; // we already verified this is a will in matches() } } diff --git a/src/main/java/vazkii/botania/common/fixers/AttachedWills.java b/src/main/java/vazkii/botania/common/fixers/AttachedWills.java new file mode 100644 index 000000000..451f1f3c8 --- /dev/null +++ b/src/main/java/vazkii/botania/common/fixers/AttachedWills.java @@ -0,0 +1,36 @@ +package vazkii.botania.common.fixers; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.datafix.IFixableData; +import vazkii.botania.api.item.IAncientWillContainer; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; + +import java.util.Locale; + +// Renames the pre-1.13 will tags inside Terrasteel Helmets (of revealing) +public class AttachedWills implements IFixableData { + @Override + public int getFixVersion() { + return 1; + } + + @Override + public NBTTagCompound fixTagCompound(NBTTagCompound compound) { + String terraHelm = ModItems.terrasteelHelm.getRegistryName().toString(); + String terraHelmReveal = ModItems.terrasteelHelmRevealing.getRegistryName().toString(); + + if((terraHelm.equals(compound.getString("id")) || terraHelmReveal.equals(compound.getString("id"))) + && compound.hasKey("tag")) { + NBTTagCompound tag = compound.getCompoundTag("tag"); + for(int i = 0; i < 6; i++) { + String oldKey = ItemTerrasteelHelm.TAG_ANCIENT_WILL + i; + if(tag.hasKey(oldKey)) { + tag.removeTag(oldKey); + tag.setBoolean(ItemTerrasteelHelm.TAG_ANCIENT_WILL + "_" + IAncientWillContainer.AncientWillType.values()[i].name().toLowerCase(Locale.ROOT), true); + } + } + } + return compound; + } +} diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 6ce0a1cb6..acd54c5bc 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -4,12 +4,14 @@ import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.datafix.IFixableData; +import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.function.IntFunction; @@ -92,6 +94,10 @@ public class FlattenItems implements IFixableData { case 3: return ModItems.sparkUpgradeIsolated.getRegistryName().toString(); } }); + LOOKUP.put("botania:ancientwill", i -> { + IAncientWillContainer.AncientWillType[] vals = IAncientWillContainer.AncientWillType.values(); + return LibMisc.MOD_ID + ":" + LibItemNames.ANCIENT_WILL + "_" + vals[i & vals.length].name().toLowerCase(Locale.ROOT); + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 92ddffdc5..10331ff9c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -12,57 +12,33 @@ package vazkii.botania.common.item; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; import java.util.List; +import java.util.Locale; public class ItemAncientWill extends ItemMod { + public final IAncientWillContainer.AncientWillType type; - private static final int SUBTYPES = 6; - - public ItemAncientWill() { - super(LibItemNames.ANCIENT_WILL); - setHasSubtypes(true); + public ItemAncientWill(IAncientWillContainer.AncientWillType variant) { + super(LibItemNames.ANCIENT_WILL + "_" + variant.name().toLowerCase(Locale.ROOT)); + this.type = variant; setMaxStackSize(1); } - @Override - public void getSubItems(CreativeTabs tab, NonNullList list) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); - } - } - @SideOnly(Side.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { addStringToTooltip(I18n.format("botaniamisc.craftToAddWill"), list); - addStringToTooltip(I18n.format("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); + addStringToTooltip(I18n.format("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".shortDesc"), list); } public void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 6, LibItemNames.ANCIENT_WILL); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 7a8fbe1f7..5442e16c8 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -23,6 +23,7 @@ import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.mana.spark.SparkUpgradeType; +import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.brew.ItemBrewFlask; import vazkii.botania.common.item.brew.ItemBrewVial; import vazkii.botania.common.item.brew.ItemIncenseStick; @@ -287,7 +288,12 @@ public final class ModItems { public static final Item flareChakram = new ItemThornChakram(LibItemNames.FLARE_CHAKRAM); public static final Item overgrowthSeed = new ItemOvergrowthSeed(); public static final Item craftPattern = new ItemCraftPattern(); - public static final Item ancientWill = new ItemAncientWill(); + public static final Item ancientWillAhrim = new ItemAncientWill(IAncientWillContainer.AncientWillType.AHRIM); + public static final Item ancientWillDharok = new ItemAncientWill(IAncientWillContainer.AncientWillType.DHAROK); + public static final Item ancientWillGuthan = new ItemAncientWill(IAncientWillContainer.AncientWillType.GUTHAN); + public static final Item ancientWillTorag = new ItemAncientWill(IAncientWillContainer.AncientWillType.TORAG); + public static final Item ancientWillVerac = new ItemAncientWill(IAncientWillContainer.AncientWillType.VERAC); + public static final Item ancientWillKaril = new ItemAncientWill(IAncientWillContainer.AncientWillType.KARIL); public static final Item corporeaSpark = new ItemCorporeaSpark(); public static final Item livingwoodBow = new ItemLivingwoodBow(); public static final Item crystalBow = new ItemCrystalBow(); @@ -511,7 +517,12 @@ public final class ModItems { r.register(flareChakram); r.register(overgrowthSeed); r.register(craftPattern); - r.register(ancientWill); + r.register(ancientWillAhrim); + r.register(ancientWillDharok); + r.register(ancientWillGuthan); + r.register(ancientWillTorag); + r.register(ancientWillVerac); + r.register(ancientWillKaril); r.register(corporeaSpark); r.register(livingwoodBow); r.register(crystalBow); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 19379acbf..4678e591d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -39,10 +39,11 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nullable; import java.util.List; +import java.util.Locale; public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer, IManaGivingItem { - private static final String TAG_ANCIENT_WILL = "AncientWill"; + public static final String TAG_ANCIENT_WILL = "AncientWill"; public ItemTerrasteelHelm() { this(LibItemNames.TERRASTEEL_HELM); @@ -70,31 +71,31 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } @Override - public void addAncientWill(ItemStack stack, int will) { - ItemNBTHelper.setBoolean(stack, TAG_ANCIENT_WILL + will, true); + public void addAncientWill(ItemStack stack, AncientWillType will) { + ItemNBTHelper.setBoolean(stack, TAG_ANCIENT_WILL + "_" + will.name().toLowerCase(Locale.ROOT), true); } @Override - public boolean hasAncientWill(ItemStack stack, int will) { + public boolean hasAncientWill(ItemStack stack, AncientWillType will) { return hasAncientWill_(stack, will); } - public static boolean hasAncientWill_(ItemStack stack, int will) { - return ItemNBTHelper.getBoolean(stack, TAG_ANCIENT_WILL + will, false); + private static boolean hasAncientWill_(ItemStack stack, AncientWillType will) { + return ItemNBTHelper.getBoolean(stack, TAG_ANCIENT_WILL + "_" + will.name().toLowerCase(Locale.ROOT), false); } @Override @SideOnly(Side.CLIENT) public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); - for(int i = 0; i < 6; i++) - if(hasAncientWill(stack, i)) - addStringToTooltip(I18n.format("botania.armorset.will" + i + ".desc"), list); + for(AncientWillType type : AncientWillType.values()) + if(hasAncientWill(stack, type)) + addStringToTooltip(I18n.format("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".desc"), list); } - public static boolean hasAnyWill(ItemStack stack) { - for(int i = 0; i < 6; i++) - if(hasAncientWill_(stack, i)) + private static boolean hasAnyWill(ItemStack stack) { + for(AncientWillType type : AncientWillType.values()) + if(hasAncientWill_(stack, type)) return true; return false; @@ -128,24 +129,17 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if(crit && !stack.isEmpty() && stack.getItem() instanceof ItemTerrasteelHelm) { - boolean ahrim = hasAncientWill(stack, 0); - boolean dharok = hasAncientWill(stack, 1); - boolean guthan = hasAncientWill(stack, 2); - boolean torag = hasAncientWill(stack, 3); - boolean verac = hasAncientWill(stack, 4); - boolean karil = hasAncientWill(stack, 5); - - if(ahrim) + if(hasAncientWill(stack, AncientWillType.AHRIM)) event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 20, 1)); - if(dharok) + if(hasAncientWill(stack, AncientWillType.DHAROK)) event.setAmount(event.getAmount() * (1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F)); - if(guthan) + if(hasAncientWill(stack, AncientWillType.GUTHAN)) player.heal(event.getAmount() * 0.25F); - if(torag) + if(hasAncientWill(stack, AncientWillType.TORAG)) event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 60, 1)); - if(verac) + if(hasAncientWill(stack, AncientWillType.VERAC)) event.getSource().setDamageBypassesArmor(); - if(karil) + if(hasAncientWill(stack, AncientWillType.KARIL)) event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.WITHER, 60, 1)); } } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 7542ee719..18327ae62 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -126,7 +126,7 @@ public final class LibItemNames { public static final String FLARE_CHAKRAM = "flare_chakram"; public static final String OVERGROWTH_SEED = "overgrowthSeed"; public static final String CRAFT_PATTERN = "craftPattern"; - public static final String ANCIENT_WILL = "ancientWill"; + public static final String ANCIENT_WILL = "ancient_will"; public static final String CORPOREA_SPARK = "corporeaSpark"; public static final String LIVINGWOOD_BOW = "livingwoodBow"; public static final String CRYSTAL_BOW = "crystalBow"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 93bdc6a91..5ebc214b5 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -261,18 +261,18 @@ botania.armorset.manaweave.name=Manatide Prowess botania.armorset.manaweave.desc0=35%% less Mana cost on Mana Tools and Rods botania.armorset.manaweave.desc1=Increased proficiency with Magical Rods -botania.armorset.will0.desc=Critical Hits apply a strong weakness effect (Will of Ahrim) -botania.armorset.will1.desc=Critical Hit damage increases with lower HP (Will of Dharok) -botania.armorset.will2.desc=Critical Hits heal for a portion of damage dealt (Will of Guthan) -botania.armorset.will3.desc=Critical Hits apply a strong slowness effect (Will of Torag) -botania.armorset.will4.desc=Critical Hits pierce through armor (Will of Verac) -botania.armorset.will5.desc=Critical Hits apply a wither effect (Will of Karil) -botania.armorset.will0.shortDesc=Critical Hits apply a strong weakness effect -botania.armorset.will1.shortDesc=Critical Hit damage increases with lower HP -botania.armorset.will2.shortDesc=Critical Hits heal for a portion of damage dealt -botania.armorset.will3.shortDesc=Critical Hits apply a strong slowness effect -botania.armorset.will4.shortDesc=Critical Hits pierce through armor -botania.armorset.will5.shortDesc=Critical Hits apply a wither effect +botania.armorset.will_ahrim.desc=Critical Hits apply a strong weakness effect (Will of Ahrim) +botania.armorset.will_dharok.desc=Critical Hit damage increases with lower HP (Will of Dharok) +botania.armorset.will_guthan.desc=Critical Hits heal for a portion of damage dealt (Will of Guthan) +botania.armorset.will_torag.desc=Critical Hits apply a strong slowness effect (Will of Torag) +botania.armorset.will_verac.desc=Critical Hits pierce through armor (Will of Verac) +botania.armorset.will_karil.desc=Critical Hits apply a wither effect (Will of Karil) +botania.armorset.will_ahrim.shortDesc=Critical Hits apply a strong weakness effect +botania.armorset.will_dharok.shortDesc=Critical Hit damage increases with lower HP +botania.armorset.will_guthan.shortDesc=Critical Hits heal for a portion of damage dealt +botania.armorset.will_torag.shortDesc=Critical Hits apply a strong slowness effect +botania.armorset.will_verac.shortDesc=Critical Hits pierce through armor +botania.armorset.will_karil.shortDesc=Critical Hits apply a wither effect # ROMAN NUMERALS botania.roman0= @@ -1504,12 +1504,12 @@ item.botania:craftPattern6.name=Crafting Pattern #7: 2x3 item.botania:craftPattern7.name=Crafting Pattern #8: 3x2 item.botania:craftPattern8.name=Crafting Pattern #9: Donut item.botania:gaia_ingot.name=Gaia Spirit Ingot -item.botania:ancientWill0.name=Will of Ahrim -item.botania:ancientWill1.name=Will of Dharok -item.botania:ancientWill2.name=Will of Guthan -item.botania:ancientWill3.name=Will of Torag -item.botania:ancientWill4.name=Will of Verac -item.botania:ancientWill5.name=Will of Karil +item.botania:ancient_will_ahrim.name=Will of Ahrim +item.botania:ancient_will_dharok.name=Will of Dharok +item.botania:ancient_will_guthan.name=Will of Guthan +item.botania:ancient_will_torag.name=Will of Torag +item.botania:ancient_will_verac.name=Will of Verac +item.botania:ancient_will_karil.name=Will of Karil item.botania:corporeaSpark0.name=Corporea Spark item.botania:corporeaSpark1.name=Master Corporea Spark item.botania:ender_air_bottle.name=Ender Air Bottle diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index f51228468..6b7254260 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -207,18 +207,18 @@ botania.armorset.elementium.desc=Probabilidad de la hadas de otorgar efectos de botania.armorset.terrasteel.name=El legado de los antiguos botania.armorset.terrasteel.desc0=20% descuento del coste de maná en la herramientas de maná botania.armorset.terrasteel.desc1=Regenera incluso si el hambre no está saciada. -botania.armorset.will0.desc=Los golpes críticos infligen un fuerte efecto de debilidad (Legado de Ahrim) -botania.armorset.will1.desc=El daño de los golpes críticos aumenta con la salud baja (Legado de Dharok) -botania.armorset.will2.desc=Los golpes críticos curan una porción del daño infligido (Legado de Guthan) -botania.armorset.will3.desc=Los golpes críticos infligen un fuerte efecto de lentitud (Legado deTorag) -botania.armorset.will4.desc=Los golpes críticos atraviesan la armadura (Legado de Verac) -botania.armorset.will5.desc=Los golpes críticos infligen un efecto de wither (Legado de Karil) -botania.armorset.will0.shortDesc=Los golpes críticos inflige un fuerte efecto de debilidad -botania.armorset.will1.shortDesc=El daño por golpe crítico aumenta con la salud baja -botania.armorset.will2.shortDesc=Los golpes críticos curan una porción del daño infligido -botania.armorset.will3.shortDesc=Los golpes críticos infligen un fuerte efecto de lentitud -botania.armorset.will4.shortDesc=Los golpes críticos atraviesan la armadura -botania.armorset.will5.shortDesc=Los golpes críticos infligen un efecto de wither +botania.armorset.will_ahrim.desc=Los golpes críticos infligen un fuerte efecto de debilidad (Legado de Ahrim) +botania.armorset.will_dharok.desc=El daño de los golpes críticos aumenta con la salud baja (Legado de Dharok) +botania.armorset.will_guthan.desc=Los golpes críticos curan una porción del daño infligido (Legado de Guthan) +botania.armorset.will_torag.desc=Los golpes críticos infligen un fuerte efecto de lentitud (Legado deTorag) +botania.armorset.will_verac.desc=Los golpes críticos atraviesan la armadura (Legado de Verac) +botania.armorset.will_karil.desc=Los golpes críticos infligen un efecto de wither (Legado de Karil) +botania.armorset.will_ahrim.shortDesc=Los golpes críticos inflige un fuerte efecto de debilidad +botania.armorset.will_dharok.shortDesc=El daño por golpe crítico aumenta con la salud baja +botania.armorset.will_guthan.shortDesc=Los golpes críticos curan una porción del daño infligido +botania.armorset.will_torag.shortDesc=Los golpes críticos infligen un fuerte efecto de lentitud +botania.armorset.will_verac.shortDesc=Los golpes críticos atraviesan la armadura +botania.armorset.will_karil.shortDesc=Los golpes críticos infligen un efecto de wither # KNOWLEDGE botania.knowledge.minecraft=Conocimiento minecraftiano @@ -1261,12 +1261,12 @@ item.botania:craftPattern6.name=Patrón de trabajo #7: 2x3 item.botania:craftPattern7.name=Patrón de trabajo #8: 3x2 item.botania:craftPattern8.name=Patrón de trabajo #9: Donut item.botania:gaia_ingot.name=Lingote de espíritu de Gaia -item.botania:ancientWill0.name=Legado de Ahrim -item.botania:ancientWill1.name=Legado de Dharok -item.botania:ancientWill2.name=Legado de Guthan -item.botania:ancientWill3.name=Legado de Torag -item.botania:ancientWill4.name=Legado de Verac -item.botania:ancientWill5.name=Legado de Karil +item.botania:ancient_will_ahrim.name=Legado de Ahrim +item.botania:ancient_will_dharok.name=Legado de Dharok +item.botania:ancient_will_guthan.name=Legado de Guthan +item.botania:ancient_will_torag.name=Legado de Torag +item.botania:ancient_will_verac.name=Legado de Verac +item.botania:ancient_will_karil.name=Legado de Karil item.botania:corporeaSpark0.name=Chispa de corporea item.botania:corporeaSpark1.name=Chispa maestra de corporea item.botania:ender_air_bottle.name=Botella de aire del Fin diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 6c271a776..2b7f2ca7d 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -206,18 +206,18 @@ botania.armorset.elementium.desc=Chance pour les elfes d'appliquer les effets de botania.armorset.terrasteel.name=Volonté des ancients botania.armorset.terrasteel.desc0=20% de mana en moins sur les outils à mana botania.armorset.terrasteel.desc1=Régénère même si la faim n'est pas complète -botania.armorset.will0.desc=Les coups critiques appliquent un fort effet de faiblesse (Volonté d'Ahrim) -botania.armorset.will1.desc=Les dégâts de coup critiques augmentent avec de faibles PV (Volonté de Dharok) -botania.armorset.will2.desc=Les coups critiques guérissent une partie de dégâts reçus (Volonté de Guthan) -botania.armorset.will3.desc=Les coups critiques appliquent un fort effet de lenteur (Volonté de Torag) -botania.armorset.will4.desc=Les coups critiques transpercent l'armure (Volonté de Verac) -botania.armorset.will5.desc=Les coups critiques appliquent un effet de décrépitude (Volonté de Karil) -botania.armorset.will0.shortDesc=Fort effet de faiblesse sur coups critiques -botania.armorset.will1.shortDesc=Augmente les dégâts critiques avec HP inférieure -botania.armorset.will2.shortDesc=Guéri une partie de dégâts reçus sur coups critiques -botania.armorset.will3.shortDesc=Fort effet de lenteur sur coups critiques -botania.armorset.will4.shortDesc=Transpercent l'armure sur coups critiques -botania.armorset.will5.shortDesc=Effet de décrépitude sur coups critiques +botania.armorset.will_ahrim.desc=Les coups critiques appliquent un fort effet de faiblesse (Volonté d'Ahrim) +botania.armorset.will_dharok.desc=Les dégâts de coup critiques augmentent avec de faibles PV (Volonté de Dharok) +botania.armorset.will_guthan.desc=Les coups critiques guérissent une partie de dégâts reçus (Volonté de Guthan) +botania.armorset.will_torag.desc=Les coups critiques appliquent un fort effet de lenteur (Volonté de Torag) +botania.armorset.will_verac.desc=Les coups critiques transpercent l'armure (Volonté de Verac) +botania.armorset.will_karil.desc=Les coups critiques appliquent un effet de décrépitude (Volonté de Karil) +botania.armorset.will_ahrim.shortDesc=Fort effet de faiblesse sur coups critiques +botania.armorset.will_dharok.shortDesc=Augmente les dégâts critiques avec HP inférieure +botania.armorset.will_guthan.shortDesc=Guéri une partie de dégâts reçus sur coups critiques +botania.armorset.will_torag.shortDesc=Fort effet de lenteur sur coups critiques +botania.armorset.will_verac.shortDesc=Transpercent l'armure sur coups critiques +botania.armorset.will_karil.shortDesc=Effet de décrépitude sur coups critiques # KNOWLEDGE botania.knowledge.minecraft=Savoir Minecraftien @@ -1123,12 +1123,12 @@ item.botania:craftPattern6.name=Modèle d'artisanat #7: 2x3 item.botania:craftPattern7.name=Modèle d'artisanat #8: 3x2 item.botania:craftPattern8.name=Modèle d'artisanat #9: Beignet item.botania:gaia_ingot.name=Lingot d'esprit de Gaïa -item.botania:ancientWill0.name=Volonté d'Ahrim -item.botania:ancientWill1.name=Volonté de Dharok -item.botania:ancientWill2.name=Volonté de Guthan -item.botania:ancientWill3.name=Volonté de Torag -item.botania:ancientWill4.name=Volonté de Verac -item.botania:ancientWill5.name=Volonté de Karil +item.botania:ancient_will_ahrim.name=Volonté d'Ahrim +item.botania:ancient_will_dharok.name=Volonté de Dharok +item.botania:ancient_will_guthan.name=Volonté de Guthan +item.botania:ancient_will_torag.name=Volonté de Torag +item.botania:ancient_will_verac.name=Volonté de Verac +item.botania:ancient_will_karil.name=Volonté de Karil item.botania:corporeaSpark0.name=Étincelle de Corporea item.botania:corporeaSpark1.name=Étincelle maitresse de Corporea item.botania:ender_air_bottle.name=Bouteille d'air du néant diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 8db5b042e..629954a95 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1289,12 +1289,12 @@ item.botania:craftPattern6.name=クラフトパターン #7: 2x3 item.botania:craftPattern7.name=クラフトパターン #8: 3x2 item.botania:craftPattern8.name=クラフトパターン #9: ドーナツ item.botania:gaia_ingot.name=ガイアの魂インゴット -item.botania:ancientWill0.name=アリムの意思 -item.botania:ancientWill1.name=ダロクの意思 -item.botania:ancientWill2.name=グーサンの意思 -item.botania:ancientWill3.name=トラグの意思 -item.botania:ancientWill4.name=ベラックの意思 -item.botania:ancientWill5.name=カリルの意思 +item.botania:ancient_will_ahrim.name=アリムの意思 +item.botania:ancient_will_dharok.name=ダロクの意思 +item.botania:ancient_will_guthan.name=グーサンの意思 +item.botania:ancient_will_torag.name=トラグの意思 +item.botania:ancient_will_verac.name=ベラックの意思 +item.botania:ancient_will_karil.name=カリルの意思 item.botania:corporeaSpark0.name=コーポリアスパーク item.botania:corporeaSpark1.name=マスターコーポリアスパーク item.botania:ender_air_bottle.name=エンダー空気瓶 diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 9f73be9f0..82aa16148 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -216,18 +216,18 @@ botania.armorset.manaweave.name=마나타이드의 솜씨 botania.armorset.manaweave.desc0=마나를 사용하는 도구들의 마나 사용량이 35% 감소합니다. botania.armorset.manaweave.desc1=마법막대들의 효율증가 -botania.armorset.will0.desc=치명타 공격시 상대방에게 강한 나약함 효과(아림의 의지) -botania.armorset.will1.desc=치명타 공격시 상대방의 채력 회복속도가 늦어짐(더락의 의지) -botania.armorset.will2.desc=치명타 공격시 데미지에 비례해서 체력을 회복합니다. (규선의 의지) -botania.armorset.will3.desc=치명타 공격시 상대방에게 강한 구속 효과(토어래그의 의지) -botania.armorset.will4.desc=치명타 공격시 상대방의 방어력 무시 (버랙의 의지) -botania.armorset.will5.desc=치명타 공격시 상대방에게 위더 효과 (캐럴의 의지) -botania.armorset.will0.shortDesc=치명타 공격시 상대방에게 강력한 나약함 효과 -botania.armorset.will1.shortDesc=치명타 공격시 상대방의 채력 회복속도가 늦어짐 -botania.armorset.will2.shortDesc=치명타 공격시 데미지의 일부를 회복 -botania.armorset.will3.shortDesc=치명타 공격시 상대방에게 강한 구속 효과 -botania.armorset.will4.shortDesc=치명타 공격시 상대방의 방어력을 무시합니다. -botania.armorset.will5.shortDesc=치명타 공격시 상대방에게 위더 효과 +botania.armorset.will_ahrim.desc=치명타 공격시 상대방에게 강한 나약함 효과(아림의 의지) +botania.armorset.will_dharok.desc=치명타 공격시 상대방의 채력 회복속도가 늦어짐(더락의 의지) +botania.armorset.will_guthan.desc=치명타 공격시 데미지에 비례해서 체력을 회복합니다. (규선의 의지) +botania.armorset.will_torag.desc=치명타 공격시 상대방에게 강한 구속 효과(토어래그의 의지) +botania.armorset.will_verac.desc=치명타 공격시 상대방의 방어력 무시 (버랙의 의지) +botania.armorset.will_karil.desc=치명타 공격시 상대방에게 위더 효과 (캐럴의 의지) +botania.armorset.will_ahrim.shortDesc=치명타 공격시 상대방에게 강력한 나약함 효과 +botania.armorset.will_dharok.shortDesc=치명타 공격시 상대방의 채력 회복속도가 늦어짐 +botania.armorset.will_guthan.shortDesc=치명타 공격시 데미지의 일부를 회복 +botania.armorset.will_torag.shortDesc=치명타 공격시 상대방에게 강한 구속 효과 +botania.armorset.will_verac.shortDesc=치명타 공격시 상대방의 방어력을 무시합니다. +botania.armorset.will_karil.shortDesc=치명타 공격시 상대방에게 위더 효과 # KNOWLEDGE botania.knowledge.minecraft=마인크래프트 전문가의 지식 @@ -1223,12 +1223,12 @@ item.botania:craftPattern6.name=제작 패턴 #7: 2x3 item.botania:craftPattern7.name=제작 패턴 #8: 3x2 item.botania:craftPattern8.name=제작 패턴 #9: 도넛 item.botania:gaia_ingot.name=대지의 영혼 주괴 -item.botania:ancientWill0.name=아림의 의지 -item.botania:ancientWill1.name=더락의 의지 -item.botania:ancientWill2.name=규선의 의지 -item.botania:ancientWill3.name=토어래그의 의지 -item.botania:ancientWill4.name=버랙의 의지 -item.botania:ancientWill5.name=케럴의 의지 +item.botania:ancient_will_ahrim.name=아림의 의지 +item.botania:ancient_will_dharok.name=더락의 의지 +item.botania:ancient_will_guthan.name=규선의 의지 +item.botania:ancient_will_torag.name=토어래그의 의지 +item.botania:ancient_will_verac.name=버랙의 의지 +item.botania:ancient_will_karil.name=케럴의 의지 item.botania:corporeaSpark0.name=Corporea 스파크 item.botania:corporeaSpark1.name=Master Corporea 스파크 item.botania:ender_air_bottle.name=엔더 공기가 담긴 병 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 6b63bd607..fa97fabd3 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -222,18 +222,18 @@ botania.armorset.manaweave.name=Manavloed Moed botania.armorset.manaweave.desc0=35% minder Mana kosten voor Mana Gereedschappen en Staven botania.armorset.manaweave.desc1=Betere bekwaamheid met Magische Staven -botania.armorset.will0.desc=Voltreffers geven een sterk zwakheid effect (Wil van Ahrim) -botania.armorset.will1.desc=Voltreffers geven meer schade bij minder HP (Wil van Dharok) -botania.armorset.will2.desc=Voltreffers genezen voor een deel van de schade (Wil van Guthan) -botania.armorset.will3.desc=Voltreffers geven een sterk traagheid effect (Wil van Torag) -botania.armorset.will4.desc=Voltreffers doordringen armor (Wil van Verac) -botania.armorset.will5.desc=Voltreffers geven aantastend effect (Wil van Karil) -botania.armorset.will0.shortDesc=Voltreffers geven een sterk zwakheid effect effect -botania.armorset.will1.shortDesc=Voltreffers geven meer schade bij minder HP -botania.armorset.will2.shortDesc=Voltreffers genezen voor een deel van de schade -botania.armorset.will3.shortDesc=Voltreffers geven een sterk traagheid effect -botania.armorset.will4.shortDesc=Voltreffers doordringen armor -botania.armorset.will5.shortDesc=Voltreffers geven aantastend effect +botania.armorset.will_ahrim.desc=Voltreffers geven een sterk zwakheid effect (Wil van Ahrim) +botania.armorset.will_dharok.desc=Voltreffers geven meer schade bij minder HP (Wil van Dharok) +botania.armorset.will_guthan.desc=Voltreffers genezen voor een deel van de schade (Wil van Guthan) +botania.armorset.will_torag.desc=Voltreffers geven een sterk traagheid effect (Wil van Torag) +botania.armorset.will_verac.desc=Voltreffers doordringen armor (Wil van Verac) +botania.armorset.will_karil.desc=Voltreffers geven aantastend effect (Wil van Karil) +botania.armorset.will_ahrim.shortDesc=Voltreffers geven een sterk zwakheid effect effect +botania.armorset.will_dharok.shortDesc=Voltreffers geven meer schade bij minder HP +botania.armorset.will_guthan.shortDesc=Voltreffers genezen voor een deel van de schade +botania.armorset.will_torag.shortDesc=Voltreffers geven een sterk traagheid effect +botania.armorset.will_verac.shortDesc=Voltreffers doordringen armor +botania.armorset.will_karil.shortDesc=Voltreffers geven aantastend effect # KNOWLEDGE botania.knowledge.minecraft=Minecraft Wijsheid @@ -1356,12 +1356,12 @@ item.botania:craftPattern6.name=Vervaardigingspatroon #7: 2x3 item.botania:craftPattern7.name=Vervaardigingspatroon #8: 3x2 item.botania:craftPattern8.name=Vervaardigingspatroon #9: Donut item.botania:gaia_ingot.name=Staaf van Gaia -item.botania:ancientWill0.name=Wil van Ahrim -item.botania:ancientWill1.name=Wil van Dharok -item.botania:ancientWill2.name=Wil van Guthan -item.botania:ancientWill3.name=Wil van Torag -item.botania:ancientWill4.name=Wil van Verac -item.botania:ancientWill5.name=Wil van Karil +item.botania:ancient_will_ahrim.name=Wil van Ahrim +item.botania:ancient_will_dharok.name=Wil van Dharok +item.botania:ancient_will_guthan.name=Wil van Guthan +item.botania:ancient_will_torag.name=Wil van Torag +item.botania:ancient_will_verac.name=Wil van Verac +item.botania:ancient_will_karil.name=Wil van Karil item.botania:corporeaSpark0.name=Corporea Vonk item.botania:corporeaSpark1.name=Corporea Bronvonk item.botania:ender_air_bottle.name=Ender Lucht Flesje diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index d3daa5055..e8d333930 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -258,18 +258,18 @@ botania.armorset.manaweave.name=Proeza da Maré de Mana botania.armorset.manaweave.desc0=-35% no custo de Mana em ferramentas e varinhas botania.armorset.manaweave.desc1=Proeficiência aumentada com Varinhas -botania.armorset.will0.desc=Golpes críticos aplicam um forte efeito de Fraqueza (Vontade de Ahrim) -botania.armorset.will1.desc=Golpes críticos se tornam mais fortes com pouca vida (Vontade de Dharok) -botania.armorset.will2.desc=Golpes críticos absorvem um pouco de vida (Vontade de Guthan) -botania.armorset.will3.desc=Golpes críticos aplicam um forte efeito de Lentidão (Vontade de Torag) -botania.armorset.will4.desc=Golpes críticos ignoram armaduras (Vontade de Verac) -botania.armorset.will5.desc=Golpes críticos aplicam efeito de Apodrecimento (Vontade de Karil) -botania.armorset.will0.shortDesc=Golpes críticos aplicam um forte efeito de Fraqueza -botania.armorset.will1.shortDesc=Golpes críticos se tornam mais fortes com pouca vida -botania.armorset.will2.shortDesc=Golpes críticos absorvem um pouco de vida -botania.armorset.will3.shortDesc=Golpes críticos aplicam um forte efeito de Lentidão -botania.armorset.will4.shortDesc=Golpes críticos ignoram armaduras -botania.armorset.will5.shortDesc=Golpes críticos aplicam efeito de Apodrecimento +botania.armorset.will_ahrim.desc=Golpes críticos aplicam um forte efeito de Fraqueza (Vontade de Ahrim) +botania.armorset.will_dharok.desc=Golpes críticos se tornam mais fortes com pouca vida (Vontade de Dharok) +botania.armorset.will_guthan.desc=Golpes críticos absorvem um pouco de vida (Vontade de Guthan) +botania.armorset.will_torag.desc=Golpes críticos aplicam um forte efeito de Lentidão (Vontade de Torag) +botania.armorset.will_verac.desc=Golpes críticos ignoram armaduras (Vontade de Verac) +botania.armorset.will_karil.desc=Golpes críticos aplicam efeito de Apodrecimento (Vontade de Karil) +botania.armorset.will_ahrim.shortDesc=Golpes críticos aplicam um forte efeito de Fraqueza +botania.armorset.will_dharok.shortDesc=Golpes críticos se tornam mais fortes com pouca vida +botania.armorset.will_guthan.shortDesc=Golpes críticos absorvem um pouco de vida +botania.armorset.will_torag.shortDesc=Golpes críticos aplicam um forte efeito de Lentidão +botania.armorset.will_verac.shortDesc=Golpes críticos ignoram armaduras +botania.armorset.will_karil.shortDesc=Golpes críticos aplicam efeito de Apodrecimento # ROMAN NUMERALS botania.roman0= @@ -1506,12 +1506,12 @@ item.botania:craftPattern6.name=Padrão de Criação #7: 2x3 item.botania:craftPattern7.name=Padrão de Criação #8: 3x2 item.botania:craftPattern8.name=Padrão de Criação #9: Arredores item.botania:gaia_ingot.name=Barra de Espírito de Gaia -item.botania:ancientWill0.name=Vontade de Ahrim -item.botania:ancientWill1.name=Vontade de Dharok -item.botania:ancientWill2.name=Vontade de Guthan -item.botania:ancientWill3.name=Vontade de Torag -item.botania:ancientWill4.name=Vontade de Verac -item.botania:ancientWill5.name=Vontade de Karil +item.botania:ancient_will_ahrim.name=Vontade de Ahrim +item.botania:ancient_will_dharok.name=Vontade de Dharok +item.botania:ancient_will_guthan.name=Vontade de Guthan +item.botania:ancient_will_torag.name=Vontade de Torag +item.botania:ancient_will_verac.name=Vontade de Verac +item.botania:ancient_will_karil.name=Vontade de Karil item.botania:corporeaSpark0.name=Fagulha Corporea item.botania:corporeaSpark1.name=Fagulha Corporea Mestre item.botania:ender_air_bottle.name=Garrafa de ar do Fim diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 660e14164..6fac84826 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -261,18 +261,18 @@ botania.armorset.manaweave.name=魔力风箱 botania.armorset.manaweave.desc0=减少35%魔力损耗 botania.armorset.manaweave.desc1=提高魔力量传输效率 -botania.armorset.will0.desc=暴击施加重度虚弱效果(艾琳的意志) -botania.armorset.will1.desc=生命值越低暴击伤害越高(达洛克的意志) -botania.armorset.will2.desc=暴击造成的部分伤害会回复生命(古赞的意志) -botania.armorset.will3.desc=暴击施加重度缓慢效果(托拉格的意志) -botania.armorset.will4.desc=暴击伤害穿透护甲(威拉克的意志) -botania.armorset.will5.desc=暴击施加凋零效果(卡瑞的意志) -botania.armorset.will0.shortDesc=暴击施加重度虚弱效果 -botania.armorset.will1.shortDesc=生命值越低暴击伤害越高 -botania.armorset.will2.shortDesc=暴击造成的部分伤害会回复生命 -botania.armorset.will3.shortDesc=暴击施加重度缓慢效果 -botania.armorset.will4.shortDesc=暴击伤害穿透护甲 -botania.armorset.will5.shortDesc=暴击施加凋零效果 +botania.armorset.will_ahrim.desc=暴击施加重度虚弱效果(艾琳的意志) +botania.armorset.will_dharok.desc=生命值越低暴击伤害越高(达洛克的意志) +botania.armorset.will_guthan.desc=暴击造成的部分伤害会回复生命(古赞的意志) +botania.armorset.will_torag.desc=暴击施加重度缓慢效果(托拉格的意志) +botania.armorset.will_verac.desc=暴击伤害穿透护甲(威拉克的意志) +botania.armorset.will_karil.desc=暴击施加凋零效果(卡瑞的意志) +botania.armorset.will_ahrim.shortDesc=暴击施加重度虚弱效果 +botania.armorset.will_dharok.shortDesc=生命值越低暴击伤害越高 +botania.armorset.will_guthan.shortDesc=暴击造成的部分伤害会回复生命 +botania.armorset.will_torag.shortDesc=暴击施加重度缓慢效果 +botania.armorset.will_verac.shortDesc=暴击伤害穿透护甲 +botania.armorset.will_karil.shortDesc=暴击施加凋零效果 # ROMAN NUMERALS # @@ -1504,12 +1504,12 @@ item.botania:craftPattern6.name=合成模板#7: 2x3 item.botania:craftPattern7.name=合成模板#8: 3x2 item.botania:craftPattern8.name=合成模板#9: 圈形 item.botania:gaia_ingot.name=盖亚魂锭 -item.botania:ancientWill0.name=艾琳的意志 -item.botania:ancientWill1.name=达洛克的意志 -item.botania:ancientWill2.name=古赞的意志 -item.botania:ancientWill3.name=托拉格的意志 -item.botania:ancientWill4.name=威拉克的意志 -item.botania:ancientWill5.name=卡瑞的意志 +item.botania:ancient_will_ahrim.name=艾琳的意志 +item.botania:ancient_will_dharok.name=达洛克的意志 +item.botania:ancient_will_guthan.name=古赞的意志 +item.botania:ancient_will_torag.name=托拉格的意志 +item.botania:ancient_will_verac.name=威拉克的意志 +item.botania:ancient_will_karil.name=卡瑞的意志 item.botania:corporeaSpark0.name=多媒体火花 item.botania:corporeaSpark1.name=主媒体火花 item.botania:ender_air_bottle.name=瓶装末地空气 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index a936b6c58..2f73d47bb 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -255,18 +255,18 @@ botania.armorset.manaweave.name=瑪那風箱 botania.armorset.manaweave.desc0=減少35%瑪那損耗 botania.armorset.manaweave.desc1=提高瑪那量傳輸效率 -botania.armorset.will0.desc=暴擊施加重度虛弱效果(艾琳的意志) -botania.armorset.will1.desc=生命值越低暴擊傷害越高(達洛克的意志) -botania.armorset.will2.desc=暴擊造成的部分傷害會回復生命(古讚的意志) -botania.armorset.will3.desc=暴擊施加重度緩慢效果(托拉格的意志) -botania.armorset.will4.desc=暴擊傷害穿透護甲(威拉克的意志) -botania.armorset.will5.desc=暴擊施加凋零效果(卡瑞的意志) -botania.armorset.will0.shortDesc=暴擊施加重度虛弱效果 -botania.armorset.will1.shortDesc=生命值越低暴擊傷害越高 -botania.armorset.will2.shortDesc=暴擊造成的部分傷害會回復生命 -botania.armorset.will3.shortDesc=暴擊施加重度緩慢效果 -botania.armorset.will4.shortDesc=暴擊傷害穿透護甲 -botania.armorset.will5.shortDesc=暴擊施加凋零效果 +botania.armorset.will_ahrim.desc=暴擊施加重度虛弱效果(艾琳的意志) +botania.armorset.will_dharok.desc=生命值越低暴擊傷害越高(達洛克的意志) +botania.armorset.will_guthan.desc=暴擊造成的部分傷害會回復生命(古讚的意志) +botania.armorset.will_torag.desc=暴擊施加重度緩慢效果(托拉格的意志) +botania.armorset.will_verac.desc=暴擊傷害穿透護甲(威拉克的意志) +botania.armorset.will_karil.desc=暴擊施加凋零效果(卡瑞的意志) +botania.armorset.will_ahrim.shortDesc=暴擊施加重度虛弱效果 +botania.armorset.will_dharok.shortDesc=生命值越低暴擊傷害越高 +botania.armorset.will_guthan.shortDesc=暴擊造成的部分傷害會回復生命 +botania.armorset.will_torag.shortDesc=暴擊施加重度緩慢效果 +botania.armorset.will_verac.shortDesc=暴擊傷害穿透護甲 +botania.armorset.will_karil.shortDesc=暴擊施加凋零效果 # KNOWLEDGE botania.knowledge.minecraft=主世界的知識 @@ -1469,12 +1469,12 @@ item.botania:craftPattern6.name=合成模板#7: 2x3 item.botania:craftPattern7.name=合成模板#8: 3x2 item.botania:craftPattern8.name=合成模板#9: 圈形 item.botania:gaia_ingot.name=蓋亞魂錠 -item.botania:ancientWill0.name=艾琳的意志 -item.botania:ancientWill1.name=達洛克的意志 -item.botania:ancientWill2.name=古讚的意志 -item.botania:ancientWill3.name=托拉格的意志 -item.botania:ancientWill4.name=威拉克的意志 -item.botania:ancientWill5.name=卡瑞的意志 +item.botania:ancient_will_ahrim.name=艾琳的意志 +item.botania:ancient_will_dharok.name=達洛克的意志 +item.botania:ancient_will_guthan.name=古讚的意志 +item.botania:ancient_will_torag.name=托拉格的意志 +item.botania:ancient_will_verac.name=威拉克的意志 +item.botania:ancient_will_karil.name=卡瑞的意志 item.botania:corporeaSpark0.name=多媒體火花 item.botania:corporeaSpark1.name=主媒體火花 item.botania:ender_air_bottle.name=終界氣瓶 diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json index fce0f333b..12533783b 100644 --- a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -52,11 +52,32 @@ "name": "ancient_wills", "conditions": [{ "condition": "killed_by_player" }], "rolls": 1, - "entries": [{ - "type": "item", - "name": "botania:ancientWill", - "functions": [{ "function": "set_data", "data": { "min": 0, "max": 5 } }] - }] + "entries": [ + { + "type": "item", + "name": "botania:ancient_will_ahrim" + }, + { + "type": "item", + "name": "botania:ancient_will_dharok" + }, + { + "type": "item", + "name": "botania:ancient_will_guthan" + }, + { + "type": "item", + "name": "botania:ancient_will_torag" + }, + { + "type": "item", + "name": "botania:ancient_will_verac" + }, + { + "type": "item", + "name": "botania:ancient_will_karil" + } + ] }, { "name": "overgrowth_seeds", diff --git a/src/main/resources/assets/botania/models/item/ancientwill0.json b/src/main/resources/assets/botania/models/item/ancient_will_ahrim.json similarity index 100% rename from src/main/resources/assets/botania/models/item/ancientwill0.json rename to src/main/resources/assets/botania/models/item/ancient_will_ahrim.json diff --git a/src/main/resources/assets/botania/models/item/ancientwill1.json b/src/main/resources/assets/botania/models/item/ancient_will_dharok.json similarity index 100% rename from src/main/resources/assets/botania/models/item/ancientwill1.json rename to src/main/resources/assets/botania/models/item/ancient_will_dharok.json diff --git a/src/main/resources/assets/botania/models/item/ancientwill2.json b/src/main/resources/assets/botania/models/item/ancient_will_guthan.json similarity index 100% rename from src/main/resources/assets/botania/models/item/ancientwill2.json rename to src/main/resources/assets/botania/models/item/ancient_will_guthan.json diff --git a/src/main/resources/assets/botania/models/item/ancientwill5.json b/src/main/resources/assets/botania/models/item/ancient_will_karil.json similarity index 100% rename from src/main/resources/assets/botania/models/item/ancientwill5.json rename to src/main/resources/assets/botania/models/item/ancient_will_karil.json diff --git a/src/main/resources/assets/botania/models/item/ancientwill3.json b/src/main/resources/assets/botania/models/item/ancient_will_torag.json similarity index 100% rename from src/main/resources/assets/botania/models/item/ancientwill3.json rename to src/main/resources/assets/botania/models/item/ancient_will_torag.json diff --git a/src/main/resources/assets/botania/models/item/ancientwill4.json b/src/main/resources/assets/botania/models/item/ancient_will_verac.json similarity index 100% rename from src/main/resources/assets/botania/models/item/ancientwill4.json rename to src/main/resources/assets/botania/models/item/ancient_will_verac.json