diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 739f0a13da..d0d7b30ee0 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -973,9 +973,9 @@ public class UnitTypes implements ContentList{ }}; antumbra = new UnitType("antumbra"){{ - speed = 1.13f; - accel = 0.035f; - drag = 0.05f; + speed = 0.8f; + accel = 0.04f; + drag = 0.04f; rotateSpeed = 1.9f; flying = true; lowAltitude = true; @@ -1046,9 +1046,9 @@ public class UnitTypes implements ContentList{ }}; eclipse = new UnitType("eclipse"){{ - speed = 1.09f; - accel = 0.02f; - drag = 0.05f; + speed = 0.52f; + accel = 0.04f; + drag = 0.04f; rotateSpeed = 1f; flying = true; lowAltitude = true; diff --git a/core/src/mindustry/entities/bullet/HealBulletType.java b/core/src/mindustry/entities/bullet/HealBulletType.java index 9400eb5092..b811790000 100644 --- a/core/src/mindustry/entities/bullet/HealBulletType.java +++ b/core/src/mindustry/entities/bullet/HealBulletType.java @@ -21,6 +21,7 @@ public class HealBulletType extends BulletType{ despawnEffect = Fx.hitLaser; collidesTeam = true; hittable = false; + reflectable = false; } public HealBulletType(){ diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index cad0498130..155b6db9c4 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -169,7 +169,7 @@ public class ResearchDialog extends BaseDialog{ if(net.client()){ //TODO make this not display every time //TODO rework this in the future - ui.showInfo("campaign.multiplayer"); + ui.showInfo("@campaign.multiplayer"); } }); diff --git a/gradle.properties b/gradle.properties index 585b79d2df..904ff68012 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=11d4fb913d97951063390425e8aeeeac7f3c968f +archash=fdd046b83d3c91a31d4f5cea94b01f2cf753c4d0