From 63b4d75c2662954cb1e03c2181fb27fbf78d2921 Mon Sep 17 00:00:00 2001 From: Gamer-art9044 <131509007+Gamer-art9044@users.noreply.github.com> Date: Tue, 20 Feb 2024 23:59:08 +0400 Subject: [PATCH 1/9] Update servers_v7.json (#9576) update. Adddin Crimson star --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 559c1d9e60..50306e0c62 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,6 +3,10 @@ "name": "STP", "address": ["23.88.73.88:25617"] }, + { + "name": "Crimson Star", + "address": ["185.103.101.121:25528"] + }, { "name" : "LesGarsCools", "address": ["est1.be"] From 30c980bee118dfe88fe577876e3c6a1c9d4369dc Mon Sep 17 00:00:00 2001 From: HubsvVnMindus <160602714+HubsvVnMindus@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:07:47 +0700 Subject: [PATCH 2/9] Update servers_v7.json (#9579) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 50306e0c62..6052670dfc 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -286,6 +286,6 @@ }, { "name": "hubVn", - "address": ["de-free-01.hosts.optikservers.com:32362"] + "address": ["srv24.godlike.club:26189"] } ] From cb7f641ed60a9ef58b89d4c74da5efcb80d9b1f5 Mon Sep 17 00:00:00 2001 From: Hunggaming128 <160811008+Hunggaming128@users.noreply.github.com> Date: Thu, 22 Feb 2024 11:23:41 +0700 Subject: [PATCH 3/9] Update servers_v7.json (#9582) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6052670dfc..644e8944d9 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -285,7 +285,7 @@ "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] }, { - "name": "hubVn", + "name": "Sever.VN", "address": ["srv24.godlike.club:26189"] } ] From e78237d291169cf05fa4898a382059d131864c5e Mon Sep 17 00:00:00 2001 From: TheRadioactiveBanana <89061718+TheRadioactiveBanana@users.noreply.github.com> Date: Thu, 22 Feb 2024 23:23:31 +0530 Subject: [PATCH 4/9] Yay dynamic IP (#9584) amazing --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 644e8944d9..cec99c16a7 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -137,7 +137,7 @@ }, { "name": "Eradication Mindustry", - "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.99.254.211:7000", "77.99.254.211:7001", "77.99.254.211:7002", "141.148.196.135:7000", "130.61.220.99:7000", "130.61.220.99:7001"] + "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "77.100.100.249:7002", "141.148.196.135:7000", "130.61.220.99:7000", "130.61.220.99:7001"] }, { "name": "Conservatory", From 52b5a950f9dc1deb3409867d7cd2038153108094 Mon Sep 17 00:00:00 2001 From: Gamer-art9044 <131509007+Gamer-art9044@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:45:32 +0400 Subject: [PATCH 5/9] Update servers_v7.json (#9585) Server have a problems. --- servers_v7.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index cec99c16a7..b452715621 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,10 +3,6 @@ "name": "STP", "address": ["23.88.73.88:25617"] }, - { - "name": "Crimson Star", - "address": ["185.103.101.121:25528"] - }, { "name" : "LesGarsCools", "address": ["est1.be"] From 037f752b732de6a6badb89d453d762edf71fba30 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Fri, 23 Feb 2024 14:11:00 -0800 Subject: [PATCH 6/9] Improve ArmorPlateAbility draw (#9581) * Improve ArmorPlateAbility draw * Revert to tinting Just make a white shine sprite. Or none-white if you want some interesting visuals with the colors. * Fix not applying z when drawShine = false --- core/assets/shaders/unitarmor.frag | 4 +- .../entities/abilities/ArmorPlateAbility.java | 53 ++++++++++++++----- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/core/assets/shaders/unitarmor.frag b/core/assets/shaders/unitarmor.frag index 10116ff3ac..1e475fda17 100644 --- a/core/assets/shaders/unitarmor.frag +++ b/core/assets/shaders/unitarmor.frag @@ -2,7 +2,6 @@ uniform sampler2D u_texture; uniform float u_time; uniform float u_progress; -uniform vec4 u_color; uniform vec2 u_uv; uniform vec2 u_uv2; uniform vec2 u_texsize; @@ -14,8 +13,7 @@ void main(){ vec2 coords = (v_texCoords - u_uv) / (u_uv2 - u_uv); vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y); - vec4 c = texture2D(u_texture, v_texCoords); - + vec4 c = texture2D(u_texture, v_texCoords); c.a *= u_progress; c.a *= step(abs(sin(coords.y*3.0 + u_time)), 0.9); diff --git a/core/src/mindustry/entities/abilities/ArmorPlateAbility.java b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java index bfe776d737..4c02028492 100644 --- a/core/src/mindustry/entities/abilities/ArmorPlateAbility.java +++ b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java @@ -12,10 +12,20 @@ import mindustry.world.meta.*; public class ArmorPlateAbility extends Ability{ public TextureRegion plateRegion; - public Color color = Color.valueOf("d1efff"); + public TextureRegion shineRegion; + public String plateSuffix = "-armor"; + public String shineSuffix = "-shine"; + /** Color of the shine. If null, uses team color. */ + public @Nullable Color color = null; + public float shineSpeed = 1f; + public float z = -1; + + /** Whether to draw the plate region. */ + public boolean drawPlate = true; + /** Whether to draw the shine over the plate region. */ + public boolean drawShine = true; public float healthMultiplier = 0.2f; - public float z = Layer.effect; protected float warmup; @@ -34,24 +44,39 @@ public class ArmorPlateAbility extends Ability{ @Override public void draw(Unit unit){ + if(!drawPlate && !drawShine) return; + if(warmup > 0.001f){ if(plateRegion == null){ - plateRegion = Core.atlas.find(unit.type.name + "-armor", unit.type.region); + plateRegion = Core.atlas.find(unit.type.name + plateSuffix, unit.type.region); + shineRegion = Core.atlas.find(unit.type.name + shineSuffix, plateRegion); } - Draw.draw(z <= 0 ? Draw.z() : z, () -> { - Shaders.armor.region = plateRegion; - Shaders.armor.progress = warmup; - Shaders.armor.time = -Time.time / 20f; + float pz = Draw.z(); + if(z > 0) Draw.z(z); - Draw.rect(Shaders.armor.region, unit.x, unit.y, unit.rotation - 90f); - Draw.color(color); - Draw.shader(Shaders.armor); - Draw.rect(Shaders.armor.region, unit.x, unit.y, unit.rotation - 90f); - Draw.shader(); + if(drawPlate){ + Draw.alpha(warmup); + Draw.rect(plateRegion, unit.x, unit.y, unit.rotation - 90f); + Draw.alpha(1f); + } - Draw.reset(); - }); + if(drawShine){ + Draw.draw(Draw.z(), () -> { + Shaders.armor.region = shineRegion; + Shaders.armor.progress = warmup; + Shaders.armor.time = -Time.time / 20f * shineSpeed; + + Draw.color(color == null ? unit.team.color : color); + Draw.shader(Shaders.armor); + Draw.rect(shineRegion, unit.x, unit.y, unit.rotation - 90f); + Draw.shader(); + + Draw.reset(); + }); + } + + Draw.z(pz); } } } From cf777c9c9a81d7ed24efe2810413b572e0d95938 Mon Sep 17 00:00:00 2001 From: BankaiDev <114865515+MarlokytKaneki@users.noreply.github.com> Date: Sat, 24 Feb 2024 01:11:26 +0300 Subject: [PATCH 7/9] Update servers_v7.json (#9588) Crimson star server --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index b452715621..42eff526d5 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -283,5 +283,9 @@ { "name": "Sever.VN", "address": ["srv24.godlike.club:26189"] + }, + { + "name": "Crimson Star", + "address": ["185.103.101.121:25528"] } ] From dadb3a2e484606c4a9b6e60beed6c23845336d80 Mon Sep 17 00:00:00 2001 From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com> Date: Fri, 23 Feb 2024 23:50:55 -0500 Subject: [PATCH 8/9] Update servers_v7.json (#9589) My VPS provider is weird... if the servers dont appear online give it a few hours for provider to deal with mess. --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 42eff526d5..07370224c2 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -254,7 +254,7 @@ }, { "name": "Atomic", - "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845", "atomic-de.ddns.net:35313"] + "address": ["atomic-uk.ddns.net:25595", "atomic-uk.ddns.net:25587", "atomic-uk.ddns.net:25584", "atomic-uk.ddns.net:25590"] }, { "name": "SkyPlex", From 8dcde40d8dab093c4a840f21ff22e645d23f500f Mon Sep 17 00:00:00 2001 From: BankaiDev <114865515+MarlokytKaneki@users.noreply.github.com> Date: Sat, 24 Feb 2024 17:36:54 +0300 Subject: [PATCH 9/9] Update servers_v7.json (#9590) Pls add new server --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 07370224c2..861b7a7f80 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -286,6 +286,6 @@ }, { "name": "Crimson Star", - "address": ["185.103.101.121:25528"] + "address": ["185.103.101.121:25528", "81.94.159.193"] } ]