diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 4406db7b76..bccd085497 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -311,11 +311,11 @@ open = 열기 customize = 사용자 정의 규칙 cancel = 취소 command = 명령 -command.mine = Mine -command.repair = Repair -command.rebuild = Rebuild -command.assist = Assist Player -command.move = Move +command.mine = 채굴 +command.repair = 수리 +command.rebuild = 재건 +command.assist = 플레이어 지원 +command.move = 이동 openlink = 링크 열기 copylink = 링크 복사 back = 뒤로가기 diff --git a/core/src/mindustry/entities/bullet/FlakBulletType.java b/core/src/mindustry/entities/bullet/FlakBulletType.java index 26991e9287..3fbf88a1b0 100644 --- a/core/src/mindustry/entities/bullet/FlakBulletType.java +++ b/core/src/mindustry/entities/bullet/FlakBulletType.java @@ -6,7 +6,7 @@ import mindustry.entities.*; import mindustry.gen.*; public class FlakBulletType extends BasicBulletType{ - public float explodeRange = 30f, explodeDelay = 5f, flakInterval = 6f; + public float explodeRange = 30f, explodeDelay = 5f, flakDelay = 0f, flakInterval = 6f; public FlakBulletType(float speed, float damage){ super(speed, damage, "shell"); @@ -27,9 +27,9 @@ public class FlakBulletType extends BasicBulletType{ super.update(b); //don't check for targets if primed to explode - if(b.fdata >= 0 && b.timer(2, flakInterval)){ + if(b.time >= flakDelay && b.fdata >= 0 && b.timer(2, flakInterval)){ Units.nearbyEnemies(b.team, Tmp.r1.setSize(explodeRange * 2f).setCenter(b.x, b.y), unit -> { - //fadata < 0 means it's primed to explode + //fdata < 0 means it's primed to explode if(b.fdata < 0f || !unit.checkTarget(collidesAir, collidesGround)) return; if(unit.within(b, explodeRange + unit.hitSize/2f)){ diff --git a/servers_v7.json b/servers_v7.json index 612ed7a302..c86251cbda 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,8 +1,13 @@ [ + { "name": "mindustry.pl", "address": ["0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000"] }, + { + "name": "SynapseOS", + "address": ["0nera.ru:7777", "185.178.45.224:7777"] + }, { "name": "C.A.M.S.", "address": ["0.baseduser.eu.org:42001", "0.baseduser.eu.org:42002", "v7.thedimas.pp.ua"] @@ -93,7 +98,7 @@ }, { "name": "OMNIDUSTRY", - "address": ["109.94.209.233:6569"] + "address": ["109.94.209.233:6569","109.94.209.233:6570"] }, { "name": "The Devil",