diff --git a/core/assets/contributors b/core/assets/contributors index 526293b76a..69f68350fe 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -132,3 +132,4 @@ Darkness6030 hortiSquash King-BR citrusMarmelade +Evolveye diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index 3763d32ada..25f493c050 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -128,7 +128,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); diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 68058178cc..0b1b2d54d7 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -532,7 +532,7 @@ public class Turret extends ReloadTurret{ if(dead || !hasAmmo()) return; bulletOffset.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; diff --git a/servers_v6.json b/servers_v6.json index 3691d9a47f..75db78dd16 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", @@ -57,7 +57,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me:6568"] + "address": ["yeeth.mindustry.me:6568","yeeth.mindustry.me:5002"] }, { "name": "Obvilion Network", @@ -89,7 +89,7 @@ }, { "name": "Hungarian", - "address": ["survival.humindustry.tk", "148.251.175.124:25601"] + "address": ["hudustry.ddns.net"] }, { "name": "Xpdustry", @@ -121,7 +121,7 @@ }, { "name": "Shard", - "address": ["shard.mcv.kr"] + "address": ["59.12.120.171"] }, { "name": "OMNIDUSTRY", diff --git a/servers_v7.json b/servers_v7.json index fa681a4cf9..70b071417b 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", "eu-fsn-01.vapur.host:24603"] }, { "name": "Obvilion Network",