diff --git a/core/assets/maps/serpulo/hidden/111.msav b/core/assets/maps/serpulo/hidden/111.msav index a1128616b9..1c06b2ba0c 100644 Binary files a/core/assets/maps/serpulo/hidden/111.msav and b/core/assets/maps/serpulo/hidden/111.msav differ diff --git a/core/assets/maps/serpulo/hidden/13.msav b/core/assets/maps/serpulo/hidden/13.msav index 6e97fea22d..0170bf609d 100644 Binary files a/core/assets/maps/serpulo/hidden/13.msav and b/core/assets/maps/serpulo/hidden/13.msav differ diff --git a/core/assets/maps/serpulo/littoralShipyard.msav b/core/assets/maps/serpulo/littoralShipyard.msav index bb83ca2d6b..3e72623fed 100644 Binary files a/core/assets/maps/serpulo/littoralShipyard.msav and b/core/assets/maps/serpulo/littoralShipyard.msav differ diff --git a/core/assets/maps/serpulo/weatheredChannels.msav b/core/assets/maps/serpulo/weatheredChannels.msav index aa02ffabf7..22721327b6 100644 Binary files a/core/assets/maps/serpulo/weatheredChannels.msav and b/core/assets/maps/serpulo/weatheredChannels.msav differ diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 1f78d6f3ee..c8778bd566 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -269,6 +269,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case health -> health; case shield -> shield; case maxHealth -> maxHealth; + case flying -> isFlying() ? 1f : 0f; case x -> World.conv(x); case y -> World.conv(y); case velocityX -> vel.x * 60f / tilesize; diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index be03d5cbfa..4173784ef2 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -62,6 +62,7 @@ public enum LAccess{ team, type, flag, + flying, controlled, controller, name, diff --git a/core/src/mindustry/maps/SectorSubmissions.java b/core/src/mindustry/maps/SectorSubmissions.java index 5a32281406..b79a6d02e4 100644 --- a/core/src/mindustry/maps/SectorSubmissions.java +++ b/core/src/mindustry/maps/SectorSubmissions.java @@ -27,10 +27,9 @@ public class SectorSubmissions{ registerSerpuloSector(76, "Tyrant-classZzz", "https://discord.com/channels/391020510269669376/1379926833411391580/1479890094486716499", -1, 8f); registerSerpuloSector(47, "tinport", "https://discord.com/channels/391020510269669376/1379926802591645820/1481778410018570274"); registerSerpuloSector(225, "Summi", "https://discord.com/channels/391020510269669376/1379926925719376152/1419026814826709103"); - //111 has an alternate submission https://discord.com/channels/391020510269669376/1379926842659569864/1404825715244793938 - registerSerpuloSector(111, "gausofid", "https://discord.com/channels/391020510269669376/1379926842659569864/1422257393042985114"); + registerSerpuloSector(111, "enwyz", "https://discord.com/channels/391020510269669376/1379926842659569864/1517216621616169084"); registerSerpuloSector(176, "wpx", "https://discord.com/channels/391020510269669376/1379926887203213353/1419025548696621209"); - registerSerpuloSector(13, "hoijlhj", "https://discord.com/channels/391020510269669376/1379926785164312810/1402569635299065948"); + registerSerpuloSector(13, "chocomint", "https://discord.com/channels/391020510269669376/1379926785164312810/1518092246300229677"); registerSerpuloSector(259, "tinport", "https://discord.com/channels/391020510269669376/1379928048245280871/1381300770866987049"); registerSerpuloSector(192, "Skeledragon", "https://discord.com/channels/391020510269669376/1379926914122256449/1380767793989029923"); registerSerpuloSector(127, "playfree", "https://discord.com/channels/391020510269669376/1379926869465632829/1380253194428354602"); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index db3a4ebd6b..e760b55087 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -1436,6 +1436,7 @@ public class UnitType extends UnlockableContent implements Senseable{ case armor -> armor; case range -> World.conv(maxRange); case size -> hitSize / tilesize; + case flying -> flying ? 1f : 0f; case itemCapacity -> itemCapacity; case speed -> speed * 60f / tilesize; case payloadCapacity -> sample instanceof Payloadc ? payloadCapacity / tilePayload : 0f;