mirror of
https://github.com/GTNewHorizons/BloodMagic.git
synced 2026-11-18 19:29:34 +00:00
Merge branch 'master' into item-refactor
This commit is contained in:
31 files changed
+137
-117
No files matched your search
+23
-20
@@ -72,12 +72,7 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani
|
||||
.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, false);
|
||||
|
||||
if (movingobjectposition == null) {
|
||||
par3EntityPlayer.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.divinationsigil.currentessence") + " "
|
||||
+ String.format("%,d", SoulNetworkHandler.getCurrentEssence(ownerName))
|
||||
+ "LP"));
|
||||
|
||||
tellEssence(par3EntityPlayer, ownerName);
|
||||
return par1ItemStack;
|
||||
} else {
|
||||
if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
|
||||
@@ -88,12 +83,7 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani
|
||||
TileEntity tile = par2World.getTileEntity(x, y, z);
|
||||
|
||||
if (!(tile instanceof IReagentHandler)) {
|
||||
par3EntityPlayer.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.divinationsigil.currentessence") + " "
|
||||
+ SoulNetworkHandler.getCurrentEssence(ownerName)
|
||||
+ "LP"));
|
||||
|
||||
tellEssence(par3EntityPlayer, ownerName);
|
||||
return par1ItemStack;
|
||||
}
|
||||
|
||||
@@ -103,14 +93,7 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani
|
||||
if (infoList != null) {
|
||||
for (ReagentContainerInfo info : infoList) {
|
||||
if (info != null && info.reagent != null && info.reagent.reagent != null) {
|
||||
par3EntityPlayer.addChatComponentMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.divinationsigil.reagent") + " "
|
||||
+ ReagentRegistry.getKeyForReagent(info.reagent.reagent)
|
||||
+ ","
|
||||
+ StatCollector.translateToLocal("message.divinationsigil.amount")
|
||||
+ " "
|
||||
+ info.reagent.amount));
|
||||
tellReagent(par3EntityPlayer, info);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,6 +103,26 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani
|
||||
return par1ItemStack;
|
||||
}
|
||||
|
||||
private static void tellReagent(EntityPlayer par3EntityPlayer, ReagentContainerInfo info) {
|
||||
par3EntityPlayer.addChatComponentMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocalFormatted(
|
||||
"message.divinationsigil.reagent",
|
||||
ReagentRegistry.getKeyForReagent(info.reagent.reagent))));
|
||||
par3EntityPlayer.addChatComponentMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector
|
||||
.translateToLocalFormatted("message.divinationsigil.amount", info.reagent.amount)));
|
||||
}
|
||||
|
||||
private static void tellEssence(EntityPlayer par3EntityPlayer, String ownerName) {
|
||||
par3EntityPlayer.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocalFormatted(
|
||||
"message.divinationsigil.currentessence",
|
||||
SoulNetworkHandler.getCurrentEssence(ownerName))));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) {}
|
||||
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public class RitualEffectAlphaPact extends RitualEffect {
|
||||
int y = ritualStone.getYCoord();
|
||||
int z = ritualStone.getZCoord();
|
||||
|
||||
if (world.getWorldTime() % 20 != 0) {
|
||||
if (world.getTotalWorldTime() % 20 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ public class RitualEffectAnimalGrowth extends RitualEffect {
|
||||
int y = ritualStone.getYCoord();
|
||||
int z = ritualStone.getZCoord();
|
||||
|
||||
if (world.getWorldTime() % 20 != 0) {
|
||||
if (world.getTotalWorldTime() % 20 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -208,7 +208,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect {
|
||||
}
|
||||
}
|
||||
|
||||
if (world.getWorldTime() % 10 == 0) {
|
||||
if (world.getTotalWorldTime() % 10 == 0) {
|
||||
if (flag == 0 && inputInv1 != null) {
|
||||
for (int i = 0; i < recipe.length; i++) {
|
||||
ItemStack recItem = recipe[i];
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ public class RitualEffectContainment extends RitualEffect {
|
||||
}
|
||||
}
|
||||
|
||||
if (world.getWorldTime() % 2 == 0 && flag) {
|
||||
if (world.getTotalWorldTime() % 2 == 0 && flag) {
|
||||
SoulNetworkHandler.syphonFromNetwork(owner, this.getCostPerRefresh());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ public class RitualEffectCrafting extends RitualEffect {
|
||||
|
||||
boolean hasPotentia = this.canDrainReagent(ritualStone, ReagentRegistry.potentiaReagent, potentiaDrain, false);
|
||||
|
||||
if (world.getWorldTime() % (hasPotentia ? 1 : 4) != 0) {
|
||||
if (world.getTotalWorldTime() % (hasPotentia ? 1 : 4) != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ public class RitualEffectCrushing extends RitualEffect {
|
||||
int currentEssence = SoulNetworkHandler.getCurrentEssence(owner);
|
||||
World world = ritualStone.getWorld();
|
||||
|
||||
if (world.getWorldTime() % 10 != 5) {
|
||||
if (world.getTotalWorldTime() % 10 != 5) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -69,7 +69,7 @@ public class RitualEffectFeatheredEarth extends RitualEffect // Nullifies all fa
|
||||
|
||||
SoulNetworkHandler.syphonFromNetwork(owner, this.getCostPerRefresh() * entityCount);
|
||||
|
||||
if (flag && world.getWorldTime() % costCooldown == 0) {
|
||||
if (flag && world.getTotalWorldTime() % costCooldown == 0) {
|
||||
if (hasTerrae) {
|
||||
this.canDrainReagent(ritualStone, ReagentRegistry.terraeReagent, terraeDrain, true);
|
||||
}
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect {
|
||||
|
||||
int timeDelay = hasPotentia ? 10 : 20;
|
||||
|
||||
if (world.getWorldTime() % timeDelay != 0) {
|
||||
if (world.getTotalWorldTime() % timeDelay != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ public class RitualEffectFlight extends RitualEffect {
|
||||
entityCount++;
|
||||
}
|
||||
|
||||
if (entityCount > 0 && world.getWorldTime() % reagentCooldown == 0) {
|
||||
if (entityCount > 0 && world.getTotalWorldTime() % reagentCooldown == 0) {
|
||||
if (hasAether) {
|
||||
this.canDrainReagent(ritualStone, ReagentRegistry.aetherReagent, aetherDrain, true);
|
||||
}
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public class RitualEffectFullStomach extends RitualEffect {
|
||||
int y = ritualStone.getYCoord();
|
||||
int z = ritualStone.getZCoord();
|
||||
|
||||
if (world.getWorldTime() % 20 != 0) {
|
||||
if (world.getTotalWorldTime() % 20 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ public class RitualEffectGrowth extends RitualEffect {
|
||||
boolean hasVirtus = this.canDrainReagent(ritualStone, ReagentRegistry.virtusReagent, virtusDrain, false);
|
||||
|
||||
int speed = this.getSpeedForReagents(hasTerrae, hasOrbisTerrae);
|
||||
if (world.getWorldTime() % speed != 0) {
|
||||
if (world.getTotalWorldTime() % speed != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ public class RitualEffectHarvest extends RitualEffect {
|
||||
|
||||
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
|
||||
} else {
|
||||
if (world.getWorldTime() % 5 != 0) {
|
||||
if (world.getTotalWorldTime() % 5 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ public class RitualEffectHealing extends RitualEffect {
|
||||
|
||||
int timeDelay = 50;
|
||||
|
||||
if (world.getWorldTime() % timeDelay != 0) {
|
||||
if (world.getTotalWorldTime() % timeDelay != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -100,14 +100,14 @@ public class RitualEffectInterdiction extends RitualEffect {
|
||||
|
||||
if (itemFlag) {
|
||||
flag = true;
|
||||
if (world.getWorldTime() % aetherDrainRate == 0) {
|
||||
if (world.getTotalWorldTime() % aetherDrainRate == 0) {
|
||||
this.canDrainReagent(ritualStone, ReagentRegistry.aetherReagent, aetherDrain, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (world.getWorldTime() % 2 == 0 && flag) {
|
||||
if (world.getTotalWorldTime() % 2 == 0 && flag) {
|
||||
SoulNetworkHandler.syphonFromNetwork(owner, getCostPerRefresh());
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ public class RitualEffectItemRouting extends RitualEffect {
|
||||
int y = ritualStone.getYCoord();
|
||||
int z = ritualStone.getZCoord();
|
||||
|
||||
if (world.getWorldTime() % 20 != 0) {
|
||||
if (world.getTotalWorldTime() % 20 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ public class RitualEffectLava extends RitualEffect {
|
||||
&& SoulNetworkHandler.canSyphonFromOnlyNetwork(owner, fireFuseCost)) {
|
||||
boolean hasReductus = this
|
||||
.canDrainReagent(ritualStone, ReagentRegistry.reductusReagent, reductusDrain, false);
|
||||
boolean drainReductus = world.getWorldTime() % 100 == 0;
|
||||
boolean drainReductus = world.getTotalWorldTime() % 100 == 0;
|
||||
|
||||
int range = 5;
|
||||
List<EntityLivingBase> entityList = SpellHelper
|
||||
|
||||
@@ -68,7 +68,7 @@ public class RitualEffectMagnetic extends RitualEffect {
|
||||
|
||||
boolean hasPotentia = this.canDrainReagent(ritualStone, ReagentRegistry.potentiaReagent, potentiaDrain, false);
|
||||
|
||||
if (world.getWorldTime() % (hasPotentia ? 10 : 40) != 0) {
|
||||
if (world.getTotalWorldTime() % (hasPotentia ? 10 : 40) != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public class RitualEffectOmegaStalling extends RitualEffect {
|
||||
int y = ritualStone.getYCoord();
|
||||
int z = ritualStone.getZCoord();
|
||||
|
||||
if (world.getWorldTime() % 20 != 0) {
|
||||
if (world.getTotalWorldTime() % 20 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ public class RitualEffectOmegaTest extends RitualEffect {
|
||||
int y = ritualStone.getYCoord();
|
||||
int z = ritualStone.getZCoord();
|
||||
|
||||
if (world.getWorldTime() % 200 != 0) {
|
||||
if (world.getTotalWorldTime() % 200 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ public class RitualEffectSphereCreator extends RitualEffect {
|
||||
// boolean hasPotentia = this.canDrainReagent(ritualStone, ReagentRegistry.potentiaReagent,
|
||||
// potentiaDrain, false);
|
||||
|
||||
if (world.getWorldTime() % 1 != 0) {
|
||||
if (world.getTotalWorldTime() % 1 != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+13
-2
@@ -5,6 +5,7 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
@@ -45,7 +46,10 @@ public class RitualEffectSummonMeteor extends RitualEffect {
|
||||
|
||||
for (EntityItem entityItem : entities) {
|
||||
if (entityItem != null && MeteorRegistry.isValidMeteorFocusItem(entityItem.getEntityItem())) {
|
||||
int meteorID = MeteorRegistry.getMeteorIDForItem(entityItem.getEntityItem());
|
||||
ItemStack stack = entityItem.getEntityItem();
|
||||
if (stack == null || stack.stackSize <= 0) continue;
|
||||
|
||||
int meteorID = MeteorRegistry.getMeteorIDForItem(stack);
|
||||
int cost = MeteorRegistry.meteorList.get(meteorID).cost;
|
||||
|
||||
if (currentEssence < cost) {
|
||||
@@ -63,7 +67,14 @@ public class RitualEffectSummonMeteor extends RitualEffect {
|
||||
}
|
||||
}
|
||||
|
||||
entityItem.setDead();
|
||||
stack.stackSize--;
|
||||
|
||||
if (stack.stackSize <= 0) {
|
||||
world.removeEntity(entityItem);
|
||||
} else {
|
||||
entityItem.setEntityItemStack(stack);
|
||||
}
|
||||
|
||||
world.spawnEntityInWorld(meteor);
|
||||
ritualStone.setActive(false);
|
||||
SoulNetworkHandler.syphonFromNetwork(owner, cost);
|
||||
|
||||
+2
-2
@@ -44,7 +44,7 @@ public class RitualEffectSupression extends RitualEffect {
|
||||
int radius = this.getRadiusForReagents(hasAether, hasAquasalus);
|
||||
int masterRadius = radius;
|
||||
|
||||
int yIndex = (int) (world.getWorldTime() % (2 * radius + 1)) - radius;
|
||||
int yIndex = (int) (world.getTotalWorldTime() % (2 * radius + 1)) - radius;
|
||||
boolean expansion = false;
|
||||
|
||||
if (ritualStone.getVar1() < (radius + 1)) {
|
||||
@@ -86,7 +86,7 @@ public class RitualEffectSupression extends RitualEffect {
|
||||
|
||||
SoulNetworkHandler.syphonFromNetwork(owner, this.getCostPerRefresh() * costMod);
|
||||
|
||||
if (world.getWorldTime() % 100 == 0) {
|
||||
if (world.getTotalWorldTime() % 100 == 0) {
|
||||
if (hasAquasalus) {
|
||||
this.canDrainReagent(ritualStone, ReagentRegistry.aquasalusReagent, aquasalusDrain, true);
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ public class RitualEffectWater extends RitualEffect {
|
||||
if (hasOffensa) {
|
||||
boolean hasReductus = this
|
||||
.canDrainReagent(ritualStone, ReagentRegistry.reductusReagent, reductusDrain, false);
|
||||
boolean drainReductus = world.getWorldTime() % 100 == 0;
|
||||
boolean drainReductus = world.getTotalWorldTime() % 100 == 0;
|
||||
|
||||
int range = 10;
|
||||
List<Entity> list = SpellHelper.getEntitiesInRange(world, x + 0.5, y + 0.5, z + 0.5, range, range);
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect {
|
||||
int y = ritualStone.getYCoord();
|
||||
int z = ritualStone.getZCoord();
|
||||
|
||||
if (world.getWorldTime() % timeDelay != 0) {
|
||||
if (world.getTotalWorldTime() % timeDelay != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package WayofTime.alchemicalWizardry.common.tileEntity;
|
||||
|
||||
import java.text.NumberFormat;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
@@ -941,13 +940,16 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
|
||||
|
||||
public void sendChatInfoToPlayer(EntityPlayer player) {
|
||||
player.addChatMessage(
|
||||
new ChatComponentTranslation(String.format("message.altar.currentessence"), this.fluid.amount));
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocalFormatted("message.altar.currentessence", this.fluid.amount)));
|
||||
player.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocalFormatted(
|
||||
"message.altar.currenttier",
|
||||
UpgradedAltars.isAltarValid(worldObj, xCoord, yCoord, zCoord))));
|
||||
player.addChatMessage(
|
||||
new ChatComponentTranslation(
|
||||
String.format("message.altar.currenttier"),
|
||||
UpgradedAltars.isAltarValid(worldObj, xCoord, yCoord, zCoord)));
|
||||
player.addChatMessage(
|
||||
new ChatComponentTranslation(String.format("message.altar.capacity"), this.getCapacity()));
|
||||
StatCollector.translateToLocalFormatted("message.altar.capacity", this.getCapacity())));
|
||||
}
|
||||
|
||||
public void sendMoreChatInfoToPlayer(EntityPlayer player) {
|
||||
@@ -955,23 +957,25 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
|
||||
int stackSize = getStackInSlot(0).stackSize;
|
||||
player.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.altar.progress") + " "
|
||||
+ progress
|
||||
+ "LP/"
|
||||
+ liquidRequired * stackSize
|
||||
+ "LP"));
|
||||
StatCollector.translateToLocalFormatted(
|
||||
"message.altar.progress",
|
||||
progress,
|
||||
liquidRequired * stackSize)));
|
||||
player.addChatMessage(
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocal("message.altar.consumptionrate") + " "
|
||||
+ (int) (consumptionRate * (1 + consumptionMultiplier))
|
||||
+ "LP/t"));
|
||||
StatCollector.translateToLocalFormatted(
|
||||
"message.altar.consumptionrate",
|
||||
(int) (consumptionRate * (1 + consumptionMultiplier)))));
|
||||
}
|
||||
player.addChatMessage(
|
||||
new ChatComponentTranslation(String.format("message.altar.currentessence"), this.fluid.amount));
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocalFormatted("message.altar.currentessence", this.fluid.amount)));
|
||||
player.addChatMessage(
|
||||
new ChatComponentTranslation(String.format("message.altar.inputtank"), this.fluidInput.amount));
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocalFormatted("message.altar.inputtank", this.fluidInput.amount)));
|
||||
player.addChatMessage(
|
||||
new ChatComponentTranslation(String.format("message.altar.outputtank"), this.fluidOutput.amount));
|
||||
new ChatComponentText(
|
||||
StatCollector.translateToLocalFormatted("message.altar.outputtank", this.fluidOutput.amount)));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -988,26 +992,27 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
|
||||
return;
|
||||
|
||||
final NBTTagCompound altarData = accessor.getNBTData().getCompoundTag("altar");
|
||||
final NumberFormat numberFormat = NumberFormat.getIntegerInstance();
|
||||
|
||||
if (altarData.hasKey("stored")) {
|
||||
currenttip.add(
|
||||
StatCollector.translateToLocal("tooltip.waila.currentFluid")
|
||||
+ numberFormat.format(altarData.getInteger("stored")));
|
||||
StatCollector
|
||||
.translateToLocalFormatted("tooltip.waila.currentFluid", altarData.getInteger("stored")));
|
||||
} else {
|
||||
currenttip.add(StatCollector.translateToLocal("tooltip.waila.noFluid"));
|
||||
}
|
||||
|
||||
currenttip.add(
|
||||
StatCollector.translateToLocal("tooltip.waila.altarCapacity")
|
||||
+ numberFormat.format(altarData.getInteger("capacity")));
|
||||
currenttip.add(StatCollector.translateToLocal("tooltip.waila.tier") + altarData.getInteger("tier"));
|
||||
StatCollector
|
||||
.translateToLocalFormatted("tooltip.waila.altarCapacity", altarData.getInteger("capacity")));
|
||||
currenttip.add(StatCollector.translateToLocalFormatted("tooltip.waila.tier", altarData.getInteger("tier")));
|
||||
|
||||
if (altarData.hasKey("progress")) {
|
||||
currenttip.add(
|
||||
StatCollector.translateToLocal("tooltip.waila.altarProgress") + altarData.getInteger("progress")
|
||||
+ "%");
|
||||
currenttip.add(StatCollector.translateToLocal("tooltip.waila.crafting") + altarData.getString("crafting"));
|
||||
StatCollector.translateToLocalFormatted(
|
||||
"tooltip.waila.altarProgress",
|
||||
altarData.getInteger("progress")));
|
||||
currenttip.add(
|
||||
StatCollector.translateToLocalFormatted("tooltip.waila.crafting", altarData.getString("crafting")));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -733,10 +733,11 @@ public class TEWritingTable extends TEInventory implements ISidedInventory, IBlo
|
||||
final NBTTagCompound tag = accessor.getNBTData();
|
||||
final int curProgress = tag.getInteger("progress");
|
||||
if (curProgress > 0) {
|
||||
currenttip.add(StatCollector.translateToLocal("tooltip.waila.altarProgress") + curProgress + "%");
|
||||
currenttip.add(StatCollector.translateToLocalFormatted("tooltip.waila.chemistrySetProgress", curProgress));
|
||||
}
|
||||
if (tag.hasKey("crafting")) {
|
||||
currenttip.add(StatCollector.translateToLocal("tooltip.waila.crafting") + tag.getString("crafting"));
|
||||
currenttip
|
||||
.add(StatCollector.translateToLocalFormatted("tooltip.waila.crafting", tag.getString("crafting")));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -525,13 +525,13 @@ tooltip.routingFocus.desc=A focus used to route items
|
||||
tooltip.alchemy.usedinincense=Purifying incense used in a crucible
|
||||
|
||||
#Messages
|
||||
message.altar.capacity=Capacity: %s LP
|
||||
message.altar.consumptionrate=Consumption Rate:
|
||||
message.altar.currentessence=Altar's Current Essence: %s LP
|
||||
message.altar.capacity=Capacity: %,d LP
|
||||
message.altar.consumptionrate=Consumption Rate: %,d LP/t
|
||||
message.altar.currentessence=Altar's Current Essence: %,d LP
|
||||
message.altar.currenttier=Altar's Current Tier: %s
|
||||
message.altar.progress=Altar's Progress:
|
||||
message.altar.inputtank= Input Tank: %s LP
|
||||
message.altar.outputtank= Output Tank: %s LP
|
||||
message.altar.progress=Altar's Progress: %,d LP / %,d LP
|
||||
message.altar.inputtank= Input Tank: %,d LP
|
||||
message.altar.outputtank= Output Tank: %,d LP
|
||||
message.altar.hunger=[BM] Your high regeneration rate has caused you to become hungry...
|
||||
message.attunedcrystal.clearing=Clearing saved container...
|
||||
message.attunedcrystal.error.cannotfind=Can no longer find linked container.
|
||||
@@ -543,9 +543,9 @@ message.attunedcrystal.setto=Attuned Crystal now set to:
|
||||
message.demon.shallfollow=I shall follow and protect you!
|
||||
message.demon.willstay=I will stay here for now, Master.
|
||||
message.destinationclearer.cleared=Destination list now cleared.
|
||||
message.divinationsigil.amount=Amount:
|
||||
message.divinationsigil.currentessence=Current Essence:
|
||||
message.divinationsigil.reagent=Reagent:
|
||||
message.divinationsigil.amount=Amount: %,d AR
|
||||
message.divinationsigil.currentessence=Current Essence: %,d LP
|
||||
message.divinationsigil.reagent=Reagent: %s
|
||||
message.orb.currenttier=Current Tier: %d
|
||||
message.masterstone.crystalvibrates=Your crystal vibrates pathetically.
|
||||
message.masterstone.energyflows=A rush of energy flows through the ritual!
|
||||
@@ -624,13 +624,13 @@ bm.versioning.downloadingAlready=It's downloading! Be patient!
|
||||
bm.versioning.disabled=This feature is disabled.
|
||||
|
||||
# Waila localizations
|
||||
tooltip.waila.currentFluid=Life Essence:
|
||||
tooltip.waila.currentFluid=Life Essence: %,d
|
||||
tooltip.waila.noFluid=There is no Life Essence in the altar
|
||||
tooltip.waila.tier=Altar Tier:
|
||||
tooltip.waila.altarProgress=Altar Progress:
|
||||
tooltip.waila.crafting=Crafting:
|
||||
tooltip.waila.altarCapacity=Altar Capacity:
|
||||
tooltip.waila.chemistrySetProgress=Item Progress:
|
||||
tooltip.waila.tier=Altar Tier: %d
|
||||
tooltip.waila.altarProgress=Altar Progress: %d%%
|
||||
tooltip.waila.crafting=Crafting: %s
|
||||
tooltip.waila.altarCapacity=Altar Capacity: %,d
|
||||
tooltip.waila.chemistrySetProgress=Item Progress: %d%%
|
||||
tooltip.waila.owner=Owner:
|
||||
tooltip.waila.ritualString=Current Ritual:
|
||||
tooltip.waila.active=Ritual Active
|
||||
|
||||
@@ -416,13 +416,13 @@ tooltip.routingFocus.limit=Лимит:
|
||||
tooltip.routingFocus.desc=Фокус, используемый для направления предметов
|
||||
|
||||
#Messages
|
||||
message.altar.capacity=Ёмкость: %s LP
|
||||
message.altar.consumptionrate=Скорость потребления:
|
||||
message.altar.currentessence=Текущая эссенция алтаря: %s LP
|
||||
message.altar.capacity=Ёмкость: %,d LP
|
||||
message.altar.consumptionrate=Скорость потребления: %,d LP/тик
|
||||
message.altar.currentessence=Текущая эссенция алтаря: %,d LP
|
||||
message.altar.currenttier=Текущий уровень алтаря: %s
|
||||
message.altar.progress=Прогресс алтаря:
|
||||
message.altar.inputtank= Резервуар для входа: %s LP
|
||||
message.altar.outputtank= Резервуар для выхода: %s LP
|
||||
message.altar.progress=Прогресс алтаря: %,d LP / %,d LP
|
||||
message.altar.inputtank= Резервуар для входа: %,d LP
|
||||
message.altar.outputtank= Резервуар для выхода: %,d LP
|
||||
message.altar.hunger=[BM] Из-за Вашего высокого уровня регенерации Вы проголодались...
|
||||
message.attunedcrystal.clearing=Очистка сохранённого контейнера...
|
||||
message.attunedcrystal.error.cannotfind=Не удалось найти соединённый контейнер.
|
||||
@@ -434,9 +434,9 @@ message.attunedcrystal.setto=Алхимический маршрутизатор
|
||||
message.demon.shallfollow=Я обещаю следовать за Вами и защищать!
|
||||
message.demon.willstay=Я буду стоять здесь, Хозяин.
|
||||
message.destinationclearer.cleared=Список назначения очищен.
|
||||
message.divinationsigil.amount=Количество:
|
||||
message.divinationsigil.currentessence=Текущая эссенция:
|
||||
message.divinationsigil.reagent=Реагент:
|
||||
message.divinationsigil.amount=Количество: %,d AR
|
||||
message.divinationsigil.currentessence=Текущая эссенция: %,d LP
|
||||
message.divinationsigil.reagent=Реагент: %s
|
||||
message.masterstone.crystalvibrates=Ваш кристалл жалобно вибрирует.
|
||||
message.masterstone.energyflows=Порыв потоков энергии проходит через ритуал!
|
||||
message.masterstone.nothinghappened=Ничего не происходит...
|
||||
|
||||
@@ -510,13 +510,13 @@ tooltip.routingFocus.desc=一个传送物件的核心
|
||||
tooltip.alchemy.usedinincense=用于香炉的精炼熏香粉末
|
||||
|
||||
#Messages
|
||||
message.altar.capacity=容量: %s LP
|
||||
message.altar.consumptionrate=消耗率:
|
||||
message.altar.currentessence=祭坛目前的生命本质: %s LP
|
||||
message.altar.capacity=容量: %,d LP
|
||||
message.altar.consumptionrate=消耗率: %,d LP/t
|
||||
message.altar.currentessence=祭坛目前的生命本质: %,d LP
|
||||
message.altar.currenttier=祭坛目前的层数: %s
|
||||
message.altar.progress=祭坛的进展:
|
||||
message.altar.inputtank= 输入槽: %s LP
|
||||
message.altar.outputtank= 输出槽: %s LP
|
||||
message.altar.progress=祭坛的进展: %,d LP / %,d LP
|
||||
message.altar.inputtank= 输入槽: %,d LP
|
||||
message.altar.outputtank= 输出槽: %,d LP
|
||||
message.altar.hunger=[BM] 你的高级再生效果使你变得饥饿...
|
||||
message.attunedcrystal.clearing=清除已保存的容器...
|
||||
message.attunedcrystal.error.cannotfind=无法找到连接的容器.
|
||||
@@ -528,9 +528,9 @@ message.attunedcrystal.setto=调整水晶设置为:
|
||||
message.demon.shallfollow=我将会跟随并且保护你!
|
||||
message.demon.willstay=我会在这待着的,主人.
|
||||
message.destinationclearer.cleared=目标列表已清除.
|
||||
message.divinationsigil.amount=数额:
|
||||
message.divinationsigil.currentessence=目前的生命本质:
|
||||
message.divinationsigil.reagent=炼金试剂:
|
||||
message.divinationsigil.amount=数额: %,d AR
|
||||
message.divinationsigil.currentessence=目前的生命本质: %,d LP
|
||||
message.divinationsigil.reagent=炼金试剂: %s
|
||||
message.orb.currenttier=当前等级: %d
|
||||
message.masterstone.crystalvibrates=你的水晶弱弱的振动着.
|
||||
message.masterstone.energyflows=一股能量流经这个仪式!
|
||||
|
||||
@@ -424,13 +424,13 @@ tooltip.routingFocus.desc=A focus used to route items
|
||||
tooltip.alchemy.usedinincense=Purifying incense used in a crucible
|
||||
|
||||
#Messages
|
||||
message.altar.capacity=Capacity: %s LP
|
||||
message.altar.consumptionrate=Consumption Rate:
|
||||
message.altar.currentessence=Altar's Current Essence: %s LP
|
||||
message.altar.capacity=Capacity: %,d LP
|
||||
message.altar.consumptionrate=Consumption Rate: %,d LP/t
|
||||
message.altar.currentessence=Altar's Current Essence: %,d LP
|
||||
message.altar.currenttier=Altar's Current Tier: %s
|
||||
message.altar.progress=Altar's Progress:
|
||||
message.altar.inputtank= Input Tank: %s LP
|
||||
message.altar.outputtank= Output Tank: %s LP
|
||||
message.altar.progress=Altar's Progress: %,d LP / %,d LP
|
||||
message.altar.inputtank= Input Tank: %,d LP
|
||||
message.altar.outputtank= Output Tank: %,d LP
|
||||
message.altar.hunger=[BM] Your high regeneration rate has caused you to become hungry...
|
||||
message.attunedcrystal.clearing=Clearing saved container...
|
||||
message.attunedcrystal.error.cannotfind=Can no longer find linked container.
|
||||
@@ -442,9 +442,9 @@ message.attunedcrystal.setto=Attuned Crystal now set to:
|
||||
message.demon.shallfollow=I shall follow and protect you!
|
||||
message.demon.willstay=I will stay here for now, Master.
|
||||
message.destinationclearer.cleared=Destination list now cleared.
|
||||
message.divinationsigil.amount=Amount:
|
||||
message.divinationsigil.currentessence=Current Essence:
|
||||
message.divinationsigil.reagent=Reagent:
|
||||
message.divinationsigil.amount=Amount: %,d AR
|
||||
message.divinationsigil.currentessence=Current Essence: %,d LP
|
||||
message.divinationsigil.reagent=Reagent: %s
|
||||
message.masterstone.crystalvibrates=Your crystal vibrates pathetically.
|
||||
message.masterstone.energyflows=A rush of energy flows through the ritual!
|
||||
message.masterstone.nothinghappened=Nothing appears to have happened...
|
||||
|
||||
Reference in new issue
Block a user