diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f0bd63ccee..06533c4bcd 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -10,7 +10,7 @@ link.dev-builds.description = Unstable development builds link.trello.description = Official Trello board for planned features link.itch.io.description = itch.io page with PC downloads link.google-play.description = Google Play store listing -link.f-droid.description = F-Droid catalogue listing +link.f-droid.description = F-Droid listing link.wiki.description = Official Mindustry wiki link.suggestions.description = Suggest new features linkfail = Failed to open link!\nThe URL has been copied to your clipboard. @@ -562,10 +562,8 @@ threat.eradication = Eradication planets = Planets planet.serpulo.name = Serpulo -#TODO better name planet.sun.name = Sun -#NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway sector.impact0078.name = Impact 0078 sector.groundZero.name = Ground Zero sector.craters.name = The Craters @@ -582,9 +580,6 @@ sector.biomassFacility.name = Biomass Synthesis Facility sector.windsweptIslands.name = Windswept Islands sector.extractionOutpost.name = Extraction Outpost -#unused -#sector.crags.name = Crags - sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on. sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders. sector.saltFlats.description = On the outskirts of the desert lie the Salt Flats. Few resources can be found in this location.\n\nThe enemy has erected a resource storage complex here. Eradicate their core. Leave nothing standing. @@ -1278,6 +1273,7 @@ item.spore-pod.description = Used for conversion into oil, explosives and fuel. item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions. item.blast-compound.description = Used in bombs and explosive ammunition. item.pyratite.description = Used in incendiary weapons and combustion-fueled generators. + liquid.water.description = Used for cooling machines and waste processing. liquid.slag.description = Refined in separators into constituent metals, or sprayed at enemies as a weapon. liquid.oil.description = Used in advanced material production and as incendiary ammunition. @@ -1452,7 +1448,7 @@ unit.mega.description = Automatically repairs damaged structures. Capable of car unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies. -unit.minke.description = Fires incendiary shells and standard bullets at nearby ground targets. +unit.minke.description = Fires shells and standard bullets at nearby ground targets. unit.bryde.description = Fires long-range artillery shells and missiles at enemies. unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies. unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units. diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 437cdc60d9..b9a0ee1d09 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -111,7 +111,7 @@ public class UnitTypes implements ContentList{ }}; fortress = new UnitType("fortress"){{ - speed = 0.38f; + speed = 0.39f; hitSize = 13f; rotateSpeed = 3f; targetAir = false; @@ -136,7 +136,7 @@ public class UnitTypes implements ContentList{ collides = true; collidesTiles = true; splashDamageRadius = 24f; - splashDamage = 38f; + splashDamage = 45f; backColor = Pal.bulletYellowBack; frontColor = Pal.bulletYellow; }}; @@ -942,7 +942,7 @@ public class UnitTypes implements ContentList{ engineOffset = 7.8f; range = 140f; faceTarget = false; - armor = 4f; + armor = 3f; targetFlag = BlockFlag.factory; commandLimit = 5; @@ -950,7 +950,7 @@ public class UnitTypes implements ContentList{ minShootVelocity = 0.75f; x = 3f; shootY = 0f; - reload = 11f; + reload = 12f; shootCone = 180f; ejectEffect = Fx.none; inaccuracy = 15f; @@ -1466,7 +1466,7 @@ public class UnitTypes implements ContentList{ shake = 1.5f; ejectEffect = Fx.casing2; shootSound = Sounds.bang; - bullet = Bullets.artilleryIncendiary; + bullet = Bullets.artilleryDense; }}); }}; diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 42f261edce..02bff9f536 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -583,7 +583,7 @@ public class NetClient implements ApplicationListener{ totalLength += length; } - if(totalLength > 2048){ + if(totalLength > 1024){ usedRequests = i + 1; break; } diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 43465fface..3d1af1e5ce 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -66,7 +66,7 @@ public abstract class Turret extends ReloadTurret{ protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); - public @Load(value = "base-@", fallback = "block-@size") TextureRegion baseRegion; + public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion; public @Load("@-heat") TextureRegion heatRegion; public Cons drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90);