Blaster/TAIGA-OV
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Final adjustments, 2 additional traits, 1 trait rewritten. Liquids + textures included. German and english translation added.

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-07-18 00:16:46 +02:00
parent 77e86d4281
commit 302ef6cccb
28 changed files with 717 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sosnitzka/ztic_addon/traits/TraitHeroic.java
View File

@@ -19,8 +19,8 @@ public class TraitHeroic extends AbstractTrait {
public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) {
int durability = ToolHelper.getCurrentDurability(tool);
int durabilitymax = ToolHelper.getMaxDurability(tool);
float calc = (float) (newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability)));
if ((float) durability < (float) (0.12 * durabilitymax)) {
float calc = (float) (newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability - 1)));
if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) {
return super.damage(tool, player, target, damage, calc, isCritical);
} else return super.damage(tool, player, target, damage, newDamage, isCritical);
}