This commit is contained in:
Anuken
2020-09-22 12:16:17 -04:00
parent b2b8949e26
commit 08ff36c43e
12 changed files with 21 additions and 6 deletions

View File

@@ -440,6 +440,7 @@ public class UnitTypes implements ContentList{
buildSpeed = 1.7f;
armor = 9f;
landShake = 1.5f;
rotateSpeed = 1.5f;
commandLimit = 24;
@@ -1229,6 +1230,7 @@ public class UnitTypes implements ContentList{
payloadCapacity = (3 * 3) * (8 * 8);
buildSpeed = 2.5f;
range = 140f;
targetAir = false;
weapons.add(
new Weapon(){{
@@ -1241,7 +1243,8 @@ public class UnitTypes implements ContentList{
sprite = "large-bomb";
width = height = 120/4f;
range = 20f;
range = 30f;
ignoreRotation = true;
backColor = Pal.heal;
frontColor = Color.white;
@@ -1249,7 +1252,6 @@ public class UnitTypes implements ContentList{
shootCone = 180f;
ejectEffect = Fx.none;
ignoreRotation = true;
shootSound = Sounds.none;
despawnShake = 4f;

View File

@@ -71,6 +71,8 @@ public abstract class BulletType extends Content{
public boolean hittable = true;
/** Whether this bullet can be reflected. */
public boolean reflectable = true;
/** Bullet range override. */
public float range = -1f;
//additional effects
@@ -126,7 +128,7 @@ public abstract class BulletType extends Content{
/** Returns maximum distance the bullet this bullet type has can travel. */
public float range(){
return speed * lifetime * (1f - drag);
return Math.max(speed * lifetime * (1f - drag), range);
}
public boolean collides(Bullet bullet, Building tile){

View File

@@ -406,7 +406,7 @@ public class JoinDialog extends BaseDialog{
void safeConnect(String ip, int port, int version){
if(version != Version.build && Version.build != -1 && version != -1){
ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" +
Core.bundle.format("server.versions", Version.build, version));
Core.bundle.format("server.versions", Version.build, version));
}else{
connect(ip, port);
}