upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-14 01:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let's try this... Tinker Projectiles now deal actual unclamped damage instead of capped to 1/2 heart steps damage.

Browse Source
This commit is contained in:
Bernhard Bonigl committed 2014-10-19 16:46:01 +02:00
1 parent 11fcf21eb6
commit 591954cce1
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/tconstruct/library/entity/ProjectileBase.java
+5 -5
View File
@@ -177,8 +177,8 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit
public void onHitEntity(MovingObjectPosition movingobjectposition) {
NBTTagCompound tags = returnStack.getTagCompound().getCompoundTag("InfiTool");
double speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
int damage = MathHelper.ceiling_double_int(speed * tags.getInteger("Attack"));
float speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
float damage = speed * tags.getInteger("Attack");
// Damage calculations and stuff. For reference see AbilityHelper.onLeftClickEntity
ToolCore ammo = (ToolCore)returnStack.getItem();
@@ -187,7 +187,7 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit
// basically we pass the base damage to all modifiers and take the highest one
int baseDamage = 0;
for(ActiveToolMod toolmod : TConstructRegistry.activeModifiers) {
int dmg = toolmod.baseAttackDamage(baseDamage, damage, ammo, returnStack.getTagCompound(), tags, returnStack, (EntityPlayer)this.shootingEntity, movingobjectposition.entityHit);
int dmg = toolmod.baseAttackDamage(baseDamage, (int)damage, ammo, returnStack.getTagCompound(), tags, returnStack, (EntityPlayer)this.shootingEntity, movingobjectposition.entityHit);
if(dmg > baseDamage)
baseDamage = dmg;
}
@@ -213,13 +213,13 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit
int modDamage = 0;
for (ActiveToolMod mod : TConstructRegistry.activeModifiers)
{
modDamage += mod.attackDamage(modDamage, damage, ammo, returnStack.getTagCompound(), tags, returnStack, (EntityPlayer)this.shootingEntity, movingobjectposition.entityHit);
modDamage += mod.attackDamage(modDamage, (int)damage, ammo, returnStack.getTagCompound(), tags, returnStack, (EntityPlayer)this.shootingEntity, movingobjectposition.entityHit);
}
damage += modDamage;
// calculate critical damaaage
if (this.getIsCritical())
damage += this.rand.nextInt(damage / 2 + 2);
damage += this.rand.nextFloat() * (damage / 2f + 2f);
// and now we come to the part where we actually deal the damage!
if(!dealDamage(damage, ammo, tags, movingobjectposition.entityHit))