Misc bugfixes
This commit is contained in:
@@ -32,8 +32,9 @@ public class Team implements Comparable<Team>{
|
||||
sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
|
||||
crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
|
||||
malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c195fb"), Color.valueOf("665c9f"), Color.valueOf("484988")),
|
||||
green = new Team(4, "green", Color.valueOf("54d67d"), Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
|
||||
//TODO temporarily no palette.
|
||||
|
||||
//TODO temporarily no palettes for these teams.
|
||||
green = new Team(4, "green", Color.valueOf("54d67d")),//Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
|
||||
blue = new Team(5, "blue", Color.valueOf("6c87fd")); //Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392")
|
||||
|
||||
static{
|
||||
|
||||
@@ -28,8 +28,8 @@ public class ReloadTurret extends BaseTurret{
|
||||
@Override
|
||||
public void created(){
|
||||
super.created();
|
||||
//for visual reasons, the turret does not need reloading when placed
|
||||
reloadCounter = reload;
|
||||
//for visual reasons, the turret does not need reloading when placed; however, it should not be *fully* reloaded, so firing will not occur
|
||||
reloadCounter = reload - 0.0001f;
|
||||
}
|
||||
|
||||
protected void updateCooling(){
|
||||
|
||||
@@ -449,7 +449,7 @@ public class Turret extends ReloadTurret{
|
||||
}
|
||||
|
||||
public boolean charging(){
|
||||
return queuedBullets > 0;
|
||||
return queuedBullets > 0 && shoot.firstShotDelay > 0;
|
||||
}
|
||||
|
||||
protected void updateReload(){
|
||||
|
||||
Reference in New Issue
Block a user