mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-19 16:57:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/world/blocks/defense/turrets/Turret.java
This commit is contained in:
Anuken 2022-01-17 15:44:09 -05:00
commit d1206d2e2f
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/contributors
View File

@ -132,3 +132,4 @@ Darkness6030
hortiSquash
King-BR
citrusMarmelade
Evolveye

2
core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
View File

@ -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);

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@ -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;

8
servers_v6.json
View File

@ -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",

2
servers_v7.json
View File

@ -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",