From ca823be813a719ad776a1eb7deccf50257bb99f7 Mon Sep 17 00:00:00 2001 From: way-zer Date: Sat, 29 Aug 2020 20:31:35 +0800 Subject: [PATCH 1/7] Update servers_be.json one bleeding-edge server of China --- servers_be.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers_be.json b/servers_be.json index 5c007872e5..3e420ee2eb 100644 --- a/servers_be.json +++ b/servers_be.json @@ -10,5 +10,8 @@ }, { "address": "routerchain.ddns.net" + }, + { + "address": "be.wayzer.cf" } ] From 55ed739372edcf16c7312808592ec9838c2104fe Mon Sep 17 00:00:00 2001 From: Recessive <61154659+Recessive@users.noreply.github.com> Date: Wed, 9 Sep 2020 14:27:26 +1000 Subject: [PATCH 2/7] Update servers.json Add {AA} Plague to the server listing --- servers.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers.json b/servers.json index 07226a273f..34241b026b 100644 --- a/servers.json +++ b/servers.json @@ -44,6 +44,9 @@ { "address": "aamindustry.play.ai:6568" }, + { + "address": "aamindustry.play.ai:6569" + }, { "address": "mindustry.atannergaming.com" }, From f30a3392d5830604dc09a21e3f126c46ef9d7979 Mon Sep 17 00:00:00 2001 From: Leonid Skorospelov Date: Sat, 3 Oct 2020 19:54:25 +0300 Subject: [PATCH 3/7] Update servers.json --- servers.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers.json b/servers.json index 8bb2e2097c..f13878499e 100644 --- a/servers.json +++ b/servers.json @@ -70,5 +70,8 @@ }, { "address": "pandorum.su:9999" + }, + { + "address": "mindustryranked.ddns.net" } ] From 31617b906bdf84df4f1d56e98ea6ed271c523189 Mon Sep 17 00:00:00 2001 From: Pear Date: Sat, 10 Oct 2020 15:19:24 -0400 Subject: [PATCH 4/7] Add Pearkin Attack Server to server.json We're a new community starting out with Mindustry. Its a chill and relax attack server with RTV, stats, and Discord moderation setup. --- servers.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers.json b/servers.json index 6ee33c6d30..177f25f676 100644 --- a/servers.json +++ b/servers.json @@ -73,5 +73,8 @@ }, { "address": "pandorum.su:9999" + }, + { + "address": "attack.pearkin.net" } ] From 7f5561f03718a814cc665ac2f96d54dfa065b856 Mon Sep 17 00:00:00 2001 From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com> Date: Sun, 11 Oct 2020 17:03:48 -0700 Subject: [PATCH 5/7] add... --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/world/meta/values/AmmoListValue.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 70d7430557..cb365c3528 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -652,6 +652,7 @@ bullet.homing = [stat]homing bullet.shock = [stat]shock bullet.frag = [stat]frag bullet.knockback = [stat]{0}[lightgray] knockback +bullet.pierce = [stat]{0}[lightgray] pierce bullet.freezing = [stat]freezing bullet.tarred = [stat]tarred bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java index d0d8624ea9..457bcca57b 100644 --- a/core/src/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/mindustry/world/meta/values/AmmoListValue.java @@ -50,6 +50,10 @@ public class AmmoListValue implements StatValue{ sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1))); } + if(type.pierce){ + sep(bt, Core.bundle.format("bullet.pierce", type.pierceCap == -1 ? "infinite" : type.pierceCap)); + } + if((type.status == StatusEffects.burning || type.status == StatusEffects.melting) || type.incendAmount > 0){ sep(bt, "@bullet.incendiary"); } From 24d295a924a9c90beb3351100db392d1bc00e7d1 Mon Sep 17 00:00:00 2001 From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com> Date: Mon, 12 Oct 2020 17:57:00 -0700 Subject: [PATCH 6/7] add infinitepierce + bugfixes --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/world/meta/values/AmmoListValue.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index cb365c3528..b001ad4cd4 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -653,6 +653,7 @@ bullet.shock = [stat]shock bullet.frag = [stat]frag bullet.knockback = [stat]{0}[lightgray] knockback bullet.pierce = [stat]{0}[lightgray] pierce +bullet.infinitepierce = [stat]pierce bullet.freezing = [stat]freezing bullet.tarred = [stat]tarred bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java index 457bcca57b..359b958a96 100644 --- a/core/src/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/mindustry/world/meta/values/AmmoListValue.java @@ -50,8 +50,8 @@ public class AmmoListValue implements StatValue{ sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1))); } - if(type.pierce){ - sep(bt, Core.bundle.format("bullet.pierce", type.pierceCap == -1 ? "infinite" : type.pierceCap)); + if(type.pierce || type.pierceCap != -1){ + sep(bt, type.pierceCap == -1 ? "@bullet.infinitepierce" : Core.bundle.format("bullet.pierce", type.pierceCap)); } if((type.status == StatusEffects.burning || type.status == StatusEffects.melting) || type.incendAmount > 0){ From 4364851cf4050324a482118a5508fd6060777af4 Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Tue, 13 Oct 2020 22:29:55 +0900 Subject: [PATCH 7/7] let buildTable accept `closeSelect` --- core/src/mindustry/world/blocks/ItemSelection.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/ItemSelection.java b/core/src/mindustry/world/blocks/ItemSelection.java index 921808eb08..f2c0b73084 100644 --- a/core/src/mindustry/world/blocks/ItemSelection.java +++ b/core/src/mindustry/world/blocks/ItemSelection.java @@ -15,6 +15,10 @@ public class ItemSelection{ private static float scrollPos = 0f; public static void buildTable(Table table, Seq items, Prov holder, Cons consumer){ + buildTable(table, items, holder, consumer, true); + } + + public static void buildTable(Table table, Seq items, Prov holder, Cons consumer, boolean closeSelect){ ButtonGroup group = new ButtonGroup<>(); group.setMinCheckCount(0); @@ -26,7 +30,9 @@ public class ItemSelection{ for(T item : items){ if(!item.unlockedNow()) continue; - ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> control.input.frag.config.hideConfig()).group(group).get(); + ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> { + if(closeSelect) control.input.frag.config.hideConfig(); + }).group(group).get(); button.changed(() -> consumer.get(button.isChecked() ? item : null)); button.getStyle().imageUp = new TextureRegionDrawable(item.icon(Cicon.small)); button.update(() -> button.setChecked(holder.get() == item));