From 75d2b0fb69317ab0197c72fdb137c7d7f1a32f27 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 21 Jan 2021 08:48:36 -0500 Subject: [PATCH] Fixed #4393 / Fixed #4398 --- core/src/mindustry/core/NetServer.java | 2 +- core/src/mindustry/game/Gamemode.java | 1 - core/src/mindustry/game/Rules.java | 2 -- core/src/mindustry/ui/dialogs/CustomRulesDialog.java | 1 - core/src/mindustry/ui/dialogs/ModsDialog.java | 5 +++-- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- core/src/mindustry/world/blocks/power/PowerGraph.java | 2 +- core/src/mindustry/world/blocks/power/PowerNode.java | 2 +- 8 files changed, 7 insertions(+), 10 deletions(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 6a0f2f6bdc..da801cc454 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -182,7 +182,7 @@ public class NetServer implements ApplicationListener{ return; } - if(Groups.player.contains(player -> player.uuid().equals(packet.uuid) || player.usid().equals(packet.usid) || player.ip().equals(con.address))){ + if(Groups.player.contains(player -> player.uuid().equals(packet.uuid) || player.usid().equals(packet.usid))){ con.kick(KickReason.idInUse); return; } diff --git a/core/src/mindustry/game/Gamemode.java b/core/src/mindustry/game/Gamemode.java index f2bb95130a..e4c0d01c6c 100644 --- a/core/src/mindustry/game/Gamemode.java +++ b/core/src/mindustry/game/Gamemode.java @@ -31,7 +31,6 @@ public enum Gamemode{ rules.buildCostMultiplier = 1f; rules.buildSpeedMultiplier = 1f; rules.unitBuildSpeedMultiplier = 2f; - rules.unitHealthMultiplier = 3f; rules.attackMode = true; }, map -> map.teams.size > 1), editor(true, rules -> { diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index f9d594e83e..420840e7c0 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -46,8 +46,6 @@ public class Rules{ public boolean unitAmmo = false; /** How fast unit pads build units. */ public float unitBuildSpeedMultiplier = 1f; - /** How much health units start with. */ - public float unitHealthMultiplier = 1f; /** How much damage any other units deal. */ public float unitDamageMultiplier = 1f; /** How much health blocks start with. */ diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 2e6d923063..b150b5fa9f 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -161,7 +161,6 @@ public class CustomRulesDialog extends BaseDialog{ title("@rules.title.unit"); check("@rules.unitammo", b -> rules.unitAmmo = b, () -> rules.unitAmmo); - number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier); number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier); number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0.001f, 50f); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 998b401558..2ab1d7fd3d 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -221,13 +221,13 @@ public class ModsDialog extends BaseDialog{ sel.keyDown(KeyCode.escape, sel::hide); sel.keyDown(KeyCode.back, sel::hide); sel.show(); - }).width(480f).growX().left().fillY(); + }).width(460f).growX().left().fillY(); tablebrow.row(); } }); }; rebuildBrowser[0].run(); - }); + }).get().setScrollingDisabled(true, false); browser.addCloseButton(); browser.show(); }).margin(12f); @@ -241,6 +241,7 @@ public class ModsDialog extends BaseDialog{ if(!mobile){ buttons.button("@mods.openfolder", Icon.link, style, () -> Core.app.openFolder(modDirectory.absolutePath())).margin(margin); } + Styles.clearPartiali }).width(w); cont.row(); diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index ab320b7863..847ad58f7d 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -111,7 +111,7 @@ public class Turret extends ReloadTurret{ super.setStats(); stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees); - stats.add(Stat.reload, 60f / reloadTime * (alternate ? 1 : shots), StatUnit.none); + stats.add(Stat.reload, 60f / (reloadTime + 1) * (alternate ? 1 : shots), StatUnit.none); stats.add(Stat.targetsAir, targetAir); stats.add(Stat.targetsGround, targetGround); if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot); diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 03aa029f19..24873ecb14 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -224,7 +224,7 @@ public class PowerGraph{ lastPowerNeeded = powerNeeded; lastPowerProduced = powerProduced; - lastScaledPowerIn = powerProduced / Time.delta; + lastScaledPowerIn = (powerProduced + energyDelta) / Time.delta; lastScaledPowerOut = powerNeeded / Time.delta; lastCapacity = getTotalBatteryCapacity(); lastPowerStored = getBatteryStored(); diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 9982c1d324..c9f372a314 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -226,7 +226,7 @@ public class PowerNode extends PowerBlock{ for(Point2 point : (Point2[])req.config){ otherReq = null; list.each(other -> { - if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req){ + if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req && other.block != null && other.block.hasPower){ otherReq = other; } });