From 9dd6de7e3394b498bb232792b40b5e5adffbf2a9 Mon Sep 17 00:00:00 2001 From: Sam Bloom Date: Mon, 4 Jul 2022 15:52:36 -0500 Subject: [PATCH 1/2] AAS Sandbox (#7123) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 2627abe52c..4027e5c369 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -145,6 +145,6 @@ }, { "name": "AAS", - "address": ["fi01.optik.host:28453"] + "address": ["fi01.optik.host:28453", "n1.yeet.ml:6577"] } ] From 4e8736de6c0a8ed960c864d40693357840c0b197 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 4 Jul 2022 14:28:23 -0700 Subject: [PATCH 2/2] `alwaysContinuous` weapons have no reload (#7124) --- core/src/mindustry/type/Weapon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 89ec735999..4e4ca3b375 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -151,7 +151,7 @@ public class Weapon implements Cloneable{ t.row(); t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized()); } - if(reload > 0){ + if(!alwaysContinuous && reload > 0){ t.row(); t.add("[lightgray]" + Stat.reload.localized() + ": " + (mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / reload * shoot.shots, 2) + " " + StatUnit.perSecond.localized()); }