This commit is contained in:
Anuken
2020-06-06 09:33:25 -04:00
parent 93fe794f63
commit 1e3a190d5a
5 changed files with 24 additions and 12 deletions
@@ -22,6 +22,11 @@ public class BasicBulletType extends BulletType{
this.bulletSprite = bulletSprite;
}
public BasicBulletType(float speed, float damage){
this(speed, damage, "bullet");
}
/** For mods. */
public BasicBulletType(){
this(1f, 1f, "bullet");
@@ -35,6 +35,8 @@ public abstract class BulletType extends Content{
public float ammoMultiplier = 2f;
/** Multiplied by turret reload speed to get final shoot speed. */
public float reloadMultiplier = 1f;
/** Multiplier of how much base damage is done to tiles. */
public float tileDamageMultiplier = 1f;
/** Recoil from shooter entities. */
public float recoil;
/** Whether to kill the shooter when this is shot. For suicide bombers. */
@@ -1037,7 +1037,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
}
public void collision(Bulletc other){
damage(other.damage());
damage(other.damage() * other.type().tileDamageMultiplier);
}
public void removeFromProximity(){