Minor bugfixes
This commit is contained in:
@@ -347,7 +347,7 @@ public abstract class BulletType extends Content{
|
|||||||
bullet.damage = (damage < 0 ? this.damage : damage) * bullet.damageMultiplier();
|
bullet.damage = (damage < 0 ? this.damage : damage) * bullet.damageMultiplier();
|
||||||
bullet.add();
|
bullet.add();
|
||||||
|
|
||||||
if(keepVelocity && owner instanceof Velc) bullet.vel.add(((Velc)owner).vel().x, ((Velc)owner).vel().y);
|
if(keepVelocity && owner instanceof Velc v) bullet.vel.add(v.vel().x, v.vel().y);
|
||||||
return bullet;
|
return bullet;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -357,6 +357,7 @@ public abstract class BulletType extends Content{
|
|||||||
|
|
||||||
@Remote(called = Loc.server, unreliable = true)
|
@Remote(called = Loc.server, unreliable = true)
|
||||||
public static void createBullet(BulletType type, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl){
|
public static void createBullet(BulletType type, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl){
|
||||||
|
if(type == null) return;
|
||||||
type.create(null, team, x, y, angle, damage, velocityScl, lifetimeScl, null);
|
type.create(null, team, x, y, angle, damage, velocityScl, lifetimeScl, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -296,7 +296,7 @@ public class TypeIO{
|
|||||||
if(control instanceof Player p){
|
if(control instanceof Player p){
|
||||||
write.b(0);
|
write.b(0);
|
||||||
write.i(p.id);
|
write.i(p.id);
|
||||||
}else if(control instanceof FormationAI form){
|
}else if(control instanceof FormationAI form && form.leader != null){
|
||||||
write.b(1);
|
write.b(1);
|
||||||
write.i(form.leader.id);
|
write.i(form.leader.id);
|
||||||
}else if(control instanceof LogicAI logic && logic.controller != null){
|
}else if(control instanceof LogicAI logic && logic.controller != null){
|
||||||
|
|||||||
@@ -340,7 +340,7 @@ public class SectorDamage{
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(bossGroup != null){
|
if(bossGroup != null){
|
||||||
float bossMult = 1.1f;
|
float bossMult = 1.2f;
|
||||||
//calculate first boss appearaance
|
//calculate first boss appearaance
|
||||||
for(int wave = state.wave; wave < state.wave + 60; wave++){
|
for(int wave = state.wave; wave < state.wave + 60; wave++){
|
||||||
int spawned = bossGroup.getSpawned(wave - 1);
|
int spawned = bossGroup.getSpawned(wave - 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user