From 43e857e810e19fea1418dbf4c79972ba4bb4ce84 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 11 Jan 2022 06:29:25 -0800 Subject: [PATCH 01/10] Fix ammo of one item transforming into another. (#6483) * Fix ammo transmutation * Small fixes * small fix 2 * a * commit spam aeugh --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index c5b7c1b903..05f25a7cd0 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -420,7 +420,7 @@ public class Turret extends ReloadTurret{ Time.run(burstSpacing * i, () -> { if(dead || !hasAmmo()) return; tr.trns(rotation, shootLength, Mathf.range(xRand)); - bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (ii - (int)(shots / 2f)) * spread); + bullet(peekAmmo(), rotation + Mathf.range(inaccuracy + peekAmmo().inaccuracy) + (ii - (int)(shots / 2f)) * spread); effects(); useAmmo(); recoil = recoilAmount; From 4b6a48a30fb4b5e7796df1a0bed84da5e7d9055c Mon Sep 17 00:00:00 2001 From: OSP <76648940+osp54@users.noreply.github.com> Date: Tue, 11 Jan 2022 17:16:33 +0200 Subject: [PATCH 02/10] [XCore] domain change (#6484) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index fa681a4cf9..62cb12d439 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -33,7 +33,7 @@ }, { "name": "XCore", - "address": ["node.procord.ga:2707"] + "address": ["node.procord.vip:2707"] }, { "name": "Obvilion Network", From 772f3ceb5f82aa40cddbcfc7dca76d1d8fbfb887 Mon Sep 17 00:00:00 2001 From: Neba-MD <62168011+Neba-MD@users.noreply.github.com> Date: Wed, 12 Jan 2022 01:57:30 +0800 Subject: [PATCH 03/10] Update servers_v6.json (#6485) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 3691d9a47f..1212c129a5 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -33,7 +33,7 @@ }, { "name": "TWS", - "address": ["twsmindustry.24x7.hk:6701", "twsmindustry.24x7.hk:6702"] + "address": ["twsmindustry.24x7.hk:6701", "twsmindustry.24x7.hk:6702", "twsmindustry.24x7.hk:6969"] }, { "name": "mindustry.ddns.net", From f5701ba3c42ca4be5b4b2e8b1037389cb73e716a Mon Sep 17 00:00:00 2001 From: devlaq <75433319+devlaq@users.noreply.github.com> Date: Thu, 13 Jan 2022 00:00:46 +0900 Subject: [PATCH 04/10] Update servers_v6.json (#6487) Change shard server address to 59.12.120.171 for fast connection and stability --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 1212c129a5..2159278bc0 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -121,7 +121,7 @@ }, { "name": "Shard", - "address": ["shard.mcv.kr"] + "address": ["59.12.120.171"] }, { "name": "OMNIDUSTRY", From 795edb249488441ca64ea629857b8392cbfe39d5 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Thu, 13 Jan 2022 12:28:29 -0800 Subject: [PATCH 05/10] Tractor Beam Suction multiplies by timescale twice (#6489) --- .../world/blocks/defense/turrets/TractorBeamTurret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index 59cec32040..f7a3efa017 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -127,7 +127,7 @@ public class TractorBeamTurret extends BaseTurret{ } any = true; - target.impulseNet(Tmp.v1.set(this).sub(target).limit((force + (1f - target.dst(this) / range) * scaledForce) * edelta() * timeScale)); + target.impulseNet(Tmp.v1.set(this).sub(target).limit((force + (1f - target.dst(this) / range) * scaledForce) * edelta())); } }else{ strength = Mathf.lerpDelta(strength, 0, 0.1f); From f754f386c97f050efd5b107567753915806bdff2 Mon Sep 17 00:00:00 2001 From: RebornTrack970 <62565267+RebornTrack970@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:42:14 +0300 Subject: [PATCH 06/10] Added Castle Wars server as a test (#6498) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 2159278bc0..f00412b3d2 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -57,7 +57,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me:6568"] + "address": ["yeeth.mindustry.me:6568","yeeth.mindustry.me:5002"] }, { "name": "Obvilion Network", From 44c28e2af0bac6e4804599f31ce3fc8c0d008efa Mon Sep 17 00:00:00 2001 From: OSP <76648940+osp54@users.noreply.github.com> Date: Sun, 16 Jan 2022 21:28:31 +0200 Subject: [PATCH 07/10] [XCore] new server (#6500) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 62cb12d439..70b071417b 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -33,7 +33,7 @@ }, { "name": "XCore", - "address": ["node.procord.vip:2707"] + "address": ["node.procord.vip:2707", "eu-fsn-01.vapur.host:24603"] }, { "name": "Obvilion Network", From 9622d6b4016e7e7d3c8be7a34deea99658da957a Mon Sep 17 00:00:00 2001 From: Vajda Simon <75036456+VajdaSimon@users.noreply.github.com> Date: Sun, 16 Jan 2022 22:28:23 +0100 Subject: [PATCH 08/10] Hungarian server update (#6501) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with lobby and plugins 😁 --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index f00412b3d2..75db78dd16 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -89,7 +89,7 @@ }, { "name": "Hungarian", - "address": ["survival.humindustry.tk", "148.251.175.124:25601"] + "address": ["hudustry.ddns.net"] }, { "name": "Xpdustry", From 6a75d84f48b8c0e65461e080802fd9215cb45b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Stolarski?= Date: Mon, 17 Jan 2022 20:53:35 +0100 Subject: [PATCH 09/10] Evolveye (polish translator of 3.x version) (#6502) --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index f740969d67..cf8d54cf74 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -131,3 +131,4 @@ Darkness6030 hortiSquash King-BR citrusMarmelade +Evolveye From cc221d669aaf81c66c5fd26c0abdf33258c62c03 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 17 Jan 2022 15:41:45 -0500 Subject: [PATCH 10/10] Sector bugfix backport --- core/src/mindustry/mod/ContentParser.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index f5840f7df6..8f16811563 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -381,7 +381,11 @@ public class ContentParser{ if(!value.has("sector") || !value.get("sector").isNumber()) throw new RuntimeException("SectorPresets must have a sector number."); - return new SectorPreset(name, locate(ContentType.planet, value.getString("planet", "serpulo")), value.getInt("sector")); + SectorPreset out = new SectorPreset(name, locate(ContentType.planet, value.getString("planet", "serpulo")), value.getInt("sector")); + value.remove("sector"); + value.remove("planet"); + read(() -> readFields(out, value)); + return out; } );