diff --git a/core/assets/sprites/fallback/sprites.png b/core/assets/sprites/fallback/sprites.png index c538ea03aa..5154e3df5c 100644 Binary files a/core/assets/sprites/fallback/sprites.png and b/core/assets/sprites/fallback/sprites.png differ diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index e52481c015..9d666ce306 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index f5503a043a..7e278eb0ec 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 3502be105e..d407dbec38 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index 725555149a..bbf3977af5 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 53a482a7f0..2d0baca8b9 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index b18a981b2a..9c1f2b1968 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 948943433b..94d2f13937 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -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; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index a2dcf018a5..5cbb7fd3f1 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -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){ diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 4d710fe27c..648f504e9b 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -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); } diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java index 9cd7c816ee..86a2ecf4db 100644 --- a/desktop/src/mindustry/desktop/steam/SNet.java +++ b/desktop/src/mindustry/desktop/steam/SNet.java @@ -233,7 +233,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, @Override public void onLobbyEnter(SteamID steamIDLobby, int chatPermissions, boolean blocked, ChatRoomEnterResponse response){ - Log.info("enter lobby @ @", steamIDLobby.getAccountID(), response); + Log.info("onLobbyEnter @ @", steamIDLobby.getAccountID(), response); if(response != ChatRoomEnterResponse.Success){ ui.loadfrag.hide(); @@ -241,6 +241,17 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, return; } + int version = Strings.parseInt(smat.getLobbyData(steamIDLobby, "version"), -1); + + //check version + if(version != Version.build){ + ui.loadfrag.hide(); + ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" + + Core.bundle.format("server.versions", Version.build, version)); + smat.leaveLobby(steamIDLobby); + return; + } + logic.reset(); net.reset(); diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 3f09c262ee..fa98fb90df 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -315,7 +315,7 @@ public class Generators{ Color outc = Pal.darkerMetal; //Func outlineS = i -> i.shadow(0.8f, 9); - Func outline = i -> i.outline(4, outc); + Func outline = i -> i.outline(3, outc); Cons outliner = t -> { if(t != null && t.found()){ ImagePacker.replace(t, outline.get(ImagePacker.get(t)));