From 8eedb5f610467259b00d42972004eca720a0482e Mon Sep 17 00:00:00 2001 From: BasedUser Date: Fri, 13 Nov 2020 10:11:55 +0300 Subject: [PATCH 1/4] Formation of CAMS --- servers_v6.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 6f762adb26..fe37d4cd1e 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -4,10 +4,8 @@ "address": ["mindustry.pl:6000", "mindustry.pl:6666"] }, { - "address": "routerchain.ddns.net" - }, - { - "address": "pandorum.su:8000" + "name": "C.A.M.S." + "address": ["routerchain.ddns.net", "pandorum.su:8000"] }, { "name": "ECAN", From 388374aa240fc6000f1295d9211116b732f33cbe Mon Sep 17 00:00:00 2001 From: BasedUser Date: Fri, 13 Nov 2020 10:13:47 +0300 Subject: [PATCH 2/4] Update servers_v6.json --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index fe37d4cd1e..c627e00001 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -4,7 +4,7 @@ "address": ["mindustry.pl:6000", "mindustry.pl:6666"] }, { - "name": "C.A.M.S." + "name": "C.A.M.S.", "address": ["routerchain.ddns.net", "pandorum.su:8000"] }, { From bda5393a74fb0a1618bcc3a1ce2ae6b3b0b2bf4a Mon Sep 17 00:00:00 2001 From: Bohaska <73286691+Bohaska@users.noreply.github.com> Date: Fri, 13 Nov 2020 19:10:34 +0800 Subject: [PATCH 3/4] Knockback for Spectre Suggested in https://github.com/Anuken/Mindustry-Suggestions/issues/1170 --- core/src/mindustry/content/Bullets.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 87f042ed13..49469d7774 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -358,6 +358,7 @@ public class Bullets implements ContentList{ shootEffect = Fx.shootBig; pierceCap = 2; pierceBuilding = true; + knockback = 0.5f; }}; standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{ @@ -370,6 +371,7 @@ public class Bullets implements ContentList{ makeFire = true; pierceCap = 2; pierceBuilding = true; + knockback = 0.5f; }}; healBullet = new LaserBoltBulletType(5.2f, 13){{ From eaf76b55135103cc511e5d7590daca7f448499d6 Mon Sep 17 00:00:00 2001 From: Bohaska <73286691+Bohaska@users.noreply.github.com> Date: Fri, 13 Nov 2020 19:52:34 +0800 Subject: [PATCH 4/4] Knockback for Spectre just made knockback for spectre on par with water. --- core/src/mindustry/content/Bullets.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 49469d7774..c7fa47a62b 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -358,7 +358,7 @@ public class Bullets implements ContentList{ shootEffect = Fx.shootBig; pierceCap = 2; pierceBuilding = true; - knockback = 0.5f; + knockback = 0.7f; }}; standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{ @@ -371,7 +371,7 @@ public class Bullets implements ContentList{ makeFire = true; pierceCap = 2; pierceBuilding = true; - knockback = 0.5f; + knockback = 0.7f; }}; healBullet = new LaserBoltBulletType(5.2f, 13){{