Turret, power generator and bullet balancing sweep

This commit is contained in:
Anuken
2019-02-07 15:55:31 -05:00
parent 7e35de3c33
commit 79a9541394
6 changed files with 27 additions and 43 deletions
@@ -20,17 +20,17 @@ public class LiquidBulletType extends BulletType{
Liquid liquid;
public LiquidBulletType(Liquid liquid){
super(2.5f, 0);
super(2.8f, 0);
this.liquid = liquid;
lifetime = 70f;
lifetime = 74f;
status = liquid.effect;
statusDuration = 90f;
despawnEffect = Fx.none;
hitEffect = Fx.hitLiquid;
shootEffect = Fx.none;
drag = 0.01f;
knockback = 0.5f;
drag = 0.009f;
knockback = 0.55f;
}
@Override
@@ -124,22 +124,6 @@ public interface BuilderTrait extends Entity, TeamTrait{
return getPlaceQueue().size != 0;
}
/**
* If a place request matching this signature is present, it is removed.
* Otherwise, a new place request is added to the queue.
*/
default void replaceBuilding(int x, int y, int rotation, Block block){
for(BuildRequest request : getPlaceQueue()){
if(request.x == x && request.y == y){
clearBuilding();
addBuildRequest(request);
return;
}
}
addBuildRequest(new BuildRequest(x, y, rotation, block));
}
/**Clears the placement queue.*/
default void clearBuilding(){
getPlaceQueue().clear();