This commit is contained in:
Anuken
2019-04-05 09:26:31 -04:00
parent 330820062f
commit efed11eb97
23 changed files with 2335 additions and 2331 deletions
@@ -135,10 +135,6 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool
if(owner instanceof Unit){
return ((Unit) owner).getDamageMultipler();
}
if(owner instanceof Lightning && data instanceof Float){
return (Float)data;
}
return 1f;
}
@@ -155,6 +151,9 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool
@Override
public float damage(){
if(owner instanceof Lightning && data instanceof Float){
return (Float)data;
}
return type.damage * damageMultiplier();
}
@@ -288,6 +288,10 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
if(block == previous && cons != null){
cons.update();
}
if(block == previous && power != null){
power.graph.update();
}
}
@Override